[v2] rust: Write to .cargo/config.toml instead of .cargo/config#331167
Conversation
|
This time I've verified that no cargoHash changes to FOD happens (note, this was from when I based on master, waiting on building-most-of-the-world now that I rebased on staging): |
c935d4b to
f2da47c
Compare
|
This should be the proper fix to close #320294 |
|
And same steps to verify no change to cargoHash now off of staging: |
|
I'm not sure if this will just time out or not, but let's see. @ofborg build fd |
|
@winterqt looks like it succeeded (FOD being FOD, its not much a signal though... right?). Any other worries? Also ping ping @zowoq @figsoda @Mic92 @mbalatsko |
There was a problem hiding this comment.
Non‐blocking nit: If we’re changing this hook anyway we could get rid of this unnecessary ;.
|
This is an improvement over the status quo either way, but: this doesn’t adjust the |
|
Would we want to symlink Closes #334857 |
|
From discussion on Matrix I think we decided that we don’t need to support 5+ year old compilers in Nixpkgs. |
Fair enough. And if there would be a package that could absolutely not be built on a newer rust, they could create the symlink in their derivation anyways. |
Honestly I'm not sure why its not warning any more even without the mv or ln, as you suggest. I suspect it has to do with difference between $CARGO_HOME/config vs $CARGO_HOME/config.toml and where fetchCargoTarball writes the config to $name/.cargo/config. Looks like cargo is not warning about the latter case. I have a hunch that will change one day and then I'm not sure what we can do w/o causing the FOD hashes to be wrong. |
4d384b1 to
5b36343
Compare
Seeing the following new warnings pop up on stderr when cargo was bumped to 1.78: ``` warning: `/build/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` ``` which happens to break commitmsgfmt builds in nix (NixOS#320294). closes NixOS#320294
|
Rebased on latest staging to handle the conflict, looks like I'm rebuilding the world ... |
5b36343 to
17b3df2
Compare
|
commitmsgfmt FOD hash checks out as no changes after rebase. |
emilazy
left a comment
There was a problem hiding this comment.
I think let’s land this and worry about if the path in fetchCargoTarball affects anything another time. Thanks!
Description of changes
Changes the rust infra to write cargo config to .cargo/config.toml insted of .cargo/config since the latter is deprecated (since 1.38?) and is now warning on stderr.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.
Changes since v1: