GNU bug report logs - #43145
[PATCH] gnu: Add emacs-next.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 43145 in the body.
You can then email your comments to 43145 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Morgan.J.Smith <at> outlook.com
To: guix-patches <at> gnu.org
Cc: Morgan Smith <Morgan.J.Smith <at> outlook.com>
Subject: [PATCH] gnu: Add emacs-next.
Date: Mon, 31 Aug 2020 23:35:41 -0400

From: Morgan Smith <Morgan.J.Smith <at> outlook.com>

* gnu/packages/emacs.scm (emacs-next): New variable.
---
 gnu/packages/emacs.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 0cd3e04381..7f510e9a6f 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -21,6 +21,7 @@
 ;;; Copyright © 2019 Leo Prikler <leo.prikler <at> student.tugraz.at>
 ;;; Copyright © 2019 Amin Bandali <bandali <at> gnu.org>
 ;;; Copyright © 2020 Jack Hill <jackhill <at> jackhill.us>
+;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith <at> outlook.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -276,6 +277,42 @@ large Lisp programs.  It has full Unicode support for nearly all human
 languages.")
     (license license:gpl3+)))
 
+(define-public emacs-next
+  (let ((commit "2ea34662c20f71d35dd52a5ed996542c7386b9cb")
+        (revision "0")
+        (emacs-version "28.0.50.1"))
+    (package/inherit emacs
+      (name "emacs-next")
+      (version (git-version emacs-version revision commit))
+      (source
+       (origin
+         (inherit (package-source emacs))
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://git.savannah.gnu.org/git/emacs.git")
+               (commit commit)))
+         (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))))))
+
 (define-public emacs-minimal
   ;; This is the version that you should use as an input to packages that just
   ;; need to byte-compile .el files.
-- 
2.28.0

Message #10 received at 43145-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Morgan.J.Smith <at> outlook.com
Cc: 43145-done <at> debbugs.gnu.org
Subject: Re: [bug#43145] [PATCH] gnu: Add emacs-next.
Date: Wed, 02 Sep 2020 16:43:24 +0200

[Message part 1 (text/plain, inline)]

Hi,

Morgan.J.Smith <at> outlook.com skribis:

> From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
>
> * gnu/packages/emacs.scm (emacs-next): New variable.

Applied with the following change to appease ‘guix lint’.

Thank you!

Ludo’.

[Message part 2 (text/x-patch, inline)]

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 7f510e9a6f..03c28ee7a7 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -289,8 +289,9 @@ languages.")
          (inherit (package-source emacs))
          (method git-fetch)
          (uri (git-reference
-               (url "https://git.savannah.gnu.org/git/emacs.git")
+               (url "https://git.savannah.gnu.org/git/emacs.git/")
                (commit commit)))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0igjm9kwiswn2dpiy2k9xikbdfc7njs07ry48fqz70anljj8y7y3"))))

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.