From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id GAZYLrVvaWCAqQAAgWs5BA (envelope-from ) for ; Sun, 04 Apr 2021 09:50:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 1WBJJ7VvaWAyAwAAbx9fmQ (envelope-from ) for ; Sun, 04 Apr 2021 07:50:13 +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 AB174237E3 for ; Sun, 4 Apr 2021 09:50:12 +0200 (CEST) Received: from localhost ([::1]:33946 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lSxWM-0002Zb-Q6 for larch@yhetil.org; Sun, 04 Apr 2021 03:50:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSxWE-0002ZG-DM for bug-guix@gnu.org; Sun, 04 Apr 2021 03:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51516) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lSxWE-0000yl-66 for bug-guix@gnu.org; Sun, 04 Apr 2021 03:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lSxWE-0006Lq-4H for bug-guix@gnu.org; Sun, 04 Apr 2021 03:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#47458: Terrible UX upgrading Emacs in Guix Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 04 Apr 2021 07:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47458 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Maxim Cournoyer Received: via spool by 47458-submit@debbugs.gnu.org id=B47458.161752258024375 (code B ref 47458); Sun, 04 Apr 2021 07:50:02 +0000 Received: (at 47458) by debbugs.gnu.org; 4 Apr 2021 07:49:40 +0000 Received: from localhost ([127.0.0.1]:34829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lSxVr-0006L5-RG for submit@debbugs.gnu.org; Sun, 04 Apr 2021 03:49:40 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:6707) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lSxVo-0006Ku-Q3 for 47458@debbugs.gnu.org; Sun, 04 Apr 2021 03:49:38 -0400 Received: from nijino.local (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FCmCJ2Dhjz1LLyW; Sun, 4 Apr 2021 09:49:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FCmCJ2Dhjz1LLyW DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617522572; bh=WC5ayrQutP9RNgJCJhd4Vw8lsbKDlp5082X2YqRW4SA=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=tDfCPpTwG2PYXYn4WCSWRrl/l6lc4s8U9jnA7wNbped3fvDlropkV6wAlaibcy9da ZlPs0U7FghxPCN4dAtvqAPkrGb3zm1iuaLAf/KG5SYm+NbVi6j4aolH8Tj9jUTLgtI GXDi9FHmzMj7SwquIGC3YtLXPbis00V5Y8pQX2kE= Message-ID: <0491bf7a885f44dbf62e2ca3b21fb5671daed5ec.camel@student.tugraz.at> From: Leo Prikler Date: Sun, 04 Apr 2021 09:49:31 +0200 In-Reply-To: <87wntipsz0.fsf_-_@gmail.com> References: <87o8f23eew.fsf@netris.org> <20210330184101.7643-1-leo.prikler@student.tugraz.at> <87wntipsz0.fsf_-_@gmail.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 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: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 47458@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1617522613; h=from:from:sender:sender: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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=WC5ayrQutP9RNgJCJhd4Vw8lsbKDlp5082X2YqRW4SA=; b=U/2zokghMxSQr1/0oUKj4E9RO3JMo26yOOQSjsSbOj6d/uVoO0un5/mgkiSUNb4cT60sxY reBNqBNjoRq6G3ErvoTNb8PW4NQgnohjHoXv2jmSudIpbha/xiC3srHw73iULji8yeWvkW W81Z5cNvVxrxS+JCPAJiU4GBbiFaLmEDpV8djCH+5H/Xu8J49MtczqMntBq0GBNFn1Vqyb CF8qnISFlpTG/PC7iCDvAX+wuDTNwnJHo6/yXp3CAXecctc+XGWvyffgNKhPLdRjXYm/PL uN7OKAre6DrxDg0EdxQ2GXKXhMhCF+J1mLm4+jjlCJbE12Vd3k4gPf/T6sgDwQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617522613; a=rsa-sha256; cv=none; b=uxSALKzfehFMydhnBMQlsI5xt65Tu1v3VCSKlo6g5e1UKO5KiqXnDRSd/9pnxHVqzgvbVF CHQ+GBlHyznCBAYbu+ojAGl4IlB404LXR9/qaodPi0gFS1PtT8UnC/i5iLtOG+EF6SKer/ qIl4stWNv9VLR3G4jtnDXgLs67EnXUMpwEJ1HxYhRUVVgmm48E7Rz1cPuM7gw65/IlAWr2 rvINxGPc/NgtFMqWlm4MMLJeuEpnnDutpiGSNdevTXIuzXZ2uxasQG2C60TJx9QHPBh+Pj n+BjSduGNaPy5JciTGG9DM4OJ/Xrw0gZ7NSps7P0NO70W4D7PZGikHsvMwWc0w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=tDfCPpTw; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: -1.34 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=tDfCPpTw; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: AB174237E3 X-Spam-Score: -1.34 X-Migadu-Scanner: scn0.migadu.com X-TUID: c0wPesXfhfLO Hi Maxim! Am Sonntag, den 04.04.2021, 00:35 -0400 schrieb Maxim Cournoyer: > Hi Leo! > > Leo Prikler writes: > > > With this, the search path specification of EMACSLOADPATH does no > > longer > > depend on the version of Emacs, which should make upgrading major > > versions > > less painful. See also: > > - > > - > > > > * gnu/packages/emacs.scm (emacs)[#:phases]: Add ‘wrap-load-path’. > > [native-search-path]: Do not search for builtin > > libraries. > > (emacs-next)[native-search-path]: Inherit from emacs. > > --- > > gnu/packages/emacs.scm | 31 ++++++++++++++++--------------- > > 1 file changed, 16 insertions(+), 15 deletions(-) > > > > diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm > > index 7447cfe33a..e12c489f8d 100644 > > --- a/gnu/packages/emacs.scm > > +++ b/gnu/packages/emacs.scm > > @@ -201,6 +201,20 @@ > > (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) > > + (let* ((out (assoc-ref outputs "out")) > > + (lisp-dirs (find-files (string-append out > > "/share/emacs") > > + "^lisp$" > > + #:directories? #t))) > > + (for-each > > + (lambda (prog) > > + (wrap-program prog > > + `("EMACSLOADPATH" suffix ,lisp-dirs))) > > + (find-files (string-append out "/bin") > > + ;; versioned and unversioned emacs > > binaries > > + "^emacs(-[0-9]+(\\.[0-9]+)*)?$")) > > + #t))) > > Shouldn't we wrap all the binaries to be on the safe side? Things > such > as emacsclient probably ought to have EMACSLOADPATH set correctly, > no? The remaining binaries are - emacsclient, which inherits its EMACSLOADPATH from the server it connects to - ctags, ebrowse and etags, which are helper binaries, that don't seem to rely on EMACSLOADPATH at all. (Or is there an indicator, that they do?) - .-real binaries, that should only be wrapped once. We could relax the regex to include the upper two, but I don't think it's necessary to do so. > > (add-before 'reset-gzip-timestamps 'make-compressed- > > files-writable > > ;; The 'reset-gzip-timestamps phase will throw a > > permission error > > ;; if gzip files aren't writable then. This phase is > > needed when > > @@ -255,9 +269,7 @@ > > (native-search-paths > > (list (search-path-specification > > (variable "EMACSLOADPATH") > > - ;; The versioned entry is for the Emacs' builtin > > libraries. > > - (files (list "share/emacs/site-lisp" > > - (string-append "share/emacs/" version > > "/lisp")))) > > + (files '("share/emacs/site-lisp"))) > > (search-path-specification > > (variable "INFOPATH") > > (files '("share/info"))))) > > @@ -294,18 +306,7 @@ languages.") > > "0igjm9kwiswn2dpiy2k9xikbdfc7njs07ry48fqz70anljj8y7y3") > > ))) > > (native-inputs > > `(("autoconf" ,autoconf) > > - ,@(package-native-inputs emacs))) > > - (native-search-paths > > - (list (search-path-specification > > - (variable "EMACSLOADPATH") > > - ;; The versioned entry is for the Emacs' builtin > > libraries. > > - (files (list "share/emacs/site-lisp" > > - (string-append "share/emacs/" > > - (version- > > major+minor+point version) > > - "/lisp")))) > > - (search-path-specification > > - (variable "INFOPATH") > > - (files '("share/info")))))))) > > + ,@(package-native-inputs emacs)))))) > > > > (define-public emacs-next-pgtk > > (let ((commit "ae18c8ec4f0ef37c8c9cda473770ff47e41291e2") > > This makes sense, and can make it to master rather than core-updates, > which is neat. I'd like to avoid pushing this to master just yet, because we also have changes in the Emacs build system to discuss and I don't want to cause an "Emacs world" rebuild twice in a row. That said, I'm including this patch in wip-emacs with the plan to push to master or staging once everything there is resolved. Regards, Leo