unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Sharlatan Hellseher <sharlatanus@gmail.com>
To: 69238@debbugs.gnu.org
Cc: Sharlatan Hellseher <sharlatanus@gmail.com>
Subject: [bug#69238] [PATCH 10/10] gnu: ghq: Fix build.
Date: Sun, 18 Feb 2024 18:40:01 +0000	[thread overview]
Message-ID: <99555416c787fd6d58760a281799b0cf53ca1da6.1708155311.git.sharlatanus@gmail.com> (raw)
In-Reply-To: <cover.1708155311.git.sharlatanus@gmail.com>

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 b2bcca8b1e..705a7facdc 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





  parent reply	other threads:[~2024-02-18 18:42 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-17 19:04 [bug#69183] [PATCH 00/10] Fix failed builds from evaluation 1123386 Sharlatan Hellseher
2024-02-18 18:39 ` [bug#69238] [PATCH 01/10] gnu: go-github-com-alecthomas-chroma: Move to golang-xyz Sharlatan Hellseher
2024-02-18 18:39 ` [bug#69238] [PATCH 02/10] gnu: go-github-com-alecthomas-chroma: Update to 0.10.0 Sharlatan Hellseher
2024-02-18 18:39 ` [bug#69238] [PATCH 03/10] gnu: go-github-com-alecthomas-chroma: Remove bundled files Sharlatan Hellseher
2024-02-18 18:39 ` [bug#69238] [PATCH 04/10] gnu: Add go-github-com-alecthomas-chroma-v2 Sharlatan Hellseher
2024-02-18 18:39 ` [bug#69238] [PATCH 05/10] gnu: go-github-com-alecthomas-assert: Depricate package Sharlatan Hellseher
2024-02-18 20:34   ` Troy Figiel
2024-02-18 20:58     ` Sharlatan Hellseher
2024-02-18 18:39 ` [bug#69238] [PATCH 06/10] gnu: go-github-com-alecthomas-assert-v2: Update to 2.5.0 Sharlatan Hellseher
2024-02-18 18:39 ` [bug#69238] [PATCH 07/10] gnu: go-github-com-songmu-gitconfig: Move to golang-xyz Sharlatan Hellseher
2024-02-18 18:39 ` [bug#69238] [PATCH 08/10] gnu: go-github-com-songmu-gitconfig: Fix build Sharlatan Hellseher
2024-02-18 18:40 ` [bug#69238] [PATCH 09/10] gnu: ghq: Remove package labels Sharlatan Hellseher
2024-02-18 18:40 ` Sharlatan Hellseher [this message]
2024-02-18 20:39 ` bug#69252: [PATCH 00/10] Fix failed builds from evaluation 1123386 Sharlatan Hellseher
2024-02-18 20:42 ` bug#69183: " Sharlatan Hellseher
2024-02-18 20:44 ` bug#69218: " Sharlatan Hellseher
2024-02-18 20:45 ` bug#69196: [PATCH 00/10] Fix failed builds from evaluation #1123386 Sharlatan Hellseher
2024-02-18 20:47 ` bug#69203: [PATCH 00/10] Fix failed builds from evaluation 1123386 Sharlatan Hellseher
2024-02-18 20:48 ` bug#69210: " Sharlatan Hellseher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=99555416c787fd6d58760a281799b0cf53ca1da6.1708155311.git.sharlatanus@gmail.com \
    --to=sharlatanus@gmail.com \
    --cc=69238@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).