nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-12 05:26:02 +01:00
Code Activity

Merge pull request #6223 from obsidiansystems/worker-proto-with-version

Browse source 
Give `nix daemon` and `nix-store --serve` protocols separate serializers with version info
This commit is contained in:
John Ericson 2023-10-23 09:16:23 -04:00 • committed by GitHub
commit 8b68bbb777
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 605 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libstore/store-api.cc
View file

@ -11,6 +11,9 @@
#include "archive.hh"
#include "callback.hh"
#include "remote-store.hh"
// FIXME this should not be here, see TODO below on
// `addMultipleToStore`.
#include "worker-protocol.hh"
#include <nlohmann/json.hpp>
#include <regex>
@ -361,7 +364,13 @@ void Store::addMultipleToStore(
{
auto expected = readNum<uint64_t>(source);
for (uint64_t i = 0; i < expected; ++i) {
auto info = ValidPathInfo::read(source, *this, 16);
// FIXME we should not be using the worker protocol here, let
// alone the worker protocol with a hard-coded version!
auto info = WorkerProto::Serialise<ValidPathInfo>::read(*this,
WorkerProto::ReadConn {
.from = source,
.version = 16,
});
info.ultimate = false;
addToStore(info, source, repair, checkSigs);
}