Merge staging-next into staging

2019-08-28 08:26:42 +02:00
parent a2538606e3 98640fd482
commit 5061fe0c2c
1209 changed files with 36685 additions and 18393 deletions
@@ -36,7 +36,7 @@
 let
  basicEnv = (callPackage ../bundled-common {}) args;

-  cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" ] // {
+  cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" "gemset" ] // {
    inherit preferLocalBuild allowSubstitutes; # pass the defaults

    buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper;