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: 0d7376bd8a79
Choose a base ref
...
head repository: NixOS/nix
compare: 4d77513d9777
Choose a head ref
  • 15 commits
  • 9 files changed
  • 3 contributors

Commits on Jul 24, 2020

  1. queryDerivationOutputMap no longer assumes all outputs have a mapping 

    This assumption is broken by CA derivations. Making a PR now to do the
breaking daemon change as soon as possible (if it is already too late,
we can bump protocol intead).
    @Ericson2314
    Ericson2314 committed Jul 24, 2020
    Copy the full SHA
    2c75574 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2020

  1. Merge branch 'master' of github.com:NixOS/nix into drv-outputs-map-al… 

    …low-missing
    @meditans
    meditans committed Jul 31, 2020
    Copy the full SHA
    b6d97fd View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2020

  1. Merge remote-tracking branch 'upstream/master' into drv-outputs-map-a… 

    …llow-missing
    @Ericson2314
    Ericson2314 committed Aug 4, 2020
    Copy the full SHA
    fbeb869 View commit details
    Browse the repository at this point in the history

  2. Remove unused functions

    @Ericson2314
    Ericson2314 committed Aug 4, 2020
    Copy the full SHA
    45b6fdb View commit details
    Browse the repository at this point in the history

  3. Organize and format code a bit

    @Ericson2314
    Ericson2314 committed Aug 4, 2020
    Copy the full SHA
    1dfcbeb View commit details
    Browse the repository at this point in the history

  4. Get rid of some unneeded temporaries

    @Ericson2314
    Ericson2314 committed Aug 4, 2020
    Copy the full SHA
    16c98bf View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2020

  1. Merge remote-tracking branch 'upstream/master' into drv-outputs-map-a… 

    …llow-missing
    @Ericson2314
    Ericson2314 committed Aug 5, 2020
    Copy the full SHA
    cf93905 View commit details
    Browse the repository at this point in the history

  2. Proxy -> Phantom to match Rust 

    Sorry, Haskell.
    @Ericson2314
    Ericson2314 committed Aug 5, 2020
    Copy the full SHA
    ed96e60 View commit details
    Browse the repository at this point in the history

  3. WIP: Put the worker protocol read and write in a namespace to dis… 

    …ambig
    @Ericson2314
    Ericson2314 committed Aug 5, 2020
    Copy the full SHA
    6c66331 View commit details
    Browse the repository at this point in the history

  4. Solve template deduction problem 

    We had to predeclare our template functions
    @meditans
    meditans committed Aug 5, 2020
    Copy the full SHA
    0739d42 View commit details
    Browse the repository at this point in the history

  5. Simplify the namespace

    @meditans
    meditans committed Aug 5, 2020
    Copy the full SHA
    8b175f5 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2020

  1. Specialize std::optional<StorePath> so this is backwards compatible 

    While I am cautious to break parametricity, I think it's OK in this
cases---we're not about to try to do some crazy polymorphic protocol
anytime soon.
    @Ericson2314
    Ericson2314 committed Aug 7, 2020
    Copy the full SHA
    47644e4 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into drv-outputs-map-a… 

    …llow-missing
    @Ericson2314
    Ericson2314 committed Aug 7, 2020
    Copy the full SHA
    f7ba16f View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2020

  1. Rename drv output querying functions 

     - `queryDerivationOutputMapAssumeTotal` -> `queryPartialDerivationOutputMap`
 - `queryDerivationOutputMapAssumeTotal` -> `queryDerivationOutputMap`
    @Ericson2314
    Ericson2314 committed Aug 20, 2020
    Copy the full SHA
    9a9d834 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3859 from obsidiansystems/drv-outputs-map-allow-m… 

    …issing

`queryDerivationOutputMap` no longer assumes all outputs have a mapping
    @edolstra
    edolstra committed Aug 20, 2020
    Copy the full SHA
    4d77513 View commit details
    Browse the repository at this point in the history