From patchwork Sun Feb 11 21:07:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 60105 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 226E127BBE2; Sun, 11 Feb 2024 21:29:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4E49E27BBE9 for ; Sun, 11 Feb 2024 21:29:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZHNY-0007uD-0H; Sun, 11 Feb 2024 16:28:48 -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 1rZHNX-0007u4-4O for guix-patches@gnu.org; Sun, 11 Feb 2024 16:28:47 -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 1rZHNW-00084r-Tl for guix-patches@gnu.org; Sun, 11 Feb 2024 16:28:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZHNm-0003VS-8U for guix-patches@gnu.org; Sun, 11 Feb 2024 16:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69062] [PATCH] gnu: b4: Ensure git presence. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Feb 2024 21:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69062 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69062@debbugs.gnu.org Cc: ngraves@ngraves.fr X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170768689013343 (code B ref -1); Sun, 11 Feb 2024 21:29:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Feb 2024 21:28:10 +0000 Received: from localhost ([127.0.0.1]:49845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZHMv-0003T7-MV for submit@debbugs.gnu.org; Sun, 11 Feb 2024 16:28:10 -0500 Received: from lists.gnu.org ([2001:470:142::17]:33472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZHMs-0003SI-O8 for submit@debbugs.gnu.org; Sun, 11 Feb 2024 16:28:08 -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 1rZH3a-0005TD-Nr for guix-patches@gnu.org; Sun, 11 Feb 2024 16:08:10 -0500 Received: from 11.mo550.mail-out.ovh.net ([188.165.48.29]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZH3Z-0004Yk-15 for guix-patches@gnu.org; Sun, 11 Feb 2024 16:08:10 -0500 Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.148.20]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4TY0YH3m3Xz1Csj for ; Sun, 11 Feb 2024 21:08:03 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-xq929 (unknown [10.110.96.7]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 07A391FD5C; Sun, 11 Feb 2024 21:08:02 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-6684bf9d7b-xq929 with ESMTPSA id leDhNzI3yWVp3AEAvt5Ocg (envelope-from ); Sun, 11 Feb 2024 21:08:02 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S00230b379ba-46da-4c31-982f-ccca10b45612, 3432A98B6F31DB2F38D9EC044687C2FFF3C1A3CB) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 89.207.171.94 Date: Sun, 11 Feb 2024 22:07:54 +0100 Message-ID: <20240211210754.19641-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 3977522898179121890 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledruddugddugeejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehgffhveeuvdfhfffhhfevgfdvtedvkeefhfejvdeijefhjeevhfelgeduffevnecuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucfkphepuddvjedrtddrtddruddpkeelrddvtdejrddujedurdelgedpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth Received-SPF: pass client-ip=188.165.48.29; envelope-from=ngraves@ngraves.fr; helo=11.mo550.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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")