Merge branch 'staging' into staging-next

A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
parent 3257feac49 25ae1fd29f
commit d2eb7a7887
675 changed files with 5919 additions and 3687 deletions
@@ -217,8 +217,8 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {

    # looks like useless files which break build repeatability and consume space
    pushd $out/${ruby.gemPath}
-    rm -fv doc/*/*/created.rid || true
-    rm -fv {gems/*/ext/*,extensions/*/*/*}/{Makefile,mkmf.log,gem_make.out} || true
+    find doc/ -iname created.rid -delete -print
+    find gems/*/ext/ extensions/ \( -iname Makefile -o -iname mkmf.log -o -iname gem_make.out \) -delete -print
    ${if keepGemCache then "" else "rm -fvr cache"}
    popd