diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-10-01 17:12:54 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-10-01 17:12:54 +0000 |
| commit | 13b6b645897fd2edaa0f09fa48d6fe8dd6287b55 (patch) | |
| tree | 0c6fc18fa246115402c9fd0030029d9a4ebde82f /src/libstore/remote-store.cc | |
| parent | f4f3203aa7c2fc9225a8ae220db25593066fb397 (diff) | |
| parent | 4f496150eb4e0012914c11f0a3ff4df2412b1d09 (diff) | |
Merge remote-tracking branch 'upstream/master' into path-info
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 0c25bfa59..989763180 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -529,13 +529,13 @@ 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 { std::string s = dump.drain(); conn->to << wopAddTextToStore << name << s; worker_proto::write(*this, conn->to, references); conn.processStderr(); }, - [&](FixedOutputHashMethod fohm) -> void { + [&](const FixedOutputHashMethod & fohm) -> void { conn->to << wopAddToStore << name @@ -706,10 +706,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), |