b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #192860 from raboof/ruby-move-towards-3.1

Browse source 
ruby: move towards 3.1
This commit is contained in:
Mario Rodas 2022-10-06 21:16:44 -05:00 committed by GitHub
parent f470c10d7b c5e2f3c066
commit 7a2dd2ecf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/interpreters/ruby/default.nix
View file

@ -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;

4
pkgs/development/ruby-modules/bundler-app/default.nix
View file

@ -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

8
pkgs/top-level/all-packages.nix
View file

@ -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 { };