Merge pull request #129586 from marsam/update-ruby

ruby: 2.6.7 -> 2.6.8, 2.7.3 -> 2.7.4, 3.0.1 -> 3.0.2
This commit is contained in:
Mario Rodas 2021-07-07 22:08:28 -05:00 committed by GitHub
commit c3072b4dee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions

View File

@ -253,26 +253,26 @@ let
in { in {
ruby_2_6 = generic { ruby_2_6 = generic {
version = rubyVersion "2" "6" "7" ""; version = rubyVersion "2" "6" "8" "";
sha256 = { sha256 = {
src = "17m9qxalwhk95dw1qhgxbvr3kkcxs3h86yirfg5mwj35gy5pw8p4"; src = "0vfam28ifl6h2wxi6p70j0hm3f1pvsp432hf75m5j25wfy2vf1qq";
git = "08gvknanwdfsaj3lmcv1bdqjf9lldphzi7gmlv3cfa8ligx2vbap"; git = "0rc3n6sk8632r0libpv8jwslc7852hgk64rvbdrspc9razjwx21c";
}; };
}; };
ruby_2_7 = generic { ruby_2_7 = generic {
version = rubyVersion "2" "7" "3" ""; version = rubyVersion "2" "7" "4" "";
sha256 = { sha256 = {
src = "0f2kwn98n9h9hy1fd547s7d0a7ga8jjm4nh294bwiwnq65gaj9c9"; src = "0nxwkxh7snmjqf787qsp4i33mxd1rbf9yzyfiky5k230i680jhrh";
git = "0vxg9w4dgpw2ig5snxmkahvzdp2yh71w8qm49g35d5hqdsql7yrx"; git = "1prsrqwkla4k5japlm54k0j700j4824rg8z8kpswr9r3swrmrf5p";
}; };
}; };
ruby_3_0 = generic { ruby_3_0 = generic {
version = rubyVersion "3" "0" "1" ""; version = rubyVersion "3" "0" "2" "";
sha256 = { sha256 = {
src = "09vpnxxcxc46qv40xbxr9xkdpbgb0imdy25l2vpsxxlr47djb61n"; src = "1wg6yyzc6arzikcy48igqbxfcdc79bmfpiyfi9m9j1lzmphdx1ah";
git = "0vricyhnnczcbsgvz65pdhi9yx1i34zarbjlc5y5mcmj01y9r7ar"; git = "1kbkxqichi11vli080jgyvjf2xgnlbl9l2f2n1hv4s8b31gjib3r";
}; };
}; };
} }

View File

@ -1,17 +1,17 @@
{ patchSet, useRailsExpress, ops, patchLevel, fetchpatch }: { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }:
{ {
"2.6.7" = ops useRailsExpress [ "2.6.8" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch"
]; ];
"2.7.3" = ops useRailsExpress [ "2.7.4" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch"
]; ];
"3.0.1" = ops useRailsExpress [ "3.0.2" = ops useRailsExpress [
"${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch" "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch"
"${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch" "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch"
]; ];

View File

@ -3,6 +3,6 @@
fetchFromGitHub { fetchFromGitHub {
owner = "skaes"; owner = "skaes";
repo = "rvm-patchsets"; repo = "rvm-patchsets";
rev = "28c6469ce841ff3033c376e78a7043009a3bdc5c"; rev = "0251817e2b9d5f73370bbbb12fdf7f7089bd1ac3";
sha256 = "0kh08hahrwif61sq0qlvgyqiymxi8c8h2dw4s3ln4aq696k4gba9"; sha256 = "1biiq5xzzdfb4hr1sgmx14i2nr05xa9w21pc7dl8c5n4f2ilg8ss";
} }