scriptis/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
lix/src/libutil/abstract-setting-to-json.hh

19 lines
414 B
C++
Raw Normal View History

Don't include nlohmann/json.hpp in config.hh Instead make a separate header with the template implementation of `BaseSetting<T>::toJSONObj` that can be included where needed
2020-09-16 07:06:35 +00:00
#pragma once
Ensure all headers have `#pragma once` and are in API docs `///@file` makes them show up in the internal API dos. A tiny few were missing `#pragma once`.
2023-04-01 03:18:41 +00:00
///@file
Don't include nlohmann/json.hpp in config.hh Instead make a separate header with the template implementation of `BaseSetting<T>::toJSONObj` that can be included where needed
2020-09-16 07:06:35 +00:00
#include <nlohmann/json.hpp>
#include "config.hh"
Split `OptionalPathSetting` from `PathSetting` Rather than doing `allowEmpty` as boolean, have separate types and use `std::optional`. This makes it harder to forget the possibility of an empty path. The `build-hook` setting was categorized as a `PathSetting`, but actually it was split into arguments. No good! Now, it is `Setting<Strings>` which actually reflects what it means and how it is used. Because of the subtyping, we now also have support for `Setting<std::optional<String>>` in general. I imagine this can be used to clean up many more settings also.
2023-05-19 14:56:59 +00:00
#include "json-utils.hh"
Don't include nlohmann/json.hpp in config.hh Instead make a separate header with the template implementation of `BaseSetting<T>::toJSONObj` that can be included where needed
2020-09-16 07:06:35 +00:00
namespace nix {
template<typename T>
Merge pull request #9299 from tfc/config-improvements Improvements in src/libutil/config.* (cherry picked from commit dea63bb81078d7290410544285c6df1a8e002952) Change-Id: I8090eb2ad393dd9964cf2d5254ec8c796b1bd367
2024-03-04 04:36:42 +00:00
std::map<std::string, nlohmann::json> BaseSetting<T>::toJSONObject() const
Don't include nlohmann/json.hpp in config.hh Instead make a separate header with the template implementation of `BaseSetting<T>::toJSONObj` that can be included where needed
2020-09-16 07:06:35 +00:00
{
auto obj = AbstractSetting::toJSONObject();
obj.emplace("value", value);
obj.emplace("defaultValue", defaultValue);
reproducibility: hide non-reproducible settings from manual Because the manual is generated from default values which are themselves generated from various sources (cpuid, bios settings (kvm), number of cores). This commit hides non-reproducible settings from the manual output.
2021-12-01 15:08:23 +00:00
obj.emplace("documentDefault", documentDefault);
Don't include nlohmann/json.hpp in config.hh Instead make a separate header with the template implementation of `BaseSetting<T>::toJSONObj` that can be included where needed
2020-09-16 07:06:35 +00:00
return obj;
}
}
Copy permalink