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

Merge pull request #224018 from marsam/update-ruby-default

Browse source 
ruby: update default version to `ruby_3_1`
This commit is contained in:
Mario Rodas 2023-04-19 03:36:29 -05:00 committed by GitHub
parent f5d4a4e3d6 a5aa379891
commit bf5b2a67bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/version-management/gitlab/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv
, ruby, tzdata, git, nettools, nixosTests, nodejs, openssl
, ruby_2_7, tzdata, git, nettools, nixosTests, nodejs, openssl
, gitlabEnterprise ? false, callPackage, yarn
, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config
}:
@ -17,7 +17,8 @@ let
rubyEnv = bundlerEnv rec {
name = "gitlab-env-${version}";
inherit ruby;
# GitLab doesn't support Ruby 3 https://gitlab.com/groups/gitlab-org/-/epics/5149
ruby = ruby_2_7;
gemdir = ./rubyEnv;
gemset =
let x = import (gemdir + "/gemset.nix") src;

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

@ -51,7 +51,7 @@ let
, buildEnv, bundler, bundix
, libiconv, libobjc, libunwind, Foundation
, makeBinaryWrapper, buildRubyGem, defaultGemConfig
, baseRuby ? buildPackages.ruby_3_1.override {
, baseRuby ? buildPackages.ruby.override {
docSupport = false;
rubygemsSupport = false;
}

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

@ -5867,13 +5867,7 @@ with pkgs;
enableExtraPlugins = true;
};
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 = callPackage ../tools/typesetting/asciidoctor { };
asciidoctor-with-extensions = callPackage ../tools/typesetting/asciidoctor-with-extensions { };
@ -17015,8 +17009,8 @@ with pkgs;
ruby_3_1
ruby_3_2;
ruby = ruby_2_7;
rubyPackages = rubyPackages_2_7;
ruby = ruby_3_1;
rubyPackages = rubyPackages_3_1;
rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems;
rubyPackages_3_0 = recurseIntoAttrs ruby_3_0.gems;