From 8d0db928289e0d3fd8fbefad0a15b3e6c734fb2e Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 6 Aug 2024 18:37:12 -0400 Subject: [PATCH 1/2] 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 --- pkgs/os-specific/linux/zfs/2_2.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix index cc4a3490a197f7..b6d99bbcc0065e 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.11"; - latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_8; + latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_10; # 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 fde7c3afb37e7a9d4be39e112b4b8f0bd6f75352 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 6 Aug 2024 18:37:47 -0400 Subject: [PATCH 2/2] zfs-unstable: 2.2.4-unstable-2024-07-15 -> 2.2.5 Patches all appear to be merged into this release. --- pkgs/os-specific/linux/zfs/unstable.nix | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index faf3514dba3e88..d989e2394ce4ed 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -23,31 +23,13 @@ callPackage ./generic.nix args { # 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-unstable-2024-07-15"; - rev = "/54ef0fdf60a8e7633c38cb46e1f5bcfcec792f4e"; + version = "2.2.5"; + # rev = ""; isUnstable = true; tests = [ nixosTests.zfs.unstable ]; - # 6.10 patches approved+merged to the default branch, not in staging yet - # https://github.com/openzfs/zfs/pull/16250 - extraPatches = [ - (fetchpatch { - url = "https://github.com/openzfs/zfs/commit/7ca7bb7fd723a91366ce767aea53c4f5c2d65afb.patch"; - hash = "sha256-vUX4lgywh5ox6DjtIfeC90KjbLoW3Ol0rK/L65jOENo="; - }) - (fetchpatch { - url = "https://github.com/openzfs/zfs/commit/e951dba48a6330aca9c161c50189f6974e6877f0.patch"; - hash = "sha256-A1h0ZLY+nlReBMTlEm3O9kwBqto1cgsZdnJsHpR6hw0="; - }) - (fetchpatch { - url = "https://github.com/openzfs/zfs/commit/b409892ae5028965a6fe98dde1346594807e6e45.patch"; - hash = "sha256-pW1b8ktglFhwVRapTB5th9UCyjyrPmCVPg53nMENax8="; - }) - - ]; - - hash = "sha256-7vZeIzA2yDW/gSCcS2AM3+C9qbRIbA9XbCRUxikW2+M="; + hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg="; }