Merge pull request #45705 from manveru/ruby-2.5-default

ruby: default to version 2.5
This commit is contained in:
Jörg Thalheim 2018-09-01 11:17:13 +01:00 committed by GitHub
commit b29aff5a05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 6 deletions

View File

@ -1,11 +1,6 @@
{ patchSet, useRailsExpress, ops, patchLevel }:
rec {
"2.2.9" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch"
"${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch"
];
"2.3.7" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
"${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"

View File

@ -7720,7 +7720,7 @@ with pkgs;
ruby_2_4
ruby_2_5;
ruby = ruby_2_4;
ruby = ruby_2_5;
mruby = callPackage ../development/compilers/mruby { };