ruby treewide: don't merge source into top-level

Keep the `source` attrset distinct to prevent its entries from merging
with the top level attrs.
Since each type of source has a different set of entries for `source`,
this is the easiest way to keep them together.
This will pave the way for a new `url` type of source.

This is a mass-rebuild of many ruby packages,
notably those using `git` type sources.
This commit is contained in:
Aneesh Agrawal
2018-01-04 02:28:33 -05:00
parent 8686b98612
commit 36f1bcbeb8
8 changed files with 20 additions and 18 deletions
@@ -67,8 +67,10 @@ rec {
};
in res;
composeGemAttrs = ruby: gems: name: attrs: ((removeAttrs attrs ["source" "platforms"]) // attrs.source // {
composeGemAttrs = ruby: gems: name: attrs: ((removeAttrs attrs ["platforms"]) // {
inherit ruby;
inherit (attrs.source) type;
source = removeAttrs attrs.source ["type"];
gemName = name;
gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []);
});