ruby: 2.2.3 -> 2.2.5

This commit is contained in:
Rahul Gopinath 2016-07-30 11:58:31 -07:00
parent 39e197ab1c
commit 7163bab78f
4 changed files with 12 additions and 15 deletions

View File

@ -198,14 +198,14 @@ in {
}; };
}; };
ruby_2_2_3 = generic { ruby_2_2_5 = generic {
majorVersion = "2"; majorVersion = "2";
minorVersion = "2"; minorVersion = "2";
teenyVersion = "3"; teenyVersion = "5";
patchLevel = "0"; patchLevel = "0";
sha256 = { sha256 = {
src = "1kpdf7f8pw90n5bckpl2idzggk0nn0240ah92sj4a1w6k4pmyyfz"; src = "1qrmlcyc0cy9hgafb1wny2h90rjyyh6d72nvr2h4xjm4jwbb7i1h";
git = "1ssq3c23ay57ypfis47y2n817hfmb71w0xrdzp57j6bv12jqmgrx"; git = "0k0av6ypyq08c9axm721f0xi2bcp1443l7ydbxv4v8x4vsxdkmq2";
}; };
}; };

View File

@ -50,13 +50,10 @@ rec {
"${patchSet}/patches/ruby/2.1.7/railsexpress/08-funny-falcon-method-cache.patch" "${patchSet}/patches/ruby/2.1.7/railsexpress/08-funny-falcon-method-cache.patch"
"${patchSet}/patches/ruby/2.1.7/railsexpress/09-heap-dump-support.patch" "${patchSet}/patches/ruby/2.1.7/railsexpress/09-heap-dump-support.patch"
]; ];
"2.2.3" = [ "2.2.5" = ops useRailsExpress [
./ssl_v3.patch "${patchSet}/patches/ruby/2.2.5/railsexpress/01-zero-broken-tests.patch"
./ruby22-rand-egd.patch "${patchSet}/patches/ruby/2.2.5/railsexpress/02-improve-gc-stats.patch"
] ++ ops useRailsExpress [ "${patchSet}/patches/ruby/2.2.5/railsexpress/03-display-more-detailed-stack-trace.patch"
"${patchSet}/patches/ruby/2.2.3/railsexpress/01-zero-broken-tests.patch"
"${patchSet}/patches/ruby/2.2.3/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.2.3/railsexpress/03-display-more-detailed-stack-trace.patch"
]; ];
"2.3.1" = ops useRailsExpress [ "2.3.1" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"

View File

@ -3,6 +3,6 @@
fetchFromGitHub { fetchFromGitHub {
owner = "skaes"; owner = "skaes";
repo = "rvm-patchsets"; repo = "rvm-patchsets";
rev = "84d0634ce5639781c4d8e9396ec20341d6524901"; rev = "951e47ca1022cd1e41de9177fa87438cfb72d127";
sha256 = "06x2r43i8kpcmk6s5idrc3z49p8vy18b2lsh1jdqla69i5z2vqlf"; sha256 = "18n2frwmn6lcnjywysyjam1zfzfad0r50141xs2h9kifsyak5xcf";
} }

View File

@ -6005,7 +6005,7 @@ in
ruby_1_9_3 ruby_1_9_3
ruby_2_0_0 ruby_2_0_0
ruby_2_1_7 ruby_2_1_7
ruby_2_2_3 ruby_2_2_5
ruby_2_3_1; ruby_2_3_1;
# Ruby aliases # Ruby aliases
@ -6013,7 +6013,7 @@ in
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_7;
ruby_2_2 = ruby_2_2_3; ruby_2_2 = ruby_2_2_5;
ruby_2_3 = ruby_2_3_1; ruby_2_3 = ruby_2_3_1;
scsh = callPackage ../development/interpreters/scsh { }; scsh = callPackage ../development/interpreters/scsh { };