zfs_2_3: 2.3.7 -> 2.3.8, zfs_2_4: 2.4.2 -> 2.4.3 (#530908)

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=";
 }

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=";
 }

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 ''

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.