about summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2024-03-07 12:35:30 +0100
committeraszlig <aszlig@nix.build>2024-03-07 12:35:30 +0100
commit1bbead062efe0d65a02ca4946096aeeda819c12e (patch)
tree63379d06d508e5f61513d6d7519649eba844c939
parent5f9012f1d7941d4b79c724243630b05c028d1977 (diff)
core/tests: Switch to new boot.zfs.package option
When fixing evaluation for supportedFilesystems in
21fdf5e0407d11524dbc0c42743358d9b973943c, I forgot about another change
related to ZFS options, which leads to the following evaluation error:

  The option `boot.zfs.enableUnstable' can no longer be used since it's
  been removed. Instead set `boot.zfs.package = pkgs.zfs_unstable;`

Signed-off-by: aszlig <aszlig@nix.build>
Reported-by: https://github.com/devhell
-rw-r--r--modules/core/tests.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/core/tests.nix b/modules/core/tests.nix
index 05123ae1..5a0a0cb4 100644
--- a/modules/core/tests.nix
+++ b/modules/core/tests.nix
@@ -831,11 +831,11 @@ let
       path  = ["nixos" "yggdrasil"];
     }
     { check = config.boot.supportedFilesystems.zfs or false
-           && !config.boot.zfs.enableUnstable;
+           && config.boot.zfs.package.version == pkgs.zfs.version;
       path  = ["nixos" "zfs" "stable"];
     }
     { check = config.boot.supportedFilesystems.zfs or false
-           && config.boot.zfs.enableUnstable;
+           && config.boot.zfs.package.version == pkgs.zfs_unstable.version;
       path  = ["nixos" "zfs" "unstable"];
     }
     { check = config.programs.zsh.enable;