wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 06:21:14 +02:00
Code Activity

Merge branch 'drv-outputs-map-allow-missing-namespace' of github.com:obsidiansystems/nix into templated-daemon-protocol

Browse source
This commit is contained in:
Carlo Nucera 2020-08-06 15:52:33 -04:00
commit f795f0fabc
8 changed files with 112 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libstore/legacy-ssh-store.cc
View file

@ -107,7 +107,7 @@ struct LegacySSHStore : public Store
auto deriver = readString(conn->from);
if (deriver != "")
info->deriver = parseStorePath(deriver);
info->references = read(*this, conn->from, Proxy<StorePathSet> {});
info->references = nix::worker_proto::read(*this, conn->from, Phantom<StorePathSet> {});
readLongLong(conn->from); // download size
info->narSize = readLongLong(conn->from);
@ -139,7 +139,7 @@ struct LegacySSHStore : public Store
<< printStorePath(info.path)
<< (info.deriver ? printStorePath(*info.deriver) : "")
<< info.narHash->to_string(Base16, false);
write(*this, conn->to, info.references);
nix::worker_proto::write(*this, conn->to, info.references);
conn->to
<< info.registrationTime
<< info.narSize
@ -168,7 +168,7 @@ struct LegacySSHStore : public Store
conn->to
<< exportMagic
<< printStorePath(info.path);
write(*this, conn->to, info.references);
nix::worker_proto::write(*this, conn->to, info.references);
conn->to
<< (info.deriver ? printStorePath(*info.deriver) : "")
<< 0
@ -251,10 +251,10 @@ struct LegacySSHStore : public Store
conn->to
<< cmdQueryClosure
<< includeOutputs;
write(*this, conn->to, paths);
nix::worker_proto::write(*this, conn->to, paths);
conn->to.flush();
for (auto & i : read(*this, conn->from, Proxy<StorePathSet> {}))
for (auto & i : nix::worker_proto::read(*this, conn->from, Phantom<StorePathSet> {}))
out.insert(i);
}
@ -267,10 +267,10 @@ struct LegacySSHStore : public Store
<< cmdQueryValidPaths
<< false // lock
<< maybeSubstitute;
write(*this, conn->to, paths);
nix::worker_proto::write(*this, conn->to, paths);
conn->to.flush();
return read(*this, conn->from, Proxy<StorePathSet> {});
return nix::worker_proto::read(*this, conn->from, Phantom<StorePathSet> {});
}
void connect() override