From 56c6a4391f25bce8ccff890decc0e00d6ba6ea5f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 21 Jan 2017 23:35:55 +0100 Subject: zfs: add hint to try unstable version, fix typo --- pkgs/os-specific/linux/zfs/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/os-specific/linux/zfs') 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"; -- cgit 1.4.1