[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#69238] [PATCH v2 10/10] gnu: ghq: Fix build.
From: |
Sharlatan Hellseher |
Subject: |
[bug#69238] [PATCH v2 10/10] gnu: ghq: Fix build. |
Date: |
Sun, 18 Feb 2024 20:59:09 +0000 |
Fix build as seen in <https://ci.guix.gnu.org/build/3490264/details>.
* gnu/packages/version-control.scm (ghq): Use G-expressions.
[arguments] <#:go>: Use go-1.21.
<#:phases>: Remove trailing #t from lambda.
Change-Id: Ifb1e133a2570dcd04212ef43b46c8b41c3507c88
---
gnu/packages/version-control.scm | 35 ++++++++++++++++----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 242c2bf093..3c43effbd1 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3720,23 +3720,24 @@ (define-public ghq
"155sfmhmh4ia3iinm1s8fk7fxyn5dxdryad9xkbg7mr3i3ikqjwh"))))
(build-system go-build-system)
(arguments
- '(#:install-source? #f
- #:import-path "github.com/x-motemen/ghq"
- #:phases
- (modify-phases %standard-phases
- (add-after 'install 'install-completions
- (lambda* (#:key outputs import-path #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bash-completion (string-append out
"/etc/bash_completion.d"))
- (zsh-completion (string-append out
"/share/zsh/site-functions")))
- (with-directory-excursion (string-append "src/" import-path)
- (mkdir-p bash-completion)
- (copy-file "misc/bash/_ghq"
- (string-append bash-completion "/ghq"))
- (mkdir-p zsh-completion)
- (copy-file "misc/zsh/_ghq"
- (string-append zsh-completion "/_ghq"))))
- #t)))))
+ (list
+ #:install-source? #f
+ #:go go-1.21
+ #:import-path "github.com/x-motemen/ghq"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'install-completions
+ (lambda* (#:key outputs import-path #:allow-other-keys)
+ (let* ((out #$output)
+ (bash-completion (string-append out
"/etc/bash_completion.d"))
+ (zsh-completion (string-append out
"/share/zsh/site-functions")))
+ (with-directory-excursion (string-append "src/" import-path)
+ (mkdir-p bash-completion)
+ (copy-file "misc/bash/_ghq"
+ (string-append bash-completion "/ghq"))
+ (mkdir-p zsh-completion)
+ (copy-file "misc/zsh/_ghq"
+ (string-append zsh-completion "/_ghq")))))))))
(native-inputs
(list git-minimal))
(inputs
--
2.41.0
- [bug#69238] [PATCH 00/10] Fix failed builds from evaluation 1123386., Sharlatan Hellseher, 2024/02/18
- [bug#69238] [PATCH v2 01/10] gnu: go-github-com-alecthomas-chroma: Move to golang-xyz., Sharlatan Hellseher, 2024/02/18
- [bug#69238] [PATCH v2 02/10] gnu: go-github-com-alecthomas-chroma: Update to 0.10.0., Sharlatan Hellseher, 2024/02/18
- [bug#69238] [PATCH v2 07/10] gnu: go-github-com-songmu-gitconfig: Move to golang-xyz., Sharlatan Hellseher, 2024/02/18
- [bug#69238] [PATCH v2 03/10] gnu: go-github-com-alecthomas-chroma: Remove bundled files., Sharlatan Hellseher, 2024/02/18
- [bug#69238] [PATCH v2 10/10] gnu: ghq: Fix build.,
Sharlatan Hellseher <=
- [bug#69238] [PATCH v2 06/10] gnu: go-github-com-alecthomas-assert-v2: Update to 2.5.0., Sharlatan Hellseher, 2024/02/18
- [bug#69238] [PATCH v2 08/10] gnu: go-github-com-songmu-gitconfig: Fix build., Sharlatan Hellseher, 2024/02/18
- [bug#69238] [PATCH v2 04/10] gnu: Add go-github-com-alecthomas-chroma-v2., Sharlatan Hellseher, 2024/02/18
- [bug#69238] [PATCH v2 09/10] gnu: ghq: Remove package labels., Sharlatan Hellseher, 2024/02/18
- [bug#69238] [PATCH v2 05/10] gnu: go-github-com-alecthomas-assert: Deprecate package., Sharlatan Hellseher, 2024/02/18
- bug#69238: [PATCH 00/10] Fix failed builds from evaluation 1123386., Sharlatan Hellseher, 2024/02/19