Merge pull request #136267 from hercules-ci/fix-pkgs-appendOverlays-otherPackageSets-interaction

Fix interaction between appendOverlays and otherPackageSets
This commit is contained in:
Robert Hensing 2021-08-31 19:14:42 +02:00 committed by GitHub
commit 0374e294a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -15,7 +15,7 @@
# Utility functions, could just import but passing in for efficiency
lib
, # Use to reevaluate Nixpkgs; a dirty hack that should be removed
, # Use to reevaluate Nixpkgs
nixpkgsFun
## Other parameters
@ -218,7 +218,7 @@ let
appendOverlays = extraOverlays:
if extraOverlays == []
then self
else import ./stage.nix (args // { overlays = args.overlays ++ extraOverlays; });
else nixpkgsFun { overlays = args.overlays ++ extraOverlays; };
# NOTE: each call to extend causes a full nixpkgs rebuild, adding ~130MB
# of allocations. DO NOT USE THIS IN NIXPKGS.