From 138d8d6bc89e5259079eb1b321a2de51b6a9a251 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 12 Jun 2026 12:29:55 +1000
Subject: [PATCH 1/3] zfs_2_3: 2.3.7 -> 2.3.8

Diff: https://github.com/openzfs/zfs/compare/zfs-2.3.7...zfs-2.3.8

Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.8
---
 pkgs/os-specific/linux/zfs/2_3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/2_3.nix b/pkgs/os-specific/linux/zfs/2_3.nix
index bf6701cc0ff8..34e173e12d78 100644
--- a/pkgs/os-specific/linux/zfs/2_3.nix
+++ b/pkgs/os-specific/linux/zfs/2_3.nix
@@ -16,7 +16,7 @@ callPackage ./generic.nix args {
   kernelMaxSupportedMajorMinor = "7.0";
 
   # this package should point to the latest release.
-  version = "2.3.7";
+  version = "2.3.8";
 
   tests = {
     inherit (nixosTests.zfs) series_2_3;
@@ -30,5 +30,5 @@ callPackage ./generic.nix args {
     amarshall
   ];
 
-  hash = "sha256-67Yo5bAJP3dXC94xybrC4xhwz7pGtrp0MUT9P6OInog=";
+  hash = "sha256-qNBInNRpWrmImcermSHC0emYmnnjNvxWj3QnGtA6SUg=";
 }

From e431b35de8ca352c6bc1de1945a74a447fa7ec7b Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 12 Jun 2026 12:30:28 +1000
Subject: [PATCH 2/3] zfs_2_4: 2.4.2 -> 2.4.3

Diff: https://github.com/openzfs/zfs/compare/zfs-2.4.2...zfs-2.4.3

Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.4.3
---
 pkgs/os-specific/linux/zfs/2_4.nix      | 4 ++--
 pkgs/os-specific/linux/zfs/unstable.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/2_4.nix b/pkgs/os-specific/linux/zfs/2_4.nix
index 5752d198e755..6f4cbc6861d4 100644
--- a/pkgs/os-specific/linux/zfs/2_4.nix
+++ b/pkgs/os-specific/linux/zfs/2_4.nix
@@ -16,7 +16,7 @@ callPackage ./generic.nix args {
   kernelMaxSupportedMajorMinor = "7.0";
 
   # this package should point to the latest release.
-  version = "2.4.2";
+  version = "2.4.3";
 
   tests = {
     inherit (nixosTests.zfs) series_2_4;
@@ -30,5 +30,5 @@ callPackage ./generic.nix args {
     amarshall
   ];
 
-  hash = "sha256-OqsKHzyFjjyX8CoajDGydY4TbuQqMA37PIaEOL+vDug=";
+  hash = "sha256-I1wLbstr0cFiGsyynP9kJ9ATRp/2b+fnnsdz0up+IzM=";
 }
diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index f72e792a16c0..dfc43de1c33e 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -16,14 +16,14 @@ callPackage ./generic.nix args {
   # 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.4.2";
+  version = "2.4.3";
   # rev = "";
 
   tests = {
     inherit (nixosTests.zfs) unstable;
   };
 
-  hash = "sha256-OqsKHzyFjjyX8CoajDGydY4TbuQqMA37PIaEOL+vDug=";
+  hash = "sha256-I1wLbstr0cFiGsyynP9kJ9ATRp/2b+fnnsdz0up+IzM=";
 
   extraLongDescription = ''
     This is "unstable" ZFS, and will usually be a pre-release version of ZFS.

From e99eb6d145151539d4117ef1449997a934c657af Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 12 Jun 2026 12:42:47 +1000
Subject: [PATCH 3/3] zfs: remove patch

included in 2.3.8 and 2.4.3
---
 pkgs/os-specific/linux/zfs/generic.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
index 1dc98829da38..ea017985f78e 100644
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -4,7 +4,6 @@ let
       lib,
       stdenv,
       fetchFromGitHub,
-      fetchpatch2,
       autoreconfHook269,
       util-linux,
       nukeReferences,
@@ -100,12 +99,7 @@ let
         inherit rev hash;
       };
 
-      patches =
-        extraPatches
-        ++ lib.optional (kernel != null && lib.versionOlder kernel.version "5.14") (fetchpatch2 {
-          url = "https://github.com/openzfs/zfs/commit/58c8dc5f6926eb96903a3f38b141e8998ef9261b.patch?full_index=1";
-          hash = "sha256-eYkMhHsHBA9MKXnB/GuHpuv44g1SCGV5Or0InPBeNkU=";
-        });
+      patches = extraPatches;
 
       postPatch =
         optionalString buildKernel ''