From 1113c2895ab2597893be63019864a53227e9f795 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 7 Aug 2020 21:42:09 +0200
Subject: [PATCH] Fix build

---
 src/hydra-eval-jobs/hydra-eval-jobs.cc  | 2 +-
 src/hydra-queue-runner/build-remote.cc  | 2 +-
 src/hydra-queue-runner/queue-monitor.cc | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hydra-eval-jobs/hydra-eval-jobs.cc b/src/hydra-eval-jobs/hydra-eval-jobs.cc
index d9e5dfa3..cf7d98b7 100644
--- a/src/hydra-eval-jobs/hydra-eval-jobs.cc
+++ b/src/hydra-eval-jobs/hydra-eval-jobs.cc
@@ -469,7 +469,7 @@ int main(int argc, char * * argv)
                 std::string drvName(drvPath.name());
                 assert(hasSuffix(drvName, drvExtension));
                 drvName.resize(drvName.size() - drvExtension.size());
-                auto h = hashDerivationModulo(*store, drv, true);
+                auto h = std::get<Hash>(hashDerivationModulo(*store, drv, true));
                 auto outPath = store->makeOutputPath("out", h, drvName);
                 drv.env["out"] = store->printStorePath(outPath);
                 drv.outputs.insert_or_assign("out", DerivationOutput { .output = DerivationOutputInputAddressed { .path = outPath } });
diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc
index 6afe3aac..1d12331e 100644
--- a/src/hydra-queue-runner/build-remote.cc
+++ b/src/hydra-queue-runner/build-remote.cc
@@ -452,7 +452,7 @@ void State::buildRemote(ref<Store> destStore,
                 readLongLong(from); // download size
                 info.narSize = readLongLong(from);
                 totalNarSize += info.narSize;
-                info.narHash = Hash(readString(from), htSHA256);
+                info.narHash = Hash::parseAny(readString(from), htSHA256);
                 info.ca = parseContentAddressOpt(readString(from));
                 readStrings<StringSet>(from); // sigs
                 infos.insert_or_assign(info.path, info);
diff --git a/src/hydra-queue-runner/queue-monitor.cc b/src/hydra-queue-runner/queue-monitor.cc
index f1cc0ef7..ddb85f0a 100644
--- a/src/hydra-queue-runner/queue-monitor.cc
+++ b/src/hydra-queue-runner/queue-monitor.cc
@@ -649,7 +649,7 @@ BuildOutput State::getBuildOutputCached(Connection & conn, nix::ref<nix::Store>
                 product.fileSize = row[2].as<off_t>();
             }
             if (!row[3].is_null())
-                product.sha256hash = Hash(row[3].as<std::string>(), htSHA256);
+                product.sha256hash = Hash::parseAny(row[3].as<std::string>(), htSHA256);
             if (!row[4].is_null())
                 product.path = row[4].as<std::string>();
             product.name = row[5].as<std::string>();