-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
emacs: 27.2 -> 28.1 #168076
emacs: 27.2 -> 28.1 #168076
Conversation
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
and then just cycles infinitely. Executing the binary and doing some trivial tasks works just fine. Any help would be appreciated. |
Thanks for working on the update.
IMHO, |
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 |
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.
|
I'll give this a try today. |
@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.
|
@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! |
I switched to Thank you! |
Can we add the |
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
|
I took a look at this, and from what I gather explicitly setting the 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. |
All has been working well for me. |
@axelf4 Thanks. I've pushed an additional commit with your patch. The test is working fine now. |
I'm actually wondering if there is much point in not enabling native compilation outright? |
@adisbladis 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? |
I went on Repology and looked up how other distributions package 28.1:
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. |
@axelf4 I think that's what we'll eventually end up doing, but for now the additional attribute is fine and risk-free. |
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.
A follow-up PR #176780 to enable native-comp by default. Reviews are welcome. |
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
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes