about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/spl
diff options
context:
space:
mode:
authoradisbladis <adis@blad.is>2017-11-16 12:31:29 +0800
committeradisbladis <adis@blad.is>2017-11-16 19:28:15 +0800
commitbe52cff377a1993a131a02244d3d6da12dbce038 (patch)
treea74458a74d4be3b0f8b3dc870a3286c17619d0cc /pkgs/os-specific/linux/spl
parent68a703b4059a59e8411db7e01b1a308fce5ac561 (diff)
splUnstable: 2017-10-31 -> 2017-11-16
Fixes breakage with 4.14 kernels
Diffstat (limited to 'pkgs/os-specific/linux/spl')
-rw-r--r--pkgs/os-specific/linux/spl/default.nix11
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 1c0705f0e2fcc..b2d090fa7ea20 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -13,6 +13,7 @@ let
   common = { version
     , sha256
     , rev ? "spl-${version}"
+    , broken ? false
     } @ args : stdenv.mkDerivation rec {
       name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
 
@@ -52,7 +53,7 @@ let
           kernel.
         '';
 
-        broken = kernel != null && stdenv.lib.versionAtLeast kernel.version "4.14";
+        inherit broken;
 
         homepage = http://zfsonlinux.org/;
         platforms = platforms.linux;
@@ -67,11 +68,13 @@ in
     splStable = common {
       version = "0.7.3";
       sha256 = "0j8mb9ky3pjz9hnz5w6fajpzajl15jq3p0xvxb6lhpqj3rjzsqxb";
+
+      broken = kernel != null && stdenv.lib.versionAtLeast kernel.version "4.14";
     };
 
     splUnstable = common {
-      version = "2017-10-31";
-      rev = "35a44fcb8d6e346f51be82dfe57562c2ea0c6a9c";
-      sha256 = "193clx7b4p4qhgivmhc88dva0186rnhyv58fx0fwnb5zbx70dam1";
+      version = "2017-11-16";
+      rev = "ed19bccfb651843fa208232b3a2d3d22a4152bc8";
+      sha256 = "08ihjbf5fhcnhq9zavcwswg9djlbalbx1bil4rcv6i3d617wammb";
     };
 }