54/129: gnu: ruby-3.2: Inherit from ruby-3.3.

[guix-commits]

guix_mirror_bot pushed a commit to branch ruby-team
in repository guix.

commit 506183ecb3dad3b37656730853879632ece5a4f6
Author: Nicolas Graves <ngraves@ngraves.fr>
AuthorDate: Sun Feb 16 01:33:33 2025 +0100

    gnu: ruby-3.2: Inherit from ruby-3.3.
    
    * gnu/packages/ruby.scm (ruby-3.2): Move after ruby-3.3.
      [inherit]: Switch to ruby-3.3.
    
    Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
---
 gnu/packages/ruby.scm | 47 ++++++++++++++---------------------------------
 1 file changed, 14 insertions(+), 33 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 4c0fac6fdf..68fb1a926d 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -189,6 +189,20 @@ a focus on simplicity and productivity.")
         (base32
          "0wmdnqcmfa5mf961hzklvjic7vdpgrbl2ckhaafb1m0fbrhbrg2x"))))))
 
+(define-public ruby-3.2
+  (package
+    (inherit ruby-3.3)
+    (version "3.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://cache.ruby-lang.org/pub/ruby/";
+                           (version-major+minor version)
+                           "/ruby-" version ".tar.xz"))
+       (sha256
+        (base32
+         "0ss7pb7f62sakq5ywpw3dl0v586cl61cd91qlm1i094c9fak3cng"))))))
+
 (define-public ruby-2.6
   (package
     (name "ruby")
@@ -333,39 +347,6 @@ a focus on simplicity and productivity.")
         (base32
          "0kzr792rk9n9yrqlyrkc1a0cmbk5y194f7v7p4vwjdk0ww860v8v"))))))
 
-+;;; TODO: This newer version resolves serveral CVEs.  Remove
-+;;; after ungrafting ruby.
-(define ruby-3.1.7
-  (package
-    (inherit ruby-3.1)
-    (version "3.1.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "http://cache.ruby-lang.org/pub/ruby/";
-                           (version-major+minor version)
-                           "/ruby-" version ".tar.xz"))
-       (sha256
-        (base32
-         "0ddhh3nzfnwwb0ks3rsmf3w1m71ban30wf61djn8gnkbbd2wr2k5"))))))
-
-(define-public ruby-3.2
-  (package
-    (inherit ruby-3.1)
-    (version "3.2.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "http://cache.ruby-lang.org/pub/ruby/";
-                           (version-major+minor version)
-                           "/ruby-" version ".tar.xz"))
-       (sha256
-        (base32
-         "0ss7pb7f62sakq5ywpw3dl0v586cl61cd91qlm1i094c9fak3cng"))))
-    (inputs
-     (modify-inputs (package-inputs ruby-3.1)
-       (prepend libyaml)))))
-
 (define-public ruby ruby-3.1)
 
 (define-public mruby