aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-08-31 00:02:49 +0200
committerMarius Bakke <marius@gnu.org>2022-09-01 23:37:11 +0200
commit7db5168db19287e1e50a94c3de85426b9c8fee80 (patch)
treedd32b8ff86aea2e8c7882636a45c70992a8e41e9
parent58863b93b0d9a191d5cca695fe0a0dfbb067ebba (diff)
downloadguix-7db5168db19287e1e50a94c3de85426b9c8fee80.tar.gz
guix-7db5168db19287e1e50a94c3de85426b9c8fee80.zip
gnu: ruby@2.7: Incorporate grafted changes.
* gnu/packages/ruby.scm (ruby-2.7): Update to 2.7.6. [replacement]: Remove. (ruby-2.7-fixed): Remove variable.
-rw-r--r--gnu/packages/ruby.scm19
1 files changed, 2 insertions, 17 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 1518f11906..628d4eba44 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -154,8 +154,7 @@ a focus on simplicity and productivity.")
(define-public ruby-2.7
(package
(inherit ruby-2.6)
- (version "2.7.4")
- (replacement ruby-2.7-fixed) ; security fixes
+ (version "2.7.6")
(source
(origin
(inherit (package-source ruby-2.6))
@@ -164,7 +163,7 @@ a focus on simplicity and productivity.")
"/ruby-" version ".tar.gz"))
(sha256
(base32
- "0nxwkxh7snmjqf787qsp4i33mxd1rbf9yzyfiky5k230i680jhrh"))))
+ "042xrdk7hsv4072bayz3f8ffqh61i8zlhvck10nfshllq063n877"))))
(arguments
`(#:test-target "test"
#:configure-flags '("--enable-shared") ; dynamic linking
@@ -190,20 +189,6 @@ a focus on simplicity and productivity.")
(native-inputs
(list autoconf))))
-(define ruby-2.7-fixed
- (package
- (inherit ruby-2.7)
- (version "2.7.6")
- (source
- (origin
- (inherit (package-source ruby-2.7))
- (uri (string-append "https://cache.ruby-lang.org/pub/ruby/"
- (version-major+minor version)
- "/ruby-" version ".tar.gz"))
- (sha256
- (base32
- "042xrdk7hsv4072bayz3f8ffqh61i8zlhvck10nfshllq063n877"))))))
-
(define-public ruby-3.0
(package
(inherit ruby-2.7)