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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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

@ -813,21 +813,6 @@ Strings ValidPathInfo::shortRefs() const
}
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);
}
}