diff options
| author | aszlig <aszlig@nix.build> | 2022-09-26 17:27:16 +0200 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2022-09-26 17:27:21 +0200 |
| commit | 9a4b82d2af8ccc9d87729d90fdfca16d790a9517 (patch) | |
| tree | ec6fac0bfb55576b405e6da8531a61be529ba493 /nixos | |
| parent | d818fa6fe4f9f47f6559063bb89892a18fd7c1f6 (diff) | |
| parent | 373feb46cffabdbf76079789c1b60f2ebf8ba87e (diff) | |
Merge pull request #191490 (ZFS test eval fix)
This makes sure that we don't try to evaluate the tests with an
incompatible kernel version. The original reviewer didn't react within
10 days, but since they got notified and all this commit is doing is to
fix evaluation, I consider it safe to merge.
Cc: @adisbladis
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/zfs.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 0b44961a3deb..29df691cecbe 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -8,7 +8,9 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; let makeZfsTest = name: - { kernelPackage ? if enableUnstable then pkgs.linuxPackages_latest else pkgs.linuxPackages + { kernelPackage ? if enableUnstable + then pkgs.zfsUnstable.latestCompatibleLinuxPackages + else pkgs.linuxPackages , enableUnstable ? false , extraTest ? "" }: |