emacs-macport: 29.4 -> 30.2 by kfiz · Pull Request #440245 · NixOS/nixpkgs

kfiz · 2025-09-04T20:09:56Z

For background and discussion see #393512. New PR since author hasn't responded on that PR for a while.
@jian-lin @AndersonTorres @amadaluzia @jasonjckn @emilazy

Things done

Add a 👍 reaction to pull requests you find important.

jian-lin · 2025-09-05T01:11:05Z

Convert it to draft since CI fails due to conflicts

jian-lin

Maybe we should add a release note entry due to breaking changes between 29 and 30.

Note for emacs-macport users:

Please consider becoming its maintainers. It has no maintainers currently.
Please review or/and test this PR.
Do you think it is a good idea to move to this fork?

kfiz · 2025-09-05T06:03:30Z

Maybe we should add a release note entry due to breaking changes between 29 and 30.

Added some context in sources.nix.

jian-lin · 2025-09-05T06:26:49Z

Maybe we should add a release note entry due to breaking changes between 29 and 30.

Added some context in sources.nix.

Good!

However, I mean something like this which is also mentioned in the "Things done" section of PR template. BTW, it would be good to tick more boxes in the PR description.

Guides about fixing CI failures can be found in CONTRIBUTING.md.

emilazy

Since this is based on @juuyokka's work, it needs to include Co-authored-by: lactose <[email protected]> in the commit trailers.

Non-blocking:

Is the stdbool.h change still required? Our Darwin toolchain is more normal there days so I'd hope that it wouldn't be, but I don't have full context.

I would recommend signing up to maintain the package if switching to a fork since it doesn't seem to get much attention at present.

pkgs/applications/editors/emacs/sources.nix

doc/release-notes/rl-2511.section.md

pkgs/applications/editors/emacs/sources.nix

emilazy · 2025-09-06T14:25:06Z

Looks good in general to me, by the way. Thanks for taking up maintenance of this.

panchoh · 2025-09-08T19:29:43Z

I see by your new commit that upstream has provided a tag, yay!

emilazy

LGTM, but I’ll leave it to Emacs maintainers to merge.

By the way, the email address on your commits doesn’t seem to be linked to your GitHub account.

kfiz · 2025-09-08T19:41:33Z

`nixpkgs-review` result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 440245
Commit: 11bff82cb11c32623242d6430f256e28f80a309f

`aarch64-darwin`

✅ 2 packages built:

emacs-macport (emacs30-macport)
nixpkgs-manual

kfiz · 2025-09-08T19:52:22Z

LGTM, but I’ll leave it to Emacs maintainers to merge.

By the way, the email address on your commits doesn’t seem to be linked to your GitHub account.

Thx. Fixed that.

kfiz · 2025-09-09T00:00:34Z

@jian-lin What do you think? Are we good to go?

jian-lin

LGTM. Could you fix merge conflicts?

doc/release-notes/rl-2511.section.md

Co-authored-by: lactose <[email protected]> Co-authored-by: Lin Jian <[email protected]> Co-authored-by: pancho horrillo <[email protected]>

jian-lin · 2025-09-11T13:11:18Z

I resolved the merge conflicts. BTW, to avoid merge conflicts, consider adding your item at an arbitrary place in the list instead.

In addition, fixup commits like Update doc/release-notes/rl-2511.section.md are not allowed.

nixpkgs/CONTRIBUTING.md

Lines 110 to 115 in 1ccab0f

    
              - To change existing commits, [rewrite the Git history](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History). 
        
                Useful Git commands for this are `git commit --patch --amend` and `git rebase --interactive`. 
        
                With a rewritten history you need to force-push the commits: 
        
                ``` 
        
                git push --force-with-lease 
        
                ```

Follow-up to #440245

kfiz changed the title ~~emacs-macport: 29.4 -> 30.1~~ emacs-macport: 29.4 -> 30.2 Sep 4, 2025

nix-owners bot requested review from AndersonTorres, adisbladis, jian-lin, matthewbauer, panchoh and ttuegel September 4, 2025 20:17

jian-lin marked this pull request as draft September 5, 2025 01:11

kfiz force-pushed the emacs-macport-30.1 branch from 6378ab0 to 629c238 Compare September 5, 2025 04:15

nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 5, 2025

jian-lin marked this pull request as ready for review September 5, 2025 04:42

jian-lin reviewed Sep 5, 2025

View reviewed changes

