-
-
Notifications
You must be signed in to change notification settings - Fork 14.5k
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
rustc: propagate libiconv on darwin #190093
Conversation
Rust binaries are unconditionally linked to libiconv on Darwin (see rust-lang/libc#2870). We already add it as a dependency in `buildRustPackage`, so let's go a step further and propagate it.
@ofborg eval |
Why do you think retriggering eval will fix it, @zowoq? Nothing Boost-related (which is why it was failing previously) was merged into staging since the failed eval. I think it'll just fail again, unless I'm missing something. |
Sometimes it is an eval/build failure, sometimes it just chokes .. can usually guess by looking at other recent staging PRs. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Guess we don't really have a choice here.
Are you planning to remove the unnecessary libiconv
from packages after this PR is in master?
Yes, shouldn't be too many (since most packages use Might be better to just do it in this PR? Do you suggest not doing so only because we can get feedback from OfBorg, or...? |
Quick grep looks like 100 or so?
Not doing it as part of this PR would mean we avoid any conflicts while it going though staging/staging-next. |
What do you mean by avoid? We can always just watch the staging-next eval... maybe the argument can be made that it would be more annoying, but it's not that bad. |
Avoiding git conflicts in the master->staging-next->staging merges if someone modifies the same file(s) on master. |
I've done treewide changes in staging before, and have never ran into any conflicts. (I have no clue how the merge action would even handle that, if at all, tbh.) On second thought, the treewide change I'm thinking about had to be done in staging, while this doesn't have to be. So I'm comparing apples and oranges I guess. To be clear, I was just trying to understand why doing it in master is better -- I now understand that you meant git conflicts. Happy to do it in a separate PR for that reason. |
FWIW any of the instances that can be removed (if any) could have been removed over a year ago. I'll look at it eventually and make a separate though; doubt it has to go through staging. |
While something like #122231 was a possibility I hadn't been to worried about doing any removals but now that it isn't going to happen may as well do a clean up. If I have some free time I may do it myself, if I'm going to start working on it I'll leave a comment here so we aren't duplicating work. |
Found this in the pending Rust 1.66 release notes interesting: I don't know if this impacts what we choose to do here. |
1.66 release is this week. |
Description of changes
Rust binaries are unconditionally linked to libiconv on Darwin (see rust-lang/libc#2870). We already add it as a dependency in
buildRustPackage
, so let's go a step further and propagate it.Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes