summaryrefslogtreecommitdiffstats
path: root/pkgs/development/interpreters/ruby/patchsets.nix
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-05-18 17:10:02 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2016-05-18 17:10:02 +0200
commitf8d481754cf842ca6e6ac1427ce0f571f5a44108 (patch)
tree70e702285987429aed275e0d5e2dc15c050e1f8c /pkgs/development/interpreters/ruby/patchsets.nix
parent9fbc20e2f89bc045efac7ade41949a2c2d571dec (diff)
parent3cd63ade1614d4c581735ffb0cebe181bf87dfc8 (diff)
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/interpreters/ruby/patchsets.nix')
-rw-r--r--pkgs/development/interpreters/ruby/patchsets.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 4231623f8926..bf848aba5825 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -58,9 +58,9 @@ rec {
"${patchSet}/patches/ruby/2.2.3/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.2.3/railsexpress/03-display-more-detailed-stack-trace.patch"
];
- "2.3.0" = ops useRailsExpress [
- "${patchSet}/patches/ruby/2.3.0/railsexpress/01-skip-broken-tests.patch"
- "${patchSet}/patches/ruby/2.3.0/railsexpress/02-improve-gc-stats.patch"
- "${patchSet}/patches/ruby/2.3.0/railsexpress/03-display-more-detailed-stack-trace.patch"
+ "2.3.1" = 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"
];
}