[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/07: build: ruby-build-system: Remove an extraneous binding.
From: |
guix-commits |
Subject: |
07/07: build: ruby-build-system: Remove an extraneous binding. |
Date: |
Tue, 1 Sep 2020 13:20:06 -0400 (EDT) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 89fbca9de61b97ad437aba96415865d67be617b8
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Jul 18 00:22:37 2020 -0400
build: ruby-build-system: Remove an extraneous binding.
* guix/build/ruby-build-system.scm (install): Remove the RUBY-VERSION
binding,
no longer used. Fix the indentation of a comment.
---
guix/build/ruby-build-system.scm | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm
index 8a421c1..9aceb18 100644
--- a/guix/build/ruby-build-system.scm
+++ b/guix/build/ruby-build-system.scm
@@ -136,11 +136,7 @@ is #f."
#:allow-other-keys)
"Install the gem archive SOURCE to the output store item. Additional
GEM-FLAGS are passed to the 'gem' invocation, if present."
- (let* ((ruby-version
- (match:substring (string-match "ruby-(.*)\\.[0-9]$"
- (assoc-ref inputs "ruby"))
- 1))
- (out (assoc-ref outputs "out"))
+ (let* ((out (assoc-ref outputs "out"))
(vendor-dir (string-append out "/lib/ruby/vendor_ruby"))
(gem-file (first-matching-file "\\.gem$"))
(gem-file-basename (basename gem-file))
@@ -151,8 +147,8 @@ GEM-FLAGS are passed to the 'gem' invocation, if present."
(setenv "GEM_VENDOR" vendor-dir)
(or (zero?
- ;; 'zero? system*' allows the custom error handling to function as
- ;; expected, while 'invoke' raises its own exception.
+ ;; 'zero? system*' allows the custom error handling to function as
+ ;; expected, while 'invoke' raises its own exception.
(apply system* "gem" "install" gem-file
"--verbose"
"--local" "--ignore-dependencies" "--vendor"
- branch core-updates updated (15e7167 -> 89fbca9), guix-commits, 2020/09/01
- 01/07: build: ruby-build-system: Adjust replace-git-ls-files., guix-commits, 2020/09/01
- 02/07: gnu: ruby-asciidoctor: Remove obsolete 'replace-git-ls-files phase., guix-commits, 2020/09/01
- 04/07: gnu: ruby-standard: Remove obsolete 'replace-git-ls-files phase., guix-commits, 2020/09/01
- 06/07: gnu: ruby-asciidoctor-pdf: Remove obsolete 'replace-git-ls-files phase., guix-commits, 2020/09/01
- 05/07: gnu: ruby-chunky-png: Remove obsolete 'replace-git-ls-files phase., guix-commits, 2020/09/01
- 03/07: gnu: ruby-treetop: Remove obsolete 'replace-git-ls-files phase., guix-commits, 2020/09/01
- 07/07: build: ruby-build-system: Remove an extraneous binding.,
guix-commits <=