From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 11 16:28:10 2024 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 From: Nicolas Graves To: guix-patches@gnu.org Subject: [PATCH] gnu: b4: Ensure git presence. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: ngraves@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 15 06:28:07 2024 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 From: Nicolas Graves To: 69062@debbugs.gnu.org Subject: [PATCH v2] gnu: b4: Ensure git presence. 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 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 17667339864345010914 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvddtgddvkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvhefghfevuedvhfffhffhvefgvdetvdekfefhjedvieejhfejvefhleegudffveenucffohhmrghinhepkhgvrhhnvghlrdhorhhgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrdduuddtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeiledtiedvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtpdhmohguvgepshhmthhpohhuth X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 69062 Cc: ngraves@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) * 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 15 12:08:08 2024 Received: (at 69062) by debbugs.gnu.org; 15 Feb 2024 17:08:08 +0000 Received: from localhost ([127.0.0.1]:56888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rafDU-0006fU-5D for submit@debbugs.gnu.org; Thu, 15 Feb 2024 12:08:08 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:46636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rafDS-0006fK-25 for 69062@debbugs.gnu.org; Thu, 15 Feb 2024 12:08:06 -0500 Date: Thu, 15 Feb 2024 21:20:28 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1708016777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=j+amVXnV7jvavruizQTNGotoCieJsvNea1rSh5BdwMI=; b=v0mm9zp2KSzmCuinGjrAGae+VJgMiNOlWVIr62VzoXeWXjjJxX+oug1wy66Tpfb7T+UO9u YQZMeuOVy4ZZrJd+hNj69Gp3N7cbAP2AfZ8MPVDQpHXP7i6mGaVzMeyY3LencrmvEUi5xY dRHAFFbmyVTCoMrOB0d7ki5dHjCYFnjmMbdlMi84RJ1LqnWbjzxE9kbDAA5s5lIc/1uJUc 5X/zs2qVxSmmCl7CVaWl8AOFZJwozn/ee3VFsJoZqwiJNBj08wMsodO1NKKggex+41snJC gZEb7jQV23b/5iMRunMtnxF99kZfuFQ5+2/l2xpycVj6+XgxXP78Pua7LSHlQw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Message-ID: <874je9984j.wl-hako@ultrarare.space> From: Hilton Chain To: Nicolas Graves Subject: Re: [bug#69062] [PATCH v2] gnu: b4: Ensure git presence. In-Reply-To: <20240215112727.21542-1-ngraves@ngraves.fr> References: <20240211210754.19641-1-ngraves@ngraves.fr> <20240215112727.21542-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spamd-Bar: / X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 69062 Cc: 69062@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 15 15:34:46 2024 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 Authentication-Results: garm.ovh; auth=pass (GARM-102R0042cd7fad4-473d-41d8-b182-b23bc32cd7c3, FEBE2CB63E5AC1FBDE7FF7F56B72DCD1DC974DFA) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.110.172.34 From: Nicolas Graves To: 69062@debbugs.gnu.org Subject: [PATCH v3] gnu: b4: Ensure git presence. 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-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 69062 Cc: ngraves@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) * 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 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 18 09:33:42 2024 Received: (at 69062) by debbugs.gnu.org; 18 Feb 2024 14:33:42 +0000 Received: from localhost ([127.0.0.1]:34294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbiEf-0000Cj-Pc for submit@debbugs.gnu.org; Sun, 18 Feb 2024 09:33:42 -0500 Received: from 3.mo561.mail-out.ovh.net ([46.105.44.175]:41535) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbiEb-0000CS-E1 for 69062@debbugs.gnu.org; Sun, 18 Feb 2024 09:33:39 -0500 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.176.8]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4Td7SV3KKbz18sf for <69062@debbugs.gnu.org>; Sun, 18 Feb 2024 14:33:14 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-ctdvj (unknown [10.110.96.50]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 417EE1FD6B; Sun, 18 Feb 2024 14:33:14 +0000 (UTC) Received: from ngraves.fr ([37.59.142.99]) by ghost-submission-6684bf9d7b-ctdvj with ESMTPSA id 1AN3DSoV0mU81QEAUYi6wA (envelope-from ); Sun, 18 Feb 2024 14:33:14 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-99G0038ebbe8b5-5ac2-4ef6-833f-324f6db3c362, 2BDDC0F10C19D38C469074ECAF2B7153554C806A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 From: Nicolas Graves To: 69062@debbugs.gnu.org Subject: [PATCH v4] gnu: b4: Ensure git presence. Date: Sun, 18 Feb 2024 15:33:08 +0100 Message-ID: <20240218143309.824-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 1525031426817843938 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdeigdeikecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvhefghfevuedvhfffhffhvefgvdetvdekfefhjedvieejhfejvefhleegudffveenucffohhmrghinhepkhgvrhhnvghlrdhorhhgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrdelleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieeltdeivdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiuddpmhhouggvpehsmhhtphhouhht X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 69062 Cc: ngraves@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) * 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 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 11:47:12 2024 Received: (at 69062-done) by debbugs.gnu.org; 24 Feb 2024 16:47:12 +0000 Received: from localhost ([127.0.0.1]:41189 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdvBA-00089m-3Y for submit@debbugs.gnu.org; Sat, 24 Feb 2024 11:47:12 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:47426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdvB7-00089W-60 for 69062-done@debbugs.gnu.org; Sat, 24 Feb 2024 11:47:10 -0500 Date: Sun, 25 Feb 2024 00:45:14 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1708793192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Dx4cXlaVEco/ir6czhQ2t/yB4bZhFRzF5eckiJlah8s=; b=IN+J4zI4Pjk5efWWwyII1AqbwVyKMJcpWDP9aEAiN7zAjzyPuNeA6N+T+uKDEqTXsIdH+b rJnSL4rLB9uc6IgY5Fz7A8rdPY5vm01o+Dxbb6sBPQgpI82+pxAq0a6PyWBvLD5kXnYmg0 DxkQMZPiHFnvkTm8MJqTjthPvL/xovGN/4ufDCnosyGGmWsGqhzfKyaIIWSWmx+YlLClDf pZpj2MyqGd8k2J5aibAlRzQv0NnMywdEI6usFgrluyydTFDyBhmHK6YCSP2MxYRA3UYZZ0 1DBoOpjV9oz68DBp/0niD0MznqEdvBqworMsiSVXuEYTiELAxVwB29O1sdQCBQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Message-ID: <875xydizfp.wl-hako@ultrarare.space> From: Hilton Chain To: Nicolas Graves Subject: Re: [bug#69062] [PATCH v4] gnu: b4: Ensure git presence. In-Reply-To: <20240218143309.824-1-ngraves@ngraves.fr> References: <20240211210754.19641-1-ngraves@ngraves.fr> <20240218143309.824-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spamd-Bar: / X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69062-done Cc: 69062-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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! From unknown Sun Jun 15 08:33:20 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 24 Mar 2024 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator