diff options
| author | Robin Gloster <mail@glob.in> | 2016-02-07 11:17:57 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-02-07 11:17:57 +0000 |
| commit | 9229e9c6563d88f1b9413ce128e022921089413f (patch) | |
| tree | cc1ce2eda51dd7cebe7a75e342cfcaf88c45e2f5 /pkgs/development/interpreters/ruby/patchsets.nix | |
| parent | 051662610104c2c57b89783084b9f31f5e978c71 (diff) | |
| parent | 6205f17ea43fd74e4aff14a24a5734ec33415fd7 (diff) | |
| download | nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.gz nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.bz2 nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.lz nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.xz nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.zst nixlib-9229e9c6563d88f1b9413ce128e022921089413f.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/interpreters/ruby/patchsets.nix')
| -rw-r--r-- | pkgs/development/interpreters/ruby/patchsets.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 1d0405312130..01e4e2f4c58d 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -147,4 +147,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" + ]; } |