Skip to content

emacs: replace fetchFromSavannah with mirror#437637

Merged
jian-lin merged 2 commits intoNixOS:masterfrom
linj-fork:pr/emacs-replace-fetchFromSavannah-with-mirror
Aug 27, 2025
Merged

emacs: replace fetchFromSavannah with mirror#437637
jian-lin merged 2 commits intoNixOS:masterfrom
linj-fork:pr/emacs-replace-fetchFromSavannah-with-mirror

Conversation

@jian-lin
Copy link
Contributor

@jian-lin jian-lin commented Aug 27, 2025 •
edited
Loading

Revert and re-apply a019344 with
fixes and minor improvements.

Refs: #427024 #435964
Co-authored-by: Lin Jian [email protected]

  • I need to do some tests

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

jian-lin and others added 2 commits August 28, 2025 03:10
@jian-lin
Revert "emacs: replace fetchFromSavannah with mirror; adjust build"
69bda6c 
This reverts commit a019344.

This commit needs some fixes.  Compared to adding fixes, I think it is
more clear and easier to read to revert it first and re-apply this
commit together with fixes as a whole.
@jian-lin
emacs: replace fetchFromSavannah with mirror
4a2ad81 
This commit re-apply a019344 with
fixes and minor improvements.

Refs: NixOS#427024 NixOS#435964
Co-authored-by: Lin Jian <[email protected]>
@jian-lin jian-lin mentioned this pull request Aug 27, 2025
Merged
13 tasks
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 6.topic: emacs Text editor labels Aug 27, 2025
panchoh
panchoh approved these changes Aug 27, 2025
View reviewed changes
Copy link
Contributor

@panchoh panchoh left a comment

Choose a reason for hiding this comment

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

👍

@jian-lin jian-lin merged commit fd68b14 into NixOS:master Aug 27, 2025
30 of 34 checks passed
@jian-lin jian-lin deleted the pr/emacs-replace-fetchFromSavannah-with-mirror branch August 27, 2025 20:53
philiptaron
philiptaron reviewed Aug 27, 2025
View reviewed changes
Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

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

LGTM. That was a fast merge 😜

jian-lin
jian-lin commented Aug 27, 2025
View reviewed changes
Copy link
Contributor Author

@jian-lin jian-lin left a comment •
edited
Loading

Choose a reason for hiding this comment

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

That was a fast merge 😜

I aim for a quick fix so that fewer users will be affected. So I (ab)used my Emacs maintainer privilege and merged this as soon as a fellow Emacs maintainer approved given that I am confident with this change.

@philiptaron
Copy link
Contributor

philiptaron commented Aug 27, 2025

I love fast merges. Thank you for your prompt attention. It makes Nixpkgs better!

@dschrempf dschrempf mentioned this pull request Aug 28, 2025
Closed
@panchoh
Copy link
Contributor

panchoh commented Aug 28, 2025

Note nix-community/emacs-overlay#509 (comment)
Thanks, @dschrempf, for linking the issue!

@emilazy
Copy link
Member

emilazy commented Sep 2, 2025

This broke emacs-macport.

@emilazy
Copy link
Member

emilazy commented Sep 2, 2025

Is it intentional that srcRepo now defaults to false rather than true? That is what broke the build.

FWIW, I am unconvinced that avoiding the autoreconfHook/texinfo dependencies is worth the complexity here. autoreconfHook is generally nice, as it avoids relying on outdated blobs from tarballs.

@emilazy emilazy mentioned this pull request Sep 2, 2025
Merged
13 tasks
@emilazy
Copy link
Member

emilazy commented Sep 2, 2025

Incorporated a fix into #435148.

@jian-lin
Copy link
Contributor Author

jian-lin commented Sep 3, 2025

Is it intentional that srcRepo now defaults to false rather than true?

Yes. The default value reflects the need of emacs, emacs-nox, emacs-gtk3 and emacs-pgtk in Nixpkgs.

FWIW, I am unconvinced that avoiding the autoreconfHook/texinfo dependencies is worth the complexity here. autoreconfHook is generally nice, as it avoids relying on outdated blobs from tarballs.

I think srcRepo exists because we closely follow upstream installation instructions for release tarballs and source repo.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@philiptaron philiptaron philiptaron left review comments

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@AndersonTorres AndersonTorres Awaiting requested review from AndersonTorres

@ttuegel ttuegel Awaiting requested review from ttuegel

@adisbladis adisbladis Awaiting requested review from adisbladis

@jwiegley jwiegley Awaiting requested review from jwiegley

@lovek323 lovek323 Awaiting requested review from lovek323

+1 more reviewer

@panchoh panchoh panchoh approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jian-lin @philiptaron @panchoh @emilazy