diff options
| author | Adam C. Stephens <2071575+adamcstephens@users.noreply.github.com> | 2023-11-27 11:43:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-27 11:43:44 -0500 |
| commit | 76c42dcda8948f0ac026b0dc8e925e4c3ceb55a9 (patch) | |
| tree | 9855b035df94c142e4273ab912e7e0f0ca5727a2 | |
| parent | Merge pull request #270436 from NixOS/backport-270235-to-release-23.11 (diff) | |
| parent | zfsUnstable: 2.2.1-unstable-2023-10-21 -> 2.2.1 (diff) | |
| download | nixpkgs-76c42dcda8948f0ac026b0dc8e925e4c3ceb55a9.tar.gz | |
Merge pull request #270295 from amarshall/backport-269097-to-release-23.11
[Backport release-23.11] zfs: 2.2.0 -> 2.2.1
| -rw-r--r-- | pkgs/os-specific/linux/zfs/stable.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/unstable.nix | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/zfs/stable.nix b/pkgs/os-specific/linux/zfs/stable.nix index 3e53ba902cbd..76a2787c4c77 100644 --- a/pkgs/os-specific/linux/zfs/stable.nix +++ b/pkgs/os-specific/linux/zfs/stable.nix @@ -14,15 +14,15 @@ callPackage ./generic.nix args { # check the release notes for compatible kernels kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM - then kernel.kernelOlder "6.6" + then kernel.kernelOlder "6.7" else kernel.kernelOlder "6.2"; latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM - then linuxKernel.packages.linux_6_5 + then linuxKernel.packages.linux_6_6 else linuxKernel.packages.linux_6_1; # this package should point to the latest release. - version = "2.2.0"; + version = "2.2.1"; - sha256 = "sha256-s1sdXSrLu6uSOmjprbUa4cFsE2Vj7JX5i75e4vRnlvg="; + sha256 = "sha256-2Q/Nhp3YKgMCLPNRNBq5r9U4GeuYlWMWAsjsQy3vFW4="; } diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 9c7e14c31bf3..18d1ae7f9d17 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -12,21 +12,20 @@ in callPackage ./generic.nix args { # check the release notes for compatible kernels kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM - then kernel.kernelOlder "6.6" + then kernel.kernelOlder "6.7" else kernel.kernelOlder "6.2"; latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM - then linuxKernel.packages.linux_6_5 + then linuxKernel.packages.linux_6_6 else linuxKernel.packages.linux_6_1; # 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-<version>-staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.2.1-unstable-2023-10-21"; - rev = "95785196f26e92d82cf4445654ba84e4a9671c57"; + version = "2.2.1"; - sha256 = "sha256-s1sdXSrLu6uSOmjprbUa4cFsE2Vj7JX5i75e4vRnlvg="; + sha256 = "sha256-2Q/Nhp3YKgMCLPNRNBq5r9U4GeuYlWMWAsjsQy3vFW4="; isUnstable = true; } |