Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging

This commit is contained in:
Luke Granger-Brown
2021-04-12 18:49:01 +00:00
377 changed files with 13801 additions and 5789 deletions
@@ -23,7 +23,7 @@
let
inherit (import ../bundled-common/functions.nix {inherit lib ruby gemConfig groups; }) genStubsScript;
basicEnv = (callPackage ../bundled-common {}) (args // { inherit pname name; mainGemName = pname; });
basicEnv = (callPackage ../bundled-common { inherit bundler; }) (args // { inherit pname name; mainGemName = pname; });
inherit (basicEnv) envPaths;
# Idea here is a mkDerivation that gen-bin-stubs new stubs "as specified" -