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: ae3c3e3bb29c
Choose a base ref
...
head repository: NixOS/nix
compare: 26e189c3f878
Choose a head ref
  • 2 commits
  • 6 files changed
  • 2 contributors

Commits on Dec 17, 2020

  1. Fix the detection of already built drv outputs 

    PRs #4370 and #4348 had a bad interaction in that the second broke the fist
one in a not trivial way.

The issue was that since #4348 the logic for detecting whether a
derivation output is already built requires some logic that was specific
to the `LocalStore`.

It happens though that most of this logic could be upstreamed to any `Store`,
which is what this commit does.
    @thufschmitt
    thufschmitt committed Dec 17, 2020
    1
    Copy the full SHA
    4d45839 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4378 from NixOS/fix-master-build 

    Fix the detection of already built drv outputs
    @edolstra
    edolstra committed Dec 17, 2020
    1
    Copy the full SHA
    26e189c View commit details
    Browse the repository at this point in the history