From patchwork Thu Feb 15 11:27:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 60358 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 A9BE827BBE9; Thu, 15 Feb 2024 11:29:03 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,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 5F44E27BBE2 for ; Thu, 15 Feb 2024 11:29:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raZv3-0001TG-Qy; Thu, 15 Feb 2024 06:28:46 -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 1raZv2-0001Sy-AI for guix-patches@gnu.org; Thu, 15 Feb 2024 06:28:44 -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 1raZv2-0001SJ-0L for guix-patches@gnu.org; Thu, 15 Feb 2024 06:28:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raZvK-0005dQ-E6 for guix-patches@gnu.org; Thu, 15 Feb 2024 06:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69062] [PATCH v2] 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 11:29:02 +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.170799648721599 (code B ref 69062); Thu, 15 Feb 2024 11:29:02 +0000 Received: (at 69062) by debbugs.gnu.org; 15 Feb 2024 11:28:07 +0000 Received: from localhost ([127.0.0.1]:54192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raZuR-0005cJ-EV for submit@debbugs.gnu.org; Thu, 15 Feb 2024 06:28:07 -0500 Received: from 5.mo560.mail-out.ovh.net ([87.98.181.248]:39825) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raZuO-0005c7-3H for 69062@debbugs.gnu.org; Thu, 15 Feb 2024 06:28:05 -0500 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.9.73]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4TbCTq511Vz1J1D for <69062@debbugs.gnu.org>; Thu, 15 Feb 2024 11:27:43 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-tx7nj (unknown [10.110.96.146]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 4CE7F1FEC0; Thu, 15 Feb 2024 11:27:43 +0000 (UTC) Received: from ngraves.fr ([37.59.142.110]) by ghost-submission-6684bf9d7b-tx7nj with ESMTPSA id lncyBy/1zWU2lwAAsyVNRg (envelope-from ); Thu, 15 Feb 2024 11:27:43 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-110S00480396fc3-0129-4ff9-baf8-22b55e41f577, FEBE2CB63E5AC1FBDE7FF7F56B72DCD1DC974DFA) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Thu, 15 Feb 2024 12:27:26 +0100 Message-ID: <20240215112727.21542-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 17667339864345010914 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvddtgddvkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvhefghfevuedvhfffhffhvefgvdetvdekfefhjedvieejhfejvefhleegudffveenucffohhmrghinhepkhgvrhhnvghlrdhorhhgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrdduuddtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeiledtiedvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtpdhmohguvgepshhmthhpohhuth 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 | 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")