nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-16 05:51:05 +01:00
Code Activity

Clean up RealiseMode

Browse source
This commit is contained in:
Eelco Dolstra 2020-07-15 20:05:42 +02:00
parent e3c2b00237
commit 94eb5fad76
9 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/nix/installables.cc
View file

@ -635,10 +635,10 @@ std::shared_ptr<Installable> SourceExprCommand::parseInstallable(
return installables.front();
}
Buildables build(ref<Store> store, RealiseMode mode,
Buildables build(ref<Store> store, Realise mode,
std::vector<std::shared_ptr<Installable>> installables)
{
if (mode != Build)
if (mode == Realise::Nothing)
settings.readOnlyMode = true;
Buildables buildables;
@ -659,15 +659,15 @@ Buildables build(ref<Store> store, RealiseMode mode,
}
}
if (mode == DryRun)
if (mode == Realise::Nothing)
printMissing(store, pathsToBuild, lvlError);
else if (mode == Build)
else if (mode == Realise::Outputs)
store->buildPaths(pathsToBuild);
return buildables;
}
StorePathSet toStorePaths(ref<Store> store, RealiseMode mode,
StorePathSet toStorePaths(ref<Store> store, Realise mode,
std::vector<std::shared_ptr<Installable>> installables)
{
StorePathSet outPaths;
@ -679,7 +679,7 @@ StorePathSet toStorePaths(ref<Store> store, RealiseMode mode,
return outPaths;
}
StorePath toStorePath(ref<Store> store, RealiseMode mode,
StorePath toStorePath(ref<Store> store, Realise mode,
std::shared_ptr<Installable> installable)
{
auto paths = toStorePaths(store, mode, {installable});