diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2023-01-06 10:35:20 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-01-06 10:35:20 -0500 |
| commit | e9fc1e4fdb0ab5adb6b163c3db361b86a4f5c69b (patch) | |
| tree | 25522f96d7aa54f7c93ba3c5e187374d3a50dfe6 /src/libstore/nar-accessor.hh | |
| parent | 55caef36ed1cee2e924c82cf49b3ceb17bdde910 (diff) | |
| parent | 3172c51baff5c81362fcdafa2e28773c2949c660 (diff) | |
Merge remote-tracking branch 'upstream/master' into path-info
Diffstat (limited to 'src/libstore/nar-accessor.hh')
| -rw-r--r-- | src/libstore/nar-accessor.hh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libstore/nar-accessor.hh b/src/libstore/nar-accessor.hh index c2241a04c..7d998ae0b 100644 --- a/src/libstore/nar-accessor.hh +++ b/src/libstore/nar-accessor.hh @@ -2,6 +2,7 @@ #include <functional> +#include <nlohmann/json_fwd.hpp> #include "fs-accessor.hh" namespace nix { @@ -24,11 +25,8 @@ ref<FSAccessor> makeLazyNarAccessor( const std::string & listing, GetNarBytes getNarBytes); -class JSONPlaceholder; - /* Write a JSON representation of the contents of a NAR (except file contents). */ -void listNar(JSONPlaceholder & res, ref<FSAccessor> accessor, - const Path & path, bool recurse); +nlohmann::json listNar(ref<FSAccessor> accessor, const Path & path, bool recurse); } |