From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id ALdmHmZEal9KXgAA0tVLHw (envelope-from ) for ; Tue, 22 Sep 2020 18:37:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id wAcZGmZEal99BwAAbx9fmQ (envelope-from ) for ; Tue, 22 Sep 2020 18:37:26 +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 C76319402B3 for ; Tue, 22 Sep 2020 18:37:25 +0000 (UTC) Received: from localhost ([::1]:48378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kKnAK-0001eK-E9 for larch@yhetil.org; Tue, 22 Sep 2020 14:37:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kKn90-0001J9-A7 for bug-guix@gnu.org; Tue, 22 Sep 2020 14:36:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50015) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kKn8z-0002LJ-V1 for bug-guix@gnu.org; Tue, 22 Sep 2020 14:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kKn8z-0002CT-Rj for bug-guix@gnu.org; Tue, 22 Sep 2020 14:36:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#43277: [PATCH] gnu: emacs-next: Fix load path and version Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 22 Sep 2020 18:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43277 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Morgan.J.Smith@outlook.com Received: via spool by 43277-submit@debbugs.gnu.org id=B43277.16007997548442 (code B ref 43277); Tue, 22 Sep 2020 18:36:01 +0000 Received: (at 43277) by debbugs.gnu.org; 22 Sep 2020 18:35:54 +0000 Received: from localhost ([127.0.0.1]:33328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kKn8r-0002C5-S7 for submit@debbugs.gnu.org; Tue, 22 Sep 2020 14:35:54 -0400 Received: from mout.gmx.net ([212.227.17.22]:43221) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kKn8o-0002Bq-ME for 43277@debbugs.gnu.org; Tue, 22 Sep 2020 14:35:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1600799739; bh=iEA5EiOmDmkT/CJQdP+gC4un3Zz49GAqtqOck3746JM=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:In-reply-to:Date; b=hEeH/892q/0ViYE+HVqUd/GPCbPXzl0+uH4jDUN5symfclCWMLH3mDVWn8/TsVYyD 1EsjK14m2QTguSK8xmmMXgWF+lsgNrq50WzT2al54pOxzVGuEPmFCrHDzUqZKefkwE hWTQIrIYBM24dTA1EjKd+a/bo/Hx7n9zJHMpyP9E= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MWzjt-1jwrFi0aev-00XP4Z; Tue, 22 Sep 2020 20:35:39 +0200 References: User-agent: mu4e 1.4.13; emacs 27.1 From: Pierre Langlois In-reply-to: Date: Tue, 22 Sep 2020 19:35:34 +0100 Message-ID: <87pn6dslqh.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:WGd3r7ScvhK0bAjnBOqm58mLIe/IHWTUnFxXF/6vX7jqbKe+xbu YxG0qfY757bqWSicfC/PuA6mjadJ0yiXV9+CCz2s+t6XJ/C6uXFTWqiAZ+kO1m9gJl39VVE l+YQrgXaEPztjyj5gS4basbRtmdySSA0+d1ntopRlWx4Ncq3TU8foonxEFnsJmR7VjSdDm8 uWCNTY8YS/RwLGGG5xCYA== X-UI-Out-Filterresults: notjunk:1;V03:K0:tcVtsZL56Rg=:cfwp85hxPyNfgvIYwb5TxS BJrrBUvfKsDUsGFH54X3xYh7gBVUNb/r7Y09BBt60IlwSGNrdoEEHN3+QGCkaqF7Bcw9B8LYV BYAOcel1NS+Me1BIef23EXqP+zatrux0kVEhU0GNFhcK2QKsKET98cuyjNvK43cx397M4jN7/ qnc3Wlq6md4Hrafyxu1uVBFOwMjWiVMwVRspFJj9NWjApeetX+cFeo6wZyRaYpoAu/y4IMPom DmVRK0ONooFXKp4v4cnMxrD7hytya+0LogzQp3HD5RdqtWOfV6uB8jMkUKu8QTO7SPN7mjwMf WDmd+ZGG9SxI6Owj5Uugy0kk97RAMD5LiUzkdqnCWa5JoTAV5v0niFxTLz2395dL1hVZPpXlH 2A3cmWAGqS7mrJcQAEAZlcHz5pj7Wdn+/qmV1kyKxQhVVkd4XdVrwRU3NxSurGXGzavpqnTbG n0qWLWjkA1upCSTWx2CTWaLCjVL9/X1MgY2QOtBdBhWpcKTz/azRL4G40Ws1WqwhMFVPZDGYQ rwP3uXUjlsqCmR+CarzDkH5lYPqHAdnU17lds80jWBbUPTJPJkOuD2RjKrs807RoJxyHQt3Du A4oi2M2sGXN8+ugWBaL+qU9d7jdwgK/bt9t1/E1Hne2UaB1epjv8d8QIJ1Q8kAgNMlSDTxNeO UQJ0PbtyC9Fkzo/Om+pZIorxSrsDr58rC4LPbbGOHNejG9cA97ZTOFtrj65CNBDTeGlyAAiUz IpPmAa1R+IR5u/R7Ju9d1Kmzq3RsuA3hyK8l5N+FZdBjD9pj5zjkP8UxljC6bxVfuY6/Ty9Sl WVUaj83K1STsUp/9kFY04+fzzCqUuMFDBaLNWHbDD+lYuokrVcofjzK/ZeLkpPPJsaAuhf/YQ 7Q7s2iXDHhKwJjH+MMNqiX4UtPMLaeSsuotoshFFsAXJu9CqVzPRlW+MbjJG72h2uyoiytr54 23m0NRnAZyDy0dqyjG+yGYDgHnNY/jryRZK35j9KpPKxDdOi1C36AIGEhK3xzBMioXsVACdii CnL1tyajyXxrb33CdRTbRNvf2QyUnYV+45ixURuOFa5kJ36v7bYNbY0peGuwYNTnAAFtI2fSX TP5B0uIjBWpOTgVjatJW5yC5cvfzDqBnQYN0Jvnpvn1uT9dCv+K0Zok1Gk54ZEocYsbSwsn5z hl39C5J6PUzDD8ctAXORSK4M/PCjwMIBt/kn252E62IP4MTS8mIWnS4I2DprenEM6ZPAfxbJl TP+49VMsjXwLLfA1EoILQaJLMFtQIqv7wAWUo9Q== X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 43277@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmx.net header.s=badeba3b8450 header.b=hEeH/892; dmarc=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-Spam-Score: 0.39 X-TUID: Tqd8KrFFuQla --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi Morgan, Morgan.J.Smith@outlook.com writes: > From: Morgan Smith > > * gnu/packages/emacs.scm (emacs): > [strip-double-wrap] Modify to work with emacs-next > > * gnu/packages/emacs.scm (emacs-next): > [version] Change version from 28.0.50.1 to 28.0.50 > [arguments] Removed field > [native-search-paths] New field > --- > > The problem turned out to be that EMACSLOADPATH wasn't being set > properly. This patch fixes that. Nice catch! This patch looks good to me overall, I'm not a maintainer but I can review it. See my couple of comments inline. > > > > gnu/packages/emacs.scm | 37 ++++++++++++++++--------------------- > 1 file changed, 16 insertions(+), 21 deletions(-) > > diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm > index 03c28ee7a7..b3d099257d 100644 > --- a/gnu/packages/emacs.scm > +++ b/gnu/packages/emacs.scm > @@ -196,11 +196,12 @@ > (lambda* (#:key outputs #:allow-other-keys) > ;; Directly copy emacs-X.Y to emacs, so that it is not wrap= ped > ;; twice. This also fixes a minor issue, where WMs would n= ot be > - ;; able to track emacs back to emacs.desktop. > + ;; able to track emacs back to emacs.desktop. It's done us= ing > + ;; this-package so emacs-next can reuse it > (with-directory-excursion (assoc-ref outputs "out") > (copy-file (string-append > "bin/emacs-" > - ,(version-major+minor (package-version emacs)= )) > + ,(car (string-split (package-version this-pac= kage) #\-))) I agree in general it's good to reuse code, however in this particular case it's probably better to keep the phases duplicated. For example, in the future one could update the emacs-next package to not require a revision number anymore, and it's likely they'd forget to update the emacs package since it'll still work. Does that make sense? It might be just a matter of taste, I don't have a super strong opinion on this. > "bin/emacs") > #t))) > (add-before 'reset-gzip-timestamps 'make-compressed-files-writa= ble > @@ -279,11 +280,10 @@ languages.") >=20=20 > (define-public emacs-next > (let ((commit "2ea34662c20f71d35dd52a5ed996542c7386b9cb") > - (revision "0") > - (emacs-version "28.0.50.1")) > + (revision "0")) > (package/inherit emacs > (name "emacs-next") > - (version (git-version emacs-version revision commit)) > + (version (git-version "28.0.50" revision commit)) > (source > (origin > (inherit (package-source emacs)) > @@ -295,24 +295,19 @@ languages.") > (sha256 > (base32 > "0igjm9kwiswn2dpiy2k9xikbdfc7njs07ry48fqz70anljj8y7y3")))) > - (arguments > - (substitute-keyword-arguments (package-arguments emacs) > - ((#:phases phases) > - `(modify-phases ,phases > - (replace 'strip-double-wrap > - (lambda* (#:key outputs #:allow-other-keys) > - ;; Directly copy emacs-X.Y to emacs, so that it is not = wrapped > - ;; twice. This also fixes a minor issue, where WMs wou= ld not be > - ;; able to track emacs back to emacs.desktop. > - (with-directory-excursion (assoc-ref outputs "out") > - (copy-file (string-append > - "bin/emacs-" > - ,(version-major+minor+point (package-vers= ion emacs-next))) > - "bin/emacs") > - #t))))))) > (native-inputs > `(("autoconf" ,autoconf) > - ,@(package-native-inputs emacs)))))) > + ,@(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/" (car (string-sp= lit version #\-)) "/lisp")))) nit: This line seems to be a bit long. > + (search-path-specification > + (variable "INFOPATH") > + (files '("share/info")))))))) >=20=20 > (define-public emacs-minimal > ;; This is the version that you should use as an input to packages tha= t just Thanks! Pierre --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAl9qQ/YYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31U+gcH/ikCn2wAUofFWcqccYuY8YqG uVZmRHM9L8iwgt+YBafje3RWhynBnMEK7J3InXfIZzNNsPDqtHh69yVjUjVJvEVO PHs16evScizEnsPZfY5ipsZ5QhjHKDLg9KglWhcEHbcfNQQiSD3w3j7ORPFSEKaI xFIJrSQpESJcn69QMtl2QM3KSF4zTvPeOgfXCLOWH7AOayDoguI7p6uI0YvWFczU dUvViLY7+cNZhC5R++ObGl/ZpKjC/WE+LH1F8EHQddIPdaN9hJ1qOtytvCSYhQ7T Vp8Am83u3/8tLOJlFx8oURDpbv9xoKVbCApQEaHRPAxy98m6y6Uk7MLLVz8iI9I= =6wHs -----END PGP SIGNATURE----- --=-=-=--