diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2021-12-02 04:24:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-02 04:24:33 -0500 |
| commit | 6cdb3ec4384165bbfbdeb2a1afbe0a4fcbb23c2c (patch) | |
| tree | d7635e15545601ba2aec91e40fcf677c347e2714 | |
| parent | 8ad2c0423eb1d35701ed8092f03cdb32e0959795 (diff) | |
| parent | 26038de2256eae025045e4646d91a73285700ed3 (diff) | |
| download | nixpkgs-6cdb3ec4384165bbfbdeb2a1afbe0a4fcbb23c2c.tar nixpkgs-6cdb3ec4384165bbfbdeb2a1afbe0a4fcbb23c2c.tar.gz nixpkgs-6cdb3ec4384165bbfbdeb2a1afbe0a4fcbb23c2c.tar.bz2 nixpkgs-6cdb3ec4384165bbfbdeb2a1afbe0a4fcbb23c2c.tar.lz nixpkgs-6cdb3ec4384165bbfbdeb2a1afbe0a4fcbb23c2c.tar.xz nixpkgs-6cdb3ec4384165bbfbdeb2a1afbe0a4fcbb23c2c.tar.zst nixpkgs-6cdb3ec4384165bbfbdeb2a1afbe0a4fcbb23c2c.zip | |
Merge pull request #147343 from chvp/bump-ruby
ruby: 2.7.4 -> 2.7.5, 3.0.2 -> 3.0.3
| -rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/interpreters/ruby/patchsets.nix | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index b6010cf32d1..7ab397bfc19 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -252,18 +252,18 @@ let in { ruby_2_7 = generic { - version = rubyVersion "2" "7" "4" ""; + version = rubyVersion "2" "7" "5" ""; sha256 = { - src = "0nxwkxh7snmjqf787qsp4i33mxd1rbf9yzyfiky5k230i680jhrh"; - git = "1prsrqwkla4k5japlm54k0j700j4824rg8z8kpswr9r3swrmrf5p"; + src = "1wc1hwmz4m6iqlmqag8liyld917p6a8dvnhnpd1v8d8jl80bjm97"; + git = "16565fyl7141hr6q6d74myhsz46lvgam8ifnacshi68vzibwjbbh"; }; }; ruby_3_0 = generic { - version = rubyVersion "3" "0" "2" ""; + version = rubyVersion "3" "0" "3" ""; sha256 = { - src = "1wg6yyzc6arzikcy48igqbxfcdc79bmfpiyfi9m9j1lzmphdx1ah"; - git = "1kbkxqichi11vli080jgyvjf2xgnlbl9l2f2n1hv4s8b31gjib3r"; + src = "1b4j39zyyvdkf1ax2c6qfa40b4mxfkr87zghhw19fmnzn8f8d1im"; + git = "1q19w5i1jkfxn7qq6f9v9ngax9h52gxwijk7hp312dx6amwrkaim"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 3ea358c349a..31a9a9f1c08 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,12 +1,12 @@ { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }: { - "2.7.4" = ops useRailsExpress [ + "2.7.5" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${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.2" = ops useRailsExpress [ + "3.0.3" = 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" ]; |