Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
base: f3fd5cc066fd^
Choose a base ref
...
head repository: NixOS/nix
compare: fe5f5f8014c5
Choose a head ref
  • 8 commits
  • 15 files changed
  • 1 contributor

Commits on Jan 26, 2021

  1. Make the build-hook work with ca derivations 

    - Pass it the name of the outputs rather than their output paths (as
  these don't exist for ca derivations)
- Get the built output paths from the remote builder
- Register the new received realisations
    @thufschmitt
    thufschmitt committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    f3fd5cc View commit details
    Browse the repository at this point in the history

  2. LocalStore: Send back the new realisations 

    To allow it to build ca derivations remotely
    @thufschmitt
    thufschmitt committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    48d9aad View commit details
    Browse the repository at this point in the history

  3. LegacySSHStore: Send back the new realisations 

    To allow it to build ca derivations remotely
    @thufschmitt
    thufschmitt committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    19a65f2 View commit details
    Browse the repository at this point in the history

  4. RemoteStore: Send back the new realisations 

    To allow it to build ca derivations remotely
    @thufschmitt
    thufschmitt committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    c09f01a View commit details
    Browse the repository at this point in the history

  5. Also send ca outputs to the build hook 

    Otherwise they don't get registered, triggering an assertion failure
at some point later
    @thufschmitt
    thufschmitt committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    b2e2ce8 View commit details
    Browse the repository at this point in the history

  6. build-remote: Always register the missing outputs 

    It's possible that all the paths are already there, but just not
associated to the current drv output
    @thufschmitt
    thufschmitt committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    05e139a View commit details
    Browse the repository at this point in the history

  7. Properly bypass the registering step when all outputs are present 

    There was already some logic for that, but it didn't handle the case of
content-addressed outputs, so extend it a bit for that
    @thufschmitt
    thufschmitt committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    cc89d72 View commit details
    Browse the repository at this point in the history

  8. Test the remote building of ca derivations

    @thufschmitt
    thufschmitt committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    fe5f5f8 View commit details
    Browse the repository at this point in the history