summary refs log tree commit diff
path: root/pkgs/development/ruby-modules/bundled-common
diff options
context:
space:
mode:
authorAneesh Agrawal <aneeshusa@gmail.com>2017-10-05 04:10:57 -0400
committerAneesh Agrawal <aneeshusa@gmail.com>2018-01-04 02:28:33 -0500
commit36f1bcbeb85d8d3447e9a5dadb5801cfe615fded (patch)
tree94302aa0943cc06ca286fb6cfd24f2185fa3217b /pkgs/development/ruby-modules/bundled-common
parent8686b98612dc41d14df2a1f09a313d9084e5f6b6 (diff)
downloadnixpkgs-36f1bcbeb85d8d3447e9a5dadb5801cfe615fded.tar
nixpkgs-36f1bcbeb85d8d3447e9a5dadb5801cfe615fded.tar.gz
nixpkgs-36f1bcbeb85d8d3447e9a5dadb5801cfe615fded.tar.bz2
nixpkgs-36f1bcbeb85d8d3447e9a5dadb5801cfe615fded.tar.lz
nixpkgs-36f1bcbeb85d8d3447e9a5dadb5801cfe615fded.tar.xz
nixpkgs-36f1bcbeb85d8d3447e9a5dadb5801cfe615fded.tar.zst
nixpkgs-36f1bcbeb85d8d3447e9a5dadb5801cfe615fded.zip
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.
Diffstat (limited to 'pkgs/development/ruby-modules/bundled-common')
-rw-r--r--pkgs/development/ruby-modules/bundled-common/functions.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix
index b17a4639e77..85e93959e4b 100644
--- a/pkgs/development/ruby-modules/bundled-common/functions.nix
+++ b/pkgs/development/ruby-modules/bundled-common/functions.nix
@@ -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 []);
   });