GNU bug report logs - #74591
[PATCH] gnu: b4: Fix git binary access.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 74591 in the body.
You can then email your comments to 74591 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: guix-patches <at> gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH] gnu: b4: Fix git binary access.
Date: Thu, 28 Nov 2024 14:38:46 +0100

* gnu/packages/version-control.scm (b4)[arguments]<#:phases>: Fix
phase 'hardcode-git-bin.
---
 gnu/packages/version-control.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index c892a83a98..24dc7bf107 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3239,7 +3239,7 @@ (define-public b4
                ;; This ensures git is present when called.
                (add-after 'unpack 'hardcode-git-bin
                  (lambda* (#:key inputs #:allow-other-keys)
-                   (substitute* (find-files "b4" "\\.py$")
+                   (substitute* (find-files "src/b4" "\\.py$")
                      (("\\['git'")
                       (string-append
                        "['" (search-input-file inputs "bin/git") "'"))))))))
-- 
2.46.0

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: Nicolas Graves via Guix-patches via <guix-patches <at> gnu.org>
Cc: 74591-done <at> debbugs.gnu.org, Nicolas Graves <ngraves <at> ngraves.fr>
Subject: Re: [bug#74591] [PATCH] gnu: b4: Fix git binary access.
Date: Sun, 01 Dec 2024 16:06:36 +0800

[Message part 1 (text/plain, inline)]

Nicolas Graves via Guix-patches via <guix-patches <at> gnu.org> writes:

> * gnu/packages/version-control.scm (b4)[arguments]<#:phases>: Fix
> phase 'hardcode-git-bin.
> ---
>  gnu/packages/version-control.scm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
> index c892a83a98..24dc7bf107 100644
> --- a/gnu/packages/version-control.scm
> +++ b/gnu/packages/version-control.scm
> @@ -3239,7 +3239,7 @@ (define-public b4
>                 ;; This ensures git is present when called.
>                 (add-after 'unpack 'hardcode-git-bin
>                   (lambda* (#:key inputs #:allow-other-keys)
> -                   (substitute* (find-files "b4" "\\.py$")
> +                   (substitute* (find-files "src/b4" "\\.py$")
>                       (("\\['git'")
>                        (string-append
>                         "['" (search-input-file inputs "bin/git") "'"))))))))

pushed, closing.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.