diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-03-04 07:00:11 -0500 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2019-03-04 12:00:11 +0000 |
| commit | de0373bbe2d7a6255c7d95e1685b91ed0e004794 (patch) | |
| tree | 1ecf3c5e16be113ad06907f6bd3f17509a097f4d /pkgs/development/interpreters/ruby | |
| parent | ba519fb2a3c9538267a4645378dda1a362c61bbe (diff) | |
| download | nixlib-de0373bbe2d7a6255c7d95e1685b91ed0e004794.tar nixlib-de0373bbe2d7a6255c7d95e1685b91ed0e004794.tar.gz nixlib-de0373bbe2d7a6255c7d95e1685b91ed0e004794.tar.bz2 nixlib-de0373bbe2d7a6255c7d95e1685b91ed0e004794.tar.lz nixlib-de0373bbe2d7a6255c7d95e1685b91ed0e004794.tar.xz nixlib-de0373bbe2d7a6255c7d95e1685b91ed0e004794.tar.zst nixlib-de0373bbe2d7a6255c7d95e1685b91ed0e004794.zip | |
ruby_2_6: add missing rvm patchset (#56461)
Diffstat (limited to 'pkgs/development/interpreters/ruby')
| -rw-r--r-- | pkgs/development/interpreters/ruby/patchsets.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/interpreters/ruby/rvm-patchsets.nix | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index fae76c706121..3d0077833efc 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -16,6 +16,9 @@ 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 [ # no Rails Express patchset yet (2019-01-30) + "2.6.1" = 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" ]; } diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 1598cbc56e1d..d6cc2057602c 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 = "ba5a3c6f972e1b957b4b3fe28b5730ef0e27bff3"; - sha256 = "0sjmhhb8hshxa58x062j44w0xdck8ykgpsg33wjr0wv9npwpkwrz"; + rev = "bdb42b13dd8653afc64676c0feb350e0c1880119"; + sha256 = "09fpx66cshyvrrmp3251d2pmqv0frjw940r421smsmpkny0dx613"; } |