summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2017-07-11 04:48:43 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2017-07-17 02:53:14 +0200
commite4eea75fa79aa6f32e8e200fa318ca9d54a86d8c (patch)
tree7ccdb43019321f081f2f9b9d5408a3fa4e0c85c9 /pkgs
parent870375e19d1ec3ad69de7eb1c73c6c80cc214108 (diff)
downloadnixpkgs-e4eea75fa79aa6f32e8e200fa318ca9d54a86d8c.tar
nixpkgs-e4eea75fa79aa6f32e8e200fa318ca9d54a86d8c.tar.gz
nixpkgs-e4eea75fa79aa6f32e8e200fa318ca9d54a86d8c.tar.bz2
nixpkgs-e4eea75fa79aa6f32e8e200fa318ca9d54a86d8c.tar.lz
nixpkgs-e4eea75fa79aa6f32e8e200fa318ca9d54a86d8c.tar.xz
nixpkgs-e4eea75fa79aa6f32e8e200fa318ca9d54a86d8c.tar.zst
nixpkgs-e4eea75fa79aa6f32e8e200fa318ca9d54a86d8c.zip
zfs: 0.6.5.10 -> 0.6.5.11
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/spl/default.nix4
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 26cc8ea7c71..2f9f971194a 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -62,8 +62,8 @@ in
   assert buildKernel -> kernel != null;
   {
     splStable = common {
-      version = "0.6.5.10";
-      sha256 = "1zdxggpdz9j0lpcqfnkvf4iym7mp2k246sg1s4frqaw1pwwcw9vi";
+      version = "0.6.5.11";
+      sha256 = "192val8035pj2rryi3fwb134avzirhv5ifaj5021vh8bbjx75pd5";
     };
     splUnstable = common {
       version = "0.7.0-rc4";
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 50f4e6f2b41..dd9bc713bdc 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -123,12 +123,12 @@ in
     # to be adapted
     zfsStable = common {
       # comment/uncomment if breaking kernel versions are known
-      incompatibleKernelVersion = null;
+      incompatibleKernelVersion = "4.12";
 
-      version = "0.6.5.10";
+      version = "0.6.5.11";
 
       # this package should point to the latest release.
-      sha256 = "04gn5fj22z17zq2nazxwl3j9dr33l79clha6ipxvdz241bhjqrk3";
+      sha256 = "1wqz43cjr21m3f52ahcikl2798pbzj5sfy16zqxwiqpv7iy09kr3";
       extraPatches = [
         (fetchpatch {
           url = "https://github.com/Mic92/zfs/compare/zfs-0.6.5.8...nixos-zfs-0.6.5.8.patch";