diff options
| author | alois31 <alois1@gmx-topmail.de> | 2024-09-09 16:14:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@localhost> | 2024-09-09 16:14:23 +0000 |
| commit | 8f7ab26f96ec025db3f922fc50f5184167662596 (patch) | |
| tree | ad5613548fae7201fe6ad96a300021673f296559 /src/libstore/globals.hh | |
| parent | c14486ae8d3bbc862c625d948a6b2f4dc0927d5b (diff) | |
| parent | 63ee2cdda36e48f932dd5a1ae7f35f85687ce1f5 (diff) | |
Merge changes If8ec210f,I6e2851b2 into main
* changes:
libfetchers: serialise accept-flake-config properly
libstore: declare SandboxMode JSON serialisation in the header
Diffstat (limited to 'src/libstore/globals.hh')
| -rw-r--r-- | src/libstore/globals.hh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index 94aa60825..bfba6ab01 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -14,6 +14,9 @@ namespace nix { typedef enum { smEnabled, smRelaxed, smDisabled } SandboxMode; +void to_json(nlohmann::json & j, const SandboxMode & e); +void from_json(const nlohmann::json & j, SandboxMode & e); + struct MaxBuildJobsSetting : public BaseSetting<unsigned int> { MaxBuildJobsSetting(Config * options, |