jian-lin mentioned this pull request Sep 5, 2025

emacs-macport: 29.4 -> 30.1 #393512

Closed

13 tasks

kfiz force-pushed the emacs-macport-30.1 branch 2 times, most recently from 79c5e44 to c501681 Compare September 5, 2025 06:02

emilazy previously requested changes Sep 5, 2025

View reviewed changes

kfiz force-pushed the emacs-macport-30.1 branch from c501681 to f18f6af Compare September 6, 2025 01:51

nixpkgs-ci bot added the 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` label Sep 6, 2025

kfiz force-pushed the emacs-macport-30.1 branch from 822209b to e2bfd44 Compare September 6, 2025 02:17

nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 8.has: changelog This PR adds or changes release notes and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Sep 6, 2025

emilazy reviewed Sep 6, 2025

View reviewed changes

pkgs/applications/editors/emacs/sources.nix Outdated Show resolved Hide resolved

doc/release-notes/rl-2511.section.md Outdated Show resolved Hide resolved

pkgs/applications/editors/emacs/sources.nix Outdated Show resolved Hide resolved

kfiz force-pushed the emacs-macport-30.1 branch from 7895ef8 to b5556d2 Compare September 6, 2025 16:30

kfiz mentioned this pull request Sep 7, 2025

Add new tag for v30.2? jdtsmith/emacs-mac#90

Closed

kfiz force-pushed the emacs-macport-30.1 branch from b5556d2 to 11bff82 Compare September 8, 2025 19:01

emilazy approved these changes Sep 8, 2025

View reviewed changes

nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Sep 8, 2025

amadaluzia approved these changes Sep 9, 2025

View reviewed changes

nixpkgs-ci bot added 12.approvals: 3+ This PR was reviewed and approved by three or more persons. 2.status: merge conflict This PR has merge conflicts with the target branch and removed 12.approvals: 2 This PR was reviewed and approved by two persons. labels Sep 9, 2025

jian-lin approved these changes Sep 10, 2025

View reviewed changes

doc/release-notes/rl-2511.section.md Outdated Show resolved Hide resolved

panchoh reviewed Sep 11, 2025

View reviewed changes

doc/release-notes/rl-2511.section.md Outdated Show resolved Hide resolved

kfiz and others added 2 commits September 11, 2025 21:00

maintainers: add kfiz

a392bb3

emacs-macport: 29.4 -> 30.2

0919966

Co-authored-by: lactose <[email protected]> Co-authored-by: Lin Jian <[email protected]> Co-authored-by: pancho horrillo <[email protected]>

jian-lin force-pushed the emacs-macport-30.1 branch from 93c3bb5 to 0919966 Compare September 11, 2025 13:07

nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 11, 2025

jian-lin added this pull request to the merge queue Sep 11, 2025

Merged via the queue into NixOS:master with commit 4ce764f Sep 11, 2025
29 of 31 checks passed

lunik1 mentioned this pull request Oct 3, 2025

emacs: make gc mark trace buffer configurable, disable by default #448201

Merged

13 tasks

Sigmanificient mentioned this pull request Oct 4, 2025

Update Request: emacs-macport 29.4 → 30.1 #392960

Closed

3 tasks

acid-bong mentioned this pull request Jan 15, 2026

emacs-macport: make homepage point to the same repo as src #480429

Merged

13 tasks

github-merge-queue bot pushed a commit that referenced this pull request Jan 16, 2026

emacs-macport: make homepage point to the same repo as src

06a433e

Follow-up to #440245

Uh oh!

Conversation

kfiz commented Sep 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Things done

Uh oh!

jian-lin commented Sep 5, 2025

Uh oh!

jian-lin left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kfiz commented Sep 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jian-lin commented Sep 5, 2025

Uh oh!

emilazy left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

emilazy commented Sep 6, 2025

Uh oh!

panchoh commented Sep 8, 2025

Uh oh!

emilazy left a comment

Choose a reason for hiding this comment

Uh oh!

kfiz commented Sep 8, 2025

nixpkgs-review result

aarch64-darwin

Uh oh!

kfiz commented Sep 8, 2025

Uh oh!

kfiz commented Sep 9, 2025

Uh oh!

jian-lin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jian-lin commented Sep 11, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

kfiz commented Sep 4, 2025 •

edited

Loading

jian-lin left a comment •

edited

Loading

kfiz commented Sep 5, 2025 •

edited

Loading

`nixpkgs-review` result

`aarch64-darwin`