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: 960e9c560e33
Choose a base ref
...
head repository: NixOS/nix
compare: 4f09ce794068
Choose a head ref
  • 2 commits
  • 7 files changed
  • 1 contributor

Commits on Feb 12, 2018

  1. toBuildables -> build

    @edolstra
    edolstra committed Feb 12, 2018
    Copy the full SHA
    35fd317 View commit details
    Browse the repository at this point in the history

  2. Fix 'deadlock: trying to re-acquire self-held lock' 

    This was caused by derivations with 'allowSubstitutes = false'. Such
derivations will be built locally. However, if there is another
SubstitionGoal that has the output of the first derivation in its
closure, then the path will be simultaneously built and substituted.

There was a check to catch this situation (via pathIsLockedByMe()),
but it no longer worked reliably because substitutions are now done in
another thread. (Thus the comment 'It can't happen between here and
the lockPaths() call below because we're not allowing multi-threading'
was no longer valid.)

The fix is to handle the path already being locked in both
SubstitutionGoal and DerivationGoal.
    @edolstra
    edolstra committed Feb 12, 2018
    3
    Copy the full SHA
    4f09ce7 View commit details
    Browse the repository at this point in the history