From f6622403c87841c50b518b34cba745b56744427b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 23 Dec 2014 17:04:54 -0800
Subject: [PATCH] zfs: 0.6.3 -> 0.6.3-1.2

---
 pkgs/os-specific/linux/zfs/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index a5b8429c03a..3661137fc29 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 ];