summary refs log tree commit diff
path: root/pkgs/os-specific/linux/zfs
diff options
context:
space:
mode:
authorHenri Menke <henri@henrimenke.de>2021-05-10 20:34:54 +0200
committerHenri Menke <henri@henrimenke.de>2021-05-10 21:01:54 +0200
commite4b05d9af55b403baaa6fdd738ee16c4498c4299 (patch)
tree6bf6425e5d2e7a718c2268c0b4fb11cf6a107ff6 /pkgs/os-specific/linux/zfs
parent94a52465b720592dc2bd5f336d6be1ccb261431d (diff)
downloadnixpkgs-e4b05d9af55b403baaa6fdd738ee16c4498c4299.tar
nixpkgs-e4b05d9af55b403baaa6fdd738ee16c4498c4299.tar.gz
nixpkgs-e4b05d9af55b403baaa6fdd738ee16c4498c4299.tar.bz2
nixpkgs-e4b05d9af55b403baaa6fdd738ee16c4498c4299.tar.lz
nixpkgs-e4b05d9af55b403baaa6fdd738ee16c4498c4299.tar.xz
nixpkgs-e4b05d9af55b403baaa6fdd738ee16c4498c4299.tar.zst
nixpkgs-e4b05d9af55b403baaa6fdd738ee16c4498c4299.zip
zfs: remove trace output
We cannot have trace output if the package is marked broken, because
ofborg will consider the evaluation failed if there is any output. Hence
if there is any unsupported kernel version in nixpkgs, the trace will
show up and ofborg will complain.
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix10
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index adfd0cda819..e10be635b1c 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -182,13 +182,9 @@ let
         license = licenses.cddl;
         platforms = platforms.linux;
         maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ];
-        broken = if
-          buildKernel && (kernelCompatible != null) && !kernelCompatible
-          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;
+        # If your Linux kernel version is not yet supported by zfs, try zfsUnstable.
+        # On NixOS set the option boot.zfs.enableUnstable.
+        broken = buildKernel && (kernelCompatible != null) && !kernelCompatible;
       };
     };
 in {