From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org>
To: 69062@debbugs.gnu.org
Cc: ngraves@ngraves.fr
Subject: [bug#69062] [PATCH] gnu: b4: Ensure git presence.
Date: Sun, 11 Feb 2024 22:07:54 +0100 [thread overview]
Message-ID: <20240211210754.19641-1-ngraves@ngraves.fr> (raw)
* 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
next reply other threads:[~2024-02-11 21:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-11 21:07 Nicolas Graves via Guix-patches via [this message]
2024-02-15 11:27 ` [bug#69062] [PATCH v2] gnu: b4: Ensure git presence 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
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=20240211210754.19641-1-ngraves@ngraves.fr \
--to=guix-patches@gnu.org \
--cc=69062@debbugs.gnu.org \
--cc=ngraves@ngraves.fr \
/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).