You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This file contains hidden or 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
This fixes a problem that comes up when referencing a dependency via git where the dependency is in a workspace, and the workspace manifest lists members using wildcards / file globs. An example is ndc-sdk-rs whose Cargo.toml defines a virtual workspace like this:
[workspace]
resolver = "2"members = ["crates/*"]
When using crate2nix in IFD mode referencing dependencies in this workspace fails because tools.nix expects workspace members to be given as exact paths, without wildcards. You get an error of this form:
No such file or directory, crates/*
This PR adds a function to produce a list of exact paths given a path that might contain wildcards, and a directory to search in. It modifies the logic that looks up crates in a workspace in a git dependency to use the new function.
I included a number of unit tests to try to verify the functionality of glob expansion. I think an integration test would be a good idea, but that requires a dependency that can be referenced via git. The best example I know of is ndc-sdk-rs which I mentioned above. It's non-trivial so I was hesitant to add the necessary build time to the test suite in crate2nix.
I just opened a PR that I think has a simpler solution for this that also solves another problem that I describe in that PR: #394
Oh yes, I see how avoiding implementing file path wildcards in Nix is simpler! I notice that #394 ignores the workspace.members property of the workspace manifest, and instead gathers all Cargo.toml files in the source tree. My first thought was that might cause problems with projects with example or test crates that aren't intended to be distributed. But then I saw this comment which seems to indicate that maybe #394 is a better match to Cargo's behavior than either this PR, or the preexisting behavior: rust-lang/cargo#1462 (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.
This fixes a problem that comes up when referencing a dependency via git where the dependency is in a workspace, and the workspace manifest lists members using wildcards / file globs. An example is ndc-sdk-rs whose
Cargo.tomldefines a virtual workspace like this:When using crate2nix in IFD mode referencing dependencies in this workspace fails because
tools.nixexpects workspace members to be given as exact paths, without wildcards. You get an error of this form:This PR adds a function to produce a list of exact paths given a path that might contain wildcards, and a directory to search in. It modifies the logic that looks up crates in a workspace in a git dependency to use the new function.
I included a number of unit tests to try to verify the functionality of glob expansion. I think an integration test would be a good idea, but that requires a dependency that can be referenced via git. The best example I know of is ndc-sdk-rs which I mentioned above. It's non-trivial so I was hesitant to add the necessary build time to the test suite in crate2nix.