diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-10-01 17:25:22 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-10-01 17:25:22 +0000 |
commit | edf67e1508523593cf549a579e8dbcc2e89c8004 (patch) | |
tree | 201207377535a5534b9086f52555d3327b645041 /src/libstore/remote-store.cc | |
parent | d6e0c511ec1201d212ce181ba0e3cd2b7774d3c0 (diff) | |
parent | 13b6b645897fd2edaa0f09fa48d6fe8dd6287b55 (diff) |
Merge branch 'path-info' into ca-drv-exotic
Diffstat (limited to 'src/libstore/remote-store.cc')
-rw-r--r-- | src/libstore/remote-store.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index 85f050c6d..0df432898 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -530,7 +530,7 @@ ref<const ValidPathInfo> RemoteStore::addCAToStore( if (repair) throw Error("repairing is not supported when building through the Nix daemon protocol < 1.25"); std::visit(overloaded { - [&](TextHashMethod thm) -> void { + [&](const TextHashMethod & thm) -> void { if (hashType != htSHA256) throw UnimplementedError("Only SHA-256 is supported for adding text-hashed data, but '%1' was given", printHashType(hashType)); @@ -539,7 +539,7 @@ ref<const ValidPathInfo> RemoteStore::addCAToStore( worker_proto::write(*this, conn->to, references); conn.processStderr(); }, - [&](FileIngestionMethod fim) -> void { + [&](const FileIngestionMethod & fim) -> void { conn->to << wopAddToStore << name @@ -710,10 +710,10 @@ static void writeDerivedPaths(RemoteStore & store, ConnectionHandle & conn, cons for (auto & p : reqs) { auto sOrDrvPath = StorePathWithOutputs::tryFromDerivedPath(p); std::visit(overloaded { - [&](StorePathWithOutputs s) { + [&](const StorePathWithOutputs & s) { ss.push_back(s.to_string(store)); }, - [&](StorePath drvPath) { + [&](const StorePath & drvPath) { throw Error("trying to request '%s', but daemon protocol %d.%d is too old (< 1.29) to request a derivation file", store.printStorePath(drvPath), GET_PROTOCOL_MAJOR(conn->daemonVersion), |