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: e915fd6d2afb
Choose a base ref
...
head repository: NixOS/nix
compare: eb75282b8dc8
Choose a head ref
  • 11 commits
  • 7 files changed
  • 3 contributors

Commits on Jun 17, 2020

  1. Merge remote-tracking branch 'upstream/master' into derivation-header… 

    …-include-order
    @Ericson2314
    Ericson2314 committed Jun 17, 2020
    Copy the full SHA
    21ef342 View commit details
    Browse the repository at this point in the history

  2. Don't need abstract struct Derivation in local-store

    @Ericson2314
    Ericson2314 committed Jun 17, 2020
    Copy the full SHA
    7130f0a View commit details
    Browse the repository at this point in the history

  3. Move some Store functions from derivations.cc to store-api.cc 

    This further continues with the dependency inverstion. Also I just went
ahead and exposed `parseDerivation`: it seems like the more proper
building block, and not a bad thing to expose if we are trying to be
less wedded to drv files on disk anywas.
    @Ericson2314
    Ericson2314 committed Jun 17, 2020
    Copy the full SHA
    18493fd View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2020

  1. Merge remote-tracking branch 'upstream/master' into derivation-header… 

    …-include-order
    @Ericson2314
    Ericson2314 committed Jun 21, 2020
    Copy the full SHA
    8313f0e View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2020

  1. Merge remote-tracking branch 'upstream/master' into derivation-header… 

    …-include-order
    @Ericson2314
    Ericson2314 committed Jul 5, 2020
    Copy the full SHA
    a38ab99 View commit details
    Browse the repository at this point in the history

  2. See if setting -std=c++17 for perl bindings helps

    @Ericson2314
    Ericson2314 committed Jul 5, 2020
    Copy the full SHA
    f1c7746 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2020

  1. Merge branch 'master' of github.com:NixOS/nix into derivation-header-… 

    …include-order
    @meditans
    meditans committed Jul 15, 2020
    Copy the full SHA
    455bdee View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2020

  1. Small namespace fix

    @meditans
    meditans committed Jul 16, 2020
    Copy the full SHA
    e3b394b View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2020

  1. Merge remote-tracking branch 'upstream/master' into derivation-header… 

    …-include-order
    @Ericson2314
    Ericson2314 committed Aug 1, 2020
    Copy the full SHA
    9357512 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2020

  1. Merge remote-tracking branch 'upstream/master' into derivation-header… 

    …-include-order
    @Ericson2314
    Ericson2314 committed Aug 18, 2020
    Copy the full SHA
    950ddfd View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2020

  1. Merge pull request #3434 from Ericson2314/derivation-header-include-o… 

    …rder

Revise division of labor in deserialization of derivations
    @edolstra
    edolstra committed Aug 27, 2020
    Copy the full SHA
    eb75282 View commit details
    Browse the repository at this point in the history