diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-09-11 17:00:13 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-09-11 17:00:13 +0200 |
commit | 39017312b152f5a89817abebe400e4fb2f9093c6 (patch) | |
tree | 984e6e6df232b72cb9cec0f6936ec0bd6307ecf7 /modules/core/tests.nix | |
parent | 8aa351305d04ea7054b54abc557f754bec057522 (diff) |
core/tests: Add and remove upstream NixOS tests
New tests as of NixOS/nixpkgs@4ac7b7d5deb4a2ccf291c1251ff7515f1ab17c82: * nixos.kde5 * nixos.ferm * nixos.quagga The following tests were removed: * nixos.dockerRegistry * nixos.sddm The test for SDDM is now included within the KDE5 test. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules/core/tests.nix')
-rw-r--r-- | modules/core/tests.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/modules/core/tests.nix b/modules/core/tests.nix index aca068f3..329b8d87 100644 --- a/modules/core/tests.nix +++ b/modules/core/tests.nix @@ -60,15 +60,15 @@ let { check = config.virtualisation.docker.enable; path = ["nixos" "docker"]; } - { check = config.services.dockerRegistry.enable; - path = ["nixos" "dockerRegistry"]; - } { check = config.security.pam.enableEcryptfs; path = ["nixos" "ecryptfs"]; } { check = config.services.etcd.enable; path = ["nixos" "etcd"]; } + { check = config.services.ferm.enable; + path = ["nixos" "ferm"]; + } { check = config.networking.firewall.enable; path = ["nixos" "firewall"]; } @@ -146,6 +146,10 @@ let { check = config.services.xserver.desktopManager.kde4.enable; path = ["nixos" "kde4"]; } + { check = config.services.xserver.displayManager.sddm.enable + || config.services.xserver.desktopManager.kde5.enable; + path = ["nixos" "kde5"]; + } { check = config.i18n.consoleKeyMap == "azerty/fr" || config.services.xserver.layout == "fr"; path = ["nixos" "keymap" "azerty"]; @@ -274,6 +278,9 @@ let { check = config.services.pumpio.enable; path = ["nixos" "pumpio"]; } + { check = config.services.quagga.ospf.enable; + path = ["nixos" "quagga"]; + } { check = config.hardware.opengl.driSupport && config.services.xserver.enable; path = ["nixos" "quake3"]; @@ -281,9 +288,6 @@ let { check = true; path = ["nixos" "runInMachine"]; } - { check = config.services.xserver.displayManager.sddm.enable; - path = ["nixos" "sddm"]; - } { check = true; path = ["nixos" "simple"]; } |