From 6cd2bb69542326a17ce1bded30671dcb4a2908e0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Oct 2020 21:01:06 +0200 Subject: [PATCH] Fix build --- src/hydra-eval-jobs/hydra-eval-jobs.cc | 1 + src/hydra-queue-runner/build-remote.cc | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/hydra-eval-jobs/hydra-eval-jobs.cc b/src/hydra-eval-jobs/hydra-eval-jobs.cc index 313bb855..600d4670 100644 --- a/src/hydra-eval-jobs/hydra-eval-jobs.cc +++ b/src/hydra-eval-jobs/hydra-eval-jobs.cc @@ -14,6 +14,7 @@ #include "flake/flake.hh" #include "attr-path.hh" #include "derivations.hh" +#include "local-fs-store.hh" #include "hydra-config.hh" diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc index 3a668ab3..7b3e64d8 100644 --- a/src/hydra-queue-runner/build-remote.cc +++ b/src/hydra-queue-runner/build-remote.cc @@ -95,12 +95,12 @@ static void copyClosureTo(std::timed_mutex & sendMutex, ref destStore, the remote host to substitute missing paths. */ // FIXME: substitute output pollutes our build log to << cmdQueryValidPaths << 1 << useSubstitutes; - writeStorePaths(*destStore, to, closure); + worker_proto::write(*destStore, to, closure); to.flush(); /* Get back the set of paths that are already valid on the remote host. */ - auto present = readStorePaths(*destStore, from); + auto present = worker_proto::read(*destStore, from, Phantom {}); if (present.size() == closure.size()) return; @@ -315,7 +315,7 @@ void State::buildRemote(ref destStore, if (sendDerivation) { to << cmdBuildPaths; - writeStorePaths(*localStore, to, {step->drvPath}); + worker_proto::write(*localStore, to, {step->drvPath}); } else { to << cmdBuildDerivation << localStore->printStorePath(step->drvPath); writeDerivation(to, *localStore, basicDrv); @@ -444,13 +444,13 @@ void State::buildRemote(ref destStore, std::map infos; size_t totalNarSize = 0; to << cmdQueryPathInfos; - writeStorePaths(*localStore, to, outputs); + worker_proto::write(*localStore, to, outputs); to.flush(); while (true) { auto storePathS = readString(from); if (storePathS == "") break; readString(from); // deriver - auto references = readStorePaths(*localStore, from); + auto references = worker_proto::read(*localStore, from, Phantom {}); readLongLong(from); // download size auto narSize = readLongLong(from); auto narHash = Hash::parseAny(readString(from), htSHA256);