From 86d19956f25db21919ac0afabca01cd7399ff238 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 9 Sep 2025 13:44:07 +0200 Subject: [PATCH] Remove WorkerProto::Op::ImportPaths This was obsoleted in May 2016 (538a64e8c314f23ba0c5d76201f1c20e71884a21). --- src/libstore/daemon.cc | 12 ------------ .../include/nix/store/worker-protocol-connection.hh | 2 -- src/libstore/include/nix/store/worker-protocol.hh | 1 - src/libstore/worker-protocol-connection.cc | 8 -------- 4 files changed, 23 deletions(-) diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc index ebe0c2ab4..2bd0698a0 100644 --- a/src/libstore/daemon.cc +++ b/src/libstore/daemon.cc @@ -546,18 +546,6 @@ static void performOp( break; } - case WorkerProto::Op::ImportPaths: { - logger->startWork(); - TunnelSource source(conn.from, conn.to); - auto paths = store->importPaths(source, trusted ? NoCheckSigs : CheckSigs); - logger->stopWork(); - Strings paths2; - for (auto & i : paths) - paths2.push_back(store->printStorePath(i)); - conn.to << paths2; - break; - } - case WorkerProto::Op::BuildPaths: { auto drvs = WorkerProto::Serialise::read(*store, rconn); BuildMode mode = bmNormal; diff --git a/src/libstore/include/nix/store/worker-protocol-connection.hh b/src/libstore/include/nix/store/worker-protocol-connection.hh index 73dd50719..31436395f 100644 --- a/src/libstore/include/nix/store/worker-protocol-connection.hh +++ b/src/libstore/include/nix/store/worker-protocol-connection.hh @@ -130,8 +130,6 @@ struct WorkerProto::BasicClientConnection : WorkerProto::BasicConnection bool * daemonException, const StorePath & path, std::function fun); - - void importPaths(const StoreDirConfig & store, bool * daemonException, Source & source); }; struct WorkerProto::BasicServerConnection : WorkerProto::BasicConnection diff --git a/src/libstore/include/nix/store/worker-protocol.hh b/src/libstore/include/nix/store/worker-protocol.hh index 3920089fa..29d4828c2 100644 --- a/src/libstore/include/nix/store/worker-protocol.hh +++ b/src/libstore/include/nix/store/worker-protocol.hh @@ -161,7 +161,6 @@ enum struct WorkerProto::Op : uint64_t { QueryFailedPaths = 24, ClearFailedPaths = 25, QueryPathInfo = 26, - ImportPaths = 27, // obsolete QueryDerivationOutputNames = 28, // obsolete QueryPathFromHashPart = 29, QuerySubstitutablePathInfos = 30, diff --git a/src/libstore/worker-protocol-connection.cc b/src/libstore/worker-protocol-connection.cc index 987d0c8dd..8a3766290 100644 --- a/src/libstore/worker-protocol-connection.cc +++ b/src/libstore/worker-protocol-connection.cc @@ -313,12 +313,4 @@ void WorkerProto::BasicClientConnection::narFromPath( fun(from); } -void WorkerProto::BasicClientConnection::importPaths( - const StoreDirConfig & store, bool * daemonException, Source & source) -{ - to << WorkerProto::Op::ImportPaths; - processStderr(daemonException, 0, &source); - auto importedPaths = WorkerProto::Serialise::read(store, *this); - assert(importedPaths.size() <= importedPaths.size()); -} } // namespace nix