Don't use DerivedPath::toJSON()

It doesn't work on unrealized paths.

Author: edolstra

src/libstore/build-result.cc

@@ -23,11 +23,20 @@ void to_json(nlohmann::json & json, const BuildResult & buildResult)
         json["stopTime"] = buildResult.stopTime;
 }
 
-nlohmann::json KeyedBuildResult::toJSON(Store & store) const
+void to_json(nlohmann::json & json, const KeyedBuildResult & buildResult)
 {
-    auto json = nlohmann::json((const BuildResult &) *this);
-    json["path"] = path.toJSON(store);
-    return json;
+    to_json(json, (const BuildResult &) buildResult);
+    auto path = nlohmann::json::object();
+    std::visit(
+        overloaded{
+            [&](const DerivedPathOpaque & opaque) { path["opaque"] = opaque.path.to_string(); },
+            [&](const DerivedPathBuilt & drv) {
+                path["drvPath"] = drv.drvPath->getBaseStorePath().to_string();
+                path["outputs"] = drv.outputs.to_string();
+            },
+        },
+        buildResult.path.raw());
+    json["path"] = std::move(path);
 }
 
 } // namespace nix

src/libstore/build/derivation-goal.cc

@@ -377,13 +377,6 @@ Goal::Done DerivationGoal::doneFailure(BuildError ex)
         fs << worker.store.printStorePath(drvPath) << "\t" << buildResult.toString() << std::endl;
     }
 
-    logger->result(
-        act ? act->id : getCurActivity(),
-        resBuildResult,
-        KeyedBuildResult(
-            buildResult,
-            DerivedPath::Built{.drvPath = makeConstantStorePathRef(drvPath), .outputs = wantedOutputs}).toJSON(worker.store));
-
     return amDone(buildResult.success() ? ecSuccess : ecFailed, std::move(ex));
 }
 

src/libstore/build/substitution-goal.cc

@@ -37,13 +37,6 @@ Goal::Done PathSubstitutionGoal::done(ExitCode result, BuildResult::Status statu
         buildResult.errorMsg = *errorMsg;
     }
 
-    logger->result(
-        getCurActivity(),
-        resBuildResult,
-        KeyedBuildResult(
-            buildResult,
-            DerivedPath::Opaque{storePath}).toJSON(worker.store));
-
     return amDone(result);
 }
 

src/libstore/include/nix/store/build-result.hh

@@ -55,29 +55,46 @@ struct BuildResult
     static std::string_view statusToString(Status status)
     {
         switch (status) {
-        case Built: return "Built";
-        case Substituted: return "Substituted";
-        case AlreadyValid: return "AlreadyValid";
-        case PermanentFailure: return "PermanentFailure";
-        case InputRejected: return "InputRejected";
-        case OutputRejected: return "OutputRejected";
-        case TransientFailure: return "TransientFailure";
-        case CachedFailure: return "CachedFailure";
-        case TimedOut: return "TimedOut";
-        case MiscFailure: return "MiscFailure";
-        case DependencyFailed: return "DependencyFailed";
-        case LogLimitExceeded: return "LogLimitExceeded";
-        case NotDeterministic: return "NotDeterministic";
-        case ResolvesToAlreadyValid: return "ResolvesToAlreadyValid";
-        case NoSubstituters: return "NoSubstituters";
-        default: return "Unknown";
+        case Built:
+            return "Built";
+        case Substituted:
+            return "Substituted";
+        case AlreadyValid:
+            return "AlreadyValid";
+        case PermanentFailure:
+            return "PermanentFailure";
+        case InputRejected:
+            return "InputRejected";
+        case OutputRejected:
+            return "OutputRejected";
+        case TransientFailure:
+            return "TransientFailure";
+        case CachedFailure:
+            return "CachedFailure";
+        case TimedOut:
+            return "TimedOut";
+        case MiscFailure:
+            return "MiscFailure";
+        case DependencyFailed:
+            return "DependencyFailed";
+        case LogLimitExceeded:
+            return "LogLimitExceeded";
+        case NotDeterministic:
+            return "NotDeterministic";
+        case ResolvesToAlreadyValid:
+            return "ResolvesToAlreadyValid";
+        case NoSubstituters:
+            return "NoSubstituters";
+        case HashMismatch:
+            return "HashMismatch";
+        default:
+            return "Unknown";
         };
     }
 
-    std::string toString() const {
-        return
-            std::string(statusToString(status))
-            + ((errorMsg == "") ? "" : " : " + errorMsg);
+    std::string toString() const
+    {
+        return std::string(statusToString(status)) + ((errorMsg == "") ? "" : " : " + errorMsg);
     }
 
     /**
@@ -165,7 +182,6 @@ struct KeyedBuildResult : BuildResult
 };
 
 void to_json(nlohmann::json & json, const BuildResult & buildResult);
-
-}
+void to_json(nlohmann::json & json, const KeyedBuildResult & buildResult);
 
 } // namespace nix