diff options
author | aszlig <aszlig@nix.build> | 2020-04-15 12:59:42 +0200 |
---|---|---|
committer | aszlig <aszlig@nix.build> | 2020-04-15 12:59:42 +0200 |
commit | 4794a17af36d1da04edcc13e2366b7fe9b2bb192 (patch) | |
tree | dc2072c6757ab0f8489d879b302ddc7e1a90628b | |
parent | 9194146ca0c78085118d769d8eda270764296ed2 (diff) |
core/tests: Rename references to "nesting"
The nesting.clone and nesting.children options were renamed[1] upstream and they're now contained in one single submodule option, which means that for our tests we only need to check for config.specialisation instead of nesting.clone and nesting.children separately. [1]: https://github.com/NixOS/nixpkgs/commit/ec2d28e3233c4c04fe6afe13e82 Signed-off-by: aszlig <aszlig@nix.build>
-rw-r--r-- | modules/core/tests.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/modules/core/tests.nix b/modules/core/tests.nix index dcbc64f2..5bc77820 100644 --- a/modules/core/tests.nix +++ b/modules/core/tests.nix @@ -400,7 +400,7 @@ let path = ["nixos" "installer" "simple"]; } { check = elem "ext3" config.boot.supportedFilesystems - && config.nesting.clone != []; + && config.specialisation != {}; path = ["nixos" "installer" "simpleClone"]; } { check = config.boot.loader.grub.device == "nodev" @@ -409,7 +409,7 @@ let } { check = config.boot.loader.grub.device == "nodev" && config.boot.loader.grub.efiSupport - && config.nesting.clone != []; + && config.specialisation != {}; path = ["nixos" "installer" "simpleUefiGrubClone"]; } { check = config.boot.loader.systemd-boot.enable; @@ -640,9 +640,8 @@ let { check = config.services.neo4j.enable; path = ["nixos" "neo4j"]; } - { check = config.nesting.clone != [] - || config.nesting.children != []; - path = ["nixos" "nesting"]; + { check = config.specialisation != {}; + path = ["nixos" "specialisation"]; } { check = config.services.netdata.enable; path = ["nixos" "netdata"]; |