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

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
+3 -3
View File
@@ -69,9 +69,9 @@ let
}'';
legacyOptionsDefined =
optional opt.system.isDefined opt.system
++ (optional (opt.localSystem.highestPrio < (mkOptionDefault {}).priority) opt.localSystem)
++ (optional (opt.crossSystem.highestPrio < (mkOptionDefault {}).priority) opt.crossSystem)
optional (opt.localSystem.highestPrio < (mkDefault {}).priority) opt.system
++ optional (opt.localSystem.highestPrio < (mkOptionDefault {}).priority) opt.localSystem
++ optional (opt.crossSystem.highestPrio < (mkOptionDefault {}).priority) opt.crossSystem
;
defaultPkgs =