nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-20 17:29:36 +01:00
Code Activity

Merge remote-tracking branch 'upstream/master' into no-hash-type-unknown

Browse source
This commit is contained in:
John Ericson 2020-06-02 16:07:25 +00:00
commit 64cffb804a
13 changed files with 274 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libfetchers/tarball.cc
View file

@ -71,7 +71,8 @@ DownloadFileResult downloadFile(
info.narHash = hashString(HashType::SHA256, *sink.s);
info.narSize = sink.s->size();
info.ca = makeFixedOutputCA(FileIngestionMethod::Flat, hash);
store->addToStore(info, sink.s, NoRepair, NoCheckSigs);
auto source = StringSource { *sink.s };
store->addToStore(info, source, NoRepair, NoCheckSigs);
storePath = std::move(info.path);
}