diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-16 03:09:33 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-16 03:09:33 +0300 |
| commit | 6b6a57574828b21632a7b8ff3a99e1465035b93e (patch) | |
| tree | 07fe10e97c2d0b4cbf45e90952d8c7d948e84c59 /nixos/release.nix | |
| parent | ce018be2d6ce20960b52ebc4bd86e64a5a58ce29 (diff) | |
| parent | 780592ca6ef752f3f4886a66ed6181095e358db5 (diff) | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/tools/networking/telnet/default.nix pkgs/top-level/aliases.nix
Diffstat (limited to 'nixos/release.nix')
| -rw-r--r-- | nixos/release.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index 0d79580253910..04970f1c188c3 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -285,6 +285,7 @@ in rec { tests.env = callTest tests/env.nix {}; tests.ferm = callTest tests/ferm.nix {}; tests.firefox = callTest tests/firefox.nix {}; + tests.flatpak = callTest tests/flatpak.nix {}; tests.firewall = callTest tests/firewall.nix {}; tests.fwupd = callTest tests/fwupd.nix {}; tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {}; @@ -347,6 +348,7 @@ in rec { tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; }; # TODO: put in networking.nix after the test becomes more complete tests.networkingProxy = callTest tests/networking-proxy.nix {}; + tests.nexus = callTest tests/nexus.nix { }; tests.nfs3 = callTest tests/nfs.nix { version = 3; }; tests.nfs4 = callTest tests/nfs.nix { version = 4; }; tests.nginx = callTest tests/nginx.nix { }; @@ -397,6 +399,7 @@ in rec { tests.virtualbox = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/virtualbox.nix {}; tests.wordpress = callTest tests/wordpress.nix {}; tests.xautolock = callTest tests/xautolock.nix {}; + tests.xdg-desktop-portal = callTest tests/xdg-desktop-portal.nix {}; tests.xfce = callTest tests/xfce.nix {}; tests.xmonad = callTest tests/xmonad.nix {}; tests.xrdp = callTest tests/xrdp.nix {}; |