guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcmd/repl: factor out buildWithProgressBar

Browse Source 
This logic is used in the various build-related REPL commands and is
factored out to make it easier to write the handlers for each
build-related REPL commands.

Change-Id: Iaa18df489db75495b12924e9a76b3fff1975eb64
Signed-off-by: Raito Bezarius <raito@lix.systems>
This commit is contained in:
Raito Bezarius
2026-01-01 22:02:50 +01:00
parent e798115c76
commit bdd6bd5e38
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lix/libcmd/repl.cc
+25 -16
View File
@@ -148,6 +148,11 @@ struct NixRepl
* to a derivation, or evaluates to an invalid derivation.
*/
StorePath getDerivationPath(Value & v);
/**
* Build a path and show a progress bar for it.
*/
Derivation buildWithProgressBar(const StorePath & drvPath);
ProcessLineResult processLine(std::string line);
bool inDebugger() const
@@ -496,6 +501,25 @@ StorePath NixRepl::getDerivationPath(Value & v) {
return *drvPath;
}
Derivation NixRepl::buildWithProgressBar(const StorePath & drvPath)
{
// TODO: this only shows a progress bar for explicitly initiated builds,
// not eval-time fetching or builds performed for IFD.
// But we can't just show it everywhere, since that would erase partial output from evaluation.
logger->resetProgress();
logger->resume();
Finally stopLogger([&]() { logger->pause(); });
state.aio.blockOn(evaluator.store->buildPaths({
DerivedPath::Built{
.drvPath = makeConstantStorePath(drvPath),
.outputs = OutputsSpec::All{},
},
}));
auto drv = state.aio.blockOn(evaluator.store->readDerivation(drvPath));
return drv;
}
void NixRepl::loadDebugTraceEnv(const DebugTrace & dt)
{
initEnv();
@@ -758,22 +782,7 @@ ProcessLineResult NixRepl::processLine(std::string line)
Path drvPathRaw = evaluator.store->printStorePath(drvPath);
if (command == ":b" || command == ":bl") {
// TODO: this only shows a progress bar for explicitly initiated builds,
// not eval-time fetching or builds performed for IFD.
// But we can't just show it everywhere, since that would erase partial output from evaluation.
logger->resetProgress();
logger->resume();
Finally stopLogger([&]() {
logger->pause();
});
state.aio.blockOn(evaluator.store->buildPaths({
DerivedPath::Built {
.drvPath = makeConstantStorePath(drvPath),
.outputs = OutputsSpec::All { },
},
}));
auto drv = state.aio.blockOn(evaluator.store->readDerivation(drvPath));
auto drv = buildWithProgressBar(drvPath);
logger->cout("\nThis derivation produced the following outputs:");
for (auto & [outputName, outputPath] :
state.aio.blockOn(evaluator.store->queryDerivationOutputMap(drvPath)))