Skip to content

Commit 9da5b17

Browse files
authored
Merge pull request #375 from nix-community/zfs-fix
latest-zfs-kernel: fix with latest nixpkgs api
2 parents 149afed + ce78bbf commit 9da5b17

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

nix/latest-zfs-kernel.nix

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,23 @@ let
1212
(builtins.match "linux_[0-9]+_[0-9]+" name) != null
1313
&& (builtins.tryEval kernelPackages).success
1414
&& (
15-
(!isUnstable && !kernelPackages.zfs.meta.broken)
16-
|| (isUnstable && !kernelPackages.zfs_unstable.meta.broken)
15+
let
16+
zfsPackage =
17+
if isUnstable then
18+
kernelPackages.zfs_unstable
19+
else
20+
kernelPackages.${pkgs.zfs.kernelModuleAttribute};
21+
in
22+
!(zfsPackage.meta.broken or false)
1723
)
1824
) pkgs.linuxKernel.packages;
1925
latestKernelPackage = lib.last (
20-
lib.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version)) (builtins.attrValues zfsCompatibleKernelPackages)
26+
lib.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version)) (
27+
builtins.attrValues zfsCompatibleKernelPackages
28+
)
2129
);
2230
in
2331
{
2432
# Note this might jump back and worth as kernel get added or removed.
25-
boot.kernelPackages = latestKernelPackage;
33+
boot.kernelPackages = lib.mkIf (lib.meta.availableOn pkgs.hostPlatform pkgs.zfs) latestKernelPackage;
2634
}

0 commit comments

Comments
 (0)