From e4b05d9af55b403baaa6fdd738ee16c4498c4299 Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Mon, 10 May 2021 20:34:54 +0200 Subject: [PATCH] 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. --- pkgs/os-specific/linux/zfs/default.nix | 10 +++------- 1 file 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 {