diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-04 21:04:35 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-04 21:04:35 +0000 |
commit | e5cc1ebc5db1ef837da82f5ce7824bb29cbcc44b (patch) | |
tree | 42d659874572b812526596f6534ffe884e77080f /src/libstore/store-api.hh | |
parent | a7b82fd006606dad591f8da88907e79b4c87b1f7 (diff) | |
parent | 0f44b60e6dc999697bf9f2a4b3652a0551016598 (diff) |
Merge remote-tracking branch 'upstream/master' into no-stringly-typed-derivation-output
Diffstat (limited to 'src/libstore/store-api.hh')
-rw-r--r-- | src/libstore/store-api.hh | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index 01501abeb..d76a5b24d 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -451,12 +451,7 @@ public: /* Import a path into the store. */ virtual void addToStore(const ValidPathInfo & info, Source & narSource, RepairFlag repair = NoRepair, CheckSigsFlag checkSigs = CheckSigs, - std::shared_ptr<FSAccessor> accessor = 0); - - // FIXME: remove - virtual void addToStore(const ValidPathInfo & info, const ref<std::string> & nar, - RepairFlag repair = NoRepair, CheckSigsFlag checkSigs = CheckSigs, - std::shared_ptr<FSAccessor> accessor = 0); + std::shared_ptr<FSAccessor> accessor = 0) = 0; /* Copy the contents of a path to the store and register the validity the resulting path. The resulting path is returned. |