about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2014-12-23 17:04:54 -0800
committerWilliam A. Kennington III <william@wkennington.com>2014-12-23 17:05:02 -0800
commitf6622403c87841c50b518b34cba745b56744427b (patch)
tree927e9237f3e5c1818b83b875d1a1cf642322e68b
parent7e8eea59ee0fcc7726b3ccefa9bb420c886b212e (diff)
downloadnixlib-f6622403c87841c50b518b34cba745b56744427b.tar
nixlib-f6622403c87841c50b518b34cba745b56744427b.tar.gz
nixlib-f6622403c87841c50b518b34cba745b56744427b.tar.bz2
nixlib-f6622403c87841c50b518b34cba745b56744427b.tar.lz
nixlib-f6622403c87841c50b518b34cba745b56744427b.tar.xz
nixlib-f6622403c87841c50b518b34cba745b56744427b.tar.zst
nixlib-f6622403c87841c50b518b34cba745b56744427b.zip
zfs: 0.6.3 -> 0.6.3-1.2
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix16
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index a5b8429c03a0..3661137fc295 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
+{ stdenv, fetchFromGitHub, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
 
-stdenv.mkDerivation {
-  name = "zfs-0.6.3-${kernel.version}";
+stdenv.mkDerivation rec {
+  name = "zfs-${version}-${kernel.version}";
+  version = "0.6.3-1.2";
 
-  src = fetchurl {
-    url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.3.tar.gz;
-    sha256 = "06rrip9fxn13x6qnyp6br68r9pcygb95lld25hnnj88m2vagvg19";
+  src = fetchFromGitHub {
+    owner = "zfsonlinux";
+    repo = "zfs";
+    rev = "zfs-${version}";
+    sha256 = "1iqkh08ikmsg8zi7s2pr46z9z7lshbb65pv2ihg1llwmgcm42r9r";
   };
 
   patches = [
     ./mount_zfs_prefix.patch
     ./nix-build.patch # Remove in >=0.6.4
-    ./remove-lock-checks.patch # Remove in >=0.6.4
   ];
 
   buildInputs = [ spl perl autoconf automake libtool zlib libuuid coreutils ];