[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/16: gnu: scsh: Fix version number and use gexps.
From: |
guix-commits |
Subject: |
13/16: gnu: scsh: Fix version number and use gexps. |
Date: |
Sat, 12 Aug 2023 17:21:36 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit a479c0925a9158c9fae5931268d5c79e36f98634
Author: Andrew Whatson <whatson@tailcall.au>
AuthorDate: Fri Aug 11 21:48:40 2023 +1000
gnu: scsh: Fix version number and use gexps.
* gnu/packages/shells.scm (scsh)[version] Use latest upstream commit.
Use git-version. Correct base version number to 0.7.
[source]: Use git-file-name.
[arguments]: Use gexps and remove trailing #t in phases.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/shells.scm | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index aef22efd01..62b682496e 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -602,36 +602,36 @@ use of experts and novices alike.")
(license license:bsd-2)))
(define-public scsh
- (let ((commit "114432435e4eadd54334df6b37fcae505079b49f")
- (revision "1"))
+ (let ((commit "4acf6e4ed7b65b46186ef0c9c2a1e10bef8dc052")
+ (revision "0"))
(package
(name "scsh")
- (version (string-append "0.0.0-" revision "." (string-take commit 7)))
+ (version (git-version "0.7" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/scheme/scsh")
(commit commit)))
- (file-name (string-append name "-" version "-checkout"))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1ghk08akiz7hff1pndi8rmgamgcrn2mv9asbss9l79d3c2iaav3q"))
+ "1czrp808v5gs0ci5lmkp3wr3gfkrb3vd5b2iw2hz1bpqgaf6bxpv"))
(patches (search-patches "scsh-nonstring-search-path.patch"))))
(build-system gnu-build-system)
(arguments
- `(#:test-target "test"
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'replace-rx
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((rx (assoc-ref inputs "scheme48-rx"))
- (rxpath (string-append rx "/share/scheme48-"
- ,(package-version scheme48)
+ (list
+ #:test-target "test"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'replace-rx
+ (lambda _
+ (let ((rxpath (string-append #$scheme48-rx
+ "/share/scheme48-"
+ #$(package-version scheme48)
"/rx")))
- (delete-file-recursively "rx")
- (symlink rxpath "rx"))
- #t)))))
+ (delete-file-recursively "rx")
+ (symlink rxpath "rx")))))))
(inputs
(list scheme48 scheme48-rx))
(native-inputs
- 10/16: gnu: Add emacs-math-preview., (continued)
- 10/16: gnu: Add emacs-math-preview., guix-commits, 2023/08/12
- 04/16: gnu: Add xorgxrdp., guix-commits, 2023/08/12
- 06/16: platform: Add powerpc64-linux., guix-commits, 2023/08/12
- 07/16: gnu: guile-smc: Update to 0.6.1., guix-commits, 2023/08/12
- 09/16: reconfigure: Use let* from srfi-71., guix-commits, 2023/08/12
- 14/16: gnu: gpodder: Update to 3.11.1., guix-commits, 2023/08/12
- 02/16: gnu: uwufetch: Add and use missing inputs., guix-commits, 2023/08/12
- 01/16: gnu: ntp: Fix cross-compilation inputs., guix-commits, 2023/08/12
- 03/16: gnu: Add xrdp., guix-commits, 2023/08/12
- 11/16: gnu: conda: Add missing dependency., guix-commits, 2023/08/12
- 13/16: gnu: scsh: Fix version number and use gexps.,
guix-commits <=
- 16/16: gnu: Add ulauncher., guix-commits, 2023/08/12
- 15/16: gnu: loksh: Update to 7.3., guix-commits, 2023/08/12
- 12/16: gnu: Add cage., guix-commits, 2023/08/12