[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/21: gnu: tcsh: Use G-expression.
From: |
guix-commits |
Subject: |
14/21: gnu: tcsh: Use G-expression. |
Date: |
Thu, 30 Jun 2022 17:27:36 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 1a04f8c67725f1ac08e1d731a0f6629db5027889
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Jun 30 16:58:20 2022 +0200
gnu: tcsh: Use G-expression.
* gnu/packages/shells.scm (tcsh)[arguments]: Rewrite as gexp.
---
gnu/packages/shells.scm | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index fb8feb3425..7ea9dfb483 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -413,16 +413,16 @@ written by Paul Haahr and Byron Rakitzis.")
(inputs
(list ncurses))
(arguments
- `(#:phases
- (modify-phases %standard-phases
- ,@(if (%current-target-system)
- '((add-before 'configure 'set-cross-cc
- (lambda _
- (substitute* "configure"
- (("CC_FOR_GETHOST=\"cc\"")
- "CC_FOR_GETHOST=\"gcc\""))
- #t)))
- '())
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ #$@(if (%current-target-system)
+ #~((add-before 'configure 'set-cross-cc
+ (lambda _
+ (substitute* "configure"
+ (("CC_FOR_GETHOST=\"cc\"")
+ "CC_FOR_GETHOST=\"gcc\"")))))
+ #~())
(add-before 'check 'patch-test-scripts
(lambda _
;; Take care of pwd
@@ -449,15 +449,11 @@ written by Paul Haahr and Byron Rakitzis.")
;; This file is ISO-8859-1 encoded.
(with-fluids ((%default-port-encoding #f))
(substitute* "tests/testsuite"
- (("/bin/sh") (which "sh"))))
- #t))
+ (("/bin/sh") (which "sh"))))))
(add-after 'install 'post-install
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref %outputs "out"))
- (bin (string-append out "/bin")))
- (with-directory-excursion bin
- (symlink "tcsh" "csh"))
- #t))))))
+ (lambda _
+ (with-directory-excursion (string-append #$output "/bin")
+ (symlink "tcsh" "csh")))))))
(home-page "https://www.tcsh.org/")
(synopsis "Unix shell based on csh")
(description
- 02/21: gnu: dejagnu: Use G-expressions., (continued)
- 02/21: gnu: dejagnu: Use G-expressions., guix-commits, 2022/06/30
- 04/21: gnu: libgc: Use new style., guix-commits, 2022/06/30
- 06/21: gnu: zlib: Use G-expression., guix-commits, 2022/06/30
- 03/21: gnu: jsoncpp@1.7.3: Fix build failure., guix-commits, 2022/06/30
- 07/21: gnu: help2man: Update to 1.49.2., guix-commits, 2022/06/30
- 16/21: gnu: OpenBLAS: Use G-expressions., guix-commits, 2022/06/30
- 01/21: gnu: dejagnu: Fix test failure., guix-commits, 2022/06/30
- 08/21: gnu: help2man: Remove input labels., guix-commits, 2022/06/30
- 09/21: gnu: icu4c: Remove input labels., guix-commits, 2022/06/30
- 12/21: gnu: pcre: Use G-expression., guix-commits, 2022/06/30
- 14/21: gnu: tcsh: Use G-expression.,
guix-commits <=
- 17/21: gnu: libaio: Update to 0.3.113., guix-commits, 2022/06/30
- 20/21: gnu: yelp-xsl: Remove obsolete input., guix-commits, 2022/06/30
- 21/21: gnu: yelp-xsl: Remove input labels., guix-commits, 2022/06/30
- 15/21: gnu: Boost: Use G-expressions., guix-commits, 2022/06/30
- 18/21: gnu: itstool: Update to 2.0.7., guix-commits, 2022/06/30
- 10/21: gnu: pcre2: Update to 10.40., guix-commits, 2022/06/30
- 19/21: gnu: itstool: Use G-expression., guix-commits, 2022/06/30
- 05/21: gnu: zlib: Update to 1.2.12., guix-commits, 2022/06/30
- 11/21: gnu: pcre2: Use G-expression., guix-commits, 2022/06/30
- 13/21: gnu: tcsh: Update to 6.24.01., guix-commits, 2022/06/30