summary refs log tree commit diff
path: root/pkgs/os-specific/linux/zfs
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2017-01-21 23:35:55 +0100
committerFranz Pletz <fpletz@fnordicwalking.de>2017-01-21 23:35:55 +0100
commit56c6a4391f25bce8ccff890decc0e00d6ba6ea5f (patch)
tree0f3a6d49bed6b1d1cc82e385dc2144145d576f30 /pkgs/os-specific/linux/zfs
parentadecd56871325c16a303904c8f3c8f72de42efad (diff)
downloadnixpkgs-56c6a4391f25bce8ccff890decc0e00d6ba6ea5f.tar
nixpkgs-56c6a4391f25bce8ccff890decc0e00d6ba6ea5f.tar.gz
nixpkgs-56c6a4391f25bce8ccff890decc0e00d6ba6ea5f.tar.bz2
nixpkgs-56c6a4391f25bce8ccff890decc0e00d6ba6ea5f.tar.lz
nixpkgs-56c6a4391f25bce8ccff890decc0e00d6ba6ea5f.tar.xz
nixpkgs-56c6a4391f25bce8ccff890decc0e00d6ba6ea5f.tar.zst
nixpkgs-56c6a4391f25bce8ccff890decc0e00d6ba6ea5f.zip
zfs: add hint to try unstable version, fix typo
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 40781c76961..7fda9b884d8 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -13,11 +13,11 @@ let
   buildKernel = any (n: n == configFile) [ "kernel" "all" ];
   buildUser = any (n: n == configFile) [ "user" "all" ];
 
-  common = { version, sha256, extraPatches, spl, inkompatibleKernelVersion ? null } @ args:
+  common = { version, sha256, extraPatches, spl, incompatibleKernelVersion ? null } @ args:
     if buildKernel &&
-       (inkompatibleKernelVersion != null) &&
-       versionAtLeast kernel.version inkompatibleKernelVersion then
-      throw "linux v${kernel.version} is not yet supported by zfsonlinux v${version}"
+       (incompatibleKernelVersion != null) &&
+       versionAtLeast kernel.version incompatibleKernelVersion then
+      throw "Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."
     else stdenv.mkDerivation rec {
       name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
 
@@ -123,7 +123,7 @@ in
     # to be adapted
     zfsStable = common {
       # comment/uncomment if breaking kernel versions are known
-      inkompatibleKernelVersion = "4.9";
+      incompatibleKernelVersion = "4.9";
 
       version = "0.6.5.8";
 
@@ -139,7 +139,7 @@ in
     };
     zfsUnstable = common {
       # comment/uncomment if breaking kernel versions are known
-      inkompatibleKernelVersion = null;
+      incompatibleKernelVersion = null;
 
       version = "0.7.0-rc3";