diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-27 14:22:45 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-27 14:22:45 +0000 |
| commit | 699fc89b394ef5347ff0508abe389e77a7cde09e (patch) | |
| tree | 35630ccbb1f9dae69137251b6198a71a20092c04 /src/libstore/build.cc | |
| parent | 5ea817dace2b554e602d7f9df6e43084ad112e3d (diff) | |
| parent | d7c0f094cbcfe1ae4ccc3d54baec00b66ccb1ed0 (diff) | |
Merge remote-tracking branch 'upstream/master' into hash-always-has-type
Diffstat (limited to 'src/libstore/build.cc')
| -rw-r--r-- | src/libstore/build.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 0c128d757..7d82ef09b 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -2774,7 +2774,7 @@ struct RestrictedStore : public LocalFSStore goal.addDependency(info.path); } - StorePath addToStoreFromDump(const string & dump, const string & name, + StorePath addToStoreFromDump(Source & dump, const string & name, FileIngestionMethod method = FileIngestionMethod::Recursive, HashType hashAlgo = htSHA256, RepairFlag repair = NoRepair) override { auto path = next->addToStoreFromDump(dump, name, method, hashAlgo, repair); |