Merge branch 'master' into staging-next

2018-11-26 10:28:00 +01:00
parent e41154d1ab 4fef4fbb4b
commit a5de78b7d7
198 changed files with 2486 additions and 1200 deletions
@@ -89,7 +89,7 @@ let
      gemAttrs = composeGemAttrs ruby gems name attrs;
    in
    if gemAttrs.type == "path" then
-      pathDerivation gemAttrs
+      pathDerivation (gemAttrs.source // gemAttrs)
    else
      buildRubyGem gemAttrs
  );