diff options
| author | ajs124 <git@ajs124.de> | 2023-01-18 15:57:01 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-02-01 09:24:53 +0000 |
| commit | d5879f02e50003fbecd703cee9da57d2473d5b41 (patch) | |
| tree | 6afaf2f0f6b50ebc01ad96fc7175e9074f98a877 | |
| parent | ruby_2_7: 2.7.6 -> 2.7.7 (diff) | |
| download | nixpkgs-origin/backport-211410-to-release-22.11.tar.gz | |
ruby_3_0: 3.0.4 -> 3.0.5origin/backport-211410-to-release-22.11
Fixes CVE-2021-33621
(cherry picked from commit 0f9f669328ca2dbda36b96746f41f58f9be90aa6)
| -rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/ruby/patchsets.nix | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 461e22d6d881..03bfa63a0702 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -265,8 +265,8 @@ in { }; ruby_3_0 = generic { - version = rubyVersion "3" "0" "4" ""; - sha256 = "0avj4g3s2839b2y4m6pk8kid74r8nj7k0qm2rsdcwjzhg8h7rd3h"; + version = rubyVersion "3" "0" "5" ""; + sha256 = "sha256-mvxjgKAnpP4a4aPi7MtrSXucWsBjHBLKVvm3vrSEh3Y="; }; ruby_3_1 = generic { diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 569c04da5839..2bf5bc7296c6 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -7,10 +7,9 @@ "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/04-malloc-trim.patch" ]; - "3.0.4" = ops useRailsExpress [ - "${patchSet}/patches/ruby/3.0/head/railsexpress/01-fix-with-openssl-dir-option.patch" - "${patchSet}/patches/ruby/3.0/head/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/3.0/head/railsexpress/03-malloc-trim.patch" + "3.0.5" = 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" ]; "3.1.2" = ops useRailsExpress [ "${patchSet}/patches/ruby/3.1/head/railsexpress/01-improve-gc-stats.patch" |