include options in JSON drv format

Author: haenoe

src/libstore/derivations.cc

@@ -1,6 +1,7 @@
 #include "derivations.hh"
 #include "downstream-placeholder.hh"
 #include "error.hh"
+#include "json-utils.hh"
 #include "store-api.hh"
 #include "globals.hh"
 #include "types.hh"
@@ -1427,6 +1428,7 @@ nlohmann::json Derivation::toJSON(const StoreDirConfig & store) const
     res["builder"] = builder;
     res["args"] = args;
     res["env"] = env;
+    res["options"] = nlohmann::json(options);
 
     return res;
 }
@@ -1484,12 +1486,59 @@ Derivation Derivation::fromJSON(
         throw;
     }
 
+    auto options = valueAt(json, "options");
+
     res.platform = getString(valueAt(json, "system"));
     res.builder = getString(valueAt(json, "builder"));
     res.args = getStringList(valueAt(json, "args"));
     res.env = getStringMap(valueAt(json, "env"));
+    res.options = options.get<DerivationOptions>();
+
+    return res;
+}
+
+}
+
+namespace nlohmann {
+
+using namespace nix;
+
+DerivationOptions adl_serializer<DerivationOptions>::from_json(const json & json) {
+    DerivationOptions res;
+
+    res.additionalSandboxProfile = getString(valueAt(json, "additionalSandboxProfile"));
+    res.noChroot = getBoolean(valueAt(json, "noChroot"));
+    res.impureHostDeps = getStringList(valueAt(json, "impureHostDeps"));
+    res.impureEnvVars = getStringList(valueAt(json, "impureEnvVars"));
+    res.allowLocalNetworking = getBoolean(valueAt(json, "allowLocalNetworking"));
+
+    res.allowedReferences = optionalValueAt(json, "allowedReferences");
+    res.allowedRequisites = optionalValueAt(json, "allowedRequisites");
+    res.disallowedReferences = optionalValueAt(json, "disallowedReferences");
+    res.disallowedRequisites = optionalValueAt(json, "disallowedRequisites");
+
+    res.requiredSystemFeatures = getStringList(valueAt(json, "requiredSystemFeatures"));
+    res.preferLocalBuild = getBoolean(valueAt(json, "preferLocalBuild"));
+    res.allowSubstitutes = getBoolean(valueAt(json, "allowSubstitutes"));
 
     return res;
 }
 
+void adl_serializer<DerivationOptions>::to_json(json & json, DerivationOptions o) {
+    json["additionalSandboxProfile"] = o.additionalSandboxProfile;
+    json["noChroot"] = o.noChroot;
+    json["impureHostDeps"] = o.impureHostDeps;
+    json["impureEnvVars"] = o.impureEnvVars;
+    json["allowLocalNetworking"] = o.allowLocalNetworking;
+
+    json["disallowedReferences"] = o.allowedReferences;
+    json["disallowedRequisites"] = o.allowedRequisites;
+    json["disallowedReferences"] = o.disallowedReferences;
+    json["disallowedRequisites"] = o.disallowedRequisites;
+
+    json["requiredSystemFeatures"] = o.requiredSystemFeatures;
+    json["preferLocalBuild"] = o.preferLocalBuild;
+    json["allowSubstitutes"] = o.allowSubstitutes;
+}
+
 }

src/libstore/derivations.hh

@@ -1,6 +1,7 @@
 #pragma once
 ///@file
 
+#include "json-impls.hh"
 #include "path.hh"
 #include "types.hh"
 #include "hash.hh"
@@ -10,6 +11,7 @@
 #include "sync.hh"
 #include "comparator.hh"
 #include "variant-wrapper.hh"
+#include <nlohmann/json.hpp>
 
 #include <map>
 #include <optional>
@@ -630,3 +632,5 @@ std::string hashPlaceholder(const OutputNameView outputName);
 extern const Hash impureOutputHash;
 
 }
