MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #76758 from alyssais/ruby_2_7

Browse source 
Some Ruby 2.7 updates and fixes
This commit is contained in:
zimbatm 2020-01-01 11:29:44 +00:00 committed by GitHub
commit 5f5df51bf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/misc/redmine.nix
View file

@ -66,7 +66,7 @@ in
type = types.package; type = types.package;
default = pkgs.redmine; default = pkgs.redmine;
description = "Which Redmine package to use."; 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 { user = mkOption {

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

@ -9,6 +9,7 @@ let
ruby_2_4 ruby_2_4
ruby_2_5 ruby_2_5
ruby_2_6 ruby_2_6
ruby_2_7
]; ];
gemTests = gemTests =

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

@ -9,6 +9,7 @@
, withRuby_2_4 ? false, ruby_2_4 , withRuby_2_4 ? false, ruby_2_4
, withRuby_2_5 ? false, ruby_2_5 , withRuby_2_5 ? false, ruby_2_5
, withRuby_2_6 ? true, ruby_2_6 , withRuby_2_6 ? true, ruby_2_6
, withRuby_2_7 ? true, ruby_2_7
, withSSL ? true, openssl ? null , withSSL ? true, openssl ? null
, withIPv6 ? true , withIPv6 ? true
, withDebug ? false , withDebug ? false
@ -40,6 +41,7 @@ stdenv.mkDerivation rec {
++ optional withRuby_2_4 ruby_2_4 ++ optional withRuby_2_4 ruby_2_4
++ optional withRuby_2_5 ruby_2_5 ++ optional withRuby_2_5 ruby_2_5
++ optional withRuby_2_6 ruby_2_6 ++ optional withRuby_2_6 ruby_2_6
++ optional withRuby_2_7 ruby_2_7
++ optional withSSL openssl; ++ optional withSSL openssl;
configureFlags = [ 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_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_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_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 = { meta = {

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

@ -9373,6 +9373,7 @@ in
rubyPackages_2_4 = recurseIntoAttrs ruby_2_4.gems; rubyPackages_2_4 = recurseIntoAttrs ruby_2_4.gems;
rubyPackages_2_5 = recurseIntoAttrs ruby_2_5.gems; rubyPackages_2_5 = recurseIntoAttrs ruby_2_5.gems;
rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems; rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems;
rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems;
mruby = callPackage ../development/compilers/mruby { }; mruby = callPackage ../development/compilers/mruby { };