diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2024-01-01 09:21:59 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2024-01-01 09:21:59 +0000 |
| commit | db45ed38013b04a706847abc56203fdad901c5c9 (patch) | |
| tree | 42a972417a7c1577829467f20e29c367e4574627 /nixos | |
| parent | 3d54a95d71be5d2f5af41578134f52e03bb79615 (diff) | |
| download | nixlib-db45ed38013b04a706847abc56203fdad901c5c9.tar nixlib-db45ed38013b04a706847abc56203fdad901c5c9.tar.gz nixlib-db45ed38013b04a706847abc56203fdad901c5c9.tar.bz2 nixlib-db45ed38013b04a706847abc56203fdad901c5c9.tar.lz nixlib-db45ed38013b04a706847abc56203fdad901c5c9.tar.xz nixlib-db45ed38013b04a706847abc56203fdad901c5c9.tar.zst nixlib-db45ed38013b04a706847abc56203fdad901c5c9.zip | |
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.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/kernel-generic.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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 |