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

libunistring: use gnu libiconv on darwin #364495

Open
wants to merge 3 commits into
base: staging
Choose a base branch
from

Conversation

paparodeo
Copy link
Contributor

@paparodeo paparodeo commented Dec 12, 2024

libunistring doesn't appear to be used in the stdenv build and thus if it is modified will result in 59k rebuilds. Removing from stdenv reduces rebuilds if libunistring is modified to 37k (tho this PR will still incur 58k rebuilds). of the 37k rebuilds most are due to libpsl / libidn2 and to a lesser amount gnutls and guile.

https://lists.gnu.org/archive/html/bug-gnulib/2024-05/msg00375.html macoOS libiconv 14 & 15 do not work with libunistring and a configure test added in 1.3 rejects even building with it so use gnu libiconv on darwin

reverts 76cca7e as it is now unnecessary

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Dec 12, 2024
@nix-owners nix-owners bot requested review from emilazy, reckenrode and toonn December 12, 2024 07:13
@github-actions github-actions bot added 10.rebuild-darwin: 5001+ 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Dec 12, 2024
@paparodeo paparodeo marked this pull request as draft December 12, 2024 07:20
@paparodeo paparodeo force-pushed the libunistring-darwinfix branch 2 times, most recently from 551f986 to 3b2095d Compare December 12, 2024 08:40
@paparodeo paparodeo changed the base branch from master to staging-next December 12, 2024 08:41
@paparodeo paparodeo force-pushed the libunistring-darwinfix branch from 3b2095d to 750b095 Compare December 12, 2024 09:29
@paparodeo paparodeo changed the title [WIP] libunistring: use gnu libiconv on darwin libunistring: use gnu libiconv on darwin Dec 12, 2024
@paparodeo paparodeo marked this pull request as ready for review December 12, 2024 09:42
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-darwin: 501+ labels Dec 12, 2024
@paparodeo paparodeo marked this pull request as draft December 13, 2024 08:36
libunistring doesn't appear to be used in the stdenv build and thus if
it is modified will result in 59k rebuilds. Removing from stdenv reduces
rebuilds if libunistring is modified to 37k.
https://lists.gnu.org/archive/html/bug-gnulib/2024-05/msg00375.html
macoOS libiconv 14 & 15 do not work with libunistring and a configure
test added in 1.3 rejects even building with it so use gnu libiconv on
darwin
This reverts commit 76cca7e.

workaround is unneeded with commit
0182edc
@paparodeo paparodeo changed the base branch from staging-next to staging December 13, 2024 23:41
@paparodeo paparodeo force-pushed the libunistring-darwinfix branch from 750b095 to 5587af1 Compare December 13, 2024 23:42
@paparodeo paparodeo marked this pull request as ready for review December 13, 2024 23:42
@paparodeo paparodeo mentioned this pull request Dec 14, 2024
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: stdenv Standard environment 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant