* [bug#69062] [PATCH] gnu: b4: Ensure git presence.
@ 2024-02-11 21:07 Nicolas Graves via Guix-patches via
2024-02-15 11:27 ` [bug#69062] [PATCH v2] " Nicolas Graves via Guix-patches via
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-02-11 21:07 UTC (permalink / raw)
To: 69062; +Cc: ngraves
* 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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [bug#69062] [PATCH v2] gnu: b4: Ensure git presence.
2024-02-11 21:07 [bug#69062] [PATCH] gnu: b4: Ensure git presence Nicolas Graves via Guix-patches via
@ 2024-02-15 11:27 ` Nicolas Graves via Guix-patches via
2024-02-15 13:20 ` Hilton Chain via Guix-patches via
2024-02-15 20:34 ` [bug#69062] [PATCH v3] " Nicolas Graves via Guix-patches via
2024-02-18 14:33 ` [bug#69062] [PATCH v4] " Nicolas Graves via Guix-patches via
2 siblings, 1 reply; 6+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-02-15 11:27 UTC (permalink / raw)
To: 69062; +Cc: ngraves
* 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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [bug#69062] [PATCH v2] gnu: b4: Ensure git presence.
2024-02-15 11:27 ` [bug#69062] [PATCH v2] " Nicolas Graves via Guix-patches via
@ 2024-02-15 13:20 ` Hilton Chain via Guix-patches via
0 siblings, 0 replies; 6+ messages in thread
From: Hilton Chain via Guix-patches via @ 2024-02-15 13:20 UTC (permalink / raw)
To: Nicolas Graves; +Cc: 69062
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#69062] [PATCH v3] gnu: b4: Ensure git presence.
2024-02-11 21:07 [bug#69062] [PATCH] gnu: b4: Ensure git presence Nicolas Graves via Guix-patches via
2024-02-15 11:27 ` [bug#69062] [PATCH v2] " Nicolas Graves via Guix-patches via
@ 2024-02-15 20:34 ` Nicolas Graves via Guix-patches via
2024-02-18 14:33 ` [bug#69062] [PATCH v4] " Nicolas Graves via Guix-patches via
2 siblings, 0 replies; 6+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-02-15 20:34 UTC (permalink / raw)
To: 69062; +Cc: ngraves
* 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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [bug#69062] [PATCH v4] gnu: b4: Ensure git presence.
2024-02-11 21:07 [bug#69062] [PATCH] gnu: b4: Ensure git presence Nicolas Graves via Guix-patches via
2024-02-15 11:27 ` [bug#69062] [PATCH v2] " Nicolas Graves via Guix-patches via
2024-02-15 20:34 ` [bug#69062] [PATCH v3] " Nicolas Graves via Guix-patches via
@ 2024-02-18 14:33 ` Nicolas Graves via Guix-patches via
2024-02-24 16:45 ` bug#69062: " Hilton Chain via Guix-patches via
2 siblings, 1 reply; 6+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-02-18 14:33 UTC (permalink / raw)
To: 69062; +Cc: ngraves
* 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
^ permalink raw reply related [flat|nested] 6+ messages in thread* bug#69062: [PATCH v4] gnu: b4: Ensure git presence.
2024-02-18 14:33 ` [bug#69062] [PATCH v4] " Nicolas Graves via Guix-patches via
@ 2024-02-24 16:45 ` Hilton Chain via Guix-patches via
0 siblings, 0 replies; 6+ messages in thread
From: Hilton Chain via Guix-patches via @ 2024-02-24 16:45 UTC (permalink / raw)
To: Nicolas Graves; +Cc: 69062-done
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!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-02-24 16:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-11 21:07 [bug#69062] [PATCH] gnu: b4: Ensure git presence Nicolas Graves via Guix-patches via
2024-02-15 11:27 ` [bug#69062] [PATCH v2] " Nicolas Graves via Guix-patches via
2024-02-15 13:20 ` Hilton Chain via Guix-patches via
2024-02-15 20:34 ` [bug#69062] [PATCH v3] " Nicolas Graves via Guix-patches via
2024-02-18 14:33 ` [bug#69062] [PATCH v4] " Nicolas Graves via Guix-patches via
2024-02-24 16:45 ` bug#69062: " Hilton Chain via Guix-patches via
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.