From 6161f0ce070789785dd46dd56de4acee72cb8c8f Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 19 Jul 2024 08:42:04 -0400 Subject: [PATCH 1/3] zfs: move maintainer adamcstephens to 2.2 only (cherry picked from commit a65001e9994e9c54ecd4c3e54f01b39c27834e2c) --- pkgs/os-specific/linux/zfs/2_2.nix | 3 +++ pkgs/os-specific/linux/zfs/generic.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix index 6504294a597fa80..5873a73bf9dba26 100644 --- 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 , ... @@ -26,5 +27,7 @@ callPackage ./generic.nix args { nixosTests.zfs.series_2_2 ]; + maintainers = with lib.maintainers; [ adamcstephens amarshall ]; + hash = "sha256-SSp/1Tu1iGx5UDcG4j0k2fnYxK05cdE8gzfSn8DU5Z4="; } diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index c0ff834cb34ab9a..a7264a3ded59d70 100644 --- 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: From 33cd2ebbc098f25b356a1f2c6007dcba6f36245f Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 6 Aug 2024 18:37:12 -0400 Subject: [PATCH 2/3] zfs_2_2: 2.2.4 -> 2.2.5 Diff: https://github.com/openzfs/zfs/compare/zfs-2.2.4...zfs-2.2.5 Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.2.5 (cherry picked from commit 8d0db928289e0d3fd8fbefad0a15b3e6c734fb2e) --- pkgs/os-specific/linux/zfs/2_2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix index 5873a73bf9dba26..9e3fde0780f0bf7 100644 --- a/pkgs/os-specific/linux/zfs/2_2.nix +++ b/pkgs/os-specific/linux/zfs/2_2.nix @@ -15,12 +15,12 @@ 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 @@ -29,5 +29,5 @@ callPackage ./generic.nix args { maintainers = with lib.maintainers; [ adamcstephens amarshall ]; - hash = "sha256-SSp/1Tu1iGx5UDcG4j0k2fnYxK05cdE8gzfSn8DU5Z4="; + hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg="; } From 0d62076169c86d4f34cdb709c6d6293efa6e3e9e Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 6 Aug 2024 18:37:47 -0400 Subject: [PATCH 3/3] zfs-unstable: 2.2.4-unstable-2024-07-15 -> 2.2.5 While not in the cherry-picked commit, this updates the Kernel version bits to match the state there. Essentially this squashes a few previous commits that have now-superfluous intermediate state. (cherry picked from commit fde7c3afb37e7a9d4be39e112b4b8f0bd6f75352) --- pkgs/os-specific/linux/zfs/unstable.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index eb1591e04632555..59667d981319e41 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -14,15 +14,15 @@ 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--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.2.4"; + version = "2.2.5"; # rev = ""; isUnstable = true; @@ -30,5 +30,5 @@ callPackage ./generic.nix args { nixosTests.zfs.unstable ]; - hash = "sha256-SSp/1Tu1iGx5UDcG4j0k2fnYxK05cdE8gzfSn8DU5Z4="; + hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg="; }