From 69d80d7d21fa086e61ec64866f1a1a28f95a9bbd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 16 Mar 2019 12:36:22 -0500 Subject: [PATCH 1/3] ruby: update RVM patchsets --- pkgs/development/interpreters/ruby/rvm-patchsets.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index d6cc2057602..95b38fc8ebd 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "bdb42b13dd8653afc64676c0feb350e0c1880119"; - sha256 = "09fpx66cshyvrrmp3251d2pmqv0frjw940r421smsmpkny0dx613"; + rev = "e6e12c2c32ff184e0409d8f9f2a870f2dfbd06a3"; + sha256 = "0n71h2ip1k18icb3bcr1jz4161lh6vr6i3f7b45jswg77c4rrxcy"; } From cadc359a0aadc87b73e813dca0c8523b648d596f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 16 Mar 2019 12:40:51 -0500 Subject: [PATCH 2/3] ruby_2_5: 2.5.3 -> 2.5.5 --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 2a2392011d1..b5806254f30 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -215,10 +215,10 @@ in { }; ruby_2_5 = generic { - version = rubyVersion "2" "5" "3" ""; + version = rubyVersion "2" "5" "5" ""; sha256 = { - src = "0v4442aqqlzxwc792kbkfs2k61qg97r680is6gx20z63a8wd0a4q"; - git = "0r9mgvqk6gj8pc9q6qmy7j2kbln7drc8wy67sb2ij8ciclcw9nn2"; + src = "0k2in88jymqh727s88yjsv7wrqs2hdj9h2w9zh2bmrj0ygylba98"; + git = "0l7b7xv48gvvlqs27gghfi645qvc1nwiz8ym4j8w100rzzzfy6zz"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 3d0077833ef..802101cc9c2 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -11,7 +11,7 @@ rec { "${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.3" = ops useRailsExpress [ + "2.5.5" = 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" From 342773c78ccee14271436050470f6837ece6576f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 16 Mar 2019 12:41:28 -0500 Subject: [PATCH 3/3] ruby_2_6: 2.6.1 -> 2.6.2 --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index b5806254f30..e7aedfc0750 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -223,10 +223,10 @@ in { }; ruby_2_6 = generic { - version = rubyVersion "2" "6" "1" ""; + version = rubyVersion "2" "6" "2" ""; sha256 = { - src = "1f0w37jz2ryvlx260rw3s3wl0wg7dkzphb54lpvrqg90pfvly0hp"; - git = "07gp7df1izw9rdbp9ciw4q5kq8icx3zd5w1xrhwsw0dfbsmmnsrj"; + src = "1as97d2j0d21g8mldp8fmdjah96jakrxyw1v0crg7ln2y8mmsh50"; + git = "0f4mnrd7733353kx1jjha770kvm0wlc59z7id9h23kmjdg6k76nl"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 802101cc9c2..9f2a8b1b9fe 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -16,7 +16,7 @@ rec { "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "2.6.1" = ops useRailsExpress [ + "2.6.2" = ops useRailsExpress [ "${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/03-more-detailed-stacktrace.patch"