about summary refs log tree commit diff
path: root/nixos/tests/all-tests.nix
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-06-03 22:33:52 +0200
committerVladimír Čunát <v@cunat.cz>2019-06-03 22:34:49 +0200
commitee86a325dd067df0da827c2044e8f6e39ffbfed6 (patch)
treee0a4c1946e6101aa41c02c65387b9941fb9b1f48 /nixos/tests/all-tests.nix
parent2812b5ce392370ca671a1f371904a12aa3c6db13 (diff)
parentc4724fb7bcc83a778632ce096e37b7dcdd3b034b (diff)
downloadnixlib-ee86a325dd067df0da827c2044e8f6e39ffbfed6.tar
nixlib-ee86a325dd067df0da827c2044e8f6e39ffbfed6.tar.gz
nixlib-ee86a325dd067df0da827c2044e8f6e39ffbfed6.tar.bz2
nixlib-ee86a325dd067df0da827c2044e8f6e39ffbfed6.tar.lz
nixlib-ee86a325dd067df0da827c2044e8f6e39ffbfed6.tar.xz
nixlib-ee86a325dd067df0da827c2044e8f6e39ffbfed6.tar.zst
nixlib-ee86a325dd067df0da827c2044e8f6e39ffbfed6.zip
Merge branch 'staging-next' into staging
Conflicts (simple):
	nixos/doc/manual/release-notes/rl-1909.xml
Diffstat (limited to 'nixos/tests/all-tests.nix')
-rw-r--r--nixos/tests/all-tests.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index ddc253adbd0b..2f84850f6b3e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -135,6 +135,7 @@ in
   leaps = handleTest ./leaps.nix {};
   lidarr = handleTest ./lidarr.nix {};
   #lightdm = handleTest ./lightdm.nix {};
+  limesurvey = handleTest ./limesurvey.nix {};
   login = handleTest ./login.nix {};
   #logstash = handleTest ./logstash.nix {};
   mailcatcher = handleTest ./mailcatcher.nix {};
@@ -161,6 +162,7 @@ in
   nat.standalone = handleTest ./nat.nix { withFirewall = false; };
   ndppd = handleTest ./ndppd.nix {};
   neo4j = handleTest ./neo4j.nix {};
+  nesting = handleTest ./nesting.nix {};
   netdata = handleTest ./netdata.nix {};
   networking.networkd = handleTest ./networking.nix { networkd = true; };
   networking.scripted = handleTest ./networking.nix { networkd = false; };