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

Merge 80b1d7b87a into 479b6b73a9

Browse source
This commit is contained in:
John Ericson 2025-11-08 14:35:44 +01:00 • committed by GitHub
commit bc4ffb02ab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libstore/derivations.cc
View file

@ -1381,13 +1381,15 @@ adl_serializer<DerivationOutput>::from_json(const json & _json, const Experiment
} }
} }
static unsigned constexpr expectedJsonVersionDerivation = 4;
void adl_serializer<Derivation>::to_json(json & res, const Derivation & d) void adl_serializer<Derivation>::to_json(json & res, const Derivation & d)
{ {
res = nlohmann::json::object(); res = nlohmann::json::object();
res["name"] = d.name; res["name"] = d.name;
res["version"] = 4; res["version"] = expectedJsonVersionDerivation;
{ {
nlohmann::json & outputsObj = res["outputs"]; nlohmann::json & outputsObj = res["outputs"];
@ -1446,8 +1448,14 @@ Derivation adl_serializer<Derivation>::from_json(const json & _json, const Exper
res.name = getString(valueAt(json, "name")); res.name = getString(valueAt(json, "name"));
if (valueAt(json, "version") != 4) {
throw Error("Only derivation format version 4 is currently supported."); auto version = getUnsigned(valueAt(json, "version"));
if (valueAt(json, "version") != expectedJsonVersionDerivation)
throw Error(
"Unsupported derivation JSON format version %d, only format version %d is currently supported.",
version,
expectedJsonVersionDerivation);
}
try { try {
auto outputs = getObject(valueAt(json, "outputs")); auto outputs = getObject(valueAt(json, "outputs"));