diff options
author | Artturin <Artturin@artturin.com> | 2023-01-17 19:56:13 +0200 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2023-01-17 19:56:13 +0200 |
commit | ad10ad95192014fc65e339c76dfd4ee52b03c260 (patch) | |
tree | 534885c4c67c328f58f57e770e3bf9c7a371303d | |
parent | ea27fb07efe68cb426593a4d7c2efe469621021d (diff) |
tests.kernel-config: fix
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
-rw-r--r-- | pkgs/test/kernel.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/test/kernel.nix b/pkgs/test/kernel.nix index a4da10030332..051afa7c5113 100644 --- a/pkgs/test/kernel.nix +++ b/pkgs/test/kernel.nix @@ -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"; }; |