diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-06-21 22:32:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-21 22:32:49 +0200 |
| commit | a2b52669731c08a6c48d35bb62e3208ee4b0148a (patch) | |
| tree | 9060237201da96c70947cfef78bbc3f795b54920 /pkgs/build-support | |
| parent | fb94da4e9ed6f6f2840a7d4cde0eda07ca599032 (diff) | |
| parent | 3f7663c1d7cb0721ba5156364fc1d5c93674de15 (diff) | |
Merge pull request #321095 from mmlb/rust-write-config.toml-not-config
rust: Write config.toml not config
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/rust/fetch-cargo-tarball/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/rust/hooks/cargo-setup-hook.sh | 6 | ||||
| -rw-r--r-- | pkgs/build-support/rust/import-cargo-lock.nix | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix index adbfe98d81039..075e78a14e1ed 100644 --- a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix +++ b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation ({ ${cargoUpdateHook} - # Override the `http.cainfo` option usually specified in `.cargo/config`. + # Override the `http.cainfo` option usually specified in `.cargo/config.toml`. export CARGO_HTTP_CAINFO=${cacert}/etc/ssl/certs/ca-bundle.crt if grep '^source = "git' Cargo.lock; then @@ -96,7 +96,7 @@ 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; runHook postBuild ''; diff --git a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh index 693c0b08759ea..ccb2e565d05ca 100644 --- a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh @@ -22,7 +22,7 @@ cargoSetupPostUnpackHook() { mkdir .cargo fi - config="$cargoDepsCopy/.cargo/config"; + config="$cargoDepsCopy/.cargo/config.toml"; if [[ ! -e $config ]]; then config=@defaultConfig@ fi; @@ -30,9 +30,9 @@ cargoSetupPostUnpackHook() { tmp_config=$(mktemp) substitute $config $tmp_config \ --subst-var-by vendor "$cargoDepsCopy" - cat ${tmp_config} >> .cargo/config + cat ${tmp_config} >> .cargo/config.toml - cat >> .cargo/config <<'EOF' + cat >> .cargo/config.toml <<'EOF' @cargoConfig@ EOF diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix index e3fe57ef06daa..0a365ddecba9b 100644 --- a/pkgs/build-support/rust/import-cargo-lock.nix +++ b/pkgs/build-support/rust/import-cargo-lock.nix @@ -226,7 +226,7 @@ let else "cp $lockFileContentsPath $out/Cargo.lock" } - cat > $out/.cargo/config <<EOF + cat > $out/.cargo/config.toml <<EOF [source.crates-io] replace-with = "vendored-sources" @@ -237,7 +237,7 @@ EOF declare -A keysSeen for registry in ${toString (builtins.attrNames extraRegistries)}; do - cat >> $out/.cargo/config <<EOF + cat >> $out/.cargo/config.toml <<EOF [source."$registry"] registry = "$registry" @@ -253,7 +253,7 @@ EOF key=$(sed 's/\[source\."\(.*\)"\]/\1/; t; d' < "$crate/.cargo-config") if [[ -z ''${keysSeen[$key]} ]]; then keysSeen[$key]=1 - cat "$crate/.cargo-config" >> $out/.cargo/config + cat "$crate/.cargo-config" >> $out/.cargo/config.toml fi fi done |