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 yKp6Es8d2mXuwgAAqHPOHw:P1 (envelope-from ) for ; Sat, 24 Feb 2024 17:48:15 +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 yKp6Es8d2mXuwgAAqHPOHw (envelope-from ) for ; Sat, 24 Feb 2024 17:48:15 +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=IN+J4zI4; 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=1708793295; 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-to: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=Dx4cXlaVEco/ir6czhQ2t/yB4bZhFRzF5eckiJlah8s=; b=noE7+x4Si5dSBRP0H+E45aUfihb6QOSGpW74xixgrnL0mLYqGQ9TPEJxfjjvzHFuBacmGZ qoiaatsXBHBAcR9x2CxBYRzmttMJdf9upUbp83OJS/lm1cLTAN2cxD4sTirV0DdDqmwtyC 45NKRTb5sc1aRxOfg4Vso3NZwKT5GOCaFVPlpNW6U+kRDgMqxAEvUxlLy6OXGtQ1KFxoOW f0Ly+F9ipOBpmw+GB+fuu4D9Pyn9A7SPb/t0XHl6u/7p3oPcerDmwFW9XlyqcPT9q57MDw ca3OjIaDceZbgmJeBv8DFvVGR/ztbL7kVu/6LXTBUIm6Na4xi921skzU9UzunQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=IN+J4zI4; 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=1708793295; a=rsa-sha256; cv=none; b=KBGGYs22C8tgKCUtVGNLkncL427roBQiewu0yO6qO8QEGa2l4l0qYKMGCptdNrxXCYddn1 D/014gAtnWOIALecHLF19zGX+dIAGeD/LZ6fX0c3aASIl9JhchbKxaIZrRmdrQcNduDF3S 1gYI7+ymhMaHJmvPgDBazmGFK8i8a4Feqtaq3AwJD36qRGrLQqcx2vCpLb5L4UmIqnhtn4 83UXGNKVmRodYeXAEmkXK1IBVlfAibC+U/TQfNDccx3X0UsJ7dEX+14gTBGaUeh1PcYHct dhT5GjMGZmVEAirw6JVjFN6InA3aVzETJTg6jjPoZZV20ogKKnZuji3dmC7R9A== 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 20405425D8 for ; Sat, 24 Feb 2024 17:48:15 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdvBh-0007hd-77; Sat, 24 Feb 2024 11:47: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 1rdvBb-0007gs-7n for guix-patches@gnu.org; Sat, 24 Feb 2024 11:47:39 -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 1rdvBa-0008RJ-Vg for guix-patches@gnu.org; Sat, 24 Feb 2024 11:47:38 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdvBz-0008Ct-5n for guix-patches@gnu.org; Sat, 24 Feb 2024 11:48:03 -0500 Subject: bug#69062: [PATCH v4] gnu: b4: Ensure git presence. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2024 16:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 69062 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Graves Cc: 69062-done@debbugs.gnu.org Mail-Followup-To: 69062@debbugs.gnu.org, hako@ultrarare.space, ngraves@ngraves.fr Received: via spool by 69062-done@debbugs.gnu.org id=D69062.170879323231365 (code D ref 69062); Sat, 24 Feb 2024 16:48:02 +0000 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== Message-ID: <875xydizfp.wl-hako@ultrarare.space> 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-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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.77 X-Spam-Score: -6.77 X-Migadu-Queue-Id: 20405425D8 X-Migadu-Scanner: mx13.migadu.com X-TUID: issVmVTwhA0m 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!