From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id UBPlOQjqX19FaAAA0tVLHw (envelope-from ) for ; Mon, 14 Sep 2020 22:09:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id YDMfNAjqX19jIwAAB5/wlQ (envelope-from ) for ; Mon, 14 Sep 2020 22:09:12 +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 0BE0D9404C5 for ; Mon, 14 Sep 2020 22:09:10 +0000 (UTC) Received: from localhost ([::1]:33962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHweq-0001fD-Ox for larch@yhetil.org; Mon, 14 Sep 2020 18:09:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHwek-0001dq-6A for bug-guix@gnu.org; Mon, 14 Sep 2020 18:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45036) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHwej-0000Xa-T5 for bug-guix@gnu.org; Mon, 14 Sep 2020 18:09:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kHwej-0003Ar-O3 for bug-guix@gnu.org; Mon, 14 Sep 2020 18:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#43277: [PATCH] gnu: emacs-next: Fix load path and version References: <615e26f9-fb67-e929-697e-81fe4f70b03c@riseup.net> In-Reply-To: <615e26f9-fb67-e929-697e-81fe4f70b03c@riseup.net> Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 14 Sep 2020 22:09: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: 43277@debbugs.gnu.org Received: via spool by 43277-submit@debbugs.gnu.org id=B43277.160012133712188 (code B ref 43277); Mon, 14 Sep 2020 22:09:01 +0000 Received: (at 43277) by debbugs.gnu.org; 14 Sep 2020 22:08:57 +0000 Received: from localhost ([127.0.0.1]:56582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHwee-0003AV-R9 for submit@debbugs.gnu.org; Mon, 14 Sep 2020 18:08:57 -0400 Received: from mail-mw2nam10olkn2049.outbound.protection.outlook.com ([40.92.42.49]:36897 helo=NAM10-MW2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHwec-0003AG-2M for 43277@debbugs.gnu.org; Mon, 14 Sep 2020 18:08:55 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ALfQrS9kA0TfDhCXY9ycmqIEsRT/oodqanPfrNiJRODYMCHYeBYcREUKT2bcZRHIG3WqC34tixPxg9yw5slcK5p4nIvJz613GuaR/lbZoYadZse72IfdLPMrS2kFma7A7s8CDqvFrXj4Gf17crqBg9DFz6YGIR3FZfoPU5L9bLgsYxaHbwaFSP2tc1tQJ7efvioma2AhJRVhDdOH3jjZxvkuNpQbHJRYRPHQYGgmVKl2GC3qv/5hcdJFXcGTmJys23pMSgh3+cigiW2J3A1H8TFxAK+l6r+8REZ2lAfh89fQnRSRzJf5uw3TwvS3YoWIkcyJ2SznUk4ydSZINiyQRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a3MLTiuu1nIPvEgW0OjDcaFI1DTqjJ9YqFFcmW8pfUs=; b=oJ6KsTBHm5kgNwqI8PW7/aC6q/u8lxyxmYRdIXrC/wOD40BPPR7LdAEHhFF9N696lKWh14Au1n0JKXawFXbA8SPHXagSA/soAF1gPiGmEnp8ofT6xMb8hmzVwbCSkdTdoLADXGo/Bk4IFpBes8Ij5w1SkgIMpQ1Mo2fb8ajz894mc17cGi9OeV/RuhRfOd5FsXVMk1hY0DrebjCj2biWEG1b5dwDWEkzZM/fNVH3YbUlr0272K0IehELZRWk9cUDP5Mfb8QRPo4lFZacgSpgiGWfSwKkqN6rkiX0OY8q6kU/QGtOUqdlNHp+oNFp4FnFDyhA+T/Pqg3YgVoKp7V7yg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a3MLTiuu1nIPvEgW0OjDcaFI1DTqjJ9YqFFcmW8pfUs=; b=GAxNng7wf7oJ7tGABND91we14SFFMV9suaY7/9wZAJG7wmACY22CAXgP+7u9zd+1mYrQSxGC4YTeBHs9LfYPshsSMubowLfhHTrR3zY4xG35k+8BjIe7SGT5mUe/cU8pZ/SdS6QnkulucUNBSuqJNBaOnyPQFXx+Z2drBF2lzSX4X/pXHjgaUGst+jOkBnHYIxzWX5/YJOFA9c98gsXyVLkUGk/DRUP/Fa9yerH8Wz5EjooQ8oj4pJhFrL3g4dOKuQdhIXTWC0U8KqWib4TKTxGRJONhtO2kQGIpDcfT3OKx9dk8GVAdR3ip7csFy+sn1ZpLEwCb0PxRDtKKzUuZyQ== Received: from DM6PR14CA0054.namprd14.prod.outlook.com (2603:10b6:5:18f::31) by BN6PR21MB0740.namprd21.prod.outlook.com (2603:10b6:404:93::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.0; Mon, 14 Sep 2020 22:08:46 +0000 Received: from DM6NAM10FT061.eop-nam10.prod.protection.outlook.com (2603:10b6:5:18f:cafe::d7) by DM6PR14CA0054.outlook.office365.com (2603:10b6:5:18f::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Mon, 14 Sep 2020 22:08:46 +0000 Received: from DM5PR1001MB2105.namprd10.prod.outlook.com (2a01:111:e400:7e86::4a) by DM6NAM10FT061.mail.protection.outlook.com (2a01:111:e400:7e86::175) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Mon, 14 Sep 2020 22:08:46 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:63A4B8C3C5AAA7BC5F174EDBE3C5A4AD8DB8C52D9B6999EB977147B82E56279A; UpperCasedChecksum:7E2C0F9413B36D297A0C9C5723C2C9C3FFCDD71A7A189D2EDD7BB78158BF4D4C; SizeAsReceived:7524; Count:47 Received: from DM5PR1001MB2105.namprd10.prod.outlook.com ([fe80::cc1a:65a6:d74d:52f4]) by DM5PR1001MB2105.namprd10.prod.outlook.com ([fe80::cc1a:65a6:d74d:52f4%6]) with mapi id 15.20.3348.016; Mon, 14 Sep 2020 22:08:46 +0000 From: Morgan.J.Smith@outlook.com Date: Mon, 14 Sep 2020 18:08:19 -0400 Message-ID: X-Mailer: git-send-email 2.28.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: YTOPR0101CA0070.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b00:14::47) To DM5PR1001MB2105.namprd10.prod.outlook.com (2603:10b6:4:2b::24) X-Microsoft-Original-Message-ID: <20200914220819.22353-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pancake.lan (184.164.27.153) by YTOPR0101CA0070.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b00:14::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Mon, 14 Sep 2020 22:08:44 +0000 X-Mailer: git-send-email 2.28.0 X-Microsoft-Original-Message-ID: <20200914220819.22353-1-Morgan.J.Smith@outlook.com> X-TMN: [gPSBegd+KbAxjgx9Uf2W4GjXurKriHkB] X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 47 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 94e11265-37b3-4e5e-b246-08d858fabf9f X-MS-Exchange-SLBlob-MailProps: Ad+mZByrAbT64JM6d87vc5u0Kjd+lSj/XGYEnDjRpSVe7lL/L44JO/9Qow0LJ1XBFTUfSxfU7O2jBnMdQyD6ioeLzH8zQu99vBhtf0lZu/nLJ5OVzX5E98OdNtPfQJVcH8/GcHMOUy084PQVaBwQBCPI+dOm8zQuGYuAH9RioHxoNXhR+TgUI7cA2/7LVc+GjRkp68i4p1ZY6pQgRahaBncxwVOoskB4mA2oqTC2Q7niB/yNqX/kbJCgk/0QVVKyWRZS8TSSXWXHzvyQGBnaKlgDJzmyzCAhwu3zHXUy98hJA4Rpr6u9BTGi6/Bdl+/g3IyKGTeJWRr2t0vGayD+I6FMXdWqDaHrRo1mpURQanj/gh/NuuqLL0gv6jX6Co7u7dA4dQetk/0EWDsM57fL3dlAgmQW+mUcBEsGb+iWJmvlq5FWcr+0v47o1uBYf2RZwIJ9Uqd8ns2aJdHj8k0Ily7Ccz8+lNTfHsAiApOmk0rcnLHvzky3/zWw+xkIgUADdivIhXnEc8UlJUIQeoIiHACw6qtCkLP+EcGLU2QSeca+KfqQNRmqMfrq8vCCi3U+BNnvNE4V4dBHg760O3QPZp9jyETgZ5u2H2u/NuOB5Px/e4rM3mtRtMjI/+jUzZmuSBJL+o15VVSbqY6IEuiAX7pJk0W/X1rQ X-MS-TrafficTypeDiagnostic: BN6PR21MB0740: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qlz+fm+x/QYPua8F6WUo/gjXSAc3kZsCan8gCfUvX2xy1Mr+8jqBq64jqJxfLd+xEaQIbM3+hY9F4VCXSRnINZaU6eemypoLyA6quB9r3uKJJaA1wZRQoOZunNOMU8Z1wv+J+jdf0Ip+PCoHpUJeZ7Dt1EoxVOf4uKytYMsjYG1K4lFNrVPc24vH5Xvy1eb1iQj8S8jO0z6E0f5SbdLd1w== X-MS-Exchange-AntiSpam-MessageData: zCDSrhJ9UfukoMn3a7/1ryuxmwx9suyMHO+x5Z6Uo5uQU3RxSax/RlkSN50HSQg8OL902EJ4jrVnFUvY6lLtJ/ObLN/CqNMNRFiEG41lsNrBsNUaa9tmxCTKETWS9YT6qIEipgmTsJ4Y4JxUuXuH4A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94e11265-37b3-4e5e-b246-08d858fabf9f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2020 22:08:46.2002 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DM6NAM10FT061.eop-nam10.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR21MB0740 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Morgan Smith 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=outlook.com header.s=selector1 header.b=GAxNng7w; dmarc=fail reason="SPF not aligned (relaxed)" header.from=outlook.com (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-Spam-Score: 4.59 X-TUID: yB9lYfZp+8QC 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. 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 wrapped ;; twice. This also fixes a minor issue, where WMs would not be - ;; able to track emacs back to emacs.desktop. + ;; able to track emacs back to emacs.desktop. It's done using + ;; 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-package) #\-))) "bin/emacs") #t))) (add-before 'reset-gzip-timestamps 'make-compressed-files-writable @@ -279,11 +280,10 @@ languages.") (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 would 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-version 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-split version #\-)) "/lisp")))) + (search-path-specification + (variable "INFOPATH") + (files '("share/info")))))))) (define-public emacs-minimal ;; This is the version that you should use as an input to packages that just -- 2.28.0