From 7db5168db19287e1e50a94c3de85426b9c8fee80 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 31 Aug 2022 00:02:49 +0200 Subject: 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. --- gnu/packages/ruby.scm | 19 ++----------------- 1 file 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 @@ (define-public ruby-2.6 (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 @@ (define-public ruby-2.7 "/ruby-" version ".tar.gz")) (sha256 (base32 - "0nxwkxh7snmjqf787qsp4i33mxd1rbf9yzyfiky5k230i680jhrh")))) + "042xrdk7hsv4072bayz3f8ffqh61i8zlhvck10nfshllq063n877")))) (arguments `(#:test-target "test" #:configure-flags '("--enable-shared") ; dynamic linking @@ -190,20 +189,6 @@ (define-public ruby-2.7 (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) -- cgit v1.2.3