From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id WHeJMydFzmXuqwAA62LTzQ:P1 (envelope-from ) for ; Thu, 15 Feb 2024 18:08:55 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id WHeJMydFzmXuqwAA62LTzQ (envelope-from ) for ; Thu, 15 Feb 2024 18:08:55 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=v0mm9zp2; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1708016935; 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-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=j+amVXnV7jvavruizQTNGotoCieJsvNea1rSh5BdwMI=; b=OVcR9URcE1ZWmPpeqO0L8krIL+DPRWOzQZuuD22d4cVu2u/OS3RAYE1uQhk5hmMgIAY0mC UYcj8Yu5dnUXnKZgWk0QDFfxI4Cteeh9Hvr6IMWo/5fiz3l4FMiC53Rapa2mmfXPP18zTe aCJqCb2r78spVXb50mCtCoqU+kzWIVYEJkVGOezvoGlUGX93dui0sFkY0uQRxH4cN+HvPG yJcUON9H5r5ye1oqk2Vyu3wjWxOpR5f6LAu6PpxTYfLKKnFkG2RoxhohFZQKRQ2IbN0ggQ nnKStL58y5Aqa7wbPM1CLYUZzB52YofAEoVaPq0pYXkYgWGXPMNXaHwKXqr0Zw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=v0mm9zp2; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1708016935; a=rsa-sha256; cv=none; b=toagNLdDLbJgoGauDz/uV2byuvP1Zaww6tAetThtpHecoYrm9AaAMsPhDU/+/ij6QBJEZy IJAO1dPe/QePLXzYHiN49ky074xflpWRTqweF7IY0z3YHQxV2TCotxK/+9S3XMv1N0rbEV 8pMAEoSdbiu1eSO4pDLyUtum+ZJ227jOwqsf1paOuMu9OWztSQoeiicK3cjD7hTShTCUlH lb9e4HsZ4xlNNgDuezQpxqVPfpNMwYmg/g+rxbk9w2A0SoRqAaJEmQk/JWZshnX1MZvFdN wEfnvgqDU826gzVR0di/6wiQ3L8O+F8X6Ua09lrFC4eTyiBtSaoIB1kmPvt/yA== 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 BEC5E74AF9 for ; Thu, 15 Feb 2024 18:08:55 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rafE5-00087L-25; Thu, 15 Feb 2024 12:08:45 -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 1rafE3-00086s-TD for guix-patches@gnu.org; Thu, 15 Feb 2024 12:08:43 -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 1rafE3-0001oZ-KU for guix-patches@gnu.org; Thu, 15 Feb 2024 12:08:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rafEM-0006gv-At for guix-patches@gnu.org; Thu, 15 Feb 2024 12:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69062] [PATCH v2] gnu: b4: Ensure git presence. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Feb 2024 17:09: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: Nicolas Graves Cc: 69062@debbugs.gnu.org Received: via spool by 69062-submit@debbugs.gnu.org id=B69062.170801688825641 (code B ref 69062); Thu, 15 Feb 2024 17:09:02 +0000 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== Message-ID: <874je9984j.wl-hako@ultrarare.space> 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-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: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches From: Hilton Chain 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -6.98 X-Spam-Score: -6.98 X-Migadu-Queue-Id: BEC5E74AF9 X-Migadu-Scanner: mx11.migadu.com X-TUID: 5CMRRjlftfhU 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