1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-20 09:19:36 +01:00

Merge remote-tracking branch 'upstream/master' into validPathInfo-ca-proper-datatype

This commit is contained in:
John Ericson 2020-06-02 14:31:18 +00:00
commit 1b6461f671
13 changed files with 274 additions and 31 deletions

View file

@ -74,7 +74,8 @@ DownloadFileResult downloadFile(
.method = FileIngestionMethod::Flat,
.hash = hash,
};
store->addToStore(info, sink.s, NoRepair, NoCheckSigs);
auto source = StringSource { *sink.s };
store->addToStore(info, source, NoRepair, NoCheckSigs);
storePath = std::move(info.path);
}