BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #111662 from nicknovitski/remove-ruby-2.5

Browse source 
Remove Ruby 2.5
This commit is contained in:
Wael Nasreddine 2021-02-15 10:21:46 -08:00 committed by GitHub
commit 2df97e4b0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -243,14 +243,6 @@ let
) args; in self;
in {
ruby_2_5 = generic {
version = rubyVersion "2" "5" "8" "";
sha256 = {
src = "16md4jspjwixjlbhx3pnd5iwpca07p23ghkxkqd82sbchw3xy2vc";
git = "19gkk3q9l33cwkfsp5k8f8fipq7gkyqkqirm9farbvy425519rv2";
};
};
ruby_2_6 = generic {
version = rubyVersion "2" "6" "6" "";
sha256 = {

1
pkgs/development/ruby-modules/with-packages/test.nix
View file

@ -6,7 +6,6 @@ let
stdenv = pkgs.stdenv;
rubyVersions = with pkgs; [
ruby_2_5
ruby_2_6
ruby_2_7
];

3
pkgs/servers/http/unit/default.nix
View file

@ -7,7 +7,6 @@
, withPerl530 ? false, perl530
, withPerl532 ? true, perl532
, withPerldevel ? false, perldevel
, withRuby_2_5 ? false, ruby_2_5
, withRuby_2_6 ? true, ruby_2_6
, withRuby_2_7 ? false, ruby_2_7
, withSSL ? true, openssl ? null
@ -51,7 +50,6 @@ in stdenv.mkDerivation rec {
++ optional withPerl530 perl530
++ optional withPerl532 perl532
++ optional withPerldevel perldevel
++ optional withRuby_2_5 ruby_2_5
++ optional withRuby_2_6 ruby_2_6
++ optional withRuby_2_7 ruby_2_7
++ optional withSSL openssl;
@ -77,7 +75,6 @@ in stdenv.mkDerivation rec {
${optionalString withPerl530 "./configure perl --module=perl530 --perl=${perl530}/bin/perl"}
${optionalString withPerl532 "./configure perl --module=perl532 --perl=${perl532}/bin/perl"}
${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"}
${optionalString withRuby_2_5 "./configure ruby --module=ruby25 --ruby=${ruby_2_5}/bin/ruby"}
${optionalString withRuby_2_6 "./configure ruby --module=ruby26 --ruby=${ruby_2_6}/bin/ruby"}
${optionalString withRuby_2_7 "./configure ruby --module=ruby27 --ruby=${ruby_2_7}/bin/ruby"}
'';

2
pkgs/top-level/aliases.nix
View file

@ -576,6 +576,8 @@ mapAliases ({
ruby_2_4 = throw "ruby_2_4 was deprecated in 2019-12: use a newer version of ruby";
ruby_2_5_0 = throw "ruby_2_5_0 was deprecated on 2018-02-13: use a newer version of ruby";
rubyPackages_2_4 = throw "rubyPackages_2_4 was deprecated in 2019-12: use a newer version of rubyPackages instead";
ruby_2_5 = throw "ruby_2_5 was deprecated in 2021-02: use a newer version of ruby";
rubyPackages_2_5 = throw "rubyPackages_2_5 was deprecated in 2021-02: use a newer version of rubyPackages instead";
rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby";
rubyMinimal = throw "rubyMinimal was removed due to being unused";
rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02

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

@ -7457,8 +7457,7 @@ in
redir = callPackage ../tools/networking/redir { };
# failed to build websocket-driver gem with ruby 2.6, so sticking to 2.5 for now
redmine = callPackage ../applications/version-management/redmine { ruby = pkgs.ruby_2_5; };
redmine = callPackage ../applications/version-management/redmine { };
redsocks = callPackage ../tools/networking/redsocks { };
@ -11489,14 +11488,12 @@ in
autoreconfHook = buildPackages.autoreconfHook269;
bison = buildPackages.bison_3_5;
})
ruby_2_5
ruby_2_6
ruby_2_7;
ruby = ruby_2_6;
rubyPackages = rubyPackages_2_6;
rubyPackages_2_5 = recurseIntoAttrs ruby_2_5.gems;
rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems;
rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems;