Skip to content
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

buildRustPackage: do validateCargoDeps after patchPhase #81065

Closed
wants to merge 1 commit into from

Conversation

B4dM4n
Copy link
Contributor

@B4dM4n B4dM4n commented Feb 25, 2020

Motivation for this change

This is an attempt to fix some issues that got mentioned in #79975 with the new fetchCargoTarball fetcher.

The primary issue seems to be that validateCargoDeps is checked during postUnpack when cargoPatches is not applied yet and builds that have to modify Cargo.lock will therefore fail the check.

Things done

I tested the cargo, rls and clippy builds which use the cargoVendorDir flag, rink and git-dit (update wip) which use cargoPatches to create the Cargo.lock and other crates like cargo-web or parinfer-rust which use the upstream Cargo.lock.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@B4dM4n
Copy link
Contributor Author

B4dM4n commented Feb 25, 2020

Just found #80262 😒

I guess this will fix the issue and which renders this PR redundant. Will check tomorrow.

@bhipple
Copy link
Contributor

bhipple commented Feb 25, 2020

Indeed, #80262 is all we need to fix all the remaining (known) issues. I'd really like it if it got merged; sorry for your lost time @B4dM4n :(

@B4dM4n B4dM4n closed this Feb 26, 2020
@B4dM4n B4dM4n deleted the rust-cargo-lock-validate branch February 26, 2020 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants