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

Merge remote-tracking branch 'upstream/master' into errors-phase-2

Browse source
This commit is contained in:
Ben Burdette 2020-06-03 17:00:00 -06:00
commit 4335ba999b
14 changed files with 275 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libstore/store-api.cc
View file

@ -844,21 +844,6 @@ std::string makeFixedOutputCA(FileIngestionMethod recursive, const Hash & hash)
}
void Store::addToStore(const ValidPathInfo & info, Source & narSource,
RepairFlag repair, CheckSigsFlag checkSigs,
std::shared_ptr<FSAccessor> accessor)
{
addToStore(info, make_ref<std::string>(narSource.drain()), repair, checkSigs, accessor);
}
void Store::addToStore(const ValidPathInfo & info, const ref<std::string> & nar,
RepairFlag repair, CheckSigsFlag checkSigs,
std::shared_ptr<FSAccessor> accessor)
{
StringSource source(*nar);
addToStore(info, source, repair, checkSigs, accessor);
}
}