From db45ed38013b04a706847abc56203fdad901c5c9 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 1 Jan 2024 09:21:59 +0000 Subject: [PATCH] nixosTests.kernel-generic: fix the eval Without the change the eval fails as: $ nix build --no-link -f. nixosTests.kernel-generic error: error: value is a Boolean while a set was expected This started happening after 80472e375406bb8f130 "treewide: add __attrsFailEvaluation and __recurseIntoDerivationForReleaseJobs" As a result kernel attribute set got not just `kernel => drv` maps but also `__attrsFailEvaluation => bool` one. It does not contain `name` and fails the evaluation without recovery. The change restores evaluation for me. --- nixos/tests/kernel-generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 72d31246b75d..76c28fb6c86d 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -23,7 +23,7 @@ let assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a") ''; }) args); - kernels = pkgs.linuxKernel.vanillaPackages // { + kernels = (removeAttrs pkgs.linuxKernel.vanillaPackages ["__attrsFailEvaluation"]) // { inherit (pkgs.linuxKernel.packages) linux_4_19_hardened linux_5_4_hardened