diff options
| author | Théophane Hufschmitt <theophane.hufschmitt@tweag.io> | 2023-01-27 09:46:46 +0100 |
|---|---|---|
| committer | Théophane Hufschmitt <theophane.hufschmitt@tweag.io> | 2023-01-27 09:46:46 +0100 |
| commit | ab424a39a966e2e3bfb2a34ba5cf4f1c49f86d2d (patch) | |
| tree | 30209c669865c452207b780f328daa0b26731ed6 /src/libstore/nar-accessor.hh | |
| parent | 6da4cc92d8c546939818b65ba4f1b4ce65d88d6e (diff) | |
| parent | ed479aafdc03f2e7428f182549cedab947824300 (diff) | |
Merge remote-tracking branch 'nixos/master' into pr-flake-show-foreign
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); } |