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: 790b694be71c
Choose a base ref
...
head repository: NixOS/nix
compare: b3e73547a03f
Choose a head ref
  • 9 commits
  • 7 files changed
  • 2 contributors

Commits on Jul 22, 2020

  1. Parse CA derivations using new output variants 

    We no longer need `ParsedDerivation` because everything libstore needs
to know about is in the `BasicDerivation` proper.
    @Ericson2314
    Ericson2314 committed Jul 22, 2020
    Copy the full SHA
    9423f64 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2020

  1. Merge branch 'misc-ca' of github.com:obsidiansystems/nix into derivat… 

    …ion-primop-floating-output
    @Ericson2314
    Ericson2314 committed Jul 23, 2020
    Copy the full SHA
    c36916e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'misc-ca' of github.com:obsidiansystems/nix into derivat… 

    …ion-primop-floating-output
    @Ericson2314
    Ericson2314 committed Jul 23, 2020
    Copy the full SHA
    58e55c0 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2020

  1. Merge branch 'misc-ca' of github.com:obsidiansystems/nix into derivat… 

    …ion-primop-floating-output
    @Ericson2314
    Ericson2314 committed Jul 27, 2020
    Copy the full SHA
    e32a9e1 View commit details
    Browse the repository at this point in the history

  2. Require ca-derivations everywhere we create a CA derivation 

    "create" as in read one in from a serialized form, or build one from
scratch in memory.
    @Ericson2314
    Ericson2314 committed Jul 27, 2020
    Copy the full SHA
    951415b View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2020

  1. Sed some names to perhaps avoid conflicts

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

  2. Merge remote-tracking branch 'obsidian/misc-ca' into derivation-primo… 

    …p-floating-output
    @Ericson2314
    Ericson2314 committed Aug 5, 2020
    Copy the full SHA
    92ad550 View commit details
    Browse the repository at this point in the history

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

    …floating-output
    @Ericson2314
    Ericson2314 committed Aug 5, 2020
    Copy the full SHA
    0559ff3 View commit details
    Browse the repository at this point in the history

  4. Update src/libexpr/primops.cc 

    Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
    @Ericson2314 @edolstra
    Ericson2314 and edolstra committed Aug 5, 2020
    Copy the full SHA
    b3e7354 View commit details
    Browse the repository at this point in the history