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-11 14:47:37 -0800
committerWilliam A. Kennington III <william@wkennington.com>2015-02-11 14:47:37 -0800
commit5742b242716564d9bf3b575e7ed4e8c4c3537d08 (patch)
tree9101b8903fd143fa86c310381863b7413010f4cc /pkgs/os-specific/linux/zfs/git.nix
parenta86fd94ecce623b4d8800d28f1211cde77ba05d7 (diff)
downloadnixlib-5742b242716564d9bf3b575e7ed4e8c4c3537d08.tar
nixlib-5742b242716564d9bf3b575e7ed4e8c4c3537d08.tar.gz
nixlib-5742b242716564d9bf3b575e7ed4e8c4c3537d08.tar.bz2
nixlib-5742b242716564d9bf3b575e7ed4e8c4c3537d08.tar.lz
nixlib-5742b242716564d9bf3b575e7ed4e8c4c3537d08.tar.xz
nixlib-5742b242716564d9bf3b575e7ed4e8c4c3537d08.tar.zst
nixlib-5742b242716564d9bf3b575e7ed4e8c4c3537d08.zip
zfs_git: Update and remove obsolete patch
Diffstat (limited to 'pkgs/os-specific/linux/zfs/git.nix')
-rw-r--r--pkgs/os-specific/linux/zfs/git.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix
index da48880ae16d..61349b2ab20a 100644
--- a/pkgs/os-specific/linux/zfs/git.nix
+++ b/pkgs/os-specific/linux/zfs/git.nix
@@ -5,13 +5,12 @@ callPackage ./generic.nix (args // rec {
 
   src = fetchgit {
     url = git://github.com/zfsonlinux/zfs.git;
-    rev = "33b4de513ee81c2a87e1b954a9544a5eec1f8f94";
-    sha256 = "07kdml65l22z1xi8jif5hr7zr7a8mykyms4f5yrf8nyad20kp6il";
+    rev = "5f15fa22167ff665d0db0159551eb90759683984";
+    sha256 = "14l1s1rfykj5dz1ssh5c8d1k98qn19l48sd31lwshiczx63zjygw";
   };
 
   patches = [
     ./nix-build-git.patch
-    ./3.19-compat-git.patch # Remove once PR-3084 is mainlined
   ];
 
   spl = spl_git;