From 209489e348904aa2e2cddc64340ea44ab3074dfd Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Sat, 1 Aug 2020 20:23:53 -0400 Subject: feat(3p/nix): Implement two more RPC calls Implement AddTextToStore and BuildPaths both on the client and the server Refs: #29 Change-Id: I45294c3e1c1a7489e42099d36425b7acc04e0427 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1560 Reviewed-by: kanepyork Tested-by: BuildkiteCI --- third_party/nix/src/libstore/rpc-store.cc | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) (limited to 'third_party/nix/src/libstore/rpc-store.cc') diff --git a/third_party/nix/src/libstore/rpc-store.cc b/third_party/nix/src/libstore/rpc-store.cc index ba7d77fb0839..4a55e099676e 100644 --- a/third_party/nix/src/libstore/rpc-store.cc +++ b/third_party/nix/src/libstore/rpc-store.cc @@ -214,9 +214,23 @@ Path RpcStore::addToStore(const std::string& name, const Path& srcPath, throw absl::StrCat("Not implemented ", __func__); } -Path RpcStore::addTextToStore(const std::string& name, const std::string& s, +Path RpcStore::addTextToStore(const std::string& name, + const std::string& content, const PathSet& references, RepairFlag repair) { - throw absl::StrCat("Not implemented ", __func__); + if (repair != 0u) { + throw Error( + "repairing is not supported when building through the Nix daemon"); + } + ClientContext ctx; + proto::AddTextToStoreRequest request; + request.set_name(name); + request.set_content(content); + for (const auto& ref : references) { + request.add_references(ref); + } + proto::StorePath result; + SuccessOrThrow(stub_->AddTextToStore(&ctx, request, &result)); + return result.path(); } void RpcStore::narFromPath(const Path& path, Sink& sink) { @@ -224,7 +238,14 @@ void RpcStore::narFromPath(const Path& path, Sink& sink) { } void RpcStore::buildPaths(const PathSet& paths, BuildMode buildMode) { - throw absl::StrCat("Not implemented ", __func__); + ClientContext ctx; + proto::BuildPathsRequest request; + for (const auto& path : paths) { + request.add_drvs(path); + } + google::protobuf::Empty response; + request.set_mode(nix::BuildModeToProto(buildMode)); + SuccessOrThrow(stub_->BuildPaths(&ctx, request, &response)); } BuildResult RpcStore::buildDerivation(const Path& drvPath, -- cgit 1.4.1