Various fetchcargo improvements #74863
Merged
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
Most stdenv wrappers already work like this -- it allows greater customisation. We just have to be careful to remove arguments we're using that shouldn't be passed to stdenv. I've been conservative here, because fetchcargo checksums shouldn't change lightly.
If a custom unpackPhase is used for the package, it needs to also be used for fetchcargo so the same source is available for vendoring.
Mic92
reviewed
Dec 3, 2019
|
Could you provide an example, how do you use this feature? |
|
Can you provide an usecase example, how you would use this?
Sure.
Here I use a custom unpackPhase for a Rust program that is very fussy
about where it is on disk in relation to its dependencies. Without the
changes in this PR, doing this isn't possible because fetchcargo doesn't
know about the custom unpackPhase.
https://spectrum-os.org/git/nixpkgs/tree/pkgs/os-specific/linux/chromium-os/crosvm/default.nix
We have an open PR to add that package to Nixpkgs (#52353), and as you
can see it has to do something much more complicated, using several
intermediary src derivations, to work around this limitation of
fetchcargo.
|
7c6f434c
reviewed
Dec 15, 2019
| inherit cargo; | ||
| }; | ||
| buildRustPackage = callPackage ../../../build-support/rust { | ||
| inherit rustc cargo fetchcargo; |
There was a problem hiding this comment.
How this passed fetchcargo get used?
There was a problem hiding this comment.
Not sure I understand? It’s used here:
There was a problem hiding this comment.
Oh my bad, I looked at the changes, that you add fetchcargo argument but do not add any uses of it. Now I see that the point is to pass the local version referencing correct cargo.
10 tasks
7c6f434c
approved these changes
Dec 17, 2019
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
Most stdenv wrappers already forward unused arguments -- it allows greater customisation. We just have to be careful to remove arguments we're using that shouldn't be passed to stdenv. I've been conservative here, because fetchcargo checksums shouldn't change lightly.
If a custom unpackPhase is used for the package, it needs to also be used for fetchcargo so the same source is available for vendoring.
I exposed
fetchcargoasrustPlatform.fetchcargo, because it might be useful to provide from another derivation.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @