buildRustCrate: Search for matching Cargo.toml in sub directories #82155
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
* Make errors include the crate name and make them much more prominent. * Move more code into lib.sh * Already source generated logging code and lib.sh in configure
…sub directories This is what cargo does for git repositories. See related issues: * nix-community/crate2nix#53 * nix-community/crate2nix#33
|
@GrahamcOfBorg build buildRustCrateTests |
|
https://logs.nix.ci/?attempt_id=cc2ccc7c-25d3-4115-b4bf-8f068cff8650&key=nixos%2Fnixpkgs.82155 |
|
I think that if I do that, darwin will not rebuild but I'll try ;) @GrahamcOfBorg build buildRustCrateTests |
|
@GrahamcOfBorg build carnix cargo-download |
|
The build failure of The tests also look fine and pass (on at least linux). Thank you for adding this! 👍 |
kolloch
added a commit
to nix-community/crate2nix
that referenced
this pull request
Mar 11, 2020
Cargo does this for git repositories as well: rust-lang/cargo#1462 (comment) This will fix #33, #53 -- integration tests pending. It depends on a nixpkgs buildRustCrate feature PR: NixOS/nixpkgs#82155
kolloch
added a commit
to nix-community/crate2nix
that referenced
this pull request
Mar 12, 2020
Cargo does this for git repositories as well: rust-lang/cargo#1462 (comment) This will fix #33, #53 -- integration tests pending. It depends on a nixpkgs buildRustCrate feature PR: NixOS/nixpkgs#82155
kolloch
added a commit
to nix-community/crate2nix
that referenced
this pull request
Mar 12, 2020
Cargo does this for git repositories as well: rust-lang/cargo#1462 (comment) This will fix #33, #53 -- integration tests pending. It depends on a nixpkgs buildRustCrate feature PR: NixOS/nixpkgs#82155
3 tasks
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.
Motivation for this change
When
cargobuilds a git dependency, it will search for a matchingCargo.tomlin any sub directory.buildRustCrateassumes the top-level directory by default which results in the following build failures:nix-community/crate2nix#33
nix-community/crate2nix#53
In theory,
workspace_membercould be set to the appropriate sub directory upfront but allowingworkspace_member = nullto trigger a search is much mroe convenient. This PR will NOT change the default behavior because the currentbuildRustCratedoes not depend on anyCargo.tomlbeing present and we'd like to preserve that.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)