summary refs log tree commit diff
path: root/pkgs/os-specific/linux/zfs/default.nix
diff options
context:
space:
mode:
authorrtreffer <treffer@measite.de>2020-07-31 21:01:56 +0200
committerrtreffer <treffer@measite.de>2020-07-31 21:02:36 +0200
commit08566523d88cc6fb266f7d9baa01b94b6503be95 (patch)
treefcd7d43ff61d5a7123c405353e2b5800929c1509 /pkgs/os-specific/linux/zfs/default.nix
parent0645303fb88142956cfb2b59b38aedf45eaac574 (diff)
downloadnixpkgs-08566523d88cc6fb266f7d9baa01b94b6503be95.tar
nixpkgs-08566523d88cc6fb266f7d9baa01b94b6503be95.tar.gz
nixpkgs-08566523d88cc6fb266f7d9baa01b94b6503be95.tar.bz2
nixpkgs-08566523d88cc6fb266f7d9baa01b94b6503be95.tar.lz
nixpkgs-08566523d88cc6fb266f7d9baa01b94b6503be95.tar.xz
nixpkgs-08566523d88cc6fb266f7d9baa01b94b6503be95.tar.zst
nixpkgs-08566523d88cc6fb266f7d9baa01b94b6503be95.zip
Backport zfs 5.8 compaitibility patch to zfs 0.8.4
Adding this patch makes zfs compile against 5.8-rc7 kernels.

Upstream PR: https://github.com/openzfs/zfs/pull/10422
Modifications:
- spl_kvmalloc does not exists in zfs 0.8.4 - related code was dropped.
Diffstat (limited to 'pkgs/os-specific/linux/zfs/default.nix')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 581316dc74d..56b36d4f368 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -42,7 +42,7 @@ let
         inherit rev sha256;
       };
 
-      patches = [ ] ++ extraPatches;
+      patches = [ ./BACKPORT-Linux-5.8-compat-__vmalloc.patch ] ++ extraPatches;
 
       postPatch = optionalString buildKernel ''
         patchShebangs scripts