core: fix overlay to merge package sets

This commit is contained in:
xeals 2020-10-17 11:59:17 +11:00
parent 6cd420d7af
commit c84fae413b
Signed by: xeals
GPG Key ID: A498C7AF27EC6B5C

View File

@ -10,9 +10,19 @@ let
nameValuePair = n: v: { name = n; value = v; }; nameValuePair = n: v: { name = n; value = v; };
nurAttrs = import ./default.nix { pkgs = super; }; nurAttrs = import ./default.nix { pkgs = super; };
overlay =
builtins.listToAttrs
(map (n: nameValuePair n nurAttrs.${n})
(builtins.filter (n: !isReserved n)
(builtins.attrNames nurAttrs)));
in in
builtins.listToAttrs # Shadow existing package sets if they already exist rather than replacing.
(map (n: nameValuePair n nurAttrs.${n}) overlay //
(builtins.filter (n: !isReserved n) {
(builtins.attrNames nurAttrs))) goModules = (super.goModules or { }) // (overlay.goModules or { });
jetbrains = (super.jetbrains or { }) // (overlay.jetbrains or { });
python2Packages = (super.python2Packages or { }) // (overlay.python2Packages or { });
python3Packages = (super.python3Packages or { }) // (overlay.python3Packages or { });
}