GNU bug report logs -
#42738
[Work in progress] gnu: emacs: update to 27.1
Previous Next
Reported by: Jack Hill <jackhill <at> jackhill.us>
Date: Fri, 7 Aug 2020 03:22:01 UTC
Severity: normal
Tags: fixed
Done: Ludovic Courtès <ludo <at> gnu.org>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 42738 in the body.
You can then email your comments to 42738 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Fri, 07 Aug 2020 03:22:01 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Jack Hill <jackhill <at> jackhill.us>:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org.
(Fri, 07 Aug 2020 03:22:01 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
Hi Guix,
Now that there is a release candidate for Emacs 27.1, I started working on
updating our Emacs packages. For the most part, it went smoothly, but
there are some other packages that broke after updating Emacs. Of the
packages reported by `guix refresh -l emacs`, the following had issues:
emacs-picpocket - picpocket uses ImageMagic, but Emacs no longer defaults
to using ImageMagic [0]. This may not be a package that we want to support
with Emacs >=27
[0] http://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-27.1-rc1&id=27877e7bcfa37b2c97a3dde170f870d4729ff807#n96
bigloo - Currently fails to build [1], and the Emacs upgrade did not
change that.
[1] https://issues.guix.gnu.org/42726
hop - depends on bigloo
emacs-haskell-mode - Tests newly fail with Emacs 27. Issue reported
upstream [2]
[2] https://github.com/haskell/haskell-mode/issues/1714
emacs-dante - depends on emacs-haskell-mode
emacs-clojure-mode - Documentation tests newly fail wtih Emacs 27. Issue
reported upstream [3]
[3] https://github.com/clojure-emacs/clojure-mode/issues/568
emacs-ample-regexps - This package builds from an arbitrary commit,
and updating that fixed issues with Emacs 27 [4].
[4] https://issues.guix.gnu.org/42737
emacs-doom-themes - This package builds from an arbitrary commit, and
updating that fixed issues with Emacs 27 [5].
[5] https://issues.guix.gnu.org/42736
emacs-treemacs - Tests newly fail with Emacs 27. Issue reported upstream [6].
[6] https://github.com/Alexander-Miller/treemacs/issues/707
emacs-lsp-java - depends on treemacs
emacs-treemacs-extra - depends on treemacs
emacs-psc-ide - Byte compilation fails with Emacs 27. Issue reported
upstream [7].
[7] https://github.com/purescript-emacs/psc-ide-emacs/issues/193
emacs-treepi - Byte compilation failure. There is an existing upstram
issue [8].
[8] https://github.com/volrath/treepy.el/issues/8
emacs-github-review - depends on emacs-treepi
notmuch - Tests time out.
emacs-elisp-ref - Tests fail. Issue reported upstream [9].
[9] https://github.com/Wilfred/elisp-refs/issues/29
emacs-helpful - depends on emacs-elisp-ref
emacs-racer - Tests fail. Issue reported upstream [10].
[10] https://github.com/racer-rust/emacs-racer/issues/136
emacs-md4rd - Byte compilation fails. Issue reported upstream [11].
[11] https://github.com/ahungry/md4rd/issues/28
Having said that, I will send the patch that I have for updating Emacs.
This borrows heavily from the current definition of emacs-next. One thing
I don't understand is why I had to add texinfo to the native inputs of
emacs-minimal. Perhaps that can be removed with a configure option. That
said, `guix size` reports a decrease from 205.3 MiB to 182.9 MiB for
emacs-minimal (and emacs decreased from 1209.8 MiB to 859.7 MiB).
I've also left emacs-next alone for now. We'll probably want to update it
as well at some point.
Best,
Jack
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Fri, 07 Aug 2020 03:24:02 GMT)
Full text and
rfc822 format available.
Message #8 received at 42738 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/emacs.scm (emacs): Update to 27.1-rc1.
[arguments]: Add --with-harfbuzz and --with-modules to #configure-flags. Add
restore-emacs-pdump phase.
[inputs]: Add jansson and harfbuzz. Remove imagemagick.
---
gnu/packages/emacs.scm | 68 ++++++++++++++++++++++++++----------------
1 file changed, 43 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index ad8d4b0606..b809e90690 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -58,7 +58,6 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages image)
- #:use-module (gnu packages imagemagick)
#:use-module (gnu packages linux) ; alsa-lib
#:use-module (gnu packages mail) ; for mailutils
#:use-module (gnu packages ncurses)
@@ -75,18 +74,18 @@
(define-public emacs
(package
(name "emacs")
- (version "26.3")
+ (version "27.1")
(source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/emacs/emacs-"
- version ".tar.xz"))
- (sha256
- (base32
- "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d"))
- (patches (search-patches "emacs-exec-path.patch"
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.savannah.gnu.org/git/emacs.git")
+ (commit "emacs-27.1-rc1")))
+ (patches (search-patches "emacs27-exec-path.patch"
"emacs-fix-scheme-indent-function.patch"
"emacs-ignore-empty-xim-styles.patch"
"emacs-source-date-epoch.patch"))
+ (sha256
+ (base32 "1vyw8bpairxfxim931xg3pwyl3afh2mmjxa2i1igsaiaaxyssbc6"))
(modules '((guix build utils)))
(snippet
'(with-directory-excursion "lisp"
@@ -94,16 +93,7 @@
;; autoloads.
(for-each delete-file
(append (find-files "." "\\.elc$")
- (find-files "." "loaddefs\\.el$")
- ;; This is the only "autoloads" file that
- ;; does not have "*loaddefs.el" name.
- ;; TODO: Next time changing this package,
- ;; replace the following with a call to
- ;; `find-files', so that `delete-file'
- ;; wouldn't error out when the file is
- ;; missing, making the entire snippet field
- ;; reusable as-is for `emacs-next' below.
- '("eshell/esh-groups.el")))
+ (find-files "." "loaddefs\\.el$")))
;; Make sure Tramp looks for binaries in the right places on
;; remote Guix System machines, where 'getconf PATH' returns
@@ -129,7 +119,8 @@
(build-system glib-or-gtk-build-system)
(arguments
`(#:tests? #f ; no check target
- #:configure-flags (list "--with-modules"
+ #:configure-flags (list "--with-harfbuzz"
+ "--with-modules"
"--disable-build-details")
#:phases
(modify-phases %standard-phases
@@ -180,9 +171,35 @@
;; which leads to conflicts.
(delete-file (string-append lisp-dir "/subdirs.el"))
;; Byte compile the site-start files.
- (emacs-byte-compile-directory lisp-dir)))))))
+ (emacs-byte-compile-directory lisp-dir))))
+ ;; Needed when building from git
+ (add-before
+ 'reset-gzip-timestamps
+ 'make-compressed-files-writable
+ (lambda _
+ (for-each make-file-writable
+ (find-files %output ".*\\.t?gz$"))
+ #t))
+ ;; restore the dump file that Emacs installs somewhere in
+ ;; libexec/ to its original state
+ (add-after 'glib-or-gtk-wrap 'restore-emacs-pdmp
+ (lambda* (#:key outputs target #:allow-other-keys)
+ (let* ((libexec (string-append (assoc-ref outputs "out")
+ "/libexec"))
+ ;; each of these find-files should return one file
+ (pdmp (find-files libexec "^emacs\\.pdmp$"))
+ (pdmp-real (find-files libexec
+ "^\\.emacs\\.pdmp-real$")))
+ (when (not (null? pdmp-real))
+ (for-each (lambda (wrapper real)
+ (delete-file wrapper)
+ (rename-file real wrapper))
+ pdmp pdmp-real))
+ #t))))))
(inputs
`(("gnutls" ,gnutls)
+ ("jansson" ,jansson)
+ ("harfbuzz" ,harfbuzz)
("ncurses" ,ncurses)
;; Avoid Emacs's limited movemail substitute that retrieves POP3 email
@@ -196,7 +213,6 @@
("libtiff" ,libtiff)
("giflib" ,giflib)
("libjpeg" ,libjpeg-turbo)
- ("imagemagick" ,imagemagick)
("acl" ,acl)
;; When looking for libpng `configure' links with `-lpng -lz', so we
@@ -218,6 +234,7 @@
(native-inputs
`(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el"))
("pkg-config" ,pkg-config)
+ ("autoconf" ,autoconf) ;Needed when building from git
("texinfo" ,texinfo)))
(native-search-paths
@@ -360,7 +377,9 @@ languages.")
`(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el"))
("ncurses" ,ncurses)))
(native-inputs
- `(("pkg-config" ,pkg-config)))))
+ `(("pkg-config" ,pkg-config)
+ ("autoconf" ,autoconf) ;Needed when building from git
+ ("texinfo" ,texinfo)))))
(define-public emacs-xwidgets
(package
@@ -387,8 +406,7 @@ editor (console only)")
(inputs (fold alist-delete
(package-inputs emacs)
'("libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg"
- "imagemagick" "libpng" "librsvg" "libxpm" "libice"
- "libsm"
+ "libpng" "librsvg" "libxpm" "libice" "libsm"
;; These depend on libx11, so remove them as well.
"libotf" "m17n-lib" "dbus")))))
--
2.28.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Tue, 18 Aug 2020 06:24:01 GMT)
Full text and
rfc822 format available.
Message #11 received at 42738 <at> debbugs.gnu.org (full text, mbox):
I've added guix-devel to the cc: becasue the Emacs upgrade has come up a
few times on IRC, and there are ways for you to help move this upgrade
along. Any suggestions are welcome, but in particular, you can help with
the following:
* Review the inputs and configure flags. Are there any additional changes
needed for the new Emacs version? A good place to start with this would be
the Emacs NEWS file. It's quite lengthy, so additional eyes would be quite
helpful.
* Making sure packages build and work with Emacs 27.1. I expect this to
involve elisp hacking and working with upstream.
I have the following updates, since I prepared at patch for the 27.1
release candidate:
On Thu, 6 Aug 2020, Jack Hill wrote:
> Hi Guix,
>
> Now that there is a release candidate for Emacs 27.1, I started working on
> updating our Emacs packages.
Now that Emacs 27.1 has been released, I've updated the patch for released
version. Per Michael Rohleder's (mroh) suggestion on IRC, I have added gmp
as an input.
Is the emacs-wide-int variant needed with the new multiprecision
functionality?
> For the most part, it went smoothly, but there are some other packages
> that broke after updating Emacs. Of the packages reported by `guix
> refresh -l emacs`, the following had issues:
I have not had a chance to try rebuilding the dependents, but I have
updated news for the following packages:
> emacs-haskell-mode - Tests newly fail with Emacs 27. Issue reported upstream
> [2]
>
> [2] https://github.com/haskell/haskell-mode/issues/1714
>
> emacs-dante - depends on emacs-haskell-mode
John Soo (jsoo) volunterred to look at the haskell packages. Thanks!
> emacs-ample-regexps - This package builds from an arbitrary commit,
> and updating that fixed issues with Emacs 27 [4].
>
>[4] https://issues.guix.gnu.org/42737
This patch has been merged!
> emacs-doom-themes - This package builds from an arbitrary commit, and
> updating that fixed issues with Emacs 27 [5].
>
> [5] https://issues.guix.gnu.org/42736
This patch has been merged!
> emacs-treemacs - Tests newly fail with Emacs 27. Issue reported upstream [6].
>
> [6] https://github.com/Alexander-Miller/treemacs/issues/707
Upstream has acknowledged the issue and is investigating.
> emacs-treepy - Byte compilation failure. There is an existing upstram issue
> [8].
>
> [8] https://github.com/volrath/treepy.el/issues/8
Upstream fixed the issue, and Michael Rohleder got the fix into Guix.
Thanks!
> emacs-github-review - depends on emacs-treepy
With the fixed treepy, emacs-github-review now builds as well.
> notmuch - Tests time out.
Work is being done upstream to add support for 27.1 [9]
[9] https://nmbug.notmuchmail.org/nmweb/show/87bljg8nxr.fsf%40cassou.me
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Tue, 18 Aug 2020 06:27:02 GMT)
Full text and
rfc822 format available.
Message #14 received at 42738 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[arguments]: Add --with-harfbuzz and --with-modules to #configure-flags. Add
restore-emacs-pdump phase.
[inputs]: Add jansson, gmp, and harfbuzz. Remove imagemagick.
---
gnu/packages/emacs.scm | 61 +++++++++++++++++++++++++++---------------
1 file changed, 39 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index ad8d4b0606..3f1bff6c15 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -58,9 +58,9 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages image)
- #:use-module (gnu packages imagemagick)
#:use-module (gnu packages linux) ; alsa-lib
#:use-module (gnu packages mail) ; for mailutils
+ #:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages texinfo)
@@ -75,18 +75,17 @@
(define-public emacs
(package
(name "emacs")
- (version "26.3")
+ (version "27.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/emacs/emacs-"
version ".tar.xz"))
- (sha256
- (base32
- "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d"))
- (patches (search-patches "emacs-exec-path.patch"
+ (patches (search-patches "emacs27-exec-path.patch"
"emacs-fix-scheme-indent-function.patch"
"emacs-ignore-empty-xim-styles.patch"
"emacs-source-date-epoch.patch"))
+ (sha256
+ (base32 "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a"))
(modules '((guix build utils)))
(snippet
'(with-directory-excursion "lisp"
@@ -94,16 +93,7 @@
;; autoloads.
(for-each delete-file
(append (find-files "." "\\.elc$")
- (find-files "." "loaddefs\\.el$")
- ;; This is the only "autoloads" file that
- ;; does not have "*loaddefs.el" name.
- ;; TODO: Next time changing this package,
- ;; replace the following with a call to
- ;; `find-files', so that `delete-file'
- ;; wouldn't error out when the file is
- ;; missing, making the entire snippet field
- ;; reusable as-is for `emacs-next' below.
- '("eshell/esh-groups.el")))
+ (find-files "." "loaddefs\\.el$")))
;; Make sure Tramp looks for binaries in the right places on
;; remote Guix System machines, where 'getconf PATH' returns
@@ -129,7 +119,8 @@
(build-system glib-or-gtk-build-system)
(arguments
`(#:tests? #f ; no check target
- #:configure-flags (list "--with-modules"
+ #:configure-flags (list "--with-harfbuzz"
+ "--with-modules"
"--disable-build-details")
#:phases
(modify-phases %standard-phases
@@ -180,9 +171,35 @@
;; which leads to conflicts.
(delete-file (string-append lisp-dir "/subdirs.el"))
;; Byte compile the site-start files.
- (emacs-byte-compile-directory lisp-dir)))))))
+ (emacs-byte-compile-directory lisp-dir))))
+ ;; Needed when building from git
+ (add-before
+ 'reset-gzip-timestamps
+ 'make-compressed-files-writable
+ (lambda _
+ (for-each make-file-writable
+ (find-files %output ".*\\.t?gz$"))
+ #t))
+ ;; restore the dump file that Emacs installs somewhere in
+ ;; libexec/ to its original state
+ (add-after 'glib-or-gtk-wrap 'restore-emacs-pdmp
+ (lambda* (#:key outputs target #:allow-other-keys)
+ (let* ((libexec (string-append (assoc-ref outputs "out")
+ "/libexec"))
+ ;; each of these find-files should return one file
+ (pdmp (find-files libexec "^emacs\\.pdmp$"))
+ (pdmp-real (find-files libexec
+ "^\\.emacs\\.pdmp-real$")))
+ (when (not (null? pdmp-real))
+ (for-each (lambda (wrapper real)
+ (delete-file wrapper)
+ (rename-file real wrapper))
+ pdmp pdmp-real))
+ #t))))))
(inputs
`(("gnutls" ,gnutls)
+ ("jansson" ,jansson)
+ ("harfbuzz" ,harfbuzz)
("ncurses" ,ncurses)
;; Avoid Emacs's limited movemail substitute that retrieves POP3 email
@@ -195,8 +212,8 @@
("libxft" ,libxft)
("libtiff" ,libtiff)
("giflib" ,giflib)
+ ("gmp" ,gmp)
("libjpeg" ,libjpeg-turbo)
- ("imagemagick" ,imagemagick)
("acl" ,acl)
;; When looking for libpng `configure' links with `-lpng -lz', so we
@@ -360,7 +377,8 @@ languages.")
`(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el"))
("ncurses" ,ncurses)))
(native-inputs
- `(("pkg-config" ,pkg-config)))))
+ `(("pkg-config" ,pkg-config)
+ ("texinfo" ,texinfo)))))
(define-public emacs-xwidgets
(package
@@ -387,8 +405,7 @@ editor (console only)")
(inputs (fold alist-delete
(package-inputs emacs)
'("libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg"
- "imagemagick" "libpng" "librsvg" "libxpm" "libice"
- "libsm"
+ "libpng" "librsvg" "libxpm" "libice" "libsm"
;; These depend on libx11, so remove them as well.
"libotf" "m17n-lib" "dbus")))))
--
2.28.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Tue, 18 Aug 2020 08:58:01 GMT)
Full text and
rfc822 format available.
Message #17 received at 42738 <at> debbugs.gnu.org (full text, mbox):
Hi Jack,
Thanks.
I just checked, and seems like harfbuzz switch is not required. News
file also says that it is on by default.
--
Alexey
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Tue, 18 Aug 2020 13:06:02 GMT)
Full text and
rfc822 format available.
Message #20 received at 42738 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Jack Hill <jackhill <at> jackhill.us> writes:
> Now that Emacs 27.1 has been released, I've updated the patch for
> released version. Per Michael Rohleder's (mroh) suggestion on IRC, I
> have added gmp as an input.
emacs (26 and 27) configure and compiles with gmp anyway. I couldn't
find out where it's (implicit) coming from.
I still like the input to make it explicit, though.
> Is the emacs-wide-int variant needed with the new multiprecision
> functionality?
I don't think so.
[signature.asc (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Wed, 19 Aug 2020 02:54:02 GMT)
Full text and
rfc822 format available.
Message #23 received at 42738 <at> debbugs.gnu.org (full text, mbox):
---------- Forwarded message ----------
Date: Tue, 18 Aug 2020 12:21:46
From: Zhu Zihao <cjpeople2013 <at> gmail.com>
To: jackhill <at> jackhill.us
Subject: [bug#42738] [PATCH v2] gnu: emacs: Update to 27.1.
Can you add configuration options "--with-cairo"(Also add cairo as input)
the main advantage of cairo build is the power to display color emoji in Emacs.
Check https://github.com/emacs-mirror/emacs/blob/master/etc/NEWS.27#L53
In upcoming Emacs 28, --with-cairo will be the default choice for Emacs. See https://github.com/emacs-mirror/emacs/blob/master/etc/NEWS#L27
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Wed, 19 Aug 2020 04:10:02 GMT)
Full text and
rfc822 format available.
Message #26 received at 42738 <at> debbugs.gnu.org (full text, mbox):
Thank you all for these improvements.
On Tue, 18 Aug 2020, Alexey Abramov wrote:
> I just checked, and seems like harfbuzz switch is not required. News
> file also says that it is on by default.
Great. This was copied bliendly from the emacs-next package. I've removed
it.
On Tue, 18 Aug 2020, Michael Rohleder wrote:
>Jack Hill <jackhill <at> jackhill.us> writes:
>> Now that Emacs 27.1 has been released, I've updated the patch for
>> released version. Per Michael Rohleder's (mroh) suggestion on IRC, I
>> have added gmp as an input.
>
> emacs (26 and 27) configure and compiles with gmp anyway. I couldn't
> find out where it's (implicit) coming from. I still like the input to
> make it explicit, though.
Interesting, I didn't catch this. I like explicit better as well.
>> Is the emacs-wide-int variant needed with the new multiprecision
>> functionality?
>
> I don't think so.
Ok, I've deprecated that package.
On Tue, 18 Aug 2020, Zhu Zihao wrote:
> Can you add configuration options "--with-cairo"(Also add cairo as
> input) the main advantage of cairo build is the power to display color
> emoji in Emacs.
Sounds good to me. I've enabled cairo, and per [1] removed libxft from the
inputs.
[1] https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-27.1#n53
Best,
Jack
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Wed, 19 Aug 2020 04:10:03 GMT)
Full text and
rfc822 format available.
Message #29 received at 42738 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[arguments]: Add --with-cairo and --with-modules to #configure-flags. Add
restore-emacs-pdump phase.
[inputs]: Add cairo, jansson, gmp, and harfbuzz. Remove imagemagick and libxft.
[native-inputs]: Add texlive.
(emacs-wide-int): Mark as deprecated package.
---
gnu/packages/emacs.scm | 71 ++++++++++++++++++++++++------------------
1 file changed, 41 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index ad8d4b0606..98d60dfd24 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -58,9 +58,9 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages image)
- #:use-module (gnu packages imagemagick)
#:use-module (gnu packages linux) ; alsa-lib
#:use-module (gnu packages mail) ; for mailutils
+ #:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages texinfo)
@@ -75,15 +75,14 @@
(define-public emacs
(package
(name "emacs")
- (version "26.3")
+ (version "27.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/emacs/emacs-"
version ".tar.xz"))
(sha256
- (base32
- "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d"))
- (patches (search-patches "emacs-exec-path.patch"
+ (base32 "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a"))
+ (patches (search-patches "emacs27-exec-path.patch"
"emacs-fix-scheme-indent-function.patch"
"emacs-ignore-empty-xim-styles.patch"
"emacs-source-date-epoch.patch"))
@@ -94,16 +93,7 @@
;; autoloads.
(for-each delete-file
(append (find-files "." "\\.elc$")
- (find-files "." "loaddefs\\.el$")
- ;; This is the only "autoloads" file that
- ;; does not have "*loaddefs.el" name.
- ;; TODO: Next time changing this package,
- ;; replace the following with a call to
- ;; `find-files', so that `delete-file'
- ;; wouldn't error out when the file is
- ;; missing, making the entire snippet field
- ;; reusable as-is for `emacs-next' below.
- '("eshell/esh-groups.el")))
+ (find-files "." "loaddefs\\.el$")))
;; Make sure Tramp looks for binaries in the right places on
;; remote Guix System machines, where 'getconf PATH' returns
@@ -130,6 +120,9 @@
(arguments
`(#:tests? #f ; no check target
#:configure-flags (list "--with-modules"
+ ;; --with-cairo will become the default in
+ ;; Emacs 28
+ "--with-cairo"
"--disable-build-details")
#:phases
(modify-phases %standard-phases
@@ -180,9 +173,35 @@
;; which leads to conflicts.
(delete-file (string-append lisp-dir "/subdirs.el"))
;; Byte compile the site-start files.
- (emacs-byte-compile-directory lisp-dir)))))))
+ (emacs-byte-compile-directory lisp-dir))))
+ ;; Needed when building from git
+ (add-before
+ 'reset-gzip-timestamps
+ 'make-compressed-files-writable
+ (lambda _
+ (for-each make-file-writable
+ (find-files %output ".*\\.t?gz$"))
+ #t))
+ ;; restore the dump file that Emacs installs somewhere in
+ ;; libexec/ to its original state
+ (add-after 'glib-or-gtk-wrap 'restore-emacs-pdmp
+ (lambda* (#:key outputs target #:allow-other-keys)
+ (let* ((libexec (string-append (assoc-ref outputs "out")
+ "/libexec"))
+ ;; each of these find-files should return one file
+ (pdmp (find-files libexec "^emacs\\.pdmp$"))
+ (pdmp-real (find-files libexec
+ "^\\.emacs\\.pdmp-real$")))
+ (when (not (null? pdmp-real))
+ (for-each (lambda (wrapper real)
+ (delete-file wrapper)
+ (rename-file real wrapper))
+ pdmp pdmp-real))
+ #t))))))
(inputs
`(("gnutls" ,gnutls)
+ ("jansson" ,jansson)
+ ("harfbuzz" ,harfbuzz)
("ncurses" ,ncurses)
;; Avoid Emacs's limited movemail substitute that retrieves POP3 email
@@ -190,13 +209,13 @@
("mailutils" ,mailutils)
;; TODO: Add the optional dependencies.
+ ("cairo" ,cairo)
("libx11" ,libx11)
("gtk+" ,gtk+)
- ("libxft" ,libxft)
("libtiff" ,libtiff)
("giflib" ,giflib)
+ ("gmp" ,gmp)
("libjpeg" ,libjpeg-turbo)
- ("imagemagick" ,imagemagick)
("acl" ,acl)
;; When looking for libpng `configure' links with `-lpng -lz', so we
@@ -360,7 +379,8 @@ languages.")
`(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el"))
("ncurses" ,ncurses)))
(native-inputs
- `(("pkg-config" ,pkg-config)))))
+ `(("pkg-config" ,pkg-config)
+ ("texinfo" ,texinfo)))))
(define-public emacs-xwidgets
(package
@@ -387,8 +407,7 @@ editor (console only)")
(inputs (fold alist-delete
(package-inputs emacs)
'("libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg"
- "imagemagick" "libpng" "librsvg" "libxpm" "libice"
- "libsm"
+ "libpng" "librsvg" "libxpm" "libice" "libsm"
;; These depend on libx11, so remove them as well.
"libotf" "m17n-lib" "dbus")))))
@@ -407,15 +426,7 @@ editor (without an X toolkit)" )
`(cons "--with-x-toolkit=no" ,cf)))))))
(define-public emacs-wide-int
- (package
- (inherit emacs)
- (name "emacs-wide-int")
- (synopsis "The extensible, customizable, self-documenting text
-editor (with wide ints)" )
- (arguments
- (substitute-keyword-arguments (package-arguments emacs)
- ((#:configure-flags flags)
- `(cons "--with-wide-int" ,flags))))))
+ (deprecated-package "emacs-wide-int" emacs))
(define-public guile-emacs
(let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")
--
2.28.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Wed, 19 Aug 2020 08:23:02 GMT)
Full text and
rfc822 format available.
Message #32 received at 42738 <at> debbugs.gnu.org (full text, mbox):
Hey Guix,
Jack Hill <jackhill <at> jackhill.us> writes:
[...]
> On Tue, 18 Aug 2020, Michael Rohleder wrote:
>>Jack Hill <jackhill <at> jackhill.us> writes:
[...]
>>> Is the emacs-wide-int variant needed with the new multiprecision
>>> functionality?
>>
>> I don't think so.
>
> Ok, I've deprecated that package.
I added the emacs-wide-int variant because emacs-telega requires 62-bit
[sic] integers (https://debbugs.gnu.org/39412). While Telega should
work with regular (non-wide-int) Emacs 27.1 (thanks to the new
multiprecision functionality), the test which checks if Emacs is suitable
for running Telega will fail, because it does not know about "bignums"
and looks at the value of most-positive-fixnum instead:
--8<---------------cut here---------------start------------->8---
;; 62bits for numbers is required
;; i.e. ./configure --with-wide-int
(cl-assert (= most-positive-fixnum 2305843009213693951) nil
"Emacs with wide ints (--with-wide-int) is required")
--8<---------------cut here---------------end--------------->8---
I suggest we keep the emacs-wide-int variant until this issue has been
resolved, so that the Emacs update does not break emacs-telega on 32-bit
systems.
[...]
Greetings,
Diego
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Wed, 19 Aug 2020 13:55:02 GMT)
Full text and
rfc822 format available.
Message #35 received at 42738 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Jack Hill <jackhill <at> jackhill.us> writes:
>>> Is the emacs-wide-int variant needed with the new multiprecision
>>> functionality?
>>
>> I don't think so.
>
> Ok, I've deprecated that package.
I think emacs-wide-int could still be useful on 32bit systems.
--
"One basic notion underlying Usenet is that it is a cooperative."
Having been on USENET for going on ten years, I disagree with this.
The basic notion underlying USENET is the flame.
-- Chuq Von Rospach
[signature.asc (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Thu, 27 Aug 2020 22:03:02 GMT)
Full text and
rfc822 format available.
Message #38 received at 42738 <at> debbugs.gnu.org (full text, mbox):
From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[arguments]: Add --with-cairo and --with-modules to #:configure-flags. Add
restore-emacs-pdump phase.
[inputs]: Add cairo, libxaw, jansson, gmp, and harfbuzz. Remove imagemagick
and libxft.
[native-inputs]: Add texlive.
(emacs-wide-int): Mark as deprecated package.
(emacs-no-x):
[arguments]: Add --with-jpeg=no --with-gif=no --with-tiff=no
to #:configure-flags.
---
Hello!
Your patch didn't build for me so I made some slight changes. I added
libxaw as an input, and added some configure flags to emacs-no-x.
I'm now using this patch to run Emacs 27.1 on my main machine
(inadvisable I know), and my personal config is running flawlessy with
the exception of emacs-clojure-mode, emacs-elisp-regs, and
emacs-helpful.
Hopefully this helps!
Morgan
gnu/packages/emacs.scm | 76 +++++++++++++++++++++++++-----------------
1 file changed, 46 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index ad8d4b0606..48ae899dcf 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -58,9 +58,9 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages image)
- #:use-module (gnu packages imagemagick)
#:use-module (gnu packages linux) ; alsa-lib
#:use-module (gnu packages mail) ; for mailutils
+ #:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages texinfo)
@@ -75,15 +75,14 @@
(define-public emacs
(package
(name "emacs")
- (version "26.3")
+ (version "27.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/emacs/emacs-"
version ".tar.xz"))
(sha256
- (base32
- "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d"))
- (patches (search-patches "emacs-exec-path.patch"
+ (base32 "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a"))
+ (patches (search-patches "emacs27-exec-path.patch"
"emacs-fix-scheme-indent-function.patch"
"emacs-ignore-empty-xim-styles.patch"
"emacs-source-date-epoch.patch"))
@@ -94,16 +93,7 @@
;; autoloads.
(for-each delete-file
(append (find-files "." "\\.elc$")
- (find-files "." "loaddefs\\.el$")
- ;; This is the only "autoloads" file that
- ;; does not have "*loaddefs.el" name.
- ;; TODO: Next time changing this package,
- ;; replace the following with a call to
- ;; `find-files', so that `delete-file'
- ;; wouldn't error out when the file is
- ;; missing, making the entire snippet field
- ;; reusable as-is for `emacs-next' below.
- '("eshell/esh-groups.el")))
+ (find-files "." "loaddefs\\.el$")))
;; Make sure Tramp looks for binaries in the right places on
;; remote Guix System machines, where 'getconf PATH' returns
@@ -130,6 +120,9 @@
(arguments
`(#:tests? #f ; no check target
#:configure-flags (list "--with-modules"
+ ;; --with-cairo will become the default in
+ ;; Emacs 28
+ "--with-cairo"
"--disable-build-details")
#:phases
(modify-phases %standard-phases
@@ -180,9 +173,35 @@
;; which leads to conflicts.
(delete-file (string-append lisp-dir "/subdirs.el"))
;; Byte compile the site-start files.
- (emacs-byte-compile-directory lisp-dir)))))))
+ (emacs-byte-compile-directory lisp-dir))))
+ ;; Needed when building from git
+ (add-before
+ 'reset-gzip-timestamps
+ 'make-compressed-files-writable
+ (lambda _
+ (for-each make-file-writable
+ (find-files %output ".*\\.t?gz$"))
+ #t))
+ ;; restore the dump file that Emacs installs somewhere in
+ ;; libexec/ to its original state
+ (add-after 'glib-or-gtk-wrap 'restore-emacs-pdmp
+ (lambda* (#:key outputs target #:allow-other-keys)
+ (let* ((libexec (string-append (assoc-ref outputs "out")
+ "/libexec"))
+ ;; each of these find-files should return one file
+ (pdmp (find-files libexec "^emacs\\.pdmp$"))
+ (pdmp-real (find-files libexec
+ "^\\.emacs\\.pdmp-real$")))
+ (when (not (null? pdmp-real))
+ (for-each (lambda (wrapper real)
+ (delete-file wrapper)
+ (rename-file real wrapper))
+ pdmp pdmp-real))
+ #t))))))
(inputs
`(("gnutls" ,gnutls)
+ ("jansson" ,jansson)
+ ("harfbuzz" ,harfbuzz)
("ncurses" ,ncurses)
;; Avoid Emacs's limited movemail substitute that retrieves POP3 email
@@ -190,13 +209,14 @@
("mailutils" ,mailutils)
;; TODO: Add the optional dependencies.
+ ("cairo" ,cairo)
("libx11" ,libx11)
+ ("libxaw" ,libxaw)
("gtk+" ,gtk+)
- ("libxft" ,libxft)
("libtiff" ,libtiff)
("giflib" ,giflib)
+ ("gmp" ,gmp)
("libjpeg" ,libjpeg-turbo)
- ("imagemagick" ,imagemagick)
("acl" ,acl)
;; When looking for libpng `configure' links with `-lpng -lz', so we
@@ -360,7 +380,8 @@ languages.")
`(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el"))
("ncurses" ,ncurses)))
(native-inputs
- `(("pkg-config" ,pkg-config)))))
+ `(("pkg-config" ,pkg-config)
+ ("texinfo" ,texinfo)))))
(define-public emacs-xwidgets
(package
@@ -384,11 +405,14 @@ editor (with xwidgets support)")
(synopsis "The extensible, customizable, self-documenting text
editor (console only)")
(build-system gnu-build-system)
+ (arguments
+ (substitute-keyword-arguments (package-arguments emacs)
+ ((#:configure-flags flags ''())
+ `(list "--with-jpeg=no" "--with-gif=no" "--with-tiff=no"))))
(inputs (fold alist-delete
(package-inputs emacs)
'("libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg"
- "imagemagick" "libpng" "librsvg" "libxpm" "libice"
- "libsm"
+ "libpng" "librsvg" "libxpm" "libice" "libsm"
;; These depend on libx11, so remove them as well.
"libotf" "m17n-lib" "dbus")))))
@@ -407,15 +431,7 @@ editor (without an X toolkit)" )
`(cons "--with-x-toolkit=no" ,cf)))))))
(define-public emacs-wide-int
- (package
- (inherit emacs)
- (name "emacs-wide-int")
- (synopsis "The extensible, customizable, self-documenting text
-editor (with wide ints)" )
- (arguments
- (substitute-keyword-arguments (package-arguments emacs)
- ((#:configure-flags flags)
- `(cons "--with-wide-int" ,flags))))))
+ (deprecated-package "emacs-wide-int" emacs))
(define-public guile-emacs
(let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")
--
2.28.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Fri, 28 Aug 2020 05:36:02 GMT)
Full text and
rfc822 format available.
Message #41 received at 42738 <at> debbugs.gnu.org (full text, mbox):
Hi Morgan,
On Thu, 27 Aug 2020, Morgan.J.Smith <at> outlook.com wrote:
> From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
>
> * gnu/packages/emacs.scm (emacs): Update to 27.1.
> [arguments]: Add --with-cairo and --with-modules to #:configure-flags. Add
> restore-emacs-pdump phase.
> [inputs]: Add cairo, libxaw, jansson, gmp, and harfbuzz. Remove imagemagick
> and libxft.
> [native-inputs]: Add texlive.
> (emacs-wide-int): Mark as deprecated package.
> (emacs-no-x):
> [arguments]: Add --with-jpeg=no --with-gif=no --with-tiff=no
> to #:configure-flags.
> ---
>
> Hello!
>
> Your patch didn't build for me so I made some slight changes. I added
> libxaw as an input, and added some configure flags to emacs-no-x.
>
> I'm now using this patch to run Emacs 27.1 on my main machine
> (inadvisable I know), and my personal config is running flawlessy with
> the exception of emacs-clojure-mode, emacs-elisp-regs, and
> emacs-helpful.
>
> Hopefully this helps!
Indeed it is, thank you!
Best,
Jack
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Fri, 28 Aug 2020 05:37:01 GMT)
Full text and
rfc822 format available.
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Fri, 28 Aug 2020 14:19:02 GMT)
Full text and
rfc822 format available.
Message #47 received at 42738 <at> debbugs.gnu.org (full text, mbox):
Hi Morgan, Mark, and all,
Morgan.J.Smith <at> outlook.com skribis:
> From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
>
> * gnu/packages/emacs.scm (emacs): Update to 27.1.
> [arguments]: Add --with-cairo and --with-modules to #:configure-flags. Add
> restore-emacs-pdump phase.
> [inputs]: Add cairo, libxaw, jansson, gmp, and harfbuzz. Remove imagemagick
> and libxft.
> [native-inputs]: Add texlive.
> (emacs-wide-int): Mark as deprecated package.
> (emacs-no-x):
> [arguments]: Add --with-jpeg=no --with-gif=no --with-tiff=no
> to #:configure-flags.
I see that Mark committed a similar patch just yesterday:
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=36a09d185343375a5cba370431870f9c4435d623
I suppose Mark hadn’t seen the ongoing discussion.
Mark, Morgan: could you see if there’s anything we’re missing from the
patch Morgan submitted?
At any rate, thanks a lot for the work everyone put in!
Ludo’, a happy Emacs user.
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Fri, 28 Aug 2020 14:40:01 GMT)
Full text and
rfc822 format available.
Message #50 received at 42738 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
I confirm that with Mark's commit
emacs-clojure-mode and emacs-elisp-refs are also broken.
Cheers!
--
Pierre Neidhardt
https://ambrevar.xyz/
[signature.asc (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Fri, 28 Aug 2020 17:01:01 GMT)
Full text and
rfc822 format available.
Message #53 received at 42738 <at> debbugs.gnu.org (full text, mbox):
Ludovic Courtès <ludo <at> gnu.org> writes:
> Hi Morgan, Mark, and all,
>
> Morgan.J.Smith <at> outlook.com skribis:
>
>> From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
>>
>> * gnu/packages/emacs.scm (emacs): Update to 27.1.
>> [arguments]: Add --with-cairo and --with-modules to #:configure-flags. Add
>> restore-emacs-pdump phase.
>> [inputs]: Add cairo, libxaw, jansson, gmp, and harfbuzz. Remove imagemagick
>> and libxft.
>> [native-inputs]: Add texlive.
>> (emacs-wide-int): Mark as deprecated package.
>> (emacs-no-x):
>> [arguments]: Add --with-jpeg=no --with-gif=no --with-tiff=no
>> to #:configure-flags.
>
> I see that Mark committed a similar patch just yesterday:
>
> https://git.savannah.gnu.org/cgit/guix.git/commit/?id=36a09d185343375a5cba370431870f9c4435d623
>
> I suppose Mark hadn’t seen the ongoing discussion.
>
> Mark, Morgan: could you see if there’s anything we’re missing from the
> patch Morgan submitted?
>
> At any rate, thanks a lot for the work everyone put in!
>
> Ludo’, a happy Emacs user.
Also, are we planning to keep emacs-next and have it track 28.x or
remove it?
Brett Gilio
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Fri, 28 Aug 2020 17:09:02 GMT)
Full text and
rfc822 format available.
Message #56 received at 42738 <at> debbugs.gnu.org (full text, mbox):
On Fri, 28 Aug 2020, Brett Gilio wrote:
> Also, are we planning to keep emacs-next and have it track 28.x or
> remove it?
I believe bandali was planning to track 28.x.
Best,
Jack
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Fri, 28 Aug 2020 18:59:02 GMT)
Full text and
rfc822 format available.
Message #59 received at 42738 <at> debbugs.gnu.org (full text, mbox):
Hello Guix,
Ludovic Courtès <ludo <at> gnu.org> wrote:
> Morgan.J.Smith <at> outlook.com skribis:
>
>> From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
>>
>> * gnu/packages/emacs.scm (emacs): Update to 27.1.
>> [arguments]: Add --with-cairo and --with-modules to #:configure-flags. Add
>> restore-emacs-pdump phase.
>> [inputs]: Add cairo, libxaw, jansson, gmp, and harfbuzz. Remove imagemagick
>> and libxft.
>> [native-inputs]: Add texlive.
>> (emacs-wide-int): Mark as deprecated package.
>> (emacs-no-x):
>> [arguments]: Add --with-jpeg=no --with-gif=no --with-tiff=no
>> to #:configure-flags.
>
> I see that Mark committed a similar patch just yesterday:
>
> https://git.savannah.gnu.org/cgit/guix.git/commit/?id=36a09d185343375a5cba370431870f9c4435d623
>
> I suppose Mark hadn’t seen the ongoing discussion.
Indeed, I hadn't. Gah, I'm terribly sorry about this. I had done some
quick web searches for preexisting work on this, but clearly they were
insufficient, and I've never subscribed to the patches list. In the
future, I'll know not to rely on web search engines for this.
> Mark, Morgan: could you see if there’s anything we’re missing from the
> patch Morgan submitted?
Looking now, here are the main differences I see between our patches:
* I found that I had to remove the 'restore-emacs-pdump' phase from most
of the other emacs variants, namely the ones that use
'gnu-build-system', because otherwise the inherited
'restore-emacs-pdump' phase would fail. Morgan's patch seems not to
consider most of the other emacs variants, and I'm not sure if they
were tested. I briefly tested all of them except for 'guile-emacs'.
* Morgan removed the snippet code that deletes "eshell/esh-groups.el",
whereas I replaced it with a call to 'find-files' to remove it only if
present, as the previous comment suggested. I'm not sure if this is
still needed, though.
* Morgan's patch adds "libxaw" to inputs and "texinfo" to native-inputs.
What's the rationale for these?
* I added 'pango' to the inputs, because the Emacs NEWS mentioned that
Pango was used for font rendering when "--with-cairo" is used.
However, it may be that "pango" finds its way into the build inputs
without being explicitly mentioned.
* Morgan removed 'libxft' from the inputs of 'emacs', whereas I didn't.
This was an oversight on my part. However, if we remove it, it's
possible that we might need to add it back to 'emacs-no-x-toolkit'.
The references that I see to Pango in the Emacs code are within
"#ifdef HAVE_GTK3".
* In 'emacs-no-x', my patch removes the new graphical library inputs
(cairo, pango, and harfbuzz) and the "--with-cairo" flag, whereas
Morgan's patch leaves "cairo" and "harfbuzz" as inputs, and overwrites
the inherited configure-flags to be precisely ("--with-jpeg=no"
"--with-gif=no" "--with-tiff=no"), apparently discarding the inherited
"--with-modules" and "--disable-build-details" flags.
* Morgan made 'emacs-wide-int' into a deprecated package, whereas I
thought that it might still be useful. My rationale was this: from a
brief skim, it looks like '--with-wide-int' might make *immediate*
integers wider, which for some applications might perform much better
than the heap-allocated arbitrary-size integers supported by Emacs 27.
However, I didn't look carefully at this.
* I updated "emacs-exec-path.patch" and removed
"emacs27-exec-path.patch", whereas Morgan's patch keeps both files and
possibly leaves "emacs-exec-path.patch" orphaned.
* I updated the patches to apply cleanly to Emacs 27, although this was
not strictly needed.
* I updated 'notmuch' in the previous commit to a version that builds
successfully with Emacs 27.
Pierre Neidhardt <mail <at> ambrevar.xyz> wrote:
> I confirm that with Mark's commit
> emacs-clojure-mode and emacs-elisp-refs are also broken.
Sorry about that. If the Emacs 27 update breaks important packages, it
might be that reverting it is the proper action. If the maintainers
decide to do this, I would not object.
Best regards,
Mark
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Fri, 28 Aug 2020 21:11:02 GMT)
Full text and
rfc822 format available.
Message #62 received at 42738 <at> debbugs.gnu.org (full text, mbox):
Hello!
It seems I am taking some credit for Jack Hill's patch. I simply took
Jack's patch (labeled as patch v3 in the debbugs thread) and attempted
to build it with my personal config. I noticed that it wouldn't build
properly since emacs wanted libxaw and emacs-no-x wanted some image
librarys (libtiff, libjpeg, etc). The only contributions I made, where
to add libxaw to emacs and to add the configure flags to emacs-no-x. I
made these changes and posted them as patch v4. However, the patch Mark
committed does build for me so you can ignore my contributions (which
weren't well thought out to begin with).
The rest of your questions should be directed to Jack.
(Also just my 2 cents, we should have upgraded emacs-next to 27.1 and
only upgraded emacs a week later. Emacs deserves more care than most
packages due to its dependence on so many other packages. Not trying to
shame anyone, just something to think of for next time.)
Thanks,
Morgan
On 8/28/20 2:57 PM, Mark H Weaver wrote:
> Looking now, here are the main differences I see between our patches:
>
> * I found that I had to remove the 'restore-emacs-pdump' phase from most
> of the other emacs variants, namely the ones that use
> 'gnu-build-system', because otherwise the inherited
> 'restore-emacs-pdump' phase would fail. Morgan's patch seems not to
> consider most of the other emacs variants, and I'm not sure if they
> were tested. I briefly tested all of them except for 'guile-emacs'.
>
> * Morgan removed the snippet code that deletes "eshell/esh-groups.el",
> whereas I replaced it with a call to 'find-files' to remove it only if
> present, as the previous comment suggested. I'm not sure if this is
> still needed, though.
>
> * Morgan's patch adds "libxaw" to inputs and "texinfo" to native-inputs.
> What's the rationale for these?
>
> * I added 'pango' to the inputs, because the Emacs NEWS mentioned that
> Pango was used for font rendering when "--with-cairo" is used.
> However, it may be that "pango" finds its way into the build inputs
> without being explicitly mentioned.
>
> * Morgan removed 'libxft' from the inputs of 'emacs', whereas I didn't.
> This was an oversight on my part. However, if we remove it, it's
> possible that we might need to add it back to 'emacs-no-x-toolkit'.
> The references that I see to Pango in the Emacs code are within
> "#ifdef HAVE_GTK3".
>
> * In 'emacs-no-x', my patch removes the new graphical library inputs
> (cairo, pango, and harfbuzz) and the "--with-cairo" flag, whereas
> Morgan's patch leaves "cairo" and "harfbuzz" as inputs, and overwrites
> the inherited configure-flags to be precisely ("--with-jpeg=no"
> "--with-gif=no" "--with-tiff=no"), apparently discarding the inherited
> "--with-modules" and "--disable-build-details" flags.
>
> * Morgan made 'emacs-wide-int' into a deprecated package, whereas I
> thought that it might still be useful. My rationale was this: from a
> brief skim, it looks like '--with-wide-int' might make *immediate*
> integers wider, which for some applications might perform much better
> than the heap-allocated arbitrary-size integers supported by Emacs 27.
> However, I didn't look carefully at this.
>
> * I updated "emacs-exec-path.patch" and removed
> "emacs27-exec-path.patch", whereas Morgan's patch keeps both files and
> possibly leaves "emacs-exec-path.patch" orphaned.
>
> * I updated the patches to apply cleanly to Emacs 27, although this was
> not strictly needed.
>
> * I updated 'notmuch' in the previous commit to a version that builds
> successfully with Emacs 27.
>
> Pierre Neidhardt <mail <at> ambrevar.xyz> wrote:
>> I confirm that with Mark's commit
>> emacs-clojure-mode and emacs-elisp-refs are also broken.
>
> Sorry about that. If the Emacs 27 update breaks important packages, it
> might be that reverting it is the proper action. If the maintainers
> decide to do this, I would not object.
>
> Best regards,
> Mark
>
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Sat, 29 Aug 2020 17:20:02 GMT)
Full text and
rfc822 format available.
Message #65 received at 42738 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Mark H Weaver <mhw <at> netris.org> writes:
[...]
> Pierre Neidhardt <mail <at> ambrevar.xyz> wrote:
>> I confirm that with Mark's commit
>> emacs-clojure-mode
I've filed bug#43090 with a trivial patch for emacs-clojure-mode, no
need to revert Emacs 27.1 for this bug IMHO.
> and emacs-elisp-refs are also broken.
is there a specific bug report for this plz?
there is also bug#43093 for emacs-ess
can we coordinate our efforts in order to avoid to revert emacs 27.1 by
tagging relevant [1] open emacs packages bugs as critical? [2]
[...]
Thanks! Gio'
[1] can we define "relevant" as: all bugs that breaks a previously
compiling emacs package?
[2]
https://issues.guix.gnu.org/search?query=subject%3Aemacs+is%3Aopen+severity%3Acritical
--
Giovanni Biscuolo
Xelera IT Infrastructures
[signature.asc (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Sat, 29 Aug 2020 20:38:02 GMT)
Full text and
rfc822 format available.
Message #68 received at 42738 <at> debbugs.gnu.org (full text, mbox):
Hi Morgan,
Morgan Smith <Morgan.J.Smith <at> outlook.com> wrote:
> It seems I am taking some credit for Jack Hill's patch. I simply took
> Jack's patch (labeled as patch v3 in the debbugs thread) and attempted
> to build it with my personal config.
Indeed, I see that now. Sorry for the mistake. I suppose it happened
because it was presented to me as "the patch Morgan submitted", but it
would have been better if I had taken the time to read the bug report
more carefully.
Also, I regret if my comments on the preliminary patch made anyone feel
badly. To be clear, there's no shame in submitting an unfinished patch
for review. On the contrary, it is a *very* useful contribution. In
this case, it makes sense to start by updating the main 'emacs' package,
and to worry about the other variants later. There's no fault in that.
The only fault here lies with me. I should have looked more carefully
for prior work, and I probably also pushed it prematurely.
> (Also just my 2 cents, we should have upgraded emacs-next to 27.1 and
> only upgraded emacs a week later. Emacs deserves more care than most
> packages due to its dependence on so many other packages. Not trying to
> shame anyone, just something to think of for next time.)
Agreed, or perhaps 'emacs' itself should have been updated on a separate
branch. In the past, when this was a smaller community and there were
far fewer emacs packages in Guix, I did major updates of Emacs a few
times without causing any obvious problems, but that was a different
time. It's also possible that Emacs 27 was a more disruptive update
than usual.
Thanks very much for your comments and contributions.
Best regards,
Mark
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Sun, 30 Aug 2020 01:51:02 GMT)
Full text and
rfc822 format available.
Message #71 received at 42738 <at> debbugs.gnu.org (full text, mbox):
Mark H Weaver <mhw <at> netris.org> writes:
> Agreed, or perhaps 'emacs' itself should have been updated on a separate
> branch.
+1 for WIP-emacs branch in future.
Brett Gilio
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Fri, 04 Sep 2020 09:04:01 GMT)
Full text and
rfc822 format available.
Message #74 received at 42738 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
emacs-helpful still seems to be broken on master.
Any idea?
I'll try to fix it later today.
--
Pierre Neidhardt
https://ambrevar.xyz/
[signature.asc (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Fri, 04 Sep 2020 09:17:01 GMT)
Full text and
rfc822 format available.
Message #77 received at 42738 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Looks like an upstream issue:
https://github.com/Wilfred/helpful/issues/248
--
Pierre Neidhardt
https://ambrevar.xyz/
[signature.asc (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Fri, 04 Sep 2020 10:21:01 GMT)
Full text and
rfc822 format available.
Message #80 received at 42738 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Hi Pierre,
thank you for working on this!
Pierre Neidhardt <mail <at> ambrevar.xyz> writes:
> Looks like an upstream issue:
>
> https://github.com/Wilfred/helpful/issues/248
This thread is getting hard to follow, should we open a specific bug on
bug-guix?
WDYT?
--
Giovanni Biscuolo
Xelera IT Infrastructures
[signature.asc (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#42738; Package
guix-patches.
(Mon, 07 Sep 2020 09:45:01 GMT)
Full text and
rfc822 format available.
Message #83 received at 42738 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Done in 43254 <at> debbugs.gnu.org.
--
Pierre Neidhardt
https://ambrevar.xyz/
[signature.asc (application/pgp-signature, inline)]
Added tag(s) fixed.
Request was from
Ludovic Courtès <ludo <at> gnu.org>
to
control <at> debbugs.gnu.org.
(Sat, 19 Sep 2020 12:20:01 GMT)
Full text and
rfc822 format available.
bug closed, send any further explanations to
42738 <at> debbugs.gnu.org and Jack Hill <jackhill <at> jackhill.us>
Request was from
Ludovic Courtès <ludo <at> gnu.org>
to
control <at> debbugs.gnu.org.
(Sat, 19 Sep 2020 12:20:01 GMT)
Full text and
rfc822 format available.
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Sun, 18 Oct 2020 11:24:07 GMT)
Full text and
rfc822 format available.
This bug report was last modified 3 years and 181 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.