summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorRaito Bezarius <masterancpp@gmail.com>2023-03-24 21:39:57 +0100
committerRaito Bezarius <masterancpp@gmail.com>2023-03-27 18:17:31 +0200
commit64a4de856877a32e4f8f4863101e2cbbfdc6b62b (patch)
tree45f4d42207464ac6150a8cfa9027f6e5c6df83bf /pkgs/os-specific
parent21be60fd0b16a8361916ec2ec23c1bb47383874a (diff)
downloadnixpkgs-64a4de856877a32e4f8f4863101e2cbbfdc6b62b.tar
nixpkgs-64a4de856877a32e4f8f4863101e2cbbfdc6b62b.tar.gz
nixpkgs-64a4de856877a32e4f8f4863101e2cbbfdc6b62b.tar.bz2
nixpkgs-64a4de856877a32e4f8f4863101e2cbbfdc6b62b.tar.lz
nixpkgs-64a4de856877a32e4f8f4863101e2cbbfdc6b62b.tar.xz
nixpkgs-64a4de856877a32e4f8f4863101e2cbbfdc6b62b.tar.zst
nixpkgs-64a4de856877a32e4f8f4863101e2cbbfdc6b62b.zip
zfsUnstable: make it compatible again with 6.2.8 and potentially 6.3
Patched from https://github.com/openzfs/zfs/pull/14668
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 5e5ec6d7931..750586ff1b1 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -256,5 +256,13 @@ in {
     sha256 = "sha256-CdPuyZMXFzANEdnsr/rB5ckkT8X5uziniY5vmRCKl1U=";
 
     isUnstable = true;
+
+    # Necessary for 6.2.8+ and 6.3 compatibility, see https://github.com/openzfs/zfs/issues/14658
+    extraPatches = [
+      (fetchpatch {
+        url = "https://github.com/openzfs/zfs/pull/14668.patch";
+        hash = "sha256-PR7hxxdjLkjszADdw0R0JRmBPfDlsXG6D+VfC7QzEhk=";
+      })
+    ];
   };
 }