aboutsummaryrefslogtreecommitdiff
path: root/src/nix-store
diff options
context:
space:
mode:
authoreldritch horrors <pennae@lix.systems>2024-07-08 02:18:03 +0200
committereldritch horrors <pennae@lix.systems>2024-07-16 00:57:42 +0000
commit6b4d46e9e0e1dd80e0977684ab20d14bcd1a6bc3 (patch)
treeb79f09fe3c9e62de804ab8aca8a8fec6d08bbb48 /src/nix-store
parenta5d1f698417dff4e470eb94c38ad6c4e5ebf38ff (diff)
libstore: remove WriteConn::sink fields
we no longer need these since we're no longer using sinks to serialize things. Change-Id: Iffb1a3eab33c83f611c88fa4e8beaa8d5ffa079b
Diffstat (limited to 'src/nix-store')
-rw-r--r--src/nix-store/nix-store.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index a2171a237..8d9a49536 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -824,7 +824,6 @@ static void opServe(Strings opFlags, Strings opArgs)
.version = clientVersion,
};
ServeProto::WriteConn wconn {
- .to = out,
.version = clientVersion,
};
@@ -881,7 +880,7 @@ static void opServe(Strings opFlags, Strings opArgs)
}
auto valid = store->queryValidPaths(paths);
- wconn.to << ServeProto::write(*store, wconn, valid);
+ out << ServeProto::write(*store, wconn, valid);
break;
}
@@ -892,7 +891,7 @@ static void opServe(Strings opFlags, Strings opArgs)
try {
auto info = store->queryPathInfo(i);
out << store->printStorePath(info->path);
- wconn.to << ServeProto::write(*store, wconn, static_cast<const UnkeyedValidPathInfo &>(*info));
+ out << ServeProto::write(*store, wconn, static_cast<const UnkeyedValidPathInfo &>(*info));
} catch (InvalidPath &) {
}
}
@@ -951,7 +950,7 @@ static void opServe(Strings opFlags, Strings opArgs)
MonitorFdHup monitor(in.fd);
auto status = store->buildDerivation(drvPath, drv);
- wconn.to << ServeProto::write(*store, wconn, status);
+ out << ServeProto::write(*store, wconn, status);
break;
}
@@ -960,7 +959,7 @@ static void opServe(Strings opFlags, Strings opArgs)
StorePathSet closure;
store->computeFSClosure(ServeProto::Serialise<StorePathSet>::read(*store, rconn),
closure, false, includeOutputs);
- wconn.to << ServeProto::write(*store, wconn, closure);
+ out << ServeProto::write(*store, wconn, closure);
break;
}