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.

Sign up for GitHub

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

Jump to bottom

Add additionalCrateHashes to generatedCargoNix #283

Merged
merged 7 commits into from
Mar 14, 2023
Merged

Add additionalCrateHashes to generatedCargoNix #283

merged 7 commits into from
Mar 14, 2023

Commits on Mar 14, 2023

  1. Add additionalCrateHashes to vendor support 

    This makes it easy to use a `crate-hashes.json` that is outside any
source tree.
    @Ericson2314
    Ericson2314 committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    7cdeb2e View commit details
    Browse the repository at this point in the history

  2. For now, hack in additionalCrateHashes in both places 

    Should be cleaned up before merging.
    @Ericson2314
    Ericson2314 committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    17acc9a View commit details
    Browse the repository at this point in the history

  3. Apply formatter

    @Ericson2314
    Ericson2314 committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    b28039f View commit details
    Browse the repository at this point in the history

  4. Pull out logic to gathering crate-hashes.json

    @cidkidnix @Ericson2314
    cidkidnix authored and Ericson2314 committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    3b35aaf View commit details
    Browse the repository at this point in the history

  5. Refactor tools.nix: 

    Split out hashes from vendorSupport and make them their own function
Hashes are now computed separately from vendorSupport
extraHashes gets replaced with extendedHashes.
    @cidkidnix
    cidkidnix committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    6573a9d View commit details
    Browse the repository at this point in the history

  6. Further simplify tools.nix 

    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
    Ericson2314 committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    95048de View commit details
    Browse the repository at this point in the history

  7. Slight manual reformat

    @Ericson2314
    Ericson2314 committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    535e256 View commit details
    Browse the repository at this point in the history