Add additionalCrateHashes to generatedCargoNix
#283
Merged
+58
−54
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
This makes it easy to use a `crate-hashes.json` that is outside any source tree.
Should be cleaned up before merging.
Split out hashes from vendorSupport and make them their own function Hashes are now computed separately from vendorSupport extraHashes gets replaced with extendedHashes.
We now always write back the extended hashes to the vendor dir. To account for the `crate-hashes.json` that might already be there, we make its contents the default value for `additionalCrateHashes.
Ericson2314
changed the title
additionalCrateHashes to vendor supportadditionalCrateHashes to generatedCargoNix
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.
This makes it easy to use a
crate-hashes.jsonthat is outside any source tree. By default it is thecrate-hashes.jsonat the root of the source tree. Additional such files next to anyCargo.lockwill also be used unconditionally.Behind the scenes, the vendor support was already reworked to separate more opinionated gathering lockfiles and
crate-hashes.jsonfrom the basiccrate2nix-agnostic work of creating the vendor dir. This cleans up the code, and makes supporting the new feature easier too.Finally, let me note one thing as future work. In NixOS/nixpkgs#217084 I learned from @winterqt that Nixpkgs now has a
importCargoLock. It would be very nice to drop the vendoring logic fromtools.nixand use that instead, now that thecrate2nix-specific bits have been pulled out as described above.