+
+JSON_IMPL(DerivationOptions)

tests/unit/libstore/data/derivation/advanced-attributes-defaults.json

@@ -13,6 +13,18 @@
   "inputDrvs": {},
   "inputSrcs": [],
   "name": "advanced-attributes-defaults",
+  "options": {
+    "additionalSandboxProfile": "",
+    "allowLocalNetworking": false,
+    "allowSubstitutes": true,
+    "disallowedReferences": null,
+    "disallowedRequisites": null,
+    "impureEnvVars": [],
+    "impureHostDeps": [],
+    "noChroot": false,
+    "preferLocalBuild": false,
+    "requiredSystemFeatures": []
+  },
   "outputs": {
     "out": {
       "path": "/nix/store/1qsc7svv43m4dw2prh6mvyf7cai5czji-advanced-attributes-defaults"

tests/unit/libstore/data/derivation/advanced-attributes-structured-attrs-defaults.json

@@ -12,6 +12,18 @@
   "inputDrvs": {},
   "inputSrcs": [],
   "name": "advanced-attributes-structured-attrs-defaults",
+  "options": {
+    "additionalSandboxProfile": "",
+    "allowLocalNetworking": false,
+    "allowSubstitutes": true,
+    "disallowedReferences": null,
+    "disallowedRequisites": null,
+    "impureEnvVars": [],
+    "impureHostDeps": [],
+    "noChroot": false,
+    "preferLocalBuild": false,
+    "requiredSystemFeatures": []
+  },
   "outputs": {
     "dev": {
       "path": "/nix/store/8bazivnbipbyi569623skw5zm91z6kc2-advanced-attributes-structured-attrs-defaults-dev"

tests/unit/libstore/data/derivation/advanced-attributes-structured-attrs.json

@@ -26,6 +26,25 @@
   },
   "inputSrcs": [],
   "name": "advanced-attributes-structured-attrs",
+  "options": {
+    "additionalSandboxProfile": "sandcastle",
+    "allowLocalNetworking": true,
+    "allowSubstitutes": false,
+    "disallowedReferences": null,
+    "disallowedRequisites": null,
+    "impureEnvVars": [
+      "UNICORN"
+    ],
+    "impureHostDeps": [
+      "/usr/bin/ditto"
+    ],
+    "noChroot": true,
+    "preferLocalBuild": true,
+    "requiredSystemFeatures": [
+      "rainbow",
+      "uid-range"
+    ]
+  },
   "outputs": {
     "bin": {
       "path": "/nix/store/pbzb48v0ycf80jgligcp4n8z0rblna4n-advanced-attributes-structured-attrs-bin"

tests/unit/libstore/data/derivation/dynDerivationDeps.json

@@ -33,6 +33,18 @@
     "/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep1"
   ],
   "name": "dyn-dep-derivation",
+  "options": {
+    "additionalSandboxProfile": "",
+    "allowLocalNetworking": false,
+    "allowSubstitutes": true,
+    "disallowedReferences": null,
+    "disallowedRequisites": null,
+    "impureEnvVars": [],
+    "impureHostDeps": [],
+    "noChroot": false,
+    "preferLocalBuild": false,
+    "requiredSystemFeatures": []
+  },
   "outputs": {},
   "system": "wasm-sel4"
 }

tests/unit/libstore/data/derivation/simple.json

@@ -20,6 +20,18 @@
     "/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep1"
   ],
   "name": "simple-derivation",
+  "options": {
+    "additionalSandboxProfile": "",
+    "allowLocalNetworking": false,
+    "allowSubstitutes": true,
+    "disallowedReferences": null,
+    "disallowedRequisites": null,
+    "impureEnvVars": [],
+    "impureHostDeps": [],
+    "noChroot": false,
+    "preferLocalBuild": false,
+    "requiredSystemFeatures": []
+  },
   "outputs": {},
   "system": "wasm-sel4"
 }