ruby: 2.1.7 -> 2.1.10

This commit is contained in:
Rahul Gopinath 2016-07-30 15:15:52 -07:00
parent 7163bab78f
commit 3b9b8726bd
3 changed files with 18 additions and 17 deletions

View File

@ -147,6 +147,7 @@ let
license = stdenv.lib.licenses.ruby; license = stdenv.lib.licenses.ruby;
homepage = http://www.ruby-lang.org/en/; homepage = http://www.ruby-lang.org/en/;
description = "The Ruby language"; description = "The Ruby language";
maintainers = [ stdenv.lib.maintainers.vrthra ];
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
@ -187,14 +188,14 @@ in {
}; };
}; };
ruby_2_1_7 = generic { ruby_2_1_10 = generic {
majorVersion = "2"; majorVersion = "2";
minorVersion = "1"; minorVersion = "1";
teenyVersion = "7"; teenyVersion = "10";
patchLevel = "0"; patchLevel = "0";
sha256 = { sha256 = {
src = "10fxlqmpbq9407zgsx060q22yj4zq6c3czbf29h7xk1rmjb1b77m"; src = "086x66w51lg41abjn79xb7f6xsryymkcc3nvakmkjnjyg96labpv";
git = "1fmbqd943akqjwsfbj9bg394ac46qmpavm8s0kv2w87rflrjcjfb"; git = "133phd5r5y0np5lc9nqif93l7yb13yd52aspyl6c46z5jhvhyvfi";
}; };
}; };

View File

@ -36,19 +36,19 @@ rec {
"${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/03-display-more-detailed-stack-trace.patch" "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/03-display-more-detailed-stack-trace.patch"
"${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
]; ];
"2.1.7" = [ "2.1.10" = [
./ssl_v3.patch
./rand-egd.patch ./rand-egd.patch
] ++ ops useRailsExpress [ ] ++ ops useRailsExpress [
"${patchSet}/patches/ruby/2.1.7/railsexpress/01-zero-broken-tests.patch" # 2.1.10 patchsets are not available, but 2.1.8 patchsets apply
"${patchSet}/patches/ruby/2.1.7/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.1.8/railsexpress/01-zero-broken-tests.patch"
"${patchSet}/patches/ruby/2.1.7/railsexpress/03-display-more-detailed-stack-trace.patch" "${patchSet}/patches/ruby/2.1.8/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.1.7/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" "${patchSet}/patches/ruby/2.1.8/railsexpress/03-display-more-detailed-stack-trace.patch"
"${patchSet}/patches/ruby/2.1.7/railsexpress/05-funny-falcon-stc-density.patch" "${patchSet}/patches/ruby/2.1.8/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
"${patchSet}/patches/ruby/2.1.7/railsexpress/06-funny-falcon-stc-pool-allocation.patch" "${patchSet}/patches/ruby/2.1.8/railsexpress/05-funny-falcon-stc-density.patch"
"${patchSet}/patches/ruby/2.1.7/railsexpress/07-aman-opt-aset-aref-str.patch" "${patchSet}/patches/ruby/2.1.8/railsexpress/06-funny-falcon-stc-pool-allocation.patch"
"${patchSet}/patches/ruby/2.1.7/railsexpress/08-funny-falcon-method-cache.patch" "${patchSet}/patches/ruby/2.1.8/railsexpress/07-aman-opt-aset-aref-str.patch"
"${patchSet}/patches/ruby/2.1.7/railsexpress/09-heap-dump-support.patch" "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch"
"${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch"
]; ];
"2.2.5" = ops useRailsExpress [ "2.2.5" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.2.5/railsexpress/01-zero-broken-tests.patch" "${patchSet}/patches/ruby/2.2.5/railsexpress/01-zero-broken-tests.patch"

View File

@ -6004,7 +6004,7 @@ in
inherit (callPackage ../development/interpreters/ruby {}) inherit (callPackage ../development/interpreters/ruby {})
ruby_1_9_3 ruby_1_9_3
ruby_2_0_0 ruby_2_0_0
ruby_2_1_7 ruby_2_1_10
ruby_2_2_5 ruby_2_2_5
ruby_2_3_1; ruby_2_3_1;
@ -6012,7 +6012,7 @@ in
ruby = ruby_2_3; ruby = ruby_2_3;
ruby_1_9 = ruby_1_9_3; ruby_1_9 = ruby_1_9_3;
ruby_2_0 = ruby_2_0_0; ruby_2_0 = ruby_2_0_0;
ruby_2_1 = ruby_2_1_7; ruby_2_1 = ruby_2_1_10;
ruby_2_2 = ruby_2_2_5; ruby_2_2 = ruby_2_2_5;
ruby_2_3 = ruby_2_3_1; ruby_2_3 = ruby_2_3_1;