GNU bug report logs - #69062
[PATCH] gnu: b4: Ensure git presence.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Hilton Chain <hako <at> ultrarare.space>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#69062: closed ([PATCH] gnu: b4: Ensure git presence.)
Date: Sat, 24 Feb 2024 16:48:03 +0000

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

Your message dated Sun, 25 Feb 2024 00:45:14 +0800
with message-id <875xydizfp.wl-hako <at> ultrarare.space>
and subject line Re: [bug#69062] [PATCH v4] gnu: b4: Ensure git presence.
has caused the debbugs.gnu.org bug report #69062,
regarding [PATCH] gnu: b4: Ensure git presence.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
69062: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=69062
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: guix-patches <at> gnu.org
Cc: ngraves <at> ngraves.fr
Subject: [PATCH] gnu: b4: Ensure git presence.
Date: Sun, 11 Feb 2024 22:07:54 +0100

* gnu/packages/version-control.scm (b4): Ensure git presence.
[arguments](phases): Add phase hardcode-git-bin.
[inputs]: Add git-minimal.

Change-Id: Ib2dca06009cdacc0e5ab4ab227cd30991474404c
---
 gnu/packages/version-control.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8f9fae5ce2..b8b818c238 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2925,9 +2925,15 @@ (define-public b4
                ;; XXX: dnspython attempts to read /etc/resolv.conf when loading
                ;; resolver.py, which breaks the sanity check in dependent
                ;; packages.  This should rather be fixed in dnspython.
-               (delete 'sanity-check))))
+               (delete 'sanity-check)
+               (add-after 'unpack 'harcode-git-bin
+                 (lambda _  ; This ensures git is present when called.
+                   (substitute* (find-files "b4" "\\.py$")
+                     (("'git'")
+                      (string-append
+                       "'" #$(this-package-input "git") "/bin/git'"))))))))
     (inputs
-     (list python-dkimpy python-dnspython python-requests))
+     (list python-dkimpy python-dnspython python-requests git-minimal))
     (propagated-inputs
      (list patatt))
     (home-page "https://git.kernel.org/pub/scm/utils/b4/b4.git")
-- 
2.41.0

[Message part 3 (message/rfc822, inline)]

From: Hilton Chain <hako <at> ultrarare.space>
To: Nicolas Graves <ngraves <at> ngraves.fr>
Cc: 69062-done <at> debbugs.gnu.org
Subject: Re: [bug#69062] [PATCH v4] gnu: b4: Ensure git presence.
Date: Sun, 25 Feb 2024 00:45:14 +0800

Hi Nicolas,

On Sun, 18 Feb 2024 22:33:08 +0800,
Nicolas Graves via Guix-patches via wrote:
>
> * gnu/packages/version-control.scm (b4): Ensure git presence.
> [arguments]<#:phases>: Add phase hardcode-git-bin.
> [inputs]: Add git-minimal.
>
> Change-Id: Ib2dca06009cdacc0e5ab4ab227cd30991474404c
> ---
>  gnu/packages/version-control.scm | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
> index 51754245d3..fc378e83fe 100644
> --- a/gnu/packages/version-control.scm
> +++ b/gnu/packages/version-control.scm
> @@ -2926,9 +2926,16 @@ (define-public b4
>                 ;; XXX: dnspython attempts to read /etc/resolv.conf when loading
>                 ;; resolver.py, which breaks the sanity check in dependent
>                 ;; packages.  This should rather be fixed in dnspython.
> -               (delete 'sanity-check))))
> +               (delete 'sanity-check)
> +               ;; This ensures git is present when called.
> +               (add-after 'unpack 'hardcode-git-bin
> +                 (lambda* (#:key inputs #:allow-other-keys)
> +                   (substitute* (find-files "b4" "\\.py$")
> +                     (("\\['git'")
> +                      (string-append
> +                       "['" (search-input-file inputs "/bin/git") "'"))))))))
>      (inputs
> -     (list python-dkimpy python-dnspython python-requests))
> +     (list git-minimal python-dkimpy python-dnspython python-requests))
>      (propagated-inputs
>       (list patatt))
>      (home-page "https://git.kernel.org/pub/scm/utils/b4/b4.git")
> --
> 2.41.0

Applied as e3e64acdb8ea8a9b55e376595b0fb1018e170376, thank you!

Previous Next

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