diff options
| author | eldritch horrors <pennae@lix.systems> | 2024-03-04 04:59:31 +0100 |
|---|---|---|
| committer | eldritch horrors <pennae@lix.systems> | 2024-03-04 04:59:31 +0100 |
| commit | 7f590ea7096d1e1bbbe73697358fef962d0fb494 (patch) | |
| tree | 379ef50da30c3ff0b49df6ac1c28d3cfac7e0f69 /src/nix-store | |
| parent | 4d9dde15efbc05af471acb3efc5b04c087ceeef0 (diff) | |
Merge pull request #6223 from obsidiansystems/worker-proto-with-version
Give `nix daemon` and `nix-store --serve` protocols separate serializers with version info
(cherry picked from commit 8b68bbb77745fda0d14939b6c23d31cc89da41ce)
Change-Id: Ia3d3b9fbaf9f0ae62ab225020b7d14790e793655
Diffstat (limited to 'src/nix-store')
| -rw-r--r-- | src/nix-store/nix-store.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc index 11d2e86e3..79002626d 100644 --- a/src/nix-store/nix-store.cc +++ b/src/nix-store/nix-store.cc @@ -959,17 +959,7 @@ static void opServe(Strings opFlags, Strings opArgs) MonitorFdHup monitor(in.fd); auto status = store->buildDerivation(drvPath, drv); - out << status.status << status.errorMsg; - - if (GET_PROTOCOL_MINOR(clientVersion) >= 3) - out << status.timesBuilt << status.isNonDeterministic << status.startTime << status.stopTime; - if (GET_PROTOCOL_MINOR(clientVersion) >= 6) { - DrvOutputs builtOutputs; - for (auto & [output, realisation] : status.builtOutputs) - builtOutputs.insert_or_assign(realisation.id, realisation); - ServeProto::write(*store, wconn, builtOutputs); - } - + ServeProto::write(*store, wconn, status); break; } |