pkgs/build-support/rust: fix warning "build/.cargo/config is deprecated"
#339281
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
VuiMuich
force-pushed
the
fix/cargo-config-deprecation
branch
from
370f917 to
f633cc4
Compare
emilazy
reviewed
Sep 3, 2024
Comment on lines
242
to
+244
| for registry in ${toString (builtins.attrNames extraRegistries)}; do | ||
| cat >> $out/.cargo/config <<EOF | ||
| cat >> $out/.cargo/config.toml <<EOF | ||
| ln -s .cargo/config.toml .cargo/config |
There was a problem hiding this comment.
I think this may fail if it is run multiple times. Can we do the ln in only one place instead?
| @@ -96,7 +96,8 @@ in stdenv.mkDerivation ({ | |||
|
|
|||
| # Packages with git dependencies generate non-default cargo configs, so | |||
| # always install it rather than trying to write a standard default template. | |||
| install -D $CARGO_CONFIG $name/.cargo/config; | |||
| install -D $CARGO_CONFIG $name/.cargo/config.toml; | |||
| @@ -22,19 +22,20 @@ cargoSetupPostUnpackHook() { | |||
| mkdir .cargo | |||
| fi | |||
|
|
|||
| config="$cargoDepsCopy/.cargo/config"; | |||
| config="$cargoDepsCopy/.cargo/config.toml"; | |||
There was a problem hiding this comment.
I think this ; is redundant too.
donovanglover
changed the title
build/.cargo/confgi is deprecated"build/.cargo/config is deprecated"
|
We need to make sure that this doesn’t invalidate the existing Cargo hashes in‐tree (i.e., that blanking out a hash still produces the same hash after this PR is applied). See #321095. |
|
This one would break the Cargo hashes, so I think we should close in favour of the earlier one. Thanks for taking a crack at this annoying problem anyway! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
With a recent
cargoversion update the deprecation warning (see below) became more vocal.To verify this works I built the
bkpackage, as it is very small and has very little deps.Edit: it creates the symlink to the old
/build/.cargo/confgiin case some packge enforces an oldcargoversion of1.38or oldercloses #334857
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.