emacs: 27.2 -> 28.1 #168076

azahi · 2022-04-10T00:21:36Z

Description of changes

https://github.com/emacs-mirror/emacs/blob/emacs-28.1/etc/NEWS
https://lists.gnu.org/archive/html/emacs-devel/2022-04/msg00093.html

Things done

azahi · 2022-04-10T00:28:11Z

I took a liberty enabling nativecomp by default and deleting (possibly) an unused patch file.

I did not build and test all of the 44 packages that depend on the emacs package. I also didn't manage to make emacs-daemon test to succeed: it errors out with something like this

vm-test-run-emacs-daemon> (finished: waiting for success: systemctl --user status emacs.service | grep 'Active: active', in 3.30 seconds)
vm-test-run-emacs-daemon> machine: must succeed: emacsclient --create-frame $EDITOR >&2 &
vm-test-run-emacs-daemon> (finished: must succeed: emacsclient --create-frame $EDITOR >&2 &, in 0.02 seconds)
vm-test-run-emacs-daemon> machine: waiting for emacseditor to appear on screen
vm-test-run-emacs-daemon> machine: sending monitor command: screendump /build/tmp9p0v4guu/ppm
vm-test-run-emacs-daemon> machine: waiting for monitor prompt
vm-test-run-emacs-daemon> (finished: waiting for monitor prompt, in 0.00 seconds)
vm-test-run-emacs-daemon> (finished: sending monitor command: screendump /build/tmp9p0v4guu/ppm, in 0.00 seconds)
vm-test-run-emacs-daemon> machine # Waiting for Emacs...
vm-test-run-emacs-daemon> machine # *ERROR*: Unknown terminal type

and then just cycles infinitely. Executing the binary and doing some trivial tasks works just fine.

Any help would be appreciated.

wahjava · 2022-04-11T03:41:53Z

Thanks for working on the update.

I took a liberty enabling nativecomp by default and deleting (possibly) an unused patch file.

IMHO, nativecomp should not be enabled by default. It takes a long time to build itself, and then it uses 100% CPU (in its default configuration) when you install any new packages for native compilation. I've used it for sometime, and other than increasing the temperature of the CPU, I didn't feel much difference in the performance, and so I ended up reverting back to without nativecomp.

siraben · 2022-04-11T04:18:33Z

nativecomp can be disabled by setting no-native-compile or no-byte-compile to non-nil.

I think that creating another definition for Emacs with native compilation (similar to emacs-overlay) would be a good idea, leaving native compilation disabled for the emacs derivation.

azahi · 2022-04-11T08:06:31Z

I think that creating another definition for Emacs with native compilation (similar to emacs-overlay) would be a good idea, leaving native compilation disabled for the emacs derivation.

That sounds reasonable. I will make changes later today.

azahi · 2022-04-11T14:47:25Z

@wahjava @siraben I've added an additional derivation and called it emacs28NativeComp.

jwiegley · 2022-04-11T15:53:08Z

I'll give this a try today.

azahi · 2022-04-11T21:22:38Z

@azahi When I try to build this on macOS Big Sur, I get: install: cannot stat 'org.elc': No such file or directory

Unfortunately, I have no way of testing and debugging the build on MacOS. I don't think that I can help you with that.

jwiegley · 2022-04-11T23:39:41Z

@azahi I figured out the problem. Everything seems to be looking good on my side, I'll switch to using this version for the next few days and will let you know if I run into any problems. Thank you for the work!

wahjava · 2022-04-12T04:00:00Z

I switched to emacs28, and everything seems to work okay.

Thank you!

wineee · 2022-04-12T17:02:03Z

Can we add the emacsPgtk derivation， which support Wayland natively, (like emacs-overlay)

azahi · 2022-04-12T17:41:45Z

Can we add the emacsPgtk branch， which support Wayland natively, (like emacs-overlay)

This is probably goes out of scope of this PR given that pGTK was not released as part of 28.1. You can check out the release notes[1], there is no mention of pGTK support there. It is promised to be included in the 29.1 version IIRC. [1] https://github.com/emacs-mirror/emacs/blob/emacs-28/etc/NEWS

axelf4 · 2022-04-13T13:56:38Z

