nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-28 05:00:58 +01:00
Code Activity

Merge remote-tracking branch 'upstream/master' into fix-and-ci-static-builds

Browse source
This commit is contained in:
John Ericson 2020-09-04 02:40:36 +00:00
commit 25f7ff16fa
341 changed files with 13513 additions and 18444 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/globals.cc
View file

@ -10,6 +10,9 @@
#include <sys/utsname.h>
#include <unordered_set>
#include <nlohmann/json.hpp>
namespace nix {
@ -160,9 +163,9 @@ template<> std::string BaseSetting<SandboxMode>::to_string() const
else abort();
}
template<> void BaseSetting<SandboxMode>::toJSON(JSONPlaceholder & out)
template<> nlohmann::json BaseSetting<SandboxMode>::toJSON()
{
AbstractSetting::toJSON(out);
return AbstractSetting::toJSON();
}
template<> void BaseSetting<SandboxMode>::convertToArg(Args & args, const std::string & category)