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: 2d2769f68c79
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4e60c5ec657a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 1, 2019

  1. Fix fetchTarball with chroot stores 

    Fixes #2405.
    @edolstra @zimbatm
    edolstra authored and zimbatm committed Oct 1, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Mic92 Jörg Thalheim
    GPG key ID: B3F5D81B0C6967C4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    168a887 View commit details

  2. Merge pull request #3112 from zimbatm/fetchTarball-with-chroot 

    Fix fetchTarball with chroot stores
    @edolstra
    edolstra authored Oct 1, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Mic92 Jörg Thalheim
    GPG key ID: B3F5D81B0C6967C4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4e60c5e 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
@@ -2089,12 +2089,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}));
}