suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

zfs: add hint to try unstable version, fix typo

Browse Source
This commit is contained in:
Franz Pletz 2017-01-21 23:35:55 +01:00
parent adecd56871
commit 56c6a4391f
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/os-specific/linux/zfs/default.nix
View File

@ -13,11 +13,11 @@ let
buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildKernel = any (n: n == configFile) [ "kernel" "all" ];
buildUser = any (n: n == configFile) [ "user" "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 && if buildKernel &&
(inkompatibleKernelVersion != null) && (incompatibleKernelVersion != null) &&
versionAtLeast kernel.version inkompatibleKernelVersion then versionAtLeast kernel.version incompatibleKernelVersion then
throw "linux v${kernel.version} is not yet supported by zfsonlinux v${version}" 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 { else stdenv.mkDerivation rec {
name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
@ -123,7 +123,7 @@ in
# to be adapted # to be adapted
zfsStable = common { zfsStable = common {
# comment/uncomment if breaking kernel versions are known # comment/uncomment if breaking kernel versions are known
inkompatibleKernelVersion = "4.9"; incompatibleKernelVersion = "4.9";
version = "0.6.5.8"; version = "0.6.5.8";
@ -139,7 +139,7 @@ in
}; };
zfsUnstable = common { zfsUnstable = common {
# comment/uncomment if breaking kernel versions are known # comment/uncomment if breaking kernel versions are known
inkompatibleKernelVersion = null; incompatibleKernelVersion = null;
version = "0.7.0-rc3"; version = "0.7.0-rc3";