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: 59067f0f587f
Choose a base ref
...
head repository: NixOS/nix
compare: 61464478427c
Choose a head ref
  • 4 commits
  • 5 files changed
  • 2 contributors

Commits on Jul 23, 2020

  1. Make Buildable a std::variant 

    I think this better captures the intent of what's going on: we either
have an opaque store path, or a drv path with some outputs.

Having this structure will also help us support CA derivations: we'll
have to allow the outpath paths to be optional, so the structure we gain
now makes up for the structure we loose then.
    @Ericson2314
    Ericson2314 committed Jul 23, 2020
    Copy the full SHA
    e1de1fe 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 buildable-variant

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

  2. Fix --profile with multiple opaque paths

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

Commits on Aug 6, 2020

  1. Merge pull request #3856 from obsidiansystems/buildable-variant 

    Make `Buildable` a `std::variant`
    @edolstra
    edolstra committed Aug 6, 2020
    Copy the full SHA
    6146447 View commit details
    Browse the repository at this point in the history