From 9339e8e093c76e8764e5baf3fad887d8140a9146 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Wed, 15 Dec 2021 21:35:01 -0500 Subject: [PATCH 1/2] zfs: Update repository zfsonlinux/zfs redirects to openzfs/zfs. --- pkgs/os-specific/linux/zfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 29e7f3e9b942a..361c5fcb62071 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -46,7 +46,7 @@ let name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; src = fetchFromGitHub { - owner = "zfsonlinux"; + owner = "openzfs"; repo = "zfs"; inherit rev sha256; }; From 04ae83ae6b4c5b7a7a9db87f091eaf9f977965bf Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Wed, 15 Dec 2021 21:32:48 -0500 Subject: [PATCH 2/2] zfs: 2.1.1 -> 2.1.2 --- pkgs/os-specific/linux/zfs/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 361c5fcb62071..7341240f95afd 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_10 ? pkgs.linuxKernel.packages.linux_5_10 +, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15 }: with lib; @@ -215,28 +215,28 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15"; - latestCompatibleLinuxPackages = linuxPackages_5_10; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16"; + latestCompatibleLinuxPackages = linuxPackages_5_15; # this package should point to the latest release. - version = "2.1.1"; + version = "2.1.2"; - sha256 = "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY="; + sha256 = "sha256-7oSFZlmjCr+egImIVf429GrFOKn3L3r4SMnK3LHHmL8="; }; zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15"; - latestCompatibleLinuxPackages = linuxPackages_5_10; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16"; + latestCompatibleLinuxPackages = linuxPackages_5_15; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.1.1"; + version = "2.1.2"; # rev = "0000000000000000000000000000000000000000"; - sha256 = "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY="; + sha256 = "sha256-7oSFZlmjCr+egImIVf429GrFOKn3L3r4SMnK3LHHmL8="; isUnstable = true; };