From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id WKpDHrFdcWOF1AAAbAwnHQ (envelope-from ) for ; Sun, 13 Nov 2022 22:12:17 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id KL1cHbFdcWOGHwAAG6o9tA (envelope-from ) for ; Sun, 13 Nov 2022 22:12:17 +0100 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 4961BD720 for ; Sun, 13 Nov 2022 22:12:16 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ouKGs-0001T1-L6; Sun, 13 Nov 2022 16:12:06 -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 1ouKGp-0001Si-EV for guix-patches@gnu.org; Sun, 13 Nov 2022 16:12:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ouKGo-0006Re-VC for guix-patches@gnu.org; Sun, 13 Nov 2022 16:12:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ouKGo-0002J2-Gq; Sun, 13 Nov 2022 16:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59253] [PATCH] gnu: emacs-magit: Substitute git executable path. Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 13 Nov 2022 21:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59253@debbugs.gnu.org Cc: Thiago Jung Bauermann , liliana.prikler@gmail.com X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: liliana.prikler@gmail.com Received: via spool by submit@debbugs.gnu.org id=B.16683738988831 (code B ref -1); Sun, 13 Nov 2022 21:12:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Nov 2022 21:11:38 +0000 Received: from localhost ([127.0.0.1]:48473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ouKGP-0002IM-BA for submit@debbugs.gnu.org; Sun, 13 Nov 2022 16:11:37 -0500 Received: from lists.gnu.org ([209.51.188.17]:51198) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ouKGJ-0002IA-8A for submit@debbugs.gnu.org; Sun, 13 Nov 2022 16:11:34 -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 1ouKGH-00014d-KP for guix-patches@gnu.org; Sun, 13 Nov 2022 16:11:30 -0500 Received: from mx.kolabnow.com ([212.103.80.155]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ouKGE-0006Mi-TE for guix-patches@gnu.org; Sun, 13 Nov 2022 16:11:28 -0500 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id D060B1784 for ; Sun, 13 Nov 2022 22:11:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :message-id:date:date:subject:subject:from:from:received :received:received; s=dkim20160331; t=1668373883; x=1670188284; bh=UQNWKVvFwixJtgRKrlktG3V/oWH7iW0/yDFMQ7xVhhQ=; b=gOs5tXKnjDR2 cFw3PNYv4dTjbPGoub+d4vMyGXkOJ9bgUUcz/kYcCaU338WA1U3Lks3wU8Qbk266 jW3Dy/dh7uqcfWd1DvgMPSsiVrX4pewqPqV8He8Ajb6L/Fb1VXVe5glppg64KzDt H6JC0GJCq3H7b8MeLCrOPjRJs+zAWlyvgVGRvRFgspyhp8OaMR4+RXmDotwVMEN/ zPq45TEqOtkeMX68V5a8nw5sLZXz6UlxRLv5MaQfqzdFFpq7oaPPfUIqIfxL3y5/ nQ/dKMFs8U+WcH/VHF8rVGSYDa6QfuGwP66npc4l0Zh5I2IBwekarUuDpHhPnWsE Wq5xawGTx6gBddjlaQs9qgO3P+m03nU7ZQEHLheYYPU4NnsojaxtJ1NEeflRb5yO Gk0HrdmPAV8Ov/nwusC6bQgsVekyT8BpSOIddGjOS7IdlryljrqF/ncf3pcaPwYU 7mo5hnCovg0ppx5Pv3ryrT5nNIK3gLqQHz6MfU6x3boK0GjBxZklvw0bIbOiFArw WybPBMXcn1UgvOpR/XoIq1re5i8qzLxfHt9HYciI2LE7FXlxnM54/23qSchq7W/L X4LnZED6rO2uOUSJ2gE2/I5DDJuTvMPO76yN132gaF2+KUFQufEvQfTZ+nmd6khg czHkEEE/pQw8ZvoNwhItlmz7d1BQMzw= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z93B-dXfTrpy for ; Sun, 13 Nov 2022 22:11:23 +0100 (CET) Received: from int-mx002.mykolab.com (unknown [10.9.13.2]) by mx.kolabnow.com (Postfix) with ESMTPS id 9A7A614D1 for ; Sun, 13 Nov 2022 22:11:22 +0100 (CET) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx002.mykolab.com (Postfix) with ESMTPS id 6693B370E; Sun, 13 Nov 2022 22:11:22 +0100 (CET) Date: Sun, 13 Nov 2022 18:11:11 -0300 Message-Id: <20221113211111.59581-1-bauermann@kolabnow.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=212.103.80.155; envelope-from=bauermann@kolabnow.com; helo=mx.kolabnow.com 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, SPF_HELO_NONE=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: , Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches From: Thiago Jung Bauermann 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1668373936; 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: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=UQNWKVvFwixJtgRKrlktG3V/oWH7iW0/yDFMQ7xVhhQ=; b=T4jEbWfVNjLx+NRP1FYxuNf/Jq7x58wHGBH9hCI5So8uC7c10nMNXZ7ZVcLhTs2WAUN4E7 iUefSuhD6fetINmQdt1rmAtR50xne0y67KQrw9T8sOOzOCMnYONhrAq7LBLTQSQB7bA2cj Y6Al4cIyUJyqHvrsRom4n0OBYIY1eM5pS1ZQg95HuuDer2EWGyVNWuXbdmemdM/tLypvX0 ytcsRTjdvavM4Cv/Ojdj6Fku5h51b0Ih7hahIPqO/LTGwBXUe35c4gdh2iMnJID4dgMWLY 6yaSw6WvutTP+MrccFTeXBCKHr+2Pekaee1l1OduhUNG9u32zMvmNjn91VpDpg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1668373936; a=rsa-sha256; cv=none; b=HWmfW7vh/zQHit3xr5UEiJ3+fi0E2oUBiDG1szRESXQb300AHdYBDfRjjep2F9EEpo6BHK +SBWJ6qQmpmm/USMmd/ED3s9TM8AZR0DGEiV1EyAjYpaH+NS5NPvcyr9iOsdgmJp/9T7Wm N26qhbZi04pz+TTQoH/dkpUqBkPiRVx5y6zy2OpwaeIsA7ETOjlw6bNJmOj8TOciCHyR60 sc8Ezjo6dhnCCttkCOQUdrJgmDYUnrtM21tfOMxZ9PjUe1txo24bd91pQs4mXL4ORQ0AeT k72V4919BH12dBq/IQg9xVC03w0BiBayKMxfHHEH/di+KiizHvkrHTzybKqEJA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kolabnow.com header.s=dkim20160331 header.b=gOs5tXKn; 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" X-Migadu-Spam-Score: -2.25 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kolabnow.com header.s=dkim20160331 header.b=gOs5tXKn; 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" X-Migadu-Queue-Id: 4961BD720 X-Spam-Score: -2.25 X-Migadu-Scanner: scn1.migadu.com X-TUID: xswFQIF0k7iR Magit has a strong dependency on Git so it should directly reference the git executable rather than expect it to be available in the profile or environment. This also fixes a build failure in emacs-forge. * gnu/packages/emacs-xyz.scm (emacs-magit)[arguments]<#:phases>: Substitute git path in the ‘magit-git-executable’ variable. --- gnu/packages/emacs-xyz.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8ff6275bad96..1406f8a715f2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -117,6 +117,7 @@ ;;; Copyright © 2022 Jose G Perez Taveras ;;; Copyright © 2022 Hilton Chain ;;; Copyright © 2022 Nicolas Graves +;;; Copyright © 2022 Thiago Jung Bauermann ;;; ;;; This file is part of GNU Guix. ;;; @@ -1031,7 +1032,11 @@ (define-public emacs-magit ("magit-version" #$version)))) (add-after 'set-magit-version 'patch-exec-paths (lambda* (#:key inputs #:allow-other-keys) - (make-file-writable "lisp/magit-sequence.el") + (for-each make-file-writable + (list "lisp/magit-git.el" "lisp/magit-sequence.el")) + (emacs-substitute-variables "lisp/magit-git.el" + ("magit-git-executable" + (search-input-file inputs "/bin/git"))) (emacs-substitute-variables "lisp/magit-sequence.el" ("magit-perl-executable" (search-input-file inputs "/bin/perl")))))