From unknown Fri Aug 15 20:03:49 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74591] [PATCH] gnu: b4: Fix git binary access. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Nov 2024 13:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74591 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74591@debbugs.gnu.org Cc: Nicolas Graves X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17328011509006 (code B ref -1); Thu, 28 Nov 2024 13:40:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Nov 2024 13:39:10 +0000 Received: from localhost ([127.0.0.1]:37915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGeje-0002LC-13 for submit@debbugs.gnu.org; Thu, 28 Nov 2024 08:39:10 -0500 Received: from lists.gnu.org ([209.51.188.17]:35682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGejd-0002Kz-3l for submit@debbugs.gnu.org; Thu, 28 Nov 2024 08:39:09 -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 1tGejV-0006cr-3a for guix-patches@gnu.org; Thu, 28 Nov 2024 08:39:04 -0500 Received: from 13.mo582.mail-out.ovh.net ([188.165.56.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tGejR-0000fl-8l for guix-patches@gnu.org; Thu, 28 Nov 2024 08:39:00 -0500 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.139.154]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4Xzcpj0tzPz1RSG for ; Thu, 28 Nov 2024 13:38:52 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-79s4b (unknown [10.110.168.242]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 93B801FE97; Thu, 28 Nov 2024 13:38:51 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-5b5ff79f4f-79s4b with ESMTPSA id OG1UImtySGeDMwAA6NIIvQ (envelope-from ); Thu, 28 Nov 2024 13:38:51 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G004e1b70c00-d1cf-41d9-a6f7-1055991f2587, 8CB19D45D73EA3B897E551571FB33637844E07BF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves Date: Thu, 28 Nov 2024 14:38:46 +0100 Message-ID: <20241128133849.14091-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 8244965020725797602 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrhedugdehfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffegteffgfffjeegjedvfffgtddvueeutefgfeeuvdejgedvgeejjeevueeuveenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=2EZGU0fZRV59T2gau5gcmKq93dydVq+IziTfe/EI5So=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1732801133; v=1; b=LLpDmA5RZtoze6q/xlh9LEYUbX58PBd0TIhD642sI2qWu6gktQiggc+lwiz583OyLGnELWrh ydFkWKz6ZgU1aD9EzseqifxsWCPLmB5Ydw21sx+VEdLP/3RNP3eWks5iexfCZgMwH3b7JSnHRBJ zfp4eT+kajWlRiegYDqsiCbkKtO5iZtueGr0jFdLpZb2zCdLLzJFdFYDjkR3n1YXlfU+zGw+gOf 9NxGqyX18oNrfk2IatK73gsDDd66Ive58Ya7LDlJMrsZo2N/2Dh8Fv+nAmUCHIKRIGol9bGcW// wNV4451J9FZBICLqQGAWRbn5kHpWIsrWxYE7v/grCCJUw== Received-SPF: pass client-ip=188.165.56.124; envelope-from=ngraves@ngraves.fr; helo=13.mo582.mail-out.ovh.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) 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.3 (--) * gnu/packages/version-control.scm (b4)[arguments]<#:phases>: Fix phase 'hardcode-git-bin. --- gnu/packages/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c892a83a98..24dc7bf107 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3239,7 +3239,7 @@ (define-public b4 ;; This ensures git is present when called. (add-after 'unpack 'hardcode-git-bin (lambda* (#:key inputs #:allow-other-keys) - (substitute* (find-files "b4" "\\.py$") + (substitute* (find-files "src/b4" "\\.py$") (("\\['git'") (string-append "['" (search-input-file inputs "bin/git") "'")))))))) -- 2.46.0 From unknown Fri Aug 15 20:03:49 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74591] [PATCH] gnu: b4: Fix git binary access. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Dec 2024 08:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74591 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74591@debbugs.gnu.org Cc: 74591-done@debbugs.gnu.org, Nicolas Graves X-Debbugs-Original-To: Nicolas Graves via Guix-patches via Received: via spool by submit@debbugs.gnu.org id=B.17330404135962 (code B ref -1); Sun, 01 Dec 2024 08:07:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Dec 2024 08:06:53 +0000 Received: from localhost ([127.0.0.1]:50161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHeyj-0001Y5-8b for submit@debbugs.gnu.org; Sun, 01 Dec 2024 03:06:53 -0500 Received: from lists.gnu.org ([209.51.188.17]:40002) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHeyg-0001Xj-8g for submit@debbugs.gnu.org; Sun, 01 Dec 2024 03:06:50 -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 1tHeye-0000Ve-5N for guix-patches@gnu.org; Sun, 01 Dec 2024 03:06:48 -0500 Received: from smtp21.cstnet.cn ([159.226.251.21] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1tHeyc-0002jt-6V for guix-patches@gnu.org; Sun, 01 Dec 2024 03:06:47 -0500 Received: from m (unknown [107.174.64.25]) by APP-01 (Coremail) with SMTP id qwCowAAXHjoOGUxnlB8NBw--.24655S2; Sun, 01 Dec 2024 16:06:41 +0800 (CST) From: Zheng Junjie In-Reply-To: <20241128133849.14091-1-ngraves@ngraves.fr> (Nicolas Graves via Guix-patches via's message of "Thu, 28 Nov 2024 14:38:46 +0100") References: <20241128133849.14091-1-ngraves@ngraves.fr> User-Agent: mu4e 1.12.7; emacs 30.0.92 Date: Sun, 01 Dec 2024 16:06:36 +0800 Message-ID: <87bjxvq12r.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: qwCowAAXHjoOGUxnlB8NBw--.24655S2 X-Coremail-Antispam: 1UD129KBjvdXoW7Jw18JFWDXr1xWw4fAw1UKFg_yoWfWwbE9F W8WF4SgayvqrW2ka1kAr1xZF9avF1UGayfKw1UtF4kJa4SqF43WF1kWay8A3WUtF4rKr4f Crs8GrWUCFn5ZjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbVxYjsxI4VWkKwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I 8E87Iv6xkF7I0E14v26r4UJVWxJr1lnx0Ee4C267I2x7xF54xIwI0E7I0Y6sxI4wAS0I0E 0xvYzxvE52x082IY62kv0487M2AExVA0xI801c8C04v7Mc02F40EFcxC0VAKzVAqx4xG6I 80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCj c4AY6r1j6r4UM4x0Y48IcVAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r 1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CE b7AF67AKxVWUXVWUAwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0x vE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAI cVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa 73UjIFyTuYvjxUh8u4DUUUU X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.21; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.93, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) 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.4 (--) --=-=-= Content-Type: text/plain Nicolas Graves via Guix-patches via writes: > * gnu/packages/version-control.scm (b4)[arguments]<#:phases>: Fix > phase 'hardcode-git-bin. > --- > gnu/packages/version-control.scm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm > index c892a83a98..24dc7bf107 100644 > --- a/gnu/packages/version-control.scm > +++ b/gnu/packages/version-control.scm > @@ -3239,7 +3239,7 @@ (define-public b4 > ;; This ensures git is present when called. > (add-after 'unpack 'hardcode-git-bin > (lambda* (#:key inputs #:allow-other-keys) > - (substitute* (find-files "b4" "\\.py$") > + (substitute* (find-files "src/b4" "\\.py$") > (("\\['git'") > (string-append > "['" (search-input-file inputs "bin/git") "'")))))))) pushed, closing. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmdMGQwACgkQO1qpk+Gi 3/APpQ//VhVUGBxBXjY5YAzncbCjntWZP6L7W8CuJmcBgFYeBLXJZVgvtGD1tWiy +UwvN5tKKUDqiUmkQLLYx3uHKl/2hQ3vV9vww5b9ToRO8PaM4j5ROwNOvJElymRr XOTrl6Cy97MraxEb/5uQCom+bOulIcbuqDRSWIrcSkurQyqV9UbdoVHP8oXo6yO/ bAt7peX+Yya2iIuozFOdU4oMkuST0WceJCvo+jvSG+Odx9kHPHggH+JyYY8AydmI UtLkxMtH3joCfhkP7DGt2GQ5nW0Jr7I0WTFMCGSDTkoJWyBjfP71hoD5z2G8p37n jLFxGWVhf+8QF6UUXuYPXDzW9AUizifiojj7jwpZheRIHzaFJqBrMyrrlrBQPAYA 92GyBUwWn4IBcgl0zal8RyuO2fWp8X8yOf5L1AwocjYLU3TcqajoNJ5gymcQ7FzU s+wEdSm/rwDmUbZLIx47PRVsQqO5PQvRQFkiXhsk4mL8j9AHTZxWkjddo7E8aK5X ODvFU02/tjnL0GNp22hjjmxI2nbVSH0yTNglrgypR0ZuqSwlYW7hqCF5ILqs//u6 2OYAHT9NlbSK8KNAoGjqlJVoGY5ODnfYrlqxRbqCHtyIyRXAOHrut5HyxxK+QTux JLL0avbe7y5Od/3rtmukzfYUAARjvRfsEFTuwDFivwVf3Z019jQ= =VWIp -----END PGP SIGNATURE----- --=-=-=-- From unknown Fri Aug 15 20:03:49 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Nicolas Graves Subject: bug#74591: closed (Re: [bug#74591] [PATCH] gnu: b4: Fix git binary access.) Message-ID: References: <87bjxvq12r.fsf@iscas.ac.cn> <20241128133849.14091-1-ngraves@ngraves.fr> X-Gnu-PR-Message: they-closed 74591 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 74591@debbugs.gnu.org Date: Sun, 01 Dec 2024 08:07:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1733040423-5999-1" This is a multi-part message in MIME format... ------------=_1733040423-5999-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #74591: [PATCH] gnu: b4: Fix git binary access. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 74591@debbugs.gnu.org. --=20 74591: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D74591 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1733040423-5999-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 74591-done) by debbugs.gnu.org; 1 Dec 2024 08:06:53 +0000 Received: from localhost ([127.0.0.1]:50159 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHeyh-0001Xw-CC for submit@debbugs.gnu.org; Sun, 01 Dec 2024 03:06:53 -0500 Received: from smtp21.cstnet.cn ([159.226.251.21]:56588 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHeyf-0001XN-9V for 74591-done@debbugs.gnu.org; Sun, 01 Dec 2024 03:06:50 -0500 Received: from m (unknown [107.174.64.25]) by APP-01 (Coremail) with SMTP id qwCowAAXHjoOGUxnlB8NBw--.24655S2; Sun, 01 Dec 2024 16:06:41 +0800 (CST) From: Zheng Junjie To: Nicolas Graves via Guix-patches via Subject: Re: [bug#74591] [PATCH] gnu: b4: Fix git binary access. In-Reply-To: <20241128133849.14091-1-ngraves@ngraves.fr> (Nicolas Graves via Guix-patches via's message of "Thu, 28 Nov 2024 14:38:46 +0100") References: <20241128133849.14091-1-ngraves@ngraves.fr> User-Agent: mu4e 1.12.7; emacs 30.0.92 Date: Sun, 01 Dec 2024 16:06:36 +0800 Message-ID: <87bjxvq12r.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: qwCowAAXHjoOGUxnlB8NBw--.24655S2 X-Coremail-Antispam: 1UD129KBjvdXoW7Jw18JFWDXr1xWw4fAw1UKFg_yoWfWwbE9F W8WF4SgayvqrW2ka1kAr1xZF9avF1UGayfKw1UtF4kJa4SqF43WF1kWay8A3WUtF4rKr4f Crs8GrWUCFn5ZjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbVxYjsxI4VWkKwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I 8E87Iv6xkF7I0E14v26r4UJVWxJr1lnx0Ee4C267I2x7xF54xIwI0E7I0Y6sxI4wAS0I0E 0xvYzxvE52x082IY62kv0487M2AExVA0xI801c8C04v7Mc02F40EFcxC0VAKzVAqx4xG6I 80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCj c4AY6r1j6r4UM4x0Y48IcVAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r 1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CE b7AF67AKxVWUXVWUAwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0x vE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAI cVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa 73UjIFyTuYvjxUh8u4DUUUU X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74591-done Cc: 74591-done@debbugs.gnu.org, Nicolas Graves 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: -3.3 (---) --=-=-= Content-Type: text/plain Nicolas Graves via Guix-patches via writes: > * gnu/packages/version-control.scm (b4)[arguments]<#:phases>: Fix > phase 'hardcode-git-bin. > --- > gnu/packages/version-control.scm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm > index c892a83a98..24dc7bf107 100644 > --- a/gnu/packages/version-control.scm > +++ b/gnu/packages/version-control.scm > @@ -3239,7 +3239,7 @@ (define-public b4 > ;; This ensures git is present when called. > (add-after 'unpack 'hardcode-git-bin > (lambda* (#:key inputs #:allow-other-keys) > - (substitute* (find-files "b4" "\\.py$") > + (substitute* (find-files "src/b4" "\\.py$") > (("\\['git'") > (string-append > "['" (search-input-file inputs "bin/git") "'")))))))) pushed, closing. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmdMGQwACgkQO1qpk+Gi 3/APpQ//VhVUGBxBXjY5YAzncbCjntWZP6L7W8CuJmcBgFYeBLXJZVgvtGD1tWiy +UwvN5tKKUDqiUmkQLLYx3uHKl/2hQ3vV9vww5b9ToRO8PaM4j5ROwNOvJElymRr XOTrl6Cy97MraxEb/5uQCom+bOulIcbuqDRSWIrcSkurQyqV9UbdoVHP8oXo6yO/ bAt7peX+Yya2iIuozFOdU4oMkuST0WceJCvo+jvSG+Odx9kHPHggH+JyYY8AydmI UtLkxMtH3joCfhkP7DGt2GQ5nW0Jr7I0WTFMCGSDTkoJWyBjfP71hoD5z2G8p37n jLFxGWVhf+8QF6UUXuYPXDzW9AUizifiojj7jwpZheRIHzaFJqBrMyrrlrBQPAYA 92GyBUwWn4IBcgl0zal8RyuO2fWp8X8yOf5L1AwocjYLU3TcqajoNJ5gymcQ7FzU s+wEdSm/rwDmUbZLIx47PRVsQqO5PQvRQFkiXhsk4mL8j9AHTZxWkjddo7E8aK5X ODvFU02/tjnL0GNp22hjjmxI2nbVSH0yTNglrgypR0ZuqSwlYW7hqCF5ILqs//u6 2OYAHT9NlbSK8KNAoGjqlJVoGY5ODnfYrlqxRbqCHtyIyRXAOHrut5HyxxK+QTux JLL0avbe7y5Od/3rtmukzfYUAARjvRfsEFTuwDFivwVf3Z019jQ= =VWIp -----END PGP SIGNATURE----- --=-=-=-- ------------=_1733040423-5999-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 28 Nov 2024 13:39:10 +0000 Received: from localhost ([127.0.0.1]:37915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGeje-0002LC-13 for submit@debbugs.gnu.org; Thu, 28 Nov 2024 08:39:10 -0500 Received: from lists.gnu.org ([209.51.188.17]:35682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGejd-0002Kz-3l for submit@debbugs.gnu.org; Thu, 28 Nov 2024 08:39:09 -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 1tGejV-0006cr-3a for guix-patches@gnu.org; Thu, 28 Nov 2024 08:39:04 -0500 Received: from 13.mo582.mail-out.ovh.net ([188.165.56.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tGejR-0000fl-8l for guix-patches@gnu.org; Thu, 28 Nov 2024 08:39:00 -0500 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.139.154]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4Xzcpj0tzPz1RSG for ; Thu, 28 Nov 2024 13:38:52 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-79s4b (unknown [10.110.168.242]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 93B801FE97; Thu, 28 Nov 2024 13:38:51 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-5b5ff79f4f-79s4b with ESMTPSA id OG1UImtySGeDMwAA6NIIvQ (envelope-from ); Thu, 28 Nov 2024 13:38:51 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G004e1b70c00-d1cf-41d9-a6f7-1055991f2587, 8CB19D45D73EA3B897E551571FB33637844E07BF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves To: guix-patches@gnu.org Subject: [PATCH] gnu: b4: Fix git binary access. Date: Thu, 28 Nov 2024 14:38:46 +0100 Message-ID: <20241128133849.14091-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 8244965020725797602 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrhedugdehfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffegteffgfffjeegjedvfffgtddvueeutefgfeeuvdejgedvgeejjeevueeuveenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=2EZGU0fZRV59T2gau5gcmKq93dydVq+IziTfe/EI5So=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1732801133; v=1; b=LLpDmA5RZtoze6q/xlh9LEYUbX58PBd0TIhD642sI2qWu6gktQiggc+lwiz583OyLGnELWrh ydFkWKz6ZgU1aD9EzseqifxsWCPLmB5Ydw21sx+VEdLP/3RNP3eWks5iexfCZgMwH3b7JSnHRBJ zfp4eT+kajWlRiegYDqsiCbkKtO5iZtueGr0jFdLpZb2zCdLLzJFdFYDjkR3n1YXlfU+zGw+gOf 9NxGqyX18oNrfk2IatK73gsDDd66Ive58Ya7LDlJMrsZo2N/2Dh8Fv+nAmUCHIKRIGol9bGcW// wNV4451J9FZBICLqQGAWRbn5kHpWIsrWxYE7v/grCCJUw== Received-SPF: pass client-ip=188.165.56.124; envelope-from=ngraves@ngraves.fr; helo=13.mo582.mail-out.ovh.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Nicolas Graves 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.3 (--) * gnu/packages/version-control.scm (b4)[arguments]<#:phases>: Fix phase 'hardcode-git-bin. --- gnu/packages/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c892a83a98..24dc7bf107 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3239,7 +3239,7 @@ (define-public b4 ;; This ensures git is present when called. (add-after 'unpack 'hardcode-git-bin (lambda* (#:key inputs #:allow-other-keys) - (substitute* (find-files "b4" "\\.py$") + (substitute* (find-files "src/b4" "\\.py$") (("\\['git'") (string-append "['" (search-input-file inputs "bin/git") "'")))))))) -- 2.46.0 ------------=_1733040423-5999-1--