public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #109029 from Atemu/zfs-meta.broken-instead-of-abort

Browse Source 
zfs: use meta.broken instead of throw when incompatible with kernel
This commit is contained in:
Jörg Thalheim 2021-01-21 15:19:42 +00:00 committed by GitHub
commit 22ac0b9087
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,14 +27,8 @@ let
, rev ? "zfs-${version}" , rev ? "zfs-${version}"
, isUnstable ? false , isUnstable ? false
, incompatibleKernelVersion ? null }: , incompatibleKernelVersion ? null }:
if buildKernel &&
(incompatibleKernelVersion != null) && stdenv.mkDerivation {
versionAtLeast kernel.version incompatibleKernelVersion then
throw ''
Linux v${kernel.version} is not yet supported by zfsonlinux v${version}.
${lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."}
''
else stdenv.mkDerivation {
name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -174,6 +168,13 @@ let
license = licenses.cddl; license = licenses.cddl;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ]; maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ];
broken = if
buildKernel && (incompatibleKernelVersion != null) && versionAtLeast kernel.version incompatibleKernelVersion
then builtins.trace ''
Linux v${kernel.version} is not yet supported by zfsonlinux v${version}.
${lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."}
'' true
else false;
}; };
}; };
in { in {