diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-01-20 21:56:57 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2023-01-20 21:56:57 +0000 |
| commit | b9b1d958d0082723233644748f6a85ef21734ce8 (patch) | |
| tree | 0a0f8a84c9dc05dbd67e9acc6ab15746e1094a9e /pkgs/test | |
| parent | c7475c80e109b480894d641bc781a024628ec34d (diff) | |
| parent | eac989c0a24cc1cd97eb3ae69bc5b7abbb1e1be0 (diff) | |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: pkgs/development/libraries/qt-6/modules/qtbase.nix pkgs/stdenv/linux/make-bootstrap-tools.nix
Diffstat (limited to 'pkgs/test')
| -rw-r--r-- | pkgs/test/kernel.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/test/kernel.nix b/pkgs/test/kernel.nix index a4da100303323..2ccd188b1edb0 100644 --- a/pkgs/test/kernel.nix +++ b/pkgs/test/kernel.nix @@ -27,15 +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; } - ]; - - optionalNoWins = mkMerge [ - { NIXOS_FAKE_USB_DEBUG = option yes;} - { NIXOS_FAKE_USB_DEBUG = yes;} + mkDefaultWorksConfig = mkMerge [ + { "NIXOS_TEST_BOOLEAN" = yes; } + { "NIXOS_TEST_BOOLEAN" = lib.mkDefault no; } ]; allOptionalRemainOptional = mkMerge [ @@ -57,7 +51,7 @@ runTests { }; testYesWinsOverNo = { - expr = (getConfig yesWinsOverNoConfig)."NIXOS_TEST_BOOLEAN".tristate; + expr = (getConfig mkDefaultWorksConfig)."NIXOS_TEST_BOOLEAN".tristate; expected = "y"; }; |