From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id WOhAAUAZTGf2gQEA62LTzQ:P1 (envelope-from ) for ; Sun, 01 Dec 2024 08:07:28 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id WOhAAUAZTGf2gQEA62LTzQ (envelope-from ) for ; Sun, 01 Dec 2024 09:07:28 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=GvjS99Tc; dmarc=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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733040448; a=rsa-sha256; cv=none; b=mGPN5oGoY5kqMailJ2jfVjLatIC0/4C4M2MEibhFWMGlLr4GeeM12tNmMma6JWN83YWTwB 2u/yz+gtIxzHt17Vv/7Jk2aMnaH8yiieZB/6J0FHXUuzFtg0bGzbpxG11yTuzwjc8pCNJL V5dbXLpQRV6so/UWtOzL/nW1rWzB8r+UClj9iooKRe9e0Gui2h4HaHo+VACw1ISJxaUoCw GU6YYL7miOSSDX6g222hDgI0tPpZaJsZnBmeGc0T9lbq0K3lSJSQpfwo0DJbALL0yvDxbi ycDNlEUswpxbO+u+fDEl7Yu/e5JVfWcb1UMV8TgN8ycIbCadqXJPEDEW1egveQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=GvjS99Tc; dmarc=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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733040448; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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: dkim-signature; bh=oXLjUQ8Lc7SDeelyGAoVWPkPsGkfKKo5Ts2sy9cMyLQ=; b=g7KLB42ep8/NEKBz1Fib1CA+h4QYy4mHziNcD71JMyafdy0H7KKzCG8UFXg+kMFgwq34hu zP6nldvDCGnGzTcvpaTM6VnjrENQcqZo+MU2fFxegSSmRVlr1m+0DP8OdmXjGbX+qAWsnT szp0bfxir687OPlfIYNbphAFrpqQ9+IsIKGUWqgNBV/wRupelPvGTbMpIU7D5PusnsPZlD 2QEHlqLPdj8wv2JabqLyBFmBh7tS8NIO85iC4jrFHCVjFAqx9qVxyCsOhCnG023mSprMi+ p74jAe57So5aVCPE4X33yY/nyz1Pss2MoxafOSUWNvjes/xRpAK45BB4pSJPig== 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 005ED61890 for ; Sun, 01 Dec 2024 09:07:27 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tHeyv-0000Xs-0d; Sun, 01 Dec 2024 03:07:05 -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 1tHeys-0000Wt-No for guix-patches@gnu.org; Sun, 01 Dec 2024 03:07:02 -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 1tHeys-0002po-FF for guix-patches@gnu.org; Sun, 01 Dec 2024 03:07:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=oXLjUQ8Lc7SDeelyGAoVWPkPsGkfKKo5Ts2sy9cMyLQ=; b=GvjS99TcISyny8KzwiwwNq4y0MxlxwTPH3bcQQE2diWn/M9nUI0Vd/cRL5is3kCzHaq5F/ARTQjoOypQVd+w1nn6i3RFsz54xvP1XBZr+L+i9jekhLj3FBNtyVKP6maZ7reWNSSC1/EXHIwfHvU3j444/BiJzY5sgmylxryVBXmvh97ASiFlQStD6kFWo7+XqUEYSU5nTR8HO5lDbucPW/av2eNMnzRFU4BstWicUhIlh2YwpVISK/4ks/vGGHXmno1ucjfLSjuKLC/WKQbU1OCpVmXIinysPhAVE/WZnNiMx/zzM/ZQpQ5ykMdK6F5vYejYx1Guy1yFSpB9gE1Dsw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tHeys-0001Yi-99 for guix-patches@gnu.org; Sun, 01 Dec 2024 03:07:02 -0500 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-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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.51 X-Spam-Score: -5.51 X-Migadu-Queue-Id: 005ED61890 X-Migadu-Scanner: mx12.migadu.com X-TUID: SRbVSC0z0sc/ --=-=-= 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----- --=-=-=--