Fix test

edolstra · edolstra · commit 80c52a29964f · 2026-01-22T15:09:14.000+01:00
diff --git a/src/libstore-tests/data/dummy-store/one-flat-file.json b/src/libstore-tests/data/dummy-store/one-flat-file.json
@@ -18,7 +18,6 @@
         "deriver": null,
         "narHash": "sha256-f1eduuSIYC1BofXA1tycF79Ai2NSMJQtUErx5DxLYSU=",
         "narSize": 120,
-        "provenance": null,
         "references": [],
         "registrationTime": null,
         "signatures": [],
diff --git a/src/libstore-tests/data/nar-info/json-1/impure.json b/src/libstore-tests/data/nar-info/json-1/impure.json
@@ -6,7 +6,6 @@
   "downloadSize": 4029176,
   "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=",
   "narSize": 34878,
-  "provenance": null,
   "references": [
     "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
     "/nix/store/n5wkd9frr45pa74if5gpz9j7mifg27fh-foo"
diff --git a/src/libstore-tests/data/nar-info/json-2/impure.json b/src/libstore-tests/data/nar-info/json-2/impure.json
@@ -9,7 +9,6 @@
   "downloadSize": 4029176,
   "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=",
   "narSize": 34878,
-  "provenance": null,
   "references": [
     "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
     "n5wkd9frr45pa74if5gpz9j7mifg27fh-foo"
diff --git a/src/libstore-tests/data/path-info/json-1/empty_impure.json b/src/libstore-tests/data/path-info/json-1/empty_impure.json
@@ -3,7 +3,6 @@
   "deriver": null,
   "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=",
   "narSize": 0,
-  "provenance": null,
   "references": [],
   "registrationTime": null,
   "signatures": [],
diff --git a/src/libstore-tests/data/path-info/json-1/impure.json b/src/libstore-tests/data/path-info/json-1/impure.json
@@ -3,7 +3,6 @@
   "deriver": "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv",
   "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=",
   "narSize": 34878,
-  "provenance": null,
   "references": [
     "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
     "/nix/store/n5wkd9frr45pa74if5gpz9j7mifg27fh-foo"
diff --git a/src/libstore-tests/data/path-info/json-2/empty_impure.json b/src/libstore-tests/data/path-info/json-2/empty_impure.json
@@ -3,7 +3,6 @@
   "deriver": null,
   "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=",
   "narSize": 0,
-  "provenance": null,
   "references": [],
   "registrationTime": null,
   "signatures": [],
diff --git a/src/libstore-tests/data/path-info/json-2/impure.json b/src/libstore-tests/data/path-info/json-2/impure.json
@@ -6,7 +6,6 @@
   "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv",
   "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=",
   "narSize": 34878,
-  "provenance": null,
   "references": [
     "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
     "n5wkd9frr45pa74if5gpz9j7mifg27fh-foo"
diff --git a/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.3.json b/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.3.json
@@ -4,7 +4,6 @@
     "deriver": null,
     "narHash": "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
     "narSize": 34878,
-    "provenance": null,
     "references": [],
     "registrationTime": null,
     "signatures": [],
@@ -17,7 +16,6 @@
     "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv",
     "narHash": "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
     "narSize": 34878,
-    "provenance": null,
     "references": [
       "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3q-foo.drv"
     ],
diff --git a/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.4.json b/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.4.json
@@ -4,7 +4,6 @@
     "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv",
     "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=",
     "narSize": 34878,
-    "provenance": null,
     "references": [
       "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3q-foo.drv"
     ],
@@ -22,7 +21,6 @@
     "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv",
     "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=",
     "narSize": 34878,
-    "provenance": null,
     "references": [
       "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
       "n5wkd9frr45pa74if5gpz9j7mifg27fh-foo"
diff --git a/src/libstore-tests/data/worker-protocol/unkeyed-valid-path-info-1.15.json b/src/libstore-tests/data/worker-protocol/unkeyed-valid-path-info-1.15.json
@@ -4,7 +4,6 @@
     "deriver": null,
     "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=",
     "narSize": 34878,
-    "provenance": null,
     "references": [],
     "registrationTime": 23423,
     "signatures": [],
@@ -17,7 +16,6 @@
     "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv",
     "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=",
     "narSize": 34878,
-    "provenance": null,
     "references": [
       "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3q-foo.drv"
     ],
diff --git a/src/libstore-tests/data/worker-protocol/valid-path-info-1.15.json b/src/libstore-tests/data/worker-protocol/valid-path-info-1.15.json
@@ -5,7 +5,6 @@
     "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=",
     "narSize": 34878,
     "path": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
-    "provenance": null,
     "references": [],
     "registrationTime": 23423,
     "signatures": [],
@@ -19,7 +18,6 @@
     "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=",
     "narSize": 34878,
     "path": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
-    "provenance": null,
     "references": [
       "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
       "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3q-foo"
diff --git a/src/libstore-tests/data/worker-protocol/valid-path-info-1.16.json b/src/libstore-tests/data/worker-protocol/valid-path-info-1.16.json
@@ -5,7 +5,6 @@
     "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=",
     "narSize": 34878,
     "path": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
-    "provenance": null,
     "references": [],
     "registrationTime": 23423,
     "signatures": [],
@@ -19,7 +18,6 @@
     "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=",
     "narSize": 34878,
     "path": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
-    "provenance": null,
     "references": [
       "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
       "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3q-foo"
@@ -42,7 +40,6 @@
     "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=",
     "narSize": 34878,
     "path": "n5wkd9frr45pa74if5gpz9j7mifg27fh-foo",
-    "provenance": null,
     "references": [
       "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
       "n5wkd9frr45pa74if5gpz9j7mifg27fh-foo"
diff --git a/src/libstore/build-result.cc b/src/libstore/build-result.cc
@@ -107,14 +107,16 @@ void adl_serializer<BuildResult>::to_json(json & res, const BuildResult & br)
                 res["success"] = true;
                 res["status"] = BuildResult::Success::statusToString(success.status);
                 res["builtOutputs"] = success.builtOutputs;
-                res["provenance"] = success.provenance ? success.provenance->to_json() : nlohmann::json(nullptr);
+                if (success.provenance)
+                    res["provenance"] = success.provenance->to_json();
             },
             [&](const BuildResult::Failure & failure) {
                 res["success"] = false;
                 res["status"] = BuildResult::Failure::statusToString(failure.status);
                 res["errorMsg"] = failure.errorMsg;
                 res["isNonDeterministic"] = failure.isNonDeterministic;
-                res["provenance"] = failure.provenance ? failure.provenance->to_json() : nlohmann::json(nullptr);
+                if (failure.provenance)
+                    res["provenance"] = failure.provenance->to_json();
             },
         },
         br.inner);
diff --git a/src/libstore/nar-info.cc b/src/libstore/nar-info.cc
@@ -131,7 +131,7 @@ std::string NarInfo::to_string(const StoreDirConfig & store) const
     if (ca)
         res += "CA: " + renderContentAddress(*ca) + "\n";
 
-    if (provenance)
+    if (provenance && experimentalFeatureSettings.isEnabled(Xp::Provenance))
         res += "Provenance: " + provenance->to_json_str() + "\n";
 
     return res;
