From be52cff377a1993a131a02244d3d6da12dbce038 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 16 Nov 2017 12:31:29 +0800 Subject: [PATCH 1/2] splUnstable: 2017-10-31 -> 2017-11-16 Fixes breakage with 4.14 kernels --- pkgs/os-specific/linux/spl/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 1c0705f0e2f..b2d090fa7ea 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"; }; } From 0bdaedbe8769594a544304a2dcbac0dd2de0e84d Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 16 Nov 2017 12:32:54 +0800 Subject: [PATCH 2/2] zfsUnstable: 2017-11-12 -> 2017-11-16 --- pkgs/os-specific/linux/zfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 65a743f5f12..e932f516375 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -159,10 +159,10 @@ in { incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release - version = "2017-11-12"; + version = "2017-11-16"; - rev = "5277f208f290ea4e2204800a66c3ba20a03fe503"; - sha256 = "0hhlhv4g678j1w45813xfrk8zza0af59cdkmib9bkxy0cn0jsnd6"; + rev = "d4a72f23863382bdf6d0ae33196f5b5decbc48fd"; + sha256 = "0q2gkkj11hy8m8cjd70g99bs69ldxvc17ym0x1pgwvs4722hzpha"; isUnstable = true; extraPatches = [