diff options
| author | aszlig <aszlig@nix.build> | 2024-03-05 21:13:54 +0100 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2024-03-05 21:16:20 +0100 |
| commit | 21fdf5e0407d11524dbc0c42743358d9b973943c (patch) | |
| tree | ba52a42af4d4994d1a87d5301f73fa23d39c68e3 | |
| parent | b7f7bee22b3754ce133b9c78856c7431db2d992e (diff) | |
core/tests: Fix evaluating supportedFilesystems
The option boot.supportedFilesystems is now[1] an attribute set instead of a list, so we need to fix all checks. [1]: https://github.com/NixOS/nixpkgs/commit/258b935d705be03e939b8205215 Signed-off-by: aszlig <aszlig@nix.build>
| -rw-r--r-- | modules/core/tests.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/core/tests.nix b/modules/core/tests.nix index ad8a579a..05123ae1 100644 --- a/modules/core/tests.nix +++ b/modules/core/tests.nix @@ -36,7 +36,7 @@ let { check = config.services.babeld.enable; path = ["nixos" "babeld"]; } - { check = elem "bcachefs" config.boot.supportedFilesystems; + { check = config.boot.supportedFilesystems.bcachefs or false; path = ["nixos" "bcachefs"]; } { check = config.services.beanstalkd.enable; @@ -315,7 +315,7 @@ let ["nixos" "installer" "luksroot-format2"] ]; } - { check = elem "ext3" config.boot.supportedFilesystems + { check = config.boot.supportedFilesystems.ext3 or false && config.specialisation != {}; path = ["nixos" "installer" "simpleClone"]; } @@ -328,7 +328,7 @@ let && config.specialisation != {}; path = ["nixos" "installer" "simpleUefiGrubClone"]; } - { check = elem "zfs" config.boot.supportedFilesystems; + { check = config.boot.supportedFilesystems.zfs or false; path = ["nixos" "installer" "zfsroot"]; } { check = config.services.jackett.enable; @@ -830,11 +830,11 @@ let { check = config.services.yggdrasil.enable; path = ["nixos" "yggdrasil"]; } - { check = elem "zfs" config.boot.supportedFilesystems + { check = config.boot.supportedFilesystems.zfs or false && !config.boot.zfs.enableUnstable; path = ["nixos" "zfs" "stable"]; } - { check = elem "zfs" config.boot.supportedFilesystems + { check = config.boot.supportedFilesystems.zfs or false && config.boot.zfs.enableUnstable; path = ["nixos" "zfs" "unstable"]; } |