diff options
| author | Carlo Nucera <carlo.nucera@protonmail.com> | 2020-08-06 15:52:33 -0400 |
|---|---|---|
| committer | Carlo Nucera <carlo.nucera@protonmail.com> | 2020-08-06 15:53:09 -0400 |
| commit | f795f0fabc785cd2eb2ccfec71564c8af819ecf4 (patch) | |
| tree | 76b0719449f036ea9312a9fb96e5ea241b455d9d /src/libstore/export-import.cc | |
| parent | 7302761f6451dafd8834f0db9fdd7dcc27f49eff (diff) | |
| parent | 8b175f58d1a25dd904fb0ffdf5b2b9501983dba0 (diff) | |
Merge branch 'drv-outputs-map-allow-missing-namespace' of github.com:obsidiansystems/nix into templated-daemon-protocol
Diffstat (limited to 'src/libstore/export-import.cc')
| -rw-r--r-- | src/libstore/export-import.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/export-import.cc b/src/libstore/export-import.cc index c20c56156..7551294f7 100644 --- a/src/libstore/export-import.cc +++ b/src/libstore/export-import.cc @@ -45,7 +45,7 @@ void Store::exportPath(const StorePath & path, Sink & sink) teeSink << exportMagic << printStorePath(path); - 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); - info.references = read(*this, source, Proxy<StorePathSet> {}); + info.references = nix::worker_proto::read(*this, source, Phantom<StorePathSet> {}); auto deriver = readString(source); if (deriver != "") |