diff options
author | Ryan Lahfa <masterancpp@gmail.com> | 2023-03-27 21:11:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-27 21:11:41 +0200 |
commit | 90b5f42ec92f15e5943ede53153a801a3dedbba0 (patch) | |
tree | dbc0097811ed3db41516d7aca65e022e7fdff349 /pkgs/os-specific | |
parent | 2749074b2e2960fc97aaeca251f3152d6e6effb7 (diff) | |
parent | 56fa7ab066165a2eb6274a0ab423b518e3e115b4 (diff) | |
download | nixpkgs-90b5f42ec92f15e5943ede53153a801a3dedbba0.tar nixpkgs-90b5f42ec92f15e5943ede53153a801a3dedbba0.tar.gz nixpkgs-90b5f42ec92f15e5943ede53153a801a3dedbba0.tar.bz2 nixpkgs-90b5f42ec92f15e5943ede53153a801a3dedbba0.tar.lz nixpkgs-90b5f42ec92f15e5943ede53153a801a3dedbba0.tar.xz nixpkgs-90b5f42ec92f15e5943ede53153a801a3dedbba0.tar.zst nixpkgs-90b5f42ec92f15e5943ede53153a801a3dedbba0.zip |
Merge pull request #222946 from RaitoBezarius/zfs-6_2-6_3-compat
zfsUnstable: make it compatible again with 6.2.8 and potentially 6.3
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 8 |
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="; + }) + ]; }; } |