b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #178958 from hercules-ci/fix-installer-tests

Browse source 
nixos/nixpkgs.nix: Ignore the default system in check
This commit is contained in:
Robert Hensing 2022-06-25 10:48:29 +02:00 committed by GitHub
parent cd875c3cb2 985b6812d6
commit 1d43ea01da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/misc/nixpkgs.nix
View file

@ -69,9 +69,9 @@ let
}''; }'';
legacyOptionsDefined = legacyOptionsDefined =
optional opt.system.isDefined opt.system optional (opt.localSystem.highestPrio < (mkDefault {}).priority) opt.system
++ (optional (opt.localSystem.highestPrio < (mkOptionDefault {}).priority) opt.localSystem) ++ optional (opt.localSystem.highestPrio < (mkOptionDefault {}).priority) opt.localSystem
++ (optional (opt.crossSystem.highestPrio < (mkOptionDefault {}).priority) opt.crossSystem) ++ optional (opt.crossSystem.highestPrio < (mkOptionDefault {}).priority) opt.crossSystem
; ;
defaultPkgs = defaultPkgs =