From 0ca42be61b2f92abfda6689b610d325adfb2e262 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 13 Aug 2026 21:45:32 +0300
Subject: [PATCH] zfs_unstable: sync backports with zfs_2_4

---
 pkgs/os-specific/linux/zfs/2_4.nix      |  1 +
 pkgs/os-specific/linux/zfs/unstable.nix | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/pkgs/os-specific/linux/zfs/2_4.nix b/pkgs/os-specific/linux/zfs/2_4.nix
index 96226842cf97..d51c121c7b9e 100644
--- a/pkgs/os-specific/linux/zfs/2_4.nix
+++ b/pkgs/os-specific/linux/zfs/2_4.nix
@@ -18,6 +18,7 @@ callPackage ./generic.nix args {
   # this package should point to the latest release.
   version = "2.4.3";
 
+  # if adding a patch here, check if it also needs to be applied to zfs_unstable
   extraPatches = [
     # https://github.com/openzfs/zfs/issues/18366
     # dedup data corruption fix unreleased as of OpenZFS 2.4.3
diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index dfc43de1c33e..8cb42a2393a9 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -1,6 +1,7 @@
 {
   callPackage,
   nixosTests,
+  fetchpatch,
   ...
 }@args:
 
@@ -19,6 +20,22 @@ callPackage ./generic.nix args {
   version = "2.4.3";
   # rev = "";
 
+  # if adding a patch here, check if it also needs to be applied to the stable branches
+  extraPatches = [
+    # https://github.com/openzfs/zfs/issues/18366
+    # dedup data corruption fix unreleased as of OpenZFS 2.4.3
+    (fetchpatch {
+      url = "https://github.com/openzfs/zfs/commit/6fb72fda0f60d9efb591e320f83f78b19ec451cc.patch?full_index=1";
+      hash = "sha256-UuSVmO61Ux5S3F+JAtRnHyeVS4EFobDTKBuD5s8PI+k=";
+    })
+    # backport kernel memory corruption fix
+    # https://github.com/openzfs/zfs/issues/18787
+    (fetchpatch {
+      url = "https://github.com/openzfs/zfs/commit/223b8bc446851e5e796e5446ac24d03bbf468f43.patch?full_index=1";
+      hash = "sha256-I29A+NLYLzy7cMC8FQpBdSYbjFu/kscgTW8mAauPVf4=";
+    })
+  ];
+
   tests = {
     inherit (nixosTests.zfs) unstable;
   };