From 79939b29eab9a1f63db4119066d037330681f998 Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Wed, 13 Dec 2017 13:03:16 +0100 Subject: [PATCH 1/2] zfs: 0.7.3 -> 0.7.4 --- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 8d6aa033d89..5ede0a91b29 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -140,9 +140,9 @@ in { incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.3"; + version = "0.7.4"; - sha256 = "1bbajrwfilnmfhn1n69gvsaznyc4q29wi7nkwc0p9r4dli37w28b"; + sha256 = "1djm97nlipn0fch1vcvpw94bnfvg9ylv9i2hp46dzaxhdh7bm265"; extraPatches = [ (fetchpatch { From 03fd7d893ffa58d3d0b3cdaec43846a7277611bd Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Wed, 13 Dec 2017 13:15:37 +0100 Subject: [PATCH 2/2] spl: 0.7.3 -> 0.7.4 --- pkgs/os-specific/linux/spl/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index b2d090fa7ea..387dc2b7c67 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -66,10 +66,8 @@ in assert buildKernel -> kernel != null; { splStable = common { - version = "0.7.3"; - sha256 = "0j8mb9ky3pjz9hnz5w6fajpzajl15jq3p0xvxb6lhpqj3rjzsqxb"; - - broken = kernel != null && stdenv.lib.versionAtLeast kernel.version "4.14"; + version = "0.7.4"; + sha256 = "0vmakqi3zm8ka5cglif45ll2m6ynq7r55mhk8d1rzjkgi191cddh"; }; splUnstable = common {