diff options
Diffstat (limited to 'pkgs/os-specific/linux/zfs/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index bf45a503761..c9f0438c86f 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ pkgs, lib, stdenv, fetchFromGitHub , autoreconfHook269, util-linux, nukeReferences, coreutils , perl, nixosTests , configFile ? "all" @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_13 +, linuxPackages_5_14 ? pkgs.linuxKernel.packages.linux_5_14 }: with lib; @@ -196,6 +196,7 @@ let license = licenses.cddl; platforms = platforms.linux; maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ]; + mainProgram = "zfs"; # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. # On NixOS set the option boot.zfs.enableUnstable. broken = buildKernel && (kernelCompatible != null) && !kernelCompatible; @@ -207,25 +208,28 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14"; - latestCompatibleLinuxPackages = linuxPackages_5_13; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15"; + latestCompatibleLinuxPackages = linuxPackages_5_14; # this package should point to the latest release. - version = "2.1.0"; + version = "2.1.1"; - sha256 = "sha256-YdY4SStXZGBBdAHdM3R/unco7ztxI3s0/buPSNSeh5o="; + sha256 = "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY="; }; zfsUnstable = common { # check the release notes for compatible kernels kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15"; - latestCompatibleLinuxPackages = linuxPackages_5_13; + latestCompatibleLinuxPackages = linuxPackages_5_14; # this package should point to a version / git revision compatible with the latest kernel release - version = "unstable-2021-08-30"; - rev = "3b89d9518df2c7fd747e349873a3d4d498beb20e"; + # IMPORTANT: Always use a tagged release candidate or commits from the + # zfs-<version>-staging branch, because this is tested by the OpenZFS + # maintainers. + version = "2.1.1"; + # rev = "0000000000000000000000000000000000000000"; - sha256 = "sha256-wVbjpVrPQmhJmMqdGUf0IwlCIoOsT7Zfj5lxSKcOsgg="; + sha256 = "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY="; isUnstable = true; }; |