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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 506b6263efbd
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 06010eaf1990
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 12, 2019

  1. Fix fetchTarball with chroot stores 

    Fixes #2405.
    @edolstra
    edolstra committed Jun 12, 2019
    2
    Copy the full SHA
    06010ea View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/libexpr/primops.cc
6 changes: 3 additions & 3 deletions src/libexpr/primops.cc
View file
Original file line number Diff line number Diff line change
@@ -2083,12 +2083,12 @@ void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
if (evalSettings.pureEval && !request.expectedHash)
throw Error("in pure evaluation mode, '%s' requires a 'sha256' argument", who);

Path res = getDownloader()->downloadCached(state.store, request).path;
auto res = getDownloader()->downloadCached(state.store, request);

if (state.allowedPaths)
state.allowedPaths->insert(res);
state.allowedPaths->insert(res.path);

mkString(v, res, PathSet({res}));
mkString(v, res.storePath, PathSet({res.storePath}));
}