nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-23 18:59:35 +01:00
Code Activity

InputAccessor::fetchToStore(): Support arbitrary ingestion methods

Browse source
This commit is contained in:
Eelco Dolstra 2023-10-19 14:19:10 +02:00
parent d2c0051784
commit 12214fef09
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libfetchers/input-accessor.cc
View file

@ -96,6 +96,7 @@ StorePath InputAccessor::fetchToStore(
ref<Store> store,
const CanonPath & path,
std::string_view name,
FileIngestionMethod method,
PathFilter * filter,
RepairFlag repair)
{
@ -107,8 +108,8 @@ StorePath InputAccessor::fetchToStore(
auto storePath =
settings.readOnlyMode
? store->computeStorePathFromDump(*source, name).first
: store->addToStoreFromDump(*source, name, FileIngestionMethod::Recursive, htSHA256, repair);
? store->computeStorePathFromDump(*source, name, method, htSHA256).first
: store->addToStoreFromDump(*source, name, method, htSHA256, repair);
return storePath;
}
@ -140,10 +141,11 @@ std::ostream & operator << (std::ostream & str, const SourcePath & path)
StorePath SourcePath::fetchToStore(
ref<Store> store,
std::string_view name,
FileIngestionMethod method,
PathFilter * filter,
RepairFlag repair) const
{
return accessor->fetchToStore(store, path, name, filter, repair);
return accessor->fetchToStore(store, path, name, method, filter, repair);
}
std::string_view SourcePath::baseName() const