From 19e874a9854c0d7f49d79fa98177a84b6997ce9a Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 20 Aug 2020 02:32:51 +0100 Subject: feat(tvix): Introduce build event streams in worker protocol Introduces a new `BuildEvent` proto type which is streamed in response to calls that trigger builds of derivations. This type can currently supply build statuses, log lines and information about builds starting. This is in preparation for threading build logs through the processes. Since we have nowhere to send the logs (yet), a null sink is used instead. Co-authored-by: Griffin Smith Change-Id: If7332337b89506c7e404cd20174acdaa1a3be4e8 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1793 Tested-by: BuildkiteCI Reviewed-by: glittershark Reviewed-by: kanepyork --- third_party/nix/src/libstore/store-api.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'third_party/nix/src/libstore/store-api.hh') diff --git a/third_party/nix/src/libstore/store-api.hh b/third_party/nix/src/libstore/store-api.hh index 39769dfb3c..1d81b228f2 100644 --- a/third_party/nix/src/libstore/store-api.hh +++ b/third_party/nix/src/libstore/store-api.hh @@ -189,7 +189,7 @@ struct ValidPathInfo { virtual ~ValidPathInfo() {} }; -typedef std::list ValidPathInfos; +using ValidPathInfos = std::list; enum BuildMode { bmNormal, bmRepair, bmCheck }; @@ -243,7 +243,7 @@ struct BuildResult { nix::proto::BuildStatus status_to_proto(); static std::optional FromProto( - const nix::proto::BuildDerivationResponse& resp); + const nix::proto::BuildResult& resp); }; class Store : public std::enable_shared_from_this, public Config { -- cgit 1.4.1