wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 06:31:14 +02:00
Code Activity

Cleanup

Browse source
This commit is contained in:
Eelco Dolstra 2020-02-02 11:31:58 +01:00
parent b270869466
commit 958ec5de56
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
6 changed files with 19 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libexpr/flake/flake.cc
View file

@ -22,7 +22,7 @@ static FlakeRef maybeLookupFlake(
const FlakeRef & flakeRef,
bool allowLookup)
{
if (!flakeRef.isDirect()) {
if (!flakeRef.input->isDirect()) {
if (allowLookup)
return flakeRef.resolve(state.store);
else
@ -150,9 +150,7 @@ static Flake getFlake(EvalState & state, const FlakeRef & originalRef,
maybeLookupFlake(state,
lookupInFlakeCache(flakeCache, originalRef), allowLookup));
auto [sourceInfo, resolvedInput] = flakeRef.input->fetchTree(state.store);
FlakeRef lockedRef(resolvedInput, flakeRef.subdir);
auto [sourceInfo, lockedRef] = flakeRef.fetchTree(state.store);
debug("got flake source '%s' from '%s'",
state.store->printStorePath(sourceInfo.storePath), lockedRef);
@ -257,9 +255,7 @@ static std::pair<fetchers::Tree, FlakeRef> getNonFlake(
maybeLookupFlake(state,
lookupInFlakeCache(flakeCache, originalRef), allowLookup));
auto [sourceInfo, resolvedInput] = flakeRef.input->fetchTree(state.store);
FlakeRef lockedRef(resolvedInput, flakeRef.subdir);
auto [sourceInfo, lockedRef] = flakeRef.fetchTree(state.store);
debug("got non-flake source '%s' from '%s'",
state.store->printStorePath(sourceInfo.storePath), lockedRef);
@ -470,7 +466,7 @@ LockedFlake lockFlake(
/* We need to update/create a new lock file
entry. So fetch the flake/non-flake. */
if (!lockFlags.allowMutable && !input.ref.isImmutable())
if (!lockFlags.allowMutable && !input.ref.input->isImmutable())
throw Error("cannot update flake input '%s' in pure mode", inputPathS);
if (input.isFlake) {