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

ruby: move towards ruby 3

Browse source 
Currently, `pkgs.ruby` is ruby 2.7.6, which is in 'security updates
only' mode and scheduled to go EOL April 2023. Updating `pkgs.ruby`
to be ruby 3.1 would be a rather large change, but using ruby 3 to
bootstrap building ruby itself would be a nice first step in that
direction.

Tested with asciidoctor that this indeed now allows building a ruby
application without getting ruby 2.7 in the build closure.

Also fixes #192729
This commit is contained in:
Arnout Engelen 2022-09-25 09:59:05 +02:00
parent ae1dc133ea
commit c5e2f3c066
No known key found for this signature in database
GPG key ID: 061107B0F74A6DAA
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

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