diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2023-01-02 20:53:39 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2023-01-02 20:53:39 +0100 |
| commit | 6b6965238506705382892b14ef22700fc5112c3d (patch) | |
| tree | c5a0f04bee2bace1281d7c7b405c8214641072c8 /src/libexpr/value.hh | |
| parent | e0ab2069c975abf80db9fdca23f0c164df921829 (diff) | |
| parent | 9af16c5f742300e831a2cc400e43df1e22f87f31 (diff) | |
Merge remote-tracking branch 'origin/master' into coerce-string
Diffstat (limited to 'src/libexpr/value.hh')
| -rw-r--r-- | src/libexpr/value.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libexpr/value.hh b/src/libexpr/value.hh index a428bc565..f57597cff 100644 --- a/src/libexpr/value.hh +++ b/src/libexpr/value.hh @@ -7,6 +7,7 @@ #if HAVE_BOEHMGC #include <gc/gc_allocator.h> #endif +#include <nlohmann/json_fwd.hpp> namespace nix { @@ -62,7 +63,6 @@ class StorePath; class Store; class EvalState; class XMLWriter; -class JSONPlaceholder; typedef int64_t NixInt; @@ -98,8 +98,8 @@ class ExternalValueBase virtual bool operator ==(const ExternalValueBase & b) const; /* Print the value as JSON. Defaults to unconvertable, i.e. throws an error */ - virtual void printValueAsJSON(EvalState & state, bool strict, - JSONPlaceholder & out, PathSet & context, bool copyToStore = true) const; + virtual nlohmann::json printValueAsJSON(EvalState & state, bool strict, + PathSet & context, bool copyToStore = true) const; /* Print the value as XML. Defaults to unevaluated */ virtual void printValueAsXML(EvalState & state, bool strict, bool location, |