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: cb90e382b5b6
Choose a base ref
...
head repository: NixOS/nix
compare: 0486e87791f0
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 4, 2020

  1. build: recover store path when replacing fails 

    This shouldn't happen in normal circumstances, but just in case
attempt to move the temporary path back if possible.
    @LnL7
    LnL7 committed Jan 4, 2020
    Copy the full SHA
    b33fefc View commit details
    Browse the repository at this point in the history

  2. build: fix path repairing when hash rewriting is required 

    Handle store path repairing on darwin when sandboxing is enabled. Unlike
on linux sandboxing on darwin still requires hash rewriting.
    @LnL7
    LnL7 committed Jan 4, 2020
    Copy the full SHA
    7d448bc View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2020

  1. Merge pull request #3302 from LnL7/darwin-repair-with-sandbox 

    build: fix path repairing with the darwin sandbox
    @edolstra
    edolstra committed Jan 5, 2020
    Copy the full SHA
    0486e87 View commit details
    Browse the repository at this point in the history