summary refs log tree commit diff
path: root/pkgs/os-specific/linux/zfs/default.nix
diff options
context:
space:
mode:
authorHenri Menke <henri@henrimenke.de>2020-10-07 19:25:08 +0200
committerJon <jonringer@users.noreply.github.com>2020-10-19 11:18:01 -0700
commitcabb90e2123c9b97f36001d7c1df9e1d578c9ace (patch)
treeedbad52fce96bd5ee73a516b47f45b25fab1349c /pkgs/os-specific/linux/zfs/default.nix
parente5973b4438e091f3601712239f7bb58fda86cb5e (diff)
downloadnixpkgs-cabb90e2123c9b97f36001d7c1df9e1d578c9ace.tar
nixpkgs-cabb90e2123c9b97f36001d7c1df9e1d578c9ace.tar.gz
nixpkgs-cabb90e2123c9b97f36001d7c1df9e1d578c9ace.tar.bz2
nixpkgs-cabb90e2123c9b97f36001d7c1df9e1d578c9ace.tar.lz
nixpkgs-cabb90e2123c9b97f36001d7c1df9e1d578c9ace.tar.xz
nixpkgs-cabb90e2123c9b97f36001d7c1df9e1d578c9ace.tar.zst
nixpkgs-cabb90e2123c9b97f36001d7c1df9e1d578c9ace.zip
zfs: 0.8.4 -> 0.8.5
Diffstat (limited to 'pkgs/os-specific/linux/zfs/default.nix')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 14b0909a189..ed07cfd6ffc 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -153,9 +153,6 @@ let
         substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"
         done
 
-        # Fix pkgconfig.
-        ln -s ../share/pkgconfig $out/lib/pkgconfig
-
         # Remove tests because they add a runtime dependency on gcc
         rm -rf $out/share/zfs/zfs-tests
 
@@ -195,10 +192,9 @@ in {
     # incompatibleKernelVersion = "4.20";
 
     # this package should point to the latest release.
-    version = "0.8.4";
+    version = "0.8.5";
 
-    sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp";
-    extraPatches = [ ./BACKPORT-Linux-5.8-compat-__vmalloc.patch ];
+    sha256 = "0vhd3zs2i83pd59nk0llml4vyk4fc178j6nhg00p6k3f6r0l655b";
   };
 
   zfsUnstable = common {