From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id AO1QNXJ1zmVlNQAAqHPOHw:P1 (envelope-from ) for ; Thu, 15 Feb 2024 21:34:59 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id AO1QNXJ1zmVlNQAAqHPOHw (envelope-from ) for ; Thu, 15 Feb 2024 21:34:58 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1708029298; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=5yN8/PDKZYn/d13zMVbRauPrqZ0uakIJKiSCXcnZoQM=; b=ZzVBYgYEON3k0XY7jm70mi2imM5Y/i2N5D/AfEhZGzQAQUBngBVA+o8b167RTQNBNx4qmB B4wmqhPsPIV1dSknCLEckzgOHUMqJ7O4jem8TzqcOpnCWN0AEVvwcSM6xe9IYU3kDDQz76 cB7mX2fHkv/nNhOhY9BAP0esp6yzL61EiEV0iPX2WQhgMMsycDEQZxJrQdDCzRlOjsuauk RQlYof4n2deCTr0J9iYPStUjE1XJw3c/LEGEiuwivsGfqMsReqPkvCCjmMMhNzGPfB5kVV qiaF26OC1pWUoDrE9dlIX15ROfHRjaLM68WfyaVg+dX+7mj8UcCMdFbT0OnzUg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1708029298; a=rsa-sha256; cv=none; b=O8EHnhAY5mG6nZVw5znjCf8F9WjGBKCjriC6jshuq9Y19QyQdcZKAlDoNIJFwn+aEBEFVc aW4uN3X0kwQR70XUopjm5uCePI4vzFqVC+md61A5pTEjoyC6117QfDSg2XUm+fb+K0qY5z 4LnpdMKyIvMS9lTIl4VME4t5AOoMQYG051n5unC0tEjhpQnuMerN2h8bWQv9SZmXmWmBl6 GQXXqf9JXI+zLB2qhNyIxEHvBSaZ6uuz+UW8HUOqjRjOcH4ZOuPY0UtFn/xopBnbFAZpL0 gkwCeaesaHdAIcEdPVqmjofm4+0MNyH1XasK+h2ivLmP2LmME+p+JfbzkDdP5g== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9435259181 for ; Thu, 15 Feb 2024 21:34:58 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raiRR-0002uV-2x; Thu, 15 Feb 2024 15:34:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1raiRP-0002sP-9a for guix-patches@gnu.org; Thu, 15 Feb 2024 15:34:43 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1raiRP-000170-01 for guix-patches@gnu.org; Thu, 15 Feb 2024 15:34:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raiRh-0001tJ-P5 for guix-patches@gnu.org; Thu, 15 Feb 2024 15:35:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69062] [PATCH v3] gnu: b4: Ensure git presence. References: <20240211210754.19641-1-ngraves@ngraves.fr> In-Reply-To: <20240211210754.19641-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Feb 2024 20:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69062 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69062@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 69062-submit@debbugs.gnu.org id=B69062.17080292867236 (code B ref 69062); Thu, 15 Feb 2024 20:35:01 +0000 Received: (at 69062) by debbugs.gnu.org; 15 Feb 2024 20:34:46 +0000 Received: from localhost ([127.0.0.1]:57533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raiRS-0001se-4s for submit@debbugs.gnu.org; Thu, 15 Feb 2024 15:34:46 -0500 Received: from 7.mo575.mail-out.ovh.net ([46.105.63.230]:54697) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raiRP-0001sT-G2 for 69062@debbugs.gnu.org; Thu, 15 Feb 2024 15:34:44 -0500 Received: from director9.ghost.mail-out.ovh.net (unknown [10.108.2.55]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4TbRcZ1h2fz1HR6 for <69062@debbugs.gnu.org>; Thu, 15 Feb 2024 20:34:22 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-v56vm (unknown [10.110.168.242]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 04A9B1FDFB; Thu, 15 Feb 2024 20:34:21 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-6684bf9d7b-v56vm with ESMTPSA id FMwcOk11zmW9fQoAxuaswQ (envelope-from ); Thu, 15 Feb 2024 20:34:21 +0000 X-OVh-ClientIp: 90.110.172.34 Date: Thu, 15 Feb 2024 21:34:15 +0100 Message-ID: <20240215203415.18655-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 8452693553258619618 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvddtgddufeelucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehgffhveeuvdfhfffhhfevgfdvtedvkeefhfejvdeijefhjeevhfelgeduffevnecuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucfkphepuddvjedrtddrtddruddpledtrdduuddtrddujedvrdefgedpfeejrdehledrudegvddruddtvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieeltdeivdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -6.48 X-Spam-Score: -6.48 X-Migadu-Queue-Id: 9435259181 X-Migadu-Scanner: mx11.migadu.com X-TUID: apPvkzUn+S9K * 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