update flake locks, fix compile errors

src/hydra-queue-runner/build-remote.cc

@@ -368,7 +368,7 @@ static std::map<StorePath, ValidPathInfo> queryPathInfos(
         auto references = ServeProto::Serialise<StorePathSet>::read(localStore, conn);
         readLongLong(conn.from); // download size
         auto narSize = readLongLong(conn.from);
-        auto narHash = Hash::parseAny(readString(conn.from), htSHA256);
+        auto narHash = Hash::parseAny(readString(conn.from), HashType::SHA256);
         auto ca = ContentAddress::parseOpt(readString(conn.from));
         readStrings<StringSet>(conn.from); // sigs
         ValidPathInfo info(localStore.parseStorePath(storePathS), narHash);
@@ -397,8 +397,7 @@ static void copyPathFromRemote(
       /* Receive the NAR from the remote and add it to the
           destination store. Meanwhile, extract all the info from the
           NAR that getBuildOutput() needs. */
-      auto source2 = sinkToSource([&](Sink & sink)
-      {
+      auto coro = [&]() -> WireFormatGenerator {
           /* Note: we should only send the command to dump the store
               path to the remote if the NAR is actually going to get read
               by the destination store, which won't happen if this path
@@ -409,11 +408,11 @@ static void copyPathFromRemote(
           conn.to << ServeProto::Command::DumpStorePath << localStore.printStorePath(info.path);
           conn.to.flush();
 
-          TeeSource tee(conn.from, sink);
-          extractNarData(tee, localStore.printStorePath(info.path), narMembers);
-      });
+          co_yield extractNarDataFilter(conn.from, localStore.printStorePath(info.path), narMembers);
+      };
+      GeneratorSource source2{coro()};
 
-      destStore.addToStore(info, *source2, NoRepair, NoCheckSigs);
+      destStore.addToStore(info, source2, NoRepair, NoCheckSigs);
 }
 
 static void copyPathsFromRemote(

src/hydra-queue-runner/build-result.cc

@@ -34,11 +34,8 @@ BuildOutput getBuildOutput(
         auto outputS = store->printStorePath(output);
         if (!narMembers.count(outputS)) {
             printInfo("fetching NAR contents of '%s'...", outputS);
-            auto source = sinkToSource([&](Sink & sink)
-            {
-                sink << store->narFromPath(output);
-            });
-            extractNarData(*source, outputS, narMembers);
+            GeneratorSource source{store->narFromPath(output)};
+            extractNarData(source, outputS, narMembers);
         }
     }
 

src/hydra-queue-runner/hydra-queue-runner.cc

@@ -534,7 +534,7 @@ void State::markSucceededBuild(pqxx::work & txn, Build::ptr build,
              product.type,
              product.subtype,
              product.fileSize ? std::make_optional(*product.fileSize) : std::nullopt,
-             product.sha256hash ? std::make_optional(product.sha256hash->to_string(Base16, false)) : std::nullopt,
+             product.sha256hash ? std::make_optional(product.sha256hash->to_string(Base::Base16, false)) : std::nullopt,
              product.path,
              product.name,
              product.defaultPath);

src/hydra-queue-runner/nar-extractor.cc

@@ -42,7 +42,7 @@ struct Extractor : ParseSink
     void preallocateContents(uint64_t size) override
     {
         expectedSize = size;
-        hashSink = std::make_unique<HashSink>(htSHA256);
+        hashSink = std::make_unique<HashSink>(HashType::SHA256);
     }
 
     void receiveContents(std::string_view data) override
@@ -76,7 +76,19 @@ void extractNarData(
     const Path & prefix,
     NarMemberDatas & members)
 {
-    Extractor extractor(members, prefix);
-    parseDump(extractor, source);
-    // Note: this point may not be reached if we're in a coroutine.
+    auto parser = extractNarDataFilter(source, prefix, members);
+    while (parser.next()) {
+        // ignore raw data
+    }
+}
+
+nix::WireFormatGenerator extractNarDataFilter(
+    Source & source,
+    const Path & prefix,
+    NarMemberDatas & members)
+{
+    return [](Source & source, const Path & prefix, NarMemberDatas & members) -> WireFormatGenerator {
+        Extractor extractor(members, prefix);
+        co_yield parseAndCopyDump(extractor, source);
+    }(source, prefix, members);
 }

src/hydra-queue-runner/nar-extractor.hh

@@ -21,3 +21,8 @@ void extractNarData(
     nix::Source & source,
     const nix::Path & prefix,
     NarMemberDatas & members);
+
+nix::WireFormatGenerator extractNarDataFilter(
+    nix::Source & source,
+    const nix::Path & prefix,
+    NarMemberDatas & members);

src/hydra-queue-runner/queue-monitor.cc

@@ -727,7 +727,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::parseAny(row[3].as<std::string>(), htSHA256);
+                product.sha256hash = Hash::parseAny(row[3].as<std::string>(), HashType::SHA256);
             if (!row[4].is_null())
                 product.path = row[4].as<std::string>();
             product.name = row[5].as<std::string>();