Skip to content

emacs: default to 30#386348

Merged
jian-lin merged 3 commits intoNixOS:masterfrom
linj-fork:pr/emacs-default-to-30
Mar 3, 2025
Merged

emacs: default to 30#386348
jian-lin merged 3 commits intoNixOS:masterfrom
linj-fork:pr/emacs-default-to-30

Conversation

@jian-lin
Copy link
Contributor

@jian-lin jian-lin commented Mar 2, 2025

#386174 (comment)

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@jian-lin jian-lin added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Mar 2, 2025
@github-actions github-actions bot added the 6.topic: emacs Text editor label Mar 2, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Mar 2, 2025
@nix-owners nix-owners bot requested review from jwiegley and lovek323 March 2, 2025 10:43
@jian-lin jian-lin force-pushed the pr/emacs-default-to-30 branch from 5ed5d8a to 42f11f1 Compare March 2, 2025 10:47
@github-actions github-actions bot removed the 6.topic: emacs Text editor label Mar 2, 2025
@jian-lin jian-lin added 6.topic: emacs Text editor and removed 1.severity: security Issues which raise a security issue, or PRs that fix one labels Mar 2, 2025
@github-actions github-actions bot removed the 6.topic: emacs Text editor label Mar 2, 2025
@jian-lin jian-lin added the 6.topic: emacs Text editor label Mar 2, 2025
jian-lin added 3 commits March 3, 2025 01:57
Emacs 30 fixes two CVEs.  With this patch, bumping default Emacs
version can go to master instead of staging.
@jian-lin
Copy link
Contributor Author

jian-lin commented Mar 3, 2025

Test succeeds on my machine: nix build -Lv --include nixpkgs=$PWD --file . emacs.tests.emacs-daemon.

@jian-lin jian-lin merged commit 2075894 into NixOS:master Mar 3, 2025
28 of 29 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Mar 3, 2025

Successfully created backport PR for release-24.11:

@jian-lin jian-lin deleted the pr/emacs-default-to-30 branch March 3, 2025 05:20
@K900
Copy link
Contributor

K900 commented Mar 3, 2025

xdp-tools is broken now.

@panchoh
Copy link
Contributor

panchoh commented Mar 3, 2025

xdp-tools is broken now.

Fixed on #386619 (thanks, K900).
Summary: xdp-tools uses emacs in its build process to generate documentation from an org file, but it failed to recognize Emacs 30 as a valid version.

@jian-lin
Copy link
Contributor Author

jian-lin commented Mar 4, 2025

I just ran two nixpkgs-review against 24.11 and unstable branches. There are no new build failures except xdp-tools and notmuch.

jian-lin added a commit to linj-fork/nixpkgs that referenced this pull request Mar 12, 2025
These build jobs were removed from hydra to speed up the security
bump[1] of Emacs 30.

[1]: NixOS#386348
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: emacs Text editor 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants