From 2f9d422172235297759f2b224fe0636cad07b6fb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 6 Apr 2020 19:48:34 +0200 Subject: [PATCH] Fix build against latest Nix --- src/hydra-queue-runner/builder.cc | 2 +- src/hydra-queue-runner/hydra-queue-runner.cc | 6 +++--- src/hydra-queue-runner/queue-monitor.cc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/hydra-queue-runner/builder.cc b/src/hydra-queue-runner/builder.cc index bc460856..94bbe223 100644 --- a/src/hydra-queue-runner/builder.cc +++ b/src/hydra-queue-runner/builder.cc @@ -466,7 +466,7 @@ void State::failStep( /* Remember failed paths in the database so that they won't be built again. */ if (result.stepStatus != bsCachedFailure && result.canCache) - for (auto & path : step->drv.outputPaths()) + for (auto & path : step->drv->outputPaths()) txn.exec_params0("insert into FailedPaths values ($1)", localStore->printStorePath(path)); txn.commit(); diff --git a/src/hydra-queue-runner/hydra-queue-runner.cc b/src/hydra-queue-runner/hydra-queue-runner.cc index c80f8d3e..165130b4 100644 --- a/src/hydra-queue-runner/hydra-queue-runner.cc +++ b/src/hydra-queue-runner/hydra-queue-runner.cc @@ -258,7 +258,7 @@ unsigned int State::createBuildStep(pqxx::work & txn, time_t startTime, BuildID localStore->printStorePath(step->drvPath), status == bsBusy ? 1 : 0, startTime != 0 ? std::make_optional(startTime) : std::nullopt, - step->drv.platform, + step->drv->platform, status != bsBusy ? std::make_optional((int) status) : std::nullopt, propagatedFrom != 0 ? std::make_optional(propagatedFrom) : std::nullopt, // internal::params errorMsg != "" ? std::make_optional(errorMsg) : std::nullopt, @@ -267,7 +267,7 @@ unsigned int State::createBuildStep(pqxx::work & txn, time_t startTime, BuildID if (r.affected_rows() == 0) goto restart; - for (auto & output : step->drv.outputs) + for (auto & output : step->drv->outputs) txn.exec_params0 ("insert into BuildStepOutputs (build, stepnr, name, path) values ($1, $2, $3, $4)", buildId, stepNr, output.first, localStore->printStorePath(output.second.path)); @@ -452,7 +452,7 @@ void State::markSucceededBuild(pqxx::work & txn, Build::ptr build, bool State::checkCachedFailure(Step::ptr step, Connection & conn) { pqxx::work txn(conn); - for (auto & path : step->drv.outputPaths()) + for (auto & path : step->drv->outputPaths()) if (!txn.exec_params("select 1 from FailedPaths where path = $1", localStore->printStorePath(path)).empty()) return true; return false; diff --git a/src/hydra-queue-runner/queue-monitor.cc b/src/hydra-queue-runner/queue-monitor.cc index 54958521..60b8545a 100644 --- a/src/hydra-queue-runner/queue-monitor.cc +++ b/src/hydra-queue-runner/queue-monitor.cc @@ -172,11 +172,11 @@ bool State::getQueuedBuilds(Connection & conn, auto res = txn.exec_params1 ("select max(build) from BuildSteps where drvPath = $1 and startTime != 0 and stopTime != 0 and status = 1", - localStore->printStorePathh(ex.step->drvPath)); + localStore->printStorePath(ex.step->drvPath)); if (!res[0].is_null()) propagatedFrom = res[0].as(); if (!propagatedFrom) { - for (auto & output : ex.step->drv.outputs) { + for (auto & output : ex.step->drv->outputs) { auto res = txn.exec_params ("select max(s.build) from BuildSteps s join BuildStepOutputs o on s.build = o.build where path = $1 and startTime != 0 and stopTime != 0 and status = 1", localStore->printStorePath(output.second.path));