cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #33780 from manveru/upgrade-ruby

Browse source 
Ruby: 2.2.8 -> 2.2.9, 2.3.5 -> 2.3.6, 2.4.2 -> 2.4.3
This commit is contained in:
Graham Christensen 2018-01-12 08:28:08 -05:00 committed by GitHub
commit 9d72156fea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/development/interpreters/ruby/default.nix
View file

@ -205,27 +205,27 @@ in {
}; };
}; };
ruby_2_2_8 = generic { ruby_2_2_9 = generic {
version = rubyVersion "2" "2" "8" ""; version = rubyVersion "2" "2" "9" "";
sha256 = { sha256 = {
src = "12i6v5i0djl4xx3x7fq12snqb5d4drqjmnwqs05fby4bagcbjdwg"; src = "19m1ximl7vcrsvq595dgrjh4yb6kar944095wbywqh7waiqcfirg";
git = "16nw0795nhrj13crp5x4jis8hmi3gsyjl96pwk698wlrb89lf9bw"; git = "03qrjh55098wcqh2khxryzkzfqkznjrcdgwf27r2bgcycbg5ca5q";
}; };
}; };
ruby_2_3_5 = generic { ruby_2_3_6 = generic {
version = rubyVersion "2" "3" "5" ""; version = rubyVersion "2" "3" "6" "";
sha256 = { sha256 = {
src = "1k6x4g68lq30i0myip5bn56rcbwjxmqq95j1fkdgbvwbnaxzfqjl"; src = "07jpa7fw1gyf069m7alf2b0zm53qm08w2ns45mhzmvgrg4r528l3";
git = "0spwqz4b5xxqzs13azsd4xz4jkc3is7d9q4s6s2qilb8ib4863jl"; git = "1bk59i0ygdc5z3zz3k6indfrxd2ix55np6rwvkcdpdw8svm749ds";
}; };
}; };
ruby_2_4_2 = generic { ruby_2_4_3 = generic {
version = rubyVersion "2" "4" "2" ""; version = rubyVersion "2" "4" "3" "";
sha256 = { sha256 = {
src = "174cdiz3am1f76vsnm3iqi9c5vqphypbf9kbxx6vqqmj01gfgfck"; src = "161smb52q19r9lrzy22b3bhnkd0z8wjffm0qsfkml14j5ic7a0zx";
git = "1w83kzak3m6vv3k09ynfw9vpgc7vpmij3x3zmgrhwm4ds1sp5irl"; git = "0x2lqbqm2rq9j5zh1p72dma56nqvdkfbgzb9wybm4y4hwhiw8c1m";
}; };
}; };

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

@ -24,17 +24,17 @@ rec {
"${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.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" "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch"
]; ];
"2.2.8" = ops useRailsExpress [ "2.2.9" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch" "${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/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch" "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch"
]; ];
"2.3.5" = ops useRailsExpress [ "2.3.6" = 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"
"${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.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" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
]; ];
"2.4.2" = ops useRailsExpress [ "2.4.3" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" "${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/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"

12
pkgs/top-level/all-packages.nix
View file

@ -6949,18 +6949,18 @@ with pkgs;
inherit (callPackage ../development/interpreters/ruby { inherit (darwin.apple_sdk.frameworks) Foundation; }) inherit (callPackage ../development/interpreters/ruby { inherit (darwin.apple_sdk.frameworks) Foundation; })
ruby_2_0_0 ruby_2_0_0
ruby_2_1_10 ruby_2_1_10
ruby_2_2_8 ruby_2_2_9
ruby_2_3_5 ruby_2_3_6
ruby_2_4_2 ruby_2_4_3
ruby_2_5_0; ruby_2_5_0;
# Ruby aliases # Ruby aliases
ruby = ruby_2_3; ruby = ruby_2_3;
ruby_2_0 = ruby_2_0_0; ruby_2_0 = ruby_2_0_0;
ruby_2_1 = ruby_2_1_10; ruby_2_1 = ruby_2_1_10;
ruby_2_2 = ruby_2_2_8; ruby_2_2 = ruby_2_2_9;
ruby_2_3 = ruby_2_3_5; ruby_2_3 = ruby_2_3_6;
ruby_2_4 = ruby_2_4_2; ruby_2_4 = ruby_2_4_3;
ruby_2_5 = ruby_2_5_0; ruby_2_5 = ruby_2_5_0;
scsh = callPackage ../development/interpreters/scsh { }; scsh = callPackage ../development/interpreters/scsh { };