From 99ee3de4767960beedf80a5a33c2a93337f2d0ed Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 30 Mar 2023 04:20:00 +0000 Subject: [PATCH 1/4] ruby_2_7: 2.7.7 -> 2.7.8 Security fixes: - CVE-2023-28755: ReDoS vulnerability in URI - CVE-2023-28756: ReDoS vulnerability in Time https://www.ruby-lang.org/en/news/2023/03/30/ruby-2-7-8-released/ --- pkgs/development/interpreters/ruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index f30b0e87fda4..0c8d93127fc1 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -322,8 +322,8 @@ in { mkRuby = generic; ruby_2_7 = generic { - version = rubyVersion "2" "7" "7" ""; - sha256 = "sha256-4QEn22kdf/NkAs/oj0GMjQJaPx7qkgRLFi3XLwuMe5A="; + version = rubyVersion "2" "7" "8" ""; + sha256 = "sha256-wtq2PLyPKgVSYQitQZ76Y6Z+1AdNu8+fwrHKZky0W6A="; }; ruby_3_0 = generic { From 17fa5d3a36ec73c897f9024b7158e13867faf76b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 30 Mar 2023 04:20:00 +0000 Subject: [PATCH 2/4] ruby_3_0: 3.0.5 -> 3.0.6 Security fixes: - CVE-2023-28755: ReDoS vulnerability in URI - CVE-2023-28756: ReDoS vulnerability in Time https://www.ruby-lang.org/en/news/2023/03/30/ruby-3-0-6-released/ --- pkgs/development/interpreters/ruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 0c8d93127fc1..a25cde49a3b9 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -327,8 +327,8 @@ in { }; ruby_3_0 = generic { - version = rubyVersion "3" "0" "5" ""; - sha256 = "sha256-mvxjgKAnpP4a4aPi7MtrSXucWsBjHBLKVvm3vrSEh3Y="; + version = rubyVersion "3" "0" "6" ""; + sha256 = "sha256-bmy9SQAw15EMD/IO3vq0KU380QRvD49H94tZeYesaD4="; }; ruby_3_1 = generic { From 1aecb7bea358c820032072eca6f82f5a50efc52b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 30 Mar 2023 04:20:00 +0000 Subject: [PATCH 3/4] ruby_3_1: 3.1.3 -> 3.1.4 Security fixes: - CVE-2023-28755: ReDoS vulnerability in URI - CVE-2023-28756: ReDoS vulnerability in Time https://www.ruby-lang.org/en/news/2023/03/30/ruby-3-1-4-released/ --- pkgs/development/interpreters/ruby/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index a25cde49a3b9..daed62800217 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -112,14 +112,6 @@ let sha256 = "sha256-43hI9L6bXfeujgmgKFVmiWhg7OXvshPCCtQ4TxqK1zk="; }) ] - ++ ops (ver.majMin == "3.1") [ - # Ruby 3.1.3 cannot find pkg-config in mkmf.rb - # https://bugs.ruby-lang.org/issues/19189 - (fetchpatch { - url = "https://github.com/ruby/ruby/commit/613fca01486e47dee9364a2fd86b5f5e77fe23c8.patch"; - sha256 = "sha256-0Ku7l6VEpcvxexL9QA5+mNER4v8gYZOJhAjhCL1WDpw="; - }) - ] ++ ops (!atLeast30 && rubygemsSupport) [ # We upgrade rubygems to a version that isn't compatible with the # ruby 2.7 installer. Backport the upstream fix. @@ -332,8 +324,8 @@ in { }; ruby_3_1 = generic { - version = rubyVersion "3" "1" "3" ""; - sha256 = "sha256-XqSYo19M0Vh1IApS3eQrbrF54SZOF9eHMsOlfNHGq54="; + version = rubyVersion "3" "1" "4" ""; + sha256 = "sha256-o9VYeaDfqx1xQf3xDSKgfb+OXNxEFdob3gYSfVzDx7Y="; }; ruby_3_2 = generic { From 3f2cadf4ea0c6233dd945fde0dddeb2cd17a4c2f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 30 Mar 2023 04:20:00 +0000 Subject: [PATCH 4/4] ruby_3_2: 3.2.1 -> 3.2.2 Security fixes: - CVE-2023-28755: ReDoS vulnerability in URI - CVE-2023-28756: ReDoS vulnerability in Time https://www.ruby-lang.org/en/news/2023/03/30/ruby-3-2-2-released/ --- pkgs/development/interpreters/ruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index daed62800217..99a77bfedc7c 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -329,8 +329,8 @@ in { }; ruby_3_2 = generic { - version = rubyVersion "3" "2" "1" ""; - sha256 = "sha256-E9Z5AWYO4yF9vZ3VYFk0a9QhLOZKacMG71LfZJNfjb0="; + version = rubyVersion "3" "2" "2" ""; + sha256 = "sha256-lsV1WIcaZ0jeW8nydOk/S1qtBs2PN776Do2U57ikI7w="; cargoSha256 = "sha256-6du7RJo0DH+eYMOoh3L31F3aqfR5+iG1iKauSV1uNcQ="; }; }