From 67421f8eaaa419b8c1c1ec258c2c884482a641bc Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Sun, 6 Oct 2024 13:54:13 +0200
Subject: [PATCH] Revert "fix build with latest lix"

This reverts commit f037de5ad8129c1d9aead55bd7ffc9b3813ca45e.
---
 src/hydra-queue-runner/builder.cc       |  2 +-
 src/hydra-queue-runner/nar-extractor.cc | 59 ++++++++++++-------------
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/hydra-queue-runner/builder.cc b/src/hydra-queue-runner/builder.cc
index 42b2b49e..3f340c72 100644
--- a/src/hydra-queue-runner/builder.cc
+++ b/src/hydra-queue-runner/builder.cc
@@ -185,7 +185,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
                     unlink(result.logFile.c_str());
                 }
             } catch (...) {
-                ignoreExceptionExceptInterrupt();
+                ignoreException();
             }
         }
     });
diff --git a/src/hydra-queue-runner/nar-extractor.cc b/src/hydra-queue-runner/nar-extractor.cc
index df0d94e3..b3350193 100644
--- a/src/hydra-queue-runner/nar-extractor.cc
+++ b/src/hydra-queue-runner/nar-extractor.cc
@@ -7,7 +7,7 @@
 
 using namespace nix;
 
-struct Extractor : NARParseVisitor
+struct Extractor : ParseSink
 {
     std::unordered_set<Path> filesToKeep {
         "/nix-support/hydra-build-products",
@@ -16,6 +16,7 @@ struct Extractor : NARParseVisitor
     };
 
     NarMemberDatas & members;
+    NarMemberData * curMember = nullptr;
     Path prefix;
 
     Extractor(NarMemberDatas & members, Path  prefix)
@@ -27,44 +28,42 @@ struct Extractor : NARParseVisitor
         members.insert_or_assign(prefix + path, NarMemberData { .type = FSAccessor::Type::tDirectory });
     }
 
-    std::unique_ptr<FileHandle> createRegularFile(const Path & path, uint64_t size, bool executable) override
+    void createRegularFile(const Path & path) override
     {
-        MyFileHandle * hdl = new MyFileHandle();
-
-        hdl->memberData = &members.insert_or_assign(prefix + path, NarMemberData {
+        curMember = &members.insert_or_assign(prefix + path, NarMemberData {
             .type = FSAccessor::Type::tRegular,
             .fileSize = 0,
             .contents = filesToKeep.count(path) ? std::optional("") : std::nullopt,
         }).first->second;
-
-        hdl->expectedSize = size;
-        hdl->hashSink = std::make_unique<HashSink>(HashType::SHA256);
-
-        return std::unique_ptr<MyFileHandle>(hdl);
     }
 
-    struct MyFileHandle : public FileHandle
-    {
-        uint64_t expectedSize;
-        std::unique_ptr<HashSink> hashSink;
-        NarMemberData * memberData;
+    std::optional<uint64_t> expectedSize;
+    std::unique_ptr<HashSink> hashSink;
 
-        void receiveContents(std::string_view data) override
-        {
-            *memberData->fileSize += data.size();
-            (*hashSink)(data);
-            if (memberData->contents) {
-                memberData->contents->append(data);
-            }
-            assert(memberData->fileSize <= expectedSize);
-            if (memberData->fileSize == expectedSize) {
-                auto [hash, len] = hashSink->finish();
-                assert(memberData->fileSize == len);
-                memberData->sha256 = hash;
-                hashSink.reset();
-            }
+    void preallocateContents(uint64_t size) override
+    {
+        expectedSize = size;
+        hashSink = std::make_unique<HashSink>(HashType::SHA256);
+    }
+
+    void receiveContents(std::string_view data) override
+    {
+        assert(expectedSize);
+        assert(curMember);
+        assert(hashSink);
+        *curMember->fileSize += data.size();
+        (*hashSink)(data);
+        if (curMember->contents) {
+            curMember->contents->append(data);
         }
-    };
+        assert(curMember->fileSize <= expectedSize);
+        if (curMember->fileSize == expectedSize) {
+            auto [hash, len] = hashSink->finish();
+            assert(curMember->fileSize == len);
+            curMember->sha256 = hash;
+            hashSink.reset();
+        }
+    }
 
     void createSymlink(const Path & path, const std::string & target) override
     {