Merge branch 'master' into bugfix/staging/stdenv

2017-07-21 20:36:34 -05:00
parent bec5797290 827b0e1b81
commit 6a004bf9c8
56 changed files with 4218 additions and 2191 deletions
@@ -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";