[Backport release-24.05] zfs{2_2,unstable}: 2.2.4 -> 2.2.5 (#340074)

NixOS · Sep 6, 2024 · 0a4cf03 · 0a4cf03
2 parents 8451067 + 0d62076
commit 0a4cf03
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix
@@ -1,6 +1,7 @@
 { callPackage
 , kernel ? null
 , stdenv
+, lib
 , linuxKernel
 , nixosTests
 , ...
@@ -14,17 +15,19 @@ callPackage ./generic.nix args {
  # this attribute is the correct one for this package.
  kernelModuleAttribute = "zfs_2_2";
  # check the release notes for compatible kernels
- kernelCompatible = kernel.kernelOlder "6.9";
+ kernelCompatible = kernel.kernelOlder "6.10";
 
  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_6;
 
  # this package should point to the latest release.
- version = "2.2.4";
+ version = "2.2.5";
 
  tests = [
  nixosTests.zfs.installer
  nixosTests.zfs.series_2_2
  ];
 
- hash = "sha256-SSp/1Tu1iGx5UDcG4j0k2fnYxK05cdE8gzfSn8DU5Z4=";
+ maintainers = with lib.maintainers; [ adamcstephens amarshall ];
+
+ hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg=";
 }
diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
@@ -30,7 +30,7 @@ let
  , isUnstable ? false
  , latestCompatibleLinuxPackages
  , kernelCompatible ? null
- , maintainers ? (with lib.maintainers; [ amarshall adamcstephens ])
+ , maintainers ? (with lib.maintainers; [ amarshall ])
  , tests
  }@innerArgs:
 

diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -14,21 +14,21 @@ callPackage ./generic.nix args {
  # this attribute is the correct one for this package.
  kernelModuleAttribute = "zfs_unstable";
  # check the release notes for compatible kernels
- kernelCompatible = kernel.kernelOlder "6.9";
+ kernelCompatible = kernel.kernelOlder "6.11";
 
- latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_6;
+ latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_10;
 
  # 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.4";
+ version = "2.2.5";
  # rev = "";
 
  isUnstable = true;
  tests = [
  nixosTests.zfs.unstable
  ];
 
- hash = "sha256-SSp/1Tu1iGx5UDcG4j0k2fnYxK05cdE8gzfSn8DU5Z4=";
+ hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg=";
 }