cargo: move cert info to fetch-cargo-tarball#210366
Conversation
|
Thanks for the PR, I've been meaning to follow up on rust/cacert. #206195 (comment) I think we might be able to remove diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index 69ee4f56b98..b057d1681b0 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -4,7 +4,6 @@
, rust
, stdenv
, callPackage
-, cacert
, cargoBuildHook
, cargoCheckHook
, cargoInstallHook
@@ -124,7 +123,6 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
inherit cargo cargo-auditable;
})
] ++ [
- cacert
cargoBuildHook
(if useNextest then cargoNextestHook else cargoCheckHook)
cargoInstallHook
|
There was a problem hiding this comment.
SSL_CERT_FILE is set by the cacert setupHook so probably don't need this.
| export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt |
|
not really familiar with certificates, changes lgtm aside from the things zowoq pointed out |
|
May as well make use of the new team. cc @nixos/rust I reverted the formatting changes and added the buildRustPackage diff in a separate commit. @linsui The email you're using for your commits doesn't seem to match with your github account so the authorship of the commits on github doesn't look correct. |
|
I didn't update my local git config. 🤷 |
|
@linsui Check your GitHub email settings to make sure |
|
It's not there. I updated it on github but not locally. 🤷 |
|
If I'm understanding your comment correctly: can you fix the commits to point to the right email, then? Thanks. |
|
Ah, if that's required I can fix it. |
|
Can you maybe include an overview/rationale in the first commit's description? A link to previous discussions would probably also be good to add :) LGTM otherwise, thanks for this! |
As proposed in NixOS#82496, we should only set the related env vars for the fetcher instead of breaking the function of cargo itself.
not needed here, set by fetchCargoTarball
Description of changes
Closes #82496
Closes #89526
As proposed in #82496 (review), we should only set the related env vars for the fetcher instead of breaking the function of cargo itself. We add env vers in nix-prefetch-git instead of breaking git. We add env vars in fetchurl instead of breaking curl. We should do the same for cargo.
Things done
sandbox = trueset 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.shto update generated release notes