From a4901759b13c3281e645949b276b78218aabf0c9 Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Mon, 1 Feb 2021 15:00:24 -0800 Subject: [PATCH 1/3] redmine: use default ruby package --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b92a34f5f7b1..b56d184d0d12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7401,8 +7401,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 { }; From c14b54d67b3bf7ecbf716c7b3c83bdc1bea87aa0 Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Mon, 1 Feb 2021 15:01:46 -0800 Subject: [PATCH 2/3] unit: remove withRuby_2_5 option --- pkgs/servers/http/unit/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index a5d5e37487aa..8170ae79c32c 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -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"} ''; From eda1eab7332c6b951bdb20d41cb101d07d4600d6 Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Mon, 1 Feb 2021 15:01:58 -0800 Subject: [PATCH 3/3] ruby_2_5: remove --- pkgs/development/interpreters/ruby/default.nix | 8 -------- pkgs/development/ruby-modules/with-packages/test.nix | 1 - pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 2678188e8cf7..a31747c512b3 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -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 = { diff --git a/pkgs/development/ruby-modules/with-packages/test.nix b/pkgs/development/ruby-modules/with-packages/test.nix index 946854e4545f..bcd9a787f7d3 100644 --- a/pkgs/development/ruby-modules/with-packages/test.nix +++ b/pkgs/development/ruby-modules/with-packages/test.nix @@ -6,7 +6,6 @@ let stdenv = pkgs.stdenv; rubyVersions = with pkgs; [ - ruby_2_5 ruby_2_6 ruby_2_7 ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b030289d77c5..a8ec129ff609 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -565,6 +565,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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b56d184d0d12..4d3fc0c055fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11418,14 +11418,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;