summary refs log tree commit diff
path: root/pkgs/os-specific/linux/zfs/git.nix
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-02-07 13:39:06 -0800
committerWilliam A. Kennington III <william@wkennington.com>2015-02-07 13:51:38 -0800
commit73c7c7978c1b5108495ff5dfa4b475c997980e22 (patch)
treeb660c0b6718553ade379cbf0ad08920355001de8 /pkgs/os-specific/linux/zfs/git.nix
parentfe03dc1a10caa0f21ca912b67a22be032ffbb91a (diff)
downloadnixlib-73c7c7978c1b5108495ff5dfa4b475c997980e22.tar
nixlib-73c7c7978c1b5108495ff5dfa4b475c997980e22.tar.gz
nixlib-73c7c7978c1b5108495ff5dfa4b475c997980e22.tar.bz2
nixlib-73c7c7978c1b5108495ff5dfa4b475c997980e22.tar.lz
nixlib-73c7c7978c1b5108495ff5dfa4b475c997980e22.tar.xz
nixlib-73c7c7978c1b5108495ff5dfa4b475c997980e22.tar.zst
nixlib-73c7c7978c1b5108495ff5dfa4b475c997980e22.zip
zfs_git: Update to latest and add the compatability patch
Diffstat (limited to 'pkgs/os-specific/linux/zfs/git.nix')
-rw-r--r--pkgs/os-specific/linux/zfs/git.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix
index 7ca8ed147874..06aac4f9c2d1 100644
--- a/pkgs/os-specific/linux/zfs/git.nix
+++ b/pkgs/os-specific/linux/zfs/git.nix
@@ -5,12 +5,13 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = git://github.com/zfsonlinux/zfs.git;
-    rev = "2c41df5bf8327f3bc6ee25cf2aa570bb159cb348";
-    sha256 = "0bmpxcb1k99fs86qql8pblmr2w6bf1sgxc9igh1vhjl672ma6634";
+    rev = "33b4de513ee81c2a87e1b954a9544a5eec1f8f94";
+    sha256 = "07kdml65l22z1xi8jif5hr7zr7a8mykyms4f5yrf8nyad20kp6il";
   };
 
   patches = [
     ./nix-build-git.patch
+    ./3.19-compat-git.patch # Remove once PR-3084 is mainlined
   ];
 
   buildInputs = [ spl_git perl python autoconf automake libtool zlib libuuid coreutils ];