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

update-melpa: try to fix some compatiblility issues on cl-lib and url-retrive. #277455

Merged
merged 2 commits into from
Feb 10, 2024

Conversation

Vonfry
Copy link
Member

@Vonfry Vonfry commented Dec 29, 2023

Description of changes

Tested

cd nixpkgs/pkgs/applications/editors/emacs/elisp-packages
nix-shell -I nixpkgs=/nix/store/<my-flake-nixpkgs> updater-emacs.nix
emacs -Q update-melpa.el

M-x eval-buffer
M-: (run-update)

And the running result can be checked here

This commit try to fix it by some compatibility issues with the emacs update.

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.

@github-actions github-actions bot added the 6.topic: emacs Text editor label Dec 29, 2023
@Vonfry Vonfry changed the title [WIP] melpa: fix update scripts on working emacs 29 [WIP] melpa: fix update scripts on emacs 29 Dec 29, 2023
@Vonfry Vonfry closed this Dec 29, 2023
@Vonfry Vonfry reopened this Dec 29, 2023
@Vonfry Vonfry marked this pull request as ready for review December 29, 2023 04:00
@Vonfry Vonfry requested a review from adisbladis as a code owner December 29, 2023 04:00
@Vonfry Vonfry changed the title [WIP] melpa: fix update scripts on emacs 29 melpa: fix update scripts on emacs 29 Dec 29, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Dec 29, 2023
Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reword the commit as update-melpa: use cl-lib instead of cl

@Vonfry Vonfry changed the title melpa: fix update scripts on emacs 29 update-melpa: fix compatiblility issue on emacs 29 Dec 31, 2023
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3183

@jian-lin jian-lin self-requested a review January 1, 2024 04:05
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 1, 2024
Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides LGTM

@Vonfry Vonfry requested a review from AndersonTorres January 1, 2024 12:27
@delroth delroth removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 1, 2024
@Vonfry Vonfry requested a review from lafrenierejm January 3, 2024 00:56
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 3, 2024
This improves compatiblity of parsing http header.
@Vonfry Vonfry changed the title update-melpa: fix compatiblility issue on emacs 29 update-melpa: try to fix some compatiblility issues on cl-lib and url-retrive. Jan 3, 2024
@delroth delroth removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 3, 2024
Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Waiting for mergers

@delroth delroth added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Jan 7, 2024
@pbsds pbsds merged commit 3c5b9e6 into NixOS:master Feb 10, 2024
21 checks passed
Copy link
Contributor

@AndersonTorres
Copy link
Member

@jian-lin
Copy link
Contributor

The file changed by this PR is only used in the update script and does not cause any rebuild. So it is fine to to merge it into the master branch.

@AndersonTorres
Copy link
Member

This update script is employed to generate artifacts that should be merged on staging, not on master.

On then other hand, no one is insane enough to generate artifacts directly on staging anyway.

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: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12.approvals: 2 This PR was reviewed and approved by two reputable people
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants