guix_mirror_bot pushed a commit to branch ruby-team
in repository guix.
commit 559f636dfd18dfa268d758a340d365559ec5baac
Author: Nicolas Graves <[email protected]>
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 <[email protected]>
---
gnu/packages/ruby.scm | 48 ++++++++++++++----------------------------------
1 file changed, 14 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 60ddabb12a..817ba7035c 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.8")
+ (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
+ "0g3s68kcxb24y4h24wvikvk5v3q6l6hs0kjxms9m49sm048d7k0w"))))))
+
(define-public ruby-2.6
(package
(name "ruby")
@@ -321,23 +335,6 @@ a focus on simplicity and productivity.")
(define-public ruby-3.1
(package
(inherit ruby-3.0)
- (version "3.1.4")
- (replacement ruby-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
- "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
@@ -349,23 +346,6 @@ a focus on simplicity and productivity.")
(base32
"0ddhh3nzfnwwb0ks3rsmf3w1m71ban30wf61djn8gnkbbd2wr2k5"))))))
-(define-public ruby-3.2
- (package
- (inherit ruby-3.1)
- (version "3.2.8")
- (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
- "0g3s68kcxb24y4h24wvikvk5v3q6l6hs0kjxms9m49sm048d7k0w"))))
- (inputs
- (modify-inputs (package-inputs ruby-3.1)
- (prepend libyaml)))))
-
(define-public ruby ruby-3.1)
(define-public mruby
