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

emacs: update emacs2nix and elpa-devel packages #237756

Merged
merged 2 commits into from
Jun 15, 2023

Conversation

leungbk
Copy link
Member

@leungbk leungbk commented Jun 14, 2023


Description of changes

This PR updates emacs2nix to a revision that is capable of handling versions that have non-numeric characters. Now packages like org are available from elpa-devel.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

@leungbk leungbk requested a review from adisbladis as a code owner June 14, 2023 13:02
@leungbk leungbk changed the title emacs: update elpa-devel packages emacs: update emacs2nix and elpa-devel packages Jun 14, 2023
@AndersonTorres
Copy link
Member

Please anyone fix this shell-command-plus duplication!

@leungbk
Copy link
Member Author

leungbk commented Jun 14, 2023

Please anyone fix this shell-command-plus duplication!

Sorry, I removed it.

Has this duplication occurred before? I would not have expected the change I made to emacs2nix (nix-community/emacs2nix@e5389c3) to result in this kind of thing. I will see if I can fix it at the Haskell level.

@leungbk
Copy link
Member Author

leungbk commented Jun 14, 2023

OK, I have tried running update-elpa-devel with the old version of emacs2nix on Nixpkgs master, and I still observe the duplication, but only when I don't delete elpa-devel-generated.nix beforehand...wtf?

I guess it should be safe to merge this PR since the update-overlay script deletes the previous elpa-devel-generated.nix.

@AndersonTorres
Copy link
Member

Has this duplication occurred before? I would not have expected the change I made to emacs2nix (nix-community/emacs2nix@e5389c3) to result in this kind of thing. I will see if I can fix it at the Haskell level.

Yes, this is a very old bug.

#119586

nix-community/emacs2nix#60

d678d2e#comments

@AndersonTorres AndersonTorres merged commit 3cda91a into NixOS:master Jun 15, 2023
21 checks passed
@github-actions
Copy link
Contributor

Successfully created backport PR for release-23.05:

@leungbk leungbk deleted the elisp-update branch June 15, 2023 01:13
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.

None yet

2 participants