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: a85bbcc2f4b1
Choose a base ref
...
head repository: NixOS/nix
compare: e2d5e02f186f
Choose a head ref
  • 10 commits
  • 34 files changed
  • 3 contributors

Commits on Jan 26, 2021

  1. Move command plugin interface to libnixcmd

    @shlevy
    shlevy committed Jan 26, 2021
    Copy the full SHA
    6af6e41 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2021

  1. Merge pull request #4483 from shlevy/libcmd 

    Move command plugin interface to libnixcmd
    @edolstra
    edolstra committed Jan 27, 2021
    Copy the full SHA
    b8f345b View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 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 28, 2021
    Copy the full SHA
    c7041fe 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 28, 2021
    Copy the full SHA
    0ebe0b8 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 28, 2021
    Copy the full SHA
    ee8f112 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 28, 2021
    Copy the full SHA
    47b3af8 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 28, 2021
    Copy the full SHA
    a93a48e 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 28, 2021
    Copy the full SHA
    97f3cbb 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 28, 2021
    Copy the full SHA
    7e93391 View commit details
    Browse the repository at this point in the history

  8. Test the remote building of ca derivations

    @thufschmitt
    thufschmitt committed Jan 28, 2021
    Copy the full SHA
    e2d5e02 View commit details
    Browse the repository at this point in the history