Merge pull request #192860 from raboof/ruby-move-towards-3.1
ruby: move towards 3.1
This commit is contained in:
commit
7a2dd2ecf9
|
@ -48,7 +48,7 @@ let
|
|||
, buildEnv, bundler, bundix
|
||||
, libiconv, libobjc, libunwind, Foundation
|
||||
, makeWrapper, buildRubyGem, defaultGemConfig
|
||||
, baseRuby ? buildPackages.ruby.override {
|
||||
, baseRuby ? buildPackages.ruby_3_1.override {
|
||||
useRailsExpress = false;
|
||||
docSupport = false;
|
||||
rubygemsSupport = false;
|
||||
|
|
|
@ -35,7 +35,9 @@
|
|||
}@args:
|
||||
|
||||
let
|
||||
basicEnv = (callPackage ../bundled-common {}) args;
|
||||
basicEnv = (callPackage ../bundled-common {
|
||||
inherit ruby;
|
||||
}) args;
|
||||
|
||||
cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" "gemset" "gemdir" ] // {
|
||||
inherit preferLocalBuild allowSubstitutes; # pass the defaults
|
||||
|
|
|
@ -4926,7 +4926,13 @@ with pkgs;
|
|||
enableExtraPlugins = true;
|
||||
};
|
||||
|
||||
asciidoctor = callPackage ../tools/typesetting/asciidoctor { };
|
||||
asciidoctor = callPackage ../tools/typesetting/asciidoctor {
|
||||
bundlerApp = bundlerApp.override {
|
||||
# asciidoc supports both ruby 2 and 3,
|
||||
# but we don't want to be stuck on it:
|
||||
ruby = ruby_3_1;
|
||||
};
|
||||
};
|
||||
|
||||
asciidoctor-with-extensions = callPackage ../tools/typesetting/asciidoctor-with-extensions { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue