From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MD+EKqkce2AOOgEAgWs5BA (envelope-from ) for ; Sat, 17 Apr 2021 19:36:41 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id iFfhJakce2A1ewAAB5/wlQ (envelope-from ) for ; Sat, 17 Apr 2021 17:36:41 +0000 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 3744BCC95 for ; Sat, 17 Apr 2021 19:36:41 +0200 (CEST) Received: from localhost ([::1]:54766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoQn-0008OQ-04 for larch@yhetil.org; Sat, 17 Apr 2021 13:08:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQO-0008Du-5w for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32811) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQN-0000DH-AN for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQN-0005ak-6B for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 03/33] gnu: emacs: Add coreutils and gzip to PATH. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867923721142 (code B ref 47661); Sat, 17 Apr 2021 17:08:03 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:17 +0000 Received: from localhost ([127.0.0.1]:44291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPc-0005Uk-CQ for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:16 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:45713) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPZ-0005UY-M9 for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:14 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzyl3BmGz1LBRx for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzyl3BmGz1LBRx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679231; bh=HTpADXlVHiUfk+dmBFj1xRx/M3eeV74QT3NrPBZYw50=; h=From:To:Subject:Date:In-Reply-To:References:From; b=JhM/JDoltWCAQOITuie/cQ544K0VGi6BMHZ4qPutkImCsVyNANeWBvyg4565azDfs l4VV1i7mG6p9QxyPbByFKJQcWBt1sdkNHZgTSz5ZF3jJ4dZgI4wocxucUkpSpE3wss qkGi4rQTdkTUZzVmxwsFQVoMSpNRmcRr4u9g760c= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:18 +0200 Message-Id: <20210417170648.3810-3-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1618681001; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: 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:dkim-signature; bh=HTpADXlVHiUfk+dmBFj1xRx/M3eeV74QT3NrPBZYw50=; b=lxBtyQwZB6NbJAn+whUROVRF4t3fZAO1S1Q2okkENdPSo5Y3kjkEHxNxPw0werH0ivR/5x J+W2mgs+2m1vQqlsVC2ru9geTRAn4G1wsTGj3vy2yiiyiHWVyUYsRWT6vmVudtlVJmLH67 O2ReWnEMqCiGz61rGuPLHvNuBG/QketknO5OiaK2HhPD1r0M4nT08UV52Rti0Ru2ZL0Eqv SJI4tb8b9n8m9dK8qR1tMoa6C44y+bafSubTgqxmVrqMBYs4JRHfPEAXqh/EBQ8cduSQ7/ tB+mHMvKM+wh5LocimUAPuDzJqxPs1OiNjJBtlvrx3b0ppieoCbem6yIixluUQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618681001; a=rsa-sha256; cv=none; b=jsAVL8LpBYM8fEc1ASkki1tQ6SgmVINKa2Xh4vBMCbNaf6biC6Xdgy0NYy5iEr7u8e2eqQ hAc6x0L1QaI1jfv4R7AdeJGVIuK4Lubdml8Q4aIHM7qcBynEto43fHr8q0L7CoP627IPRh tLODErUJo/EdiREF049UtlsjmhtbgczRf3Jd3LB1N4mT17iwRQcWe8kKu+c0RSA7V3APkc N0jtLRvt9MAVQqFOUeEcsWuQ2BD1Y39aq8yCMZaPzovyWiLgKOOwBCPJVEugY29oUKTZ8s 7OV5DiLON79NlHXPswkZaGKXpQCQ+IvEVmLRhgQeJ6B9tcimd7HTn3SZaJfwPA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b="JhM/JDol"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 1.16 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b="JhM/JDol"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 3744BCC95 X-Spam-Score: 1.16 X-Migadu-Scanner: scn0.migadu.com X-TUID: 4eEWHLBUvtIK Some parts of Emacs (dired, compression handling, Tramp) shell out to commands and patching them all is a daunting task. Also, w.r.t. Tramp, we need those commands to be portable across multiple machines, which need not only be Guix machines (and even if they are, store items can be different). This patch ensures a ‘sane’ setup FSVO ‘sane’. * gnu/packages/emacs.scm (emacs)[wrap-load-path]: Rename to... [wrap-emacs-paths] ... this. Also patch PATH. --- gnu/packages/emacs.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e1b01ac22b..5316d25151 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -201,8 +201,8 @@ (car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$")) "bin/emacs") #t))) - (add-after 'strip-double-wrap 'wrap-load-path - (lambda* (#:key outputs #:allow-other-keys) + (add-after 'strip-double-wrap 'wrap-emacs-paths + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (lisp-dirs (find-files (string-append out "/share/emacs") "^lisp$" @@ -210,6 +210,13 @@ (for-each (lambda (prog) (wrap-program prog + ;; emacs-next and variants rely on uname being in PATH for + ;; Tramp. Tramp paths can't be hardcoded, because they + ;; need to be portable. + `("PATH" suffix + ,(map (lambda (in) (string-append in "/bin")) + (list (assoc-ref inputs "gzip") + (assoc-ref inputs "coreutils")))) `("EMACSLOADPATH" suffix ,lisp-dirs))) (find-files (string-append out "/bin") ;; Matches versioned and unversioned emacs binaries. @@ -231,6 +238,10 @@ `(("gnutls" ,gnutls) ("ncurses" ,ncurses) + ;; Required for "core" functionality, such as dired and compression. + ("coreutils" ,coreutils) + ("gzip" ,gzip) + ;; Avoid Emacs's limited movemail substitute that retrieves POP3 email ;; only via insecure channels. This is not needed for (modern) IMAP. ("mailutils" ,mailutils) @@ -361,7 +372,9 @@ also enabled and works without glitches even on X server.")))) (delete 'strip-double-wrap))))) (inputs `(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el")) - ("ncurses" ,ncurses))) + ("ncurses" ,ncurses) + ("coreutils" ,coreutils) + ("gzip" ,gzip))) (native-inputs `(("pkg-config" ,pkg-config))))) -- 2.31.1