From ad10ad95192014fc65e339c76dfd4ee52b03c260 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 17 Jan 2023 19:56:13 +0200 Subject: 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 --- pkgs/test/kernel.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'pkgs/test/kernel.nix') diff --git a/pkgs/test/kernel.nix b/pkgs/test/kernel.nix index a4da100303323..051afa7c51134 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"; }; -- cgit 1.4.1