nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-21 09:49:36 +01:00
Code Activity

Move actEvaluate so it doesn't include actLockFlake

Browse source
This commit is contained in:
Eelco Dolstra 2020-11-18 18:19:31 +01:00
parent e6ca275e23
commit 2f512dd29f
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/nix/installables.cc
View file

@ -356,8 +356,6 @@ struct InstallableStorePath : Installable
Buildables InstallableValue::toBuildables() Buildables InstallableValue::toBuildables()
{ {
Activity act(*logger, lvlInfo, actEvaluate);
Buildables res; Buildables res;
std::map<StorePath, std::map<std::string, std::optional<StorePath>>> drvsToOutputs; std::map<StorePath, std::map<std::string, std::optional<StorePath>>> drvsToOutputs;
@ -489,6 +487,8 @@ std::tuple<std::string, FlakeRef, InstallableValue::DerivationInfo> InstallableF
{ {
auto lockedFlake = getLockedFlake(); auto lockedFlake = getLockedFlake();
Activity act(*logger, lvlInfo, actEvaluate);
auto cache = openEvalCache(*state, lockedFlake); auto cache = openEvalCache(*state, lockedFlake);
auto root = cache->getRoot(); auto root = cache->getRoot();