Skip to content
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

melpa: use newer package-build.el to work around a breaking change in Emacs 30 #276401

Closed
wants to merge 2 commits into from

Conversation

leungbk
Copy link
Member

@leungbk leungbk commented Dec 24, 2023

package--prepare-dependencies has been renamed in a recent revision of
Emacs 30.


Description of changes

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

@leungbk
Copy link
Member Author

leungbk commented Dec 24, 2023

Are we still allowed to target master with Elisp updates, or do we now have to target staging?

@AndersonTorres
Copy link
Member

Use staging until we have a less worse idea.

(yes I am still disappointed on this...)

@leungbk leungbk marked this pull request as draft December 24, 2023 06:08
package--prepare-dependencies has been renamed in a recent revision of
Emacs 30.
@leungbk leungbk changed the base branch from master to staging December 24, 2023 06:16
@leungbk leungbk marked this pull request as ready for review December 24, 2023 06:17
@leungbk
Copy link
Member Author

leungbk commented Dec 24, 2023

@AndersonTorres OK, done.

@leungbk
Copy link
Member Author

leungbk commented Dec 24, 2023

I have pushed an additional commit to avoid using patches entirely and instead use the latest upstream package-build (which now has the appropriate workaround for Emacs 30).

There have been multiple incompatible changes in upstream package-build; I noticed that package-build--package will, unlike before, call package-build-checkout-function and package-build-cleanup-function. I set them both to ignore in order to preserve the semantics of what we had before (I assume Nix takes care of both fetching/checkout and cleanup).

I tested briefly by building Emacs 30 with some packages across a couple of revisions of the overlay (including an overlay commit, temporarily reverted only because it requires a change similar to what is in this PR, containing the upstream Emacs change that motivated this PR).

@leungbk leungbk changed the title melpa: Account for recent breaking change in Emacs 30 melpa: use newer package-build.el to work around a breaking change in Emacs 30 Dec 24, 2023
@leungbk leungbk requested a review from purcell December 28, 2023 03:04
@Vonfry
Copy link
Member

Vonfry commented Dec 28, 2023

conflict and duplicate with #276943?

@leungbk leungbk closed this Dec 28, 2023
@leungbk leungbk deleted the package-build branch December 28, 2023 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants