Unverified Commit 76c42dcd authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

Merge pull request #270295 from amarshall/backport-269097-to-release-23.11 

[Backport release-23.11] zfs: 2.2.0 -> 2.2.1
parents 5c9af7ee e0350ce8

pkgs/os-specific/linux/zfs/stable.nix

+4 −4
Original line number Diff line number Diff line
@@ -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=";

}

pkgs/os-specific/linux/zfs/unstable.nix

+4 −5
Original line number Diff line number Diff line
@@ -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;

}