summary refs log tree commit diff
path: root/pkgs/os-specific/linux/zfs
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-07-21 20:36:34 -0500
committerThomas Tuegel <ttuegel@mailbox.org>2017-07-21 20:36:34 -0500
commit6a004bf9c896e7570f85ba9296b51ff90a545842 (patch)
treebc7cc568283165c2f205d2bda568a148381a532d /pkgs/os-specific/linux/zfs
parentbec5797290754fa783b77a49149254417cde1344 (diff)
parent827b0e1b815772458954e330327dcd7491ec485d (diff)
downloadnixpkgs-6a004bf9c896e7570f85ba9296b51ff90a545842.tar
nixpkgs-6a004bf9c896e7570f85ba9296b51ff90a545842.tar.gz
nixpkgs-6a004bf9c896e7570f85ba9296b51ff90a545842.tar.bz2
nixpkgs-6a004bf9c896e7570f85ba9296b51ff90a545842.tar.lz
nixpkgs-6a004bf9c896e7570f85ba9296b51ff90a545842.tar.xz
nixpkgs-6a004bf9c896e7570f85ba9296b51ff90a545842.tar.zst
nixpkgs-6a004bf9c896e7570f85ba9296b51ff90a545842.zip
Merge branch 'master' into bugfix/staging/stdenv
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 9e8856fdcdc..8535e3a3bb1 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -144,7 +144,7 @@ in
     };
     zfsUnstable = common {
       # comment/uncomment if breaking kernel versions are known
-      incompatibleKernelVersion = "4.12";
+      incompatibleKernelVersion = null;
 
       version = "0.7.0-rc5";