emacs: update to 29.1#247357
emacs: update to 29.1#247357Atemu merged 5 commits intoNixOS:masterfrom atorres1985-contrib:emacs-update
Conversation
|
@deejayem can you (or any Mac user) test this? |
deejayem
left a comment
There was a problem hiding this comment.
Built and tested on x86_64-darwin
|
Oh, sorry, I tested before the refactoring. With the new version I get this: |
|
Never mind I copy/pasted the wrong PR. Same error as above. |
|
Now we can try again! |
|
@ofborg build emacs-macport |
|
@FlorianFranzen can you please copy-paste the failure on notmuch? |
|
aarch64-darwin GNU Emacs 29.1 (build 1, aarch64-apple-darwin22.5.0, NS appkit-2299.60 Version 13.4.1 (c) (Build 22F770820d)) |
|
Result of 28 packages marked as broken and skipped:
9 packages failed to build:
5858 packages built:
|
|
Can someone explain why the doc generation is failing? In order to dispel this, I will remove the updates on docs. EDIT! Given the issue linked in the message below, I'll wait. |
|
Well, I think the work here is now finished. |
Atemu
left a comment
There was a problem hiding this comment.
In order to keep commit history somewhat clear, please:
- Squash b0241500a50561dfc8c7167673765582c6307f3e
- Change the commit message of b8957297c6706f53eda11a287297a0ca2d89cefc to something more in line with contributing.md (i.e.
rl-2311: mention emacs-29 update) - Drop the commit updating the default and its revert
|
That being said, I will squash everything and unsquash later:
|
Also, move emacsMacport to aliases.nix.
Co-authored-by: Atemu <[email protected]> Co-authored-by: adisbladis <[email protected]> Co-authored-by: asymmetric <[email protected]>
|
Suggestion for the future: keep three major versions of Emacs in a queue fashion (oldest goes away, newest comes in) |
|
This is the status quo. In due time, someone will rip out emacs28. That's at least a few months off though. I wouldn't be opposed to keeping old versions around until they actually become a maintenance burden though. |
|
Let me suggest adding the Thanks for the bump! |
|
Ah, maybe a cherry-pick is better, since this PR touches the release notes of the next release, which not sure would be applicable to the previous release. |
|
Backport failed for Please cherry-pick the changes locally. git fetch origin release-23.05
git worktree add -d .worktree/backport-247357-to-release-23.05 origin/release-23.05
cd .worktree/backport-247357-to-release-23.05
git checkout -b backport-247357-to-release-23.05
ancref=$(git merge-base 7f65b7ca663050e6ec6612b465547a3fc35c6824 46865e7ab83e93a676dfd52bec3c4c591968ee09)
git cherry-pick -x $ancref..46865e7ab83e93a676dfd52bec3c4c591968ee09 |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
|
Remember myself to backport this, because of #249867 |
|
FYI, #270558 |
Description of changes
Trying to catch #246203
Things done
sandbox = trueset 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/)