I also didn't manage to make emacs-daemon test to succeed: it errors out with something like this
[...]
vm-test-run-emacs-daemon> machine # Waiting for Emacs...
vm-test-run-emacs-daemon> machine # *ERROR*: Unknown terminal type
and then just cycles infinitely.

I took a look at this, and from what I gather explicitly setting the display frame parameter makes make-frame not try to make sense of the dumb TTY type when no GUI frames exist yet. That is, this patch makes the test succeed:

diff --git a/nixos/tests/emacs-daemon.nix b/nixos/tests/emacs-daemon.nix
index d53031a67f6..310e93e19b0 100644
--- a/nixos/tests/emacs-daemon.nix
+++ b/nixos/tests/emacs-daemon.nix
@@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
       )
 
       # connects to the daemon
-      machine.succeed("emacsclient --create-frame $EDITOR >&2 &")
+      machine.succeed("emacsclient --no-wait --frame-parameters='((display . \"'\"$DISPLAY\"'\"))' --create-frame $EDITOR >&2")
 
       # checks that Emacs shows the edited filename
       machine.wait_for_text("emacseditor")

I have to say, I do not fully understand what actually caused the test to start failing, but it is safe to say that it is an upstream issue based on the workaround.

jwiegley · 2022-04-13T17:10:10Z

All has been working well for me.

azahi · 2022-04-13T21:10:48Z

@axelf4 Thanks. I've pushed an additional commit with your patch. The test is working fine now.

pkgs/top-level/all-packages.nix

adisbladis · 2022-04-14T01:55:23Z

I'm actually wondering if there is much point in not enabling native compilation outright?
It has quite significant speedups and hasn't broken all that much in a very long time for us in the emacs overlay.

siraben · 2022-04-14T04:49:51Z

@adisbladis probably concerns about increased CPU usage since it compiles everything and can drain the battery on laptop devices.

axelf4 · 2022-04-14T08:41:22Z

probably concerns about increased CPU usage since it compiles everything and can drain the battery on laptop devices.

Would not those users be better off disabling just-in-time native compilation in their init files, while still benefiting from the packaged Emacs distribution being ahead-of-time compiled?

azahi · 2022-04-14T12:47:04Z

I went on Repology and looked up how other distributions package 28.1:

Additional nativecomp package:
- Arch Linux
- Parabola
nativecomp not enabled:
- Alpine Linux
- Solus
- Gentoo (USE flag is disabled by default)
- FreeBSD (Look for NATIVECOMP=off)

I'm still a bit uncertain over that if we should enable it by default or not. I think having a separate package could be the safest bet for the time being.

adisbladis · 2022-04-16T04:43:37Z

Would not those users be better off disabling just-in-time native compilation in their init files, while still benefiting from the packaged Emacs distribution being ahead-of-time compiled?

@axelf4 I think that's what we'll eventually end up doing, but for now the additional attribute is fine and risk-free.
We could revisit this soon after the 22.05 branch-off or in a follow-up PR and quickly relegate the emacsNativeComp attribute to an alias.

axelf4 figured[1] out a workaround for fixing a failure due to an unset $DISPLAY variable. [1] NixOS#168076 (comment)

In upstream nixpkgs PR NixOS/nixpkgs#168076 native compilation support was introduced to the nixpkgs attribute. This is a better naming more in line with upstream, so we should also adopt it. I have aliased emacsGcc to emacsNativeComp for backwards compatibility with a trace notice informing users about the change. Additionally we will now default to the upstream native comp derivation if it exists.

jian-lin · 2022-06-07T18:49:38Z

A follow-up PR #176780 to enable native-comp by default.

Reviews are welcome.

azahi requested a review from adisbladis as a code owner April 10, 2022 00:21

github-actions bot added the 6.topic: emacs label Apr 10, 2022

azahi force-pushed the emacs-28.1 branch from 50cb22a to 6dd5c95 Compare April 10, 2022 00:22

azahi force-pushed the emacs-28.1 branch from 6dd5c95 to c2291ee Compare April 10, 2022 00:36

ofborg bot added 8.has: clean-up 8.has: package (new) labels Apr 10, 2022

ofborg bot requested review from jwiegley and lovek323 April 10, 2022 00:52

ofborg bot added 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Apr 10, 2022

azahi force-pushed the emacs-28.1 branch from c2291ee to bcd1545 Compare April 11, 2022 14:38

jwiegley approved these changes Apr 13, 2022

View reviewed changes

github-actions bot added the 6.topic: nixos label Apr 13, 2022

ofborg bot requested a review from jwiegley April 13, 2022 21:48

adisbladis reviewed Apr 14, 2022

View reviewed changes

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved

azahi force-pushed the emacs-28.1 branch from 4726d0c to 8b8b4d3 Compare April 14, 2022 12:57

azahi requested a review from adisbladis April 14, 2022 13:06

adisbladis force-pushed the emacs-28.1 branch from 8b8b4d3 to 3f6dd01 Compare April 16, 2022 04:40

azahi added 2 commits April 16, 2022 16:53

emacs: 27.2 -> 28.1

55f57fa

tests/emacs-daemon: fix failure for unset $DISPLAY

67565c3

axelf4 figured[1] out a workaround for fixing a failure due to an unset $DISPLAY variable. [1] NixOS#168076 (comment)

adisbladis force-pushed the emacs-28.1 branch from 3f6dd01 to 67565c3 Compare April 16, 2022 04:53

adisbladis mentioned this pull request Apr 16, 2022

Change the emacsGcc attribute to emacsNativeComp nix-community/emacs-overlay#220

Merged

adisbladis approved these changes Apr 16, 2022

View reviewed changes

ofborg bot requested a review from adisbladis April 16, 2022 05:08

adisbladis merged commit 4f0ec2c into NixOS:master Apr 16, 2022

azahi deleted the emacs-28.1 branch April 16, 2022 12:07

adisbladis mentioned this pull request Apr 20, 2022

22.05 Feature Freeze #167025

Closed

jian-lin mentioned this pull request Apr 26, 2022

emacsNativeComp: nearly half native-compiled eln files for builtin libs are missing #170426

Closed

jian-lin mentioned this pull request Aug 17, 2022

emacs: enable native-comp #176780

Merged

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

emacs: 27.2 -> 28.1 #168076

emacs: 27.2 -> 28.1 #168076

azahi commented Apr 10, 2022

azahi commented Apr 10, 2022

wahjava commented Apr 11, 2022

siraben commented Apr 11, 2022

azahi commented Apr 11, 2022 via email

azahi commented Apr 11, 2022

jwiegley commented Apr 11, 2022

azahi commented Apr 11, 2022 via email

jwiegley commented Apr 11, 2022

wahjava commented Apr 12, 2022

wineee commented Apr 12, 2022 •

edited

Loading

azahi commented Apr 12, 2022 via email

axelf4 commented Apr 13, 2022

jwiegley commented Apr 13, 2022

azahi commented Apr 13, 2022

adisbladis commented Apr 14, 2022 •

edited

Loading

siraben commented Apr 14, 2022

axelf4 commented Apr 14, 2022

azahi commented Apr 14, 2022

adisbladis commented Apr 16, 2022 •

edited

Loading

jian-lin commented Jun 7, 2022

emacs: 27.2 -> 28.1 #168076

emacs: 27.2 -> 28.1 #168076

Conversation

azahi commented Apr 10, 2022

Description of changes

Things done

azahi commented Apr 10, 2022

wahjava commented Apr 11, 2022

siraben commented Apr 11, 2022

azahi commented Apr 11, 2022 via email

azahi commented Apr 11, 2022

jwiegley commented Apr 11, 2022

azahi commented Apr 11, 2022 via email

jwiegley commented Apr 11, 2022

wahjava commented Apr 12, 2022

wineee commented Apr 12, 2022 • edited Loading

azahi commented Apr 12, 2022 via email

axelf4 commented Apr 13, 2022

jwiegley commented Apr 13, 2022

azahi commented Apr 13, 2022

adisbladis commented Apr 14, 2022 • edited Loading

siraben commented Apr 14, 2022

axelf4 commented Apr 14, 2022

azahi commented Apr 14, 2022

adisbladis commented Apr 16, 2022 • edited Loading

jian-lin commented Jun 7, 2022

wineee commented Apr 12, 2022 •

edited

Loading

adisbladis commented Apr 14, 2022 •

edited

Loading

adisbladis commented Apr 16, 2022 •

edited

Loading