From 6195cec6a3079dbdb3ed433a118bbe83fa72af1f Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 16 Jul 2024 04:35:29 +0200 Subject: [PATCH] hydra-queue-runner: adjust for Lix generators related changes --- src/hydra-queue-runner/build-remote.cc | 4 ++-- src/hydra-queue-runner/build-result.cc | 2 +- src/hydra-queue-runner/state.hh | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc index ff88b343..baa8a49b 100644 --- a/src/hydra-queue-runner/build-remote.cc +++ b/src/hydra-queue-runner/build-remote.cc @@ -121,7 +121,7 @@ static void copyClosureTo( the remote host to substitute missing paths. */ // FIXME: substitute output pollutes our build log conn.to << ServeProto::Command::QueryValidPaths << 1 << useSubstitutes; - ServeProto::write(destStore, conn, closure); + conn.to << ServeProto::write(destStore, conn, closure); conn.to.flush(); /* Get back the set of paths that are already valid on the remote @@ -359,7 +359,7 @@ static std::map queryPathInfos( /* Get info about each output path. */ std::map infos; conn.to << ServeProto::Command::QueryPathInfos; - ServeProto::write(localStore, conn, outputs); + conn.to << ServeProto::write(localStore, conn, outputs); conn.to.flush(); while (true) { auto storePathS = readString(conn.from); diff --git a/src/hydra-queue-runner/build-result.cc b/src/hydra-queue-runner/build-result.cc index 08c099f3..93851369 100644 --- a/src/hydra-queue-runner/build-result.cc +++ b/src/hydra-queue-runner/build-result.cc @@ -36,7 +36,7 @@ BuildOutput getBuildOutput( printInfo("fetching NAR contents of '%s'...", outputS); auto source = sinkToSource([&](Sink & sink) { - store->narFromPath(output, sink); + sink << store->narFromPath(output); }); extractNarData(*source, outputS, narMembers); } diff --git a/src/hydra-queue-runner/state.hh b/src/hydra-queue-runner/state.hh index 49968558..29349c9b 100644 --- a/src/hydra-queue-runner/state.hh +++ b/src/hydra-queue-runner/state.hh @@ -328,7 +328,6 @@ struct Machine : nix::Machine operator nix::ServeProto::WriteConn () { return { - .to = to, .version = remoteVersion, }; }