From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id QPL2IVUV0mUBJAEAqHPOHw:P1 (envelope-from ) for ; Sun, 18 Feb 2024 15:33:57 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id QPL2IVUV0mUBJAEAqHPOHw (envelope-from ) for ; Sun, 18 Feb 2024 15:33:57 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; 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=1708266837; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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; bh=Zgb0RnVQwhV600oAZakKMqMh2iNLe0a+fsulPaadrOs=; b=jCkayXH9Bv/Xh25TCuSfGrSUmSFGkUVj/sZ4uoksTQNeZSeL1I9VM+g7RPbSLA+4HFIKIu J7CCdPZlaL6xbdwIrT1LtMilJ2ANd3OV1heh3Ulk8fVemz8U6vnGWb8uJZGps+4/f/2/Xs 6UJt9jMgfJ6PWg0S+iqxJ2jS59PT8DqEcoIymI6WXc5smAfXL3+r3Z0lvm3MjnsFeFuPeg PcvY8EhMwRUAvHNXykBhxh4W6nWXXdRg/D633IoYH4/Lw3mAN96PSOp5ofeKM4kGZlCfVA KrpLdTtSCIX/o33UPo9UXxVFGl9z8XT4xLkiubyu3ksf6HDRPyGScwOu6N/1kg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; 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=1708266837; a=rsa-sha256; cv=none; b=OjPyC3l1UzsUqgKvePlwJ+29VVvTKBS2nE3TYr5KxBJ0BCvUOe2uUOGER53kKBG10xuoWo jflOIMehKZ9xHJLArxqcpOTEQUZ4TBqPoo6p4nx6cD0jq9jK1gWIJYj/Avc356LeQJRpz9 Bx/CN7XmwWkJLk7bXGmc9HHppIJ2yrmZKQVafnjO9KiZTpAAhAkjYsVlM6PvY5jWIKRgYl J0FcAdeHa+j7pPJ4JKXx8t+Y6IFmMIkiDc3fIKCvhDB7pmQNpxyoj6QmBQtfUn3d34f0i5 hBI+OjmfeLdxGeoJFkDyAdbj0yYD9HS+ZaQ2+/6M6nzNVnOx1grj0C6KTdQ7og== 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 4C42D3C46D for ; Sun, 18 Feb 2024 15:33:57 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbiEi-0007KC-Fv; Sun, 18 Feb 2024 09:33:44 -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 1rbiEg-0007JP-Qv for guix-patches@gnu.org; Sun, 18 Feb 2024 09:33:42 -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 1rbiEg-0006AY-Iq for guix-patches@gnu.org; Sun, 18 Feb 2024 09:33:42 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbiF0-0000DU-FI for guix-patches@gnu.org; Sun, 18 Feb 2024 09:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69062] [PATCH v4] 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: Sun, 18 Feb 2024 14:34: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.1708266822795 (code B ref 69062); Sun, 18 Feb 2024 14:34:02 +0000 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 X-OVh-ClientIp: 81.67.146.208 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-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 From: Nicolas Graves via Guix-patches via 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: -6.48 X-Spam-Score: -6.48 X-Migadu-Queue-Id: 4C42D3C46D X-Migadu-Scanner: mx13.migadu.com X-TUID: e0hypXR1c9DJ * 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