Skip to content

html2text, wavpack, pinentry_mac, dosfstools: fix build with gettext 0.24.1+#419316

Closed
wegank wants to merge 5 commits intoNixOS:stagingfrom
wegank:html2text-fix
Closed

html2text, wavpack, pinentry_mac, dosfstools: fix build with gettext 0.24.1+#419316
wegank wants to merge 5 commits intoNixOS:stagingfrom
wegank:html2text-fix

Conversation

@wegank
Copy link
Member

@wegank wegank commented Jun 23, 2025

#405793 (comment)

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/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (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, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions 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. labels Jun 23, 2025
@nix-owners nix-owners bot requested a review from eikek June 23, 2025 16:32
@wegank wegank force-pushed the html2text-fix branch 2 times, most recently from 4eddcb1 to 61f3ab4 Compare June 24, 2025 22:04
@wegank wegank changed the title html2text: fix build with gettext 0.25 html2text, wavpack: fix build with gettext 0.25 Jun 24, 2025
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. and removed 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. labels Jun 24, 2025
@nix-owners nix-owners bot requested a review from codyopel June 24, 2025 22:11
@wegank
Copy link
Member Author

wegank commented Jun 24, 2025

@trofi, may I have your opinion on the hook added in this PR?

Copy link
Member

@eikek eikek left a comment

Choose a reason for hiding this comment

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

Thank you

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Jun 25, 2025
@wegank wegank changed the title html2text, wavpack: fix build with gettext 0.25 html2text, wavpack, pinentry_mac: fix build with gettext 0.25 Jun 25, 2025
@wegank wegank changed the title html2text, wavpack, pinentry_mac: fix build with gettext 0.25 html2text, wavpack, pinentry_mac: fix build with gettext 0.24.1+ Jun 25, 2025
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. and removed 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. labels Jun 25, 2025
Copy link
Member

@alyssais alyssais left a comment

Choose a reason for hiding this comment

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

Would it not be better to fix the configure.ac files for these packages? There aren't many of them.

@wegank
Copy link
Member Author

wegank commented Jun 25, 2025

I'd very much like to (and that's why I skipped libmtp and xdg-user-dirs which have upstream(ing) fixes, see #405793 (comment)).

But I still feel that such a hammer is necessary for now, as I'm not at all sure how many packages could be broken by the gettext bump (given that we've already identified six, and the staging-next iteration hasn't even begun)...

@wegank wegank changed the title html2text, wavpack, pinentry_mac: fix build with gettext 0.24.1+ html2text, wavpack, pinentry_mac, dosfstools: fix build with gettext 0.24.1+ Jun 26, 2025
@alyssais
Copy link
Member

But I still feel that such a hammer is necessary for now, as I'm not at all sure how many packages could be broken by the gettext bump (given that we've already identified six, and the staging-next iteration hasn't even begun)...

I really think we'll spend more time with this approach overall, once we take into account that we're going to be cleaning these up forever because it won't be obvious when they're no longer necessary, whereas with patches it's much more likely that things will get cleaned up as they become obsolete because the patch will no longer apply.

@wegank wegank marked this pull request as draft June 29, 2025 18:47
@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 29, 2025
@alyssais
Copy link
Member

alyssais commented Jul 2, 2025

Only one left here that hasn't been fixed properly is now pinentry_mac. Maybe somebody who uses macOS could have a look at that?

@wegank wegank closed this Jul 19, 2025
@wegank wegank deleted the html2text-fix branch July 19, 2025 03:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants