Merge remote-tracking branch 'origin/master'

2016-03-31 10:06:30 +02:00
parent 753086cd47 a3ac630092
commit 2e08d8234e
58 changed files with 1083 additions and 147 deletions
@@ -20,13 +20,13 @@ assert buildKernel -> kernel != null && spl != null;
 stdenv.mkDerivation rec {
  name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";

-  version = "0.6.5.5";
+  version = "0.6.5.6";

  src = fetchFromGitHub {
    owner = "zfsonlinux";
    repo = "zfs";
    rev = "zfs-${version}";
-    sha256 = "0np03p5zkx87a0a5rw629f9m4wp5gd01c1jkh5p7h63mmvaxfdda";
+    sha256 = "0lsb93y5zbwc8fafxzm9vyfpr6fmvl8h86ny4llbd2xy2hnfwk2i";
  };

  patches = [ ./nix-build.patch ];