diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-04-08 17:14:31 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-04-08 17:14:31 +0200 |
| commit | 625ce6c7f66c0b2ccae30f95cdd9e48feed8561c (patch) | |
| tree | c0c5a9d3510dc4dfa3008b9c35dbfea234894e81 /pkgs/development/interpreters/ruby/patchsets.nix | |
| parent | 97490e67836cda5e181caf0a49f1e2d7ca31949f (diff) | |
| parent | bf6abedefbebbec8f54cda97bd33bc06c5f46ed5 (diff) | |
Merge branch 'staging-next' into staging
In python-packages.nix, resolve conflict between 50d604314e736d24dc7aa6749b5482c859147b17 and 187d0371ab3220ee40da1f616e4c48d85ac28986.
Diffstat (limited to 'pkgs/development/interpreters/ruby/patchsets.nix')
| -rw-r--r-- | pkgs/development/interpreters/ruby/patchsets.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 2a26af52a407..964e0a4e28a8 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -11,7 +11,7 @@ "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "3.0.0" = ops useRailsExpress [ + "3.0.1" = ops useRailsExpress [ "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch" "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch" ]; |