public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #48650 from marsam/feature/update-ruby

Browse Source 
ruby: 2.3.7 -> 2.3.8, 2.4.4 -> 2.4.5, 2.5.1 -> 2.5.2
This commit is contained in:
zimbatm 2018-10-18 16:00:14 +02:00 committed by GitHub
commit ef7b1284e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/interpreters/ruby/default.nix
View File

@ -111,8 +111,8 @@ let
postPatch = if isRuby25 then ''
sed -i configure.ac -e '/config.guess/d'
cp ${config}/config.guess tool/
cp ${config}/config.sub tool/
cp --remove-destination ${config}/config.guess tool/
cp --remove-destination ${config}/config.sub tool/
''
else opString useRailsExpress ''
sed -i configure.in -e '/config.guess/d'
@ -202,26 +202,26 @@ let
in {
ruby_2_3 = generic {
version = rubyVersion "2" "3" "7" "";
version = rubyVersion "2" "3" "8" "";
sha256 = {
src = "0zvx5kdp1frjs9n95n7ba7dy0alax33wi3nj8034m3ppvnf39k9m";
git = "11wbzw2ywwfnvlkg3qjg0as2pzk5zyk63y2iis42d91lg1l2flrk";
src = "1gwsqmrhpx1wanrfvrsj3j76rv888zh7jag2si2r14qf8ihns0dm";
git = "0158fg1sx6l6applbq0831kl8kzx5jacfl9lfg0shfzicmjlys3f";
};
};
ruby_2_4 = generic {
version = rubyVersion "2" "4" "4" "";
version = rubyVersion "2" "4" "5" "";
sha256 = {
src = "0nmfr2lijik6cykk0zbj11zcapcrvmdvq83k3r6q3k74g4d1qkr5";
git = "103cs7hz1v0h84lbrippl87s4lawi20m406rs5dgxl2gr2wyjpy5";
src = "162izk7c72y73vmdgcbsh8kqihrbm65xvp53r1s139pzwqd78dv7";
git = "181za4h6bd2bkyzyknxc18i5gq0pnqag60ybc17p0ixw3q7pdj43";
};
};
ruby_2_5 = generic {
version = rubyVersion "2" "5" "1" "";
version = rubyVersion "2" "5" "2" "";
sha256 = {
src = "1c99k0fjaq7k09104h1b1cqx6mrk2b14ic1jjnxc6yav68i1ij6s";
git = "1j0fd16aq9x98n0kq9c3kfp2sh6xcsq8q4733p0wfqjh3vz50kyj";
src = "0wgl1697sdiqh6ksgv40v627jp5557j1zi462krwnzhc9bk408xk";
git = "00xy323q2f2v102hfgsj9k20vggvvmyhd6byfhbc1qwz2vyrvc47";
};
};
}

6
pkgs/development/interpreters/ruby/patchsets.nix
View File

@ -1,17 +1,17 @@
{ patchSet, useRailsExpress, ops, patchLevel }:
rec {
"2.3.7" = ops useRailsExpress [
"2.3.8" = 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"
"${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
];
"2.4.4" = ops useRailsExpress [
"2.4.5" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
"${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
];
"2.5.1" = ops useRailsExpress [
"2.5.2" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"