diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2020-01-01 11:29:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-01 11:29:44 +0000 |
| commit | 5f5df51bf0b0278b2226158731b7bac214962848 (patch) | |
| tree | 2865cb48851e5a015f6cf0deafbb8ef409179383 /pkgs | |
| parent | 31ef3b8ec568b2b6ececa8702242dd7d0cf384fa (diff) | |
| parent | ab64518d0f9b58042d30d27d43f84e01dfaf337e (diff) | |
| download | nixlib-5f5df51bf0b0278b2226158731b7bac214962848.tar nixlib-5f5df51bf0b0278b2226158731b7bac214962848.tar.gz nixlib-5f5df51bf0b0278b2226158731b7bac214962848.tar.bz2 nixlib-5f5df51bf0b0278b2226158731b7bac214962848.tar.lz nixlib-5f5df51bf0b0278b2226158731b7bac214962848.tar.xz nixlib-5f5df51bf0b0278b2226158731b7bac214962848.tar.zst nixlib-5f5df51bf0b0278b2226158731b7bac214962848.zip | |
Merge pull request #76758 from alyssais/ruby_2_7
Some Ruby 2.7 updates and fixes
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/ruby-modules/with-packages/test.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/http/unit/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 5 insertions, 0 deletions
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 = 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 = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f23dbd8ab28..0a34a6305aa8 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 { }; |