aboutsummaryrefslogtreecommitdiff
path: root/src/nix
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-04-19 15:56:17 +0200
committerEelco Dolstra <edolstra@gmail.com>2019-04-19 15:56:17 +0200
commit4fb594a375a26ff36c98be1256661284c657c096 (patch)
tree5f94ff0068f5f4dd1fb887d777ba9e8ce5a743c8 /src/nix
parent7ec7bad2f8174c67ced4a0a3e88f61c1f88affd0 (diff)
parente51abb6631ff0f5fc52523ea1819333cb587170c (diff)
Merge remote-tracking branch 'tweag/resolvedFlake' into flakes
Diffstat (limited to 'src/nix')
-rw-r--r--src/nix/flake.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nix/flake.cc b/src/nix/flake.cc
index eec280584..acba912e5 100644
--- a/src/nix/flake.cc
+++ b/src/nix/flake.cc
@@ -90,20 +90,20 @@ struct CmdFlakeDeps : FlakeCommand, MixJSON, StoreCommand, MixEvalArgs
FlakeRef flakeRef(flakeUri);
- Dependencies deps = resolveFlake(*evalState, flakeRef, AllowRegistryAtTop);
+ ResolvedFlake resFlake = resolveFlake(*evalState, flakeRef, AllowRegistryAtTop);
- std::queue<Dependencies> todo;
- todo.push(deps);
+ std::queue<ResolvedFlake> todo;
+ todo.push(resFlake);
while (!todo.empty()) {
- deps = todo.front();
+ resFlake = todo.front();
todo.pop();
- for (auto & nonFlake : deps.nonFlakeDeps)
+ for (NonFlake & nonFlake : resFlake.nonFlakeDeps)
printNonFlakeInfo(nonFlake, json);
- for (auto & newDeps : deps.flakeDeps)
- todo.push(newDeps);
+ for (ResolvedFlake & newResFlake : resFlake.flakeDeps)
+ todo.push(newResFlake);
}
}
};