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

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 69062 in the body.
You can then email your comments to 69062 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: 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 #8 received at 69062 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 69062 <at> debbugs.gnu.org
Cc: ngraves <at> ngraves.fr
Subject: [PATCH v2] gnu: b4: Ensure git presence.
Date: Thu, 15 Feb 2024 12:27:26 +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 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8f9fae5ce2..0b636ac02e 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2925,9 +2925,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)
+               (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-minimal")
+                       "/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 #11 received at 69062 <at> debbugs.gnu.org (full text, mbox):

From: Hilton Chain <hako <at> ultrarare.space>
To: Nicolas Graves <ngraves <at> ngraves.fr>
Cc: 69062 <at> debbugs.gnu.org
Subject: Re: [bug#69062] [PATCH v2] gnu: b4: Ensure git presence.
Date: Thu, 15 Feb 2024 21:20:28 +0800

Hi Nicolas,

On Thu, 15 Feb 2024 19:27:26 +0800,
Nicolas Graves via Guix-patches via wrote:
>
> * gnu/packages/version-control.scm (b4): Ensure git presence.
> [arguments](phases): Add phase hardcode-git-bin.

^ <#:phases>

> [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 8f9fae5ce2..0b636ac02e 100644
> --- a/gnu/packages/version-control.scm
> +++ b/gnu/packages/version-control.scm
> @@ -2925,9 +2925,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)
> +               (add-after 'unpack 'harcode-git-bin

^ hardcode

> +                 (lambda _  ; This ensures git is present when called.
> +                   (substitute* (find-files "b4" "\\.py$")
> +                     (("\\['git'")
> +                      (string-append
> +                       "['" #$(this-package-input "git-minimal")
> +                       "/bin/git'"))))))))

search-input-file can be used instead.

>      (inputs
> -     (list python-dkimpy python-dnspython python-requests))
> +     (list python-dkimpy python-dnspython python-requests git-minimal))

Please list inputs in alphabetical order, git-minimal should be the first in
this case.

>      (propagated-inputs
>       (list patatt))
>      (home-page "https://git.kernel.org/pub/scm/utils/b4/b4.git")
> --
> 2.41.0

Thanks

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 69062 <at> debbugs.gnu.org
Cc: ngraves <at> ngraves.fr
Subject: [PATCH v3] gnu: b4: Ensure git presence.
Date: Thu, 15 Feb 2024 21:34:15 +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 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8f9fae5ce2..62a63e926b 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2925,9 +2925,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

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 69062 <at> debbugs.gnu.org
Cc: ngraves <at> ngraves.fr
Subject: [PATCH v4] gnu: b4: Ensure git presence.
Date: Sun, 18 Feb 2024 15:33:08 +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 | 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

Message #22 received at 69062-done <at> debbugs.gnu.org (full text, mbox):

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.