diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2023-06-21 15:40:43 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-21 15:40:43 -0400 |
commit | 48fe0ed554e2708d136cbfc10ec0969a638d209e (patch) | |
tree | 81e57cb9c64741cb2569b51e0178346b18b778d6 /src/libutil/experimental-features.hh | |
parent | 3c618c43c6044eda184df235c193877529e951cb (diff) | |
parent | d2ce2e89b178e7e7467cf4c1e572704a4c2ca75e (diff) |
Merge pull request #8374 from obsidiansystems/improve-path-setting
Split `OptionalPathSetting` from `PathSetting`
Diffstat (limited to 'src/libutil/experimental-features.hh')
-rw-r--r-- | src/libutil/experimental-features.hh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/libutil/experimental-features.hh b/src/libutil/experimental-features.hh index 507b0cc06..faf2e9398 100644 --- a/src/libutil/experimental-features.hh +++ b/src/libutil/experimental-features.hh @@ -3,7 +3,7 @@ #include "comparator.hh" #include "error.hh" -#include "nlohmann/json_fwd.hpp" +#include "json-utils.hh" #include "types.hh" namespace nix { @@ -94,4 +94,10 @@ public: void to_json(nlohmann::json &, const ExperimentalFeature &); void from_json(const nlohmann::json &, ExperimentalFeature &); +/** + * It is always rendered as a string + */ +template<> +struct json_avoids_null<ExperimentalFeature> : std::true_type {}; + } |