From de0373bbe2d7a6255c7d95e1685b91ed0e004794 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 4 Mar 2019 07:00:11 -0500 Subject: [PATCH] ruby_2_6: add missing rvm patchset (#56461) --- pkgs/development/interpreters/ruby/patchsets.nix | 5 ++++- 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 fae76c70612..3d0077833ef 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 1598cbc56e1..d6cc2057602 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"; }