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

Revert "Use template structs instead of phantoms"

Browse source 
This reverts commit 9ab07e99f5.
This commit is contained in:
John Ericson 2020-09-30 00:39:06 +00:00
parent e9fc2031f0
commit 45a0ed82f0
8 changed files with 153 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/export-import.cc
View file

@ -45,7 +45,7 @@ void Store::exportPath(const StorePath & path, Sink & sink)
teeSink
<< exportMagic
<< printStorePath(path);
WorkerProto<StorePathSet>::write(*this, teeSink, info->references);
nix::worker_proto::write(*this, teeSink, info->references);
teeSink
<< (info->deriver ? printStorePath(*info->deriver) : "")
<< 0;
@ -73,7 +73,7 @@ StorePaths Store::importPaths(Source & source, CheckSigsFlag checkSigs)
//Activity act(*logger, lvlInfo, format("importing path '%s'") % info.path);
auto references = WorkerProto<StorePathSet>::read(*this, source);
auto references = nix::worker_proto::read(*this, source, Phantom<StorePathSet> {});
auto deriver = readString(source);
auto narHash = hashString(htSHA256, *saved.s);