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: 7a3f3e23df63^
Choose a base ref
...
head repository: NixOS/nix
compare: 18f601242c9c
Choose a head ref
  • 14 commits
  • 17 files changed
  • 1 contributor

Commits on May 19, 2021

  1. Always send the realisations as JSON 

    Align all the worker protocol with `buildDerivation` which inlines the
realisations as one opaque json blob.
That way we don’t have to bother changing the remote store protocol
when the definition of `Realisation` changes, as long as we keep the
json backwards-compatible
    @thufschmitt
    thufschmitt committed May 19, 2021
    Copy the full SHA
    2197bc2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ca/json-realisations-in-worker-protocol'

    @thufschmitt
    thufschmitt committed May 19, 2021
    Copy the full SHA
    2c80760 View commit details
    Browse the repository at this point in the history

  3. Add a dependencies field to DrvOutputInfo 

    Currently never used, nor set but will be useful shortly
    @thufschmitt
    thufschmitt committed May 19, 2021
    Copy the full SHA
    9b1c35c View commit details
    Browse the repository at this point in the history

  4. Store the realisation deps on the local store

    @thufschmitt
    thufschmitt committed May 19, 2021
    Copy the full SHA
    dbcf085 View commit details
    Browse the repository at this point in the history

  5. Add a method to compute the closure of a realisation 

    Only considers the closure in term of `Realisation`, ignores all the
opaque inputs.

Dunno whether that’s the nicest solution, need to think it through a bit
    @thufschmitt
    thufschmitt committed May 19, 2021
    Copy the full SHA
    e0de25d View commit details
    Browse the repository at this point in the history

  6. Properly track the drvoutput references when building

    @thufschmitt
    thufschmitt committed May 19, 2021
    Copy the full SHA
    b4e5c4d View commit details
    Browse the repository at this point in the history

  7. Make copyPaths copy the whole realisations closure 

    Otherwise registering the realisations on the remote side might fail as
it now expects a complete closure
    @thufschmitt
    thufschmitt committed May 19, 2021
    Copy the full SHA
    f7b1777 View commit details
    Browse the repository at this point in the history

  8. Add a db migration script

    @thufschmitt
    thufschmitt committed May 19, 2021
    Copy the full SHA
    b10e3bc View commit details
    Browse the repository at this point in the history

  9. Merge branch 'ca/track-drvoutput-dependencies-2-le-retour' into ca/re… 

    …cursively-substitute-realisations
    @thufschmitt
    thufschmitt committed May 19, 2021
    Copy the full SHA
    24b2a7e View commit details
    Browse the repository at this point in the history

  10. Recursively substitute the realisations 

    Make sure that whenever we substitute a realisation, we also substitute
its entire closure
    @thufschmitt
    thufschmitt committed May 19, 2021
    Copy the full SHA
    dba2946 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'ca/recursively-substitute-realisations'

    @thufschmitt
    thufschmitt committed May 19, 2021
    Copy the full SHA
    7a3f3e2 View commit details
    Browse the repository at this point in the history

  12. Add a test for the “two glibc” issue

    @thufschmitt
    thufschmitt committed May 19, 2021
    Copy the full SHA
    edef4f0 View commit details
    Browse the repository at this point in the history

  13. Properly fail when trying to register a duplicate realisation

    @thufschmitt
    thufschmitt committed May 19, 2021
    Copy the full SHA
    5a943dd View commit details
    Browse the repository at this point in the history

  14. Gracefully ignore a substituter if it holds an incompatible realisation

    @thufschmitt
    thufschmitt committed May 19, 2021
    Copy the full SHA
    18f6012 View commit details
    Browse the repository at this point in the history