mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00
Code Issues Wiki Activity

tests.kernel-config: fix

Browse source 
error: The option `settings.NIXOS_TEST_BOOLEAN.tristate' has conflicting definition values:
- In `structuredExtraConfig': "n"
- In `structuredExtraConfig': "y"

since https://github.com/NixOS/nixpkgs/pull/90065
yes does not silently win over no
This commit is contained in:
Artturin 2023-01-17 19:56:13 +02:00
parent ea27fb07ef
commit ad10ad9519
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/test/kernel.nix
View file

@ -27,10 +27,9 @@ let
{ NIXOS_FAKE_MMC_BLOCK_MINORS = freeform "64"; } # will trigger an error but the message is not great:
];
yesWinsOverNoConfig = mkMerge [
# default for "NIXOS_TEST_BOOLEAN" is no
{ "NIXOS_TEST_BOOLEAN" = yes; } # yes wins over no by default
{ "NIXOS_TEST_BOOLEAN" = no; }
mkDefaultWorksConfig = mkMerge [
{ "NIXOS_TEST_BOOLEAN" = yes; }
{ "NIXOS_TEST_BOOLEAN" = lib.mkDefault no; }
];
optionalNoWins = mkMerge [
@ -57,7 +56,7 @@ runTests {
};
testYesWinsOverNo = {
expr = (getConfig yesWinsOverNoConfig)."NIXOS_TEST_BOOLEAN".tristate;
expr = (getConfig mkDefaultWorksConfig)."NIXOS_TEST_BOOLEAN".tristate;
expected = "y";
};