From 9e6f0d5a78024f19090d8d7c62ff665d39eca1ca Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 1 Jan 2020 00:24:17 +0000 Subject: [PATCH 1/4] rubyPackages_2_7: init at 2.7.0 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3eadd3b385a8..04f49f43ab46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9373,6 +9373,7 @@ in rubyPackages_2_4 = recurseIntoAttrs ruby_2_4.gems; rubyPackages_2_5 = recurseIntoAttrs ruby_2_5.gems; rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems; + rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems; mruby = callPackage ../development/compilers/mruby { }; From c1878442146983573dc547d3a7c1da99fc958fe0 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 1 Jan 2020 00:24:48 +0000 Subject: [PATCH 2/4] unit: add withRuby_2_7 option --- pkgs/servers/http/unit/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 8711be4b5c00..71ccbb2c15a3 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -9,6 +9,7 @@ , withRuby_2_4 ? false, ruby_2_4 , withRuby_2_5 ? false, ruby_2_5 , withRuby_2_6 ? true, ruby_2_6 +, withRuby_2_7 ? true, ruby_2_7 , withSSL ? true, openssl ? null , withIPv6 ? true , withDebug ? false @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { ++ optional withRuby_2_4 ruby_2_4 ++ optional withRuby_2_5 ruby_2_5 ++ optional withRuby_2_6 ruby_2_6 + ++ optional withRuby_2_7 ruby_2_7 ++ optional withSSL openssl; configureFlags = [ @@ -62,6 +64,7 @@ stdenv.mkDerivation rec { ${optionalString withRuby_2_4 "./configure ruby --module=ruby24 --ruby=${ruby_2_4}/bin/ruby"} ${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"} ''; meta = { From a9341dbb333a0e3a1b07785bd1deba2df5a0c28a Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 1 Jan 2020 00:25:35 +0000 Subject: [PATCH 3/4] ruby_2_7.withPackages: test --- pkgs/development/ruby-modules/with-packages/test.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ruby-modules/with-packages/test.nix b/pkgs/development/ruby-modules/with-packages/test.nix index 73f8f02b27b3..dc1da3de4924 100644 --- a/pkgs/development/ruby-modules/with-packages/test.nix +++ b/pkgs/development/ruby-modules/with-packages/test.nix @@ -9,6 +9,7 @@ let ruby_2_4 ruby_2_5 ruby_2_6 + ruby_2_7 ]; gemTests = From ab64518d0f9b58042d30d27d43f84e01dfaf337e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 1 Jan 2020 00:27:14 +0000 Subject: [PATCH 4/4] nixos/redmine: update example to more recent Ruby --- nixos/modules/services/misc/redmine.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index bf9a6914a483..8bd687d08385 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -66,7 +66,7 @@ in type = types.package; default = pkgs.redmine; description = "Which Redmine package to use."; - example = "pkgs.redmine.override { ruby = pkgs.ruby_2_4; }"; + example = "pkgs.redmine.override { ruby = pkgs.ruby_2_7; }"; }; user = mkOption {