.envrc

@@ -1 +1 @@
-use flake .#clang
+use flake

flake.lock

@@ -48,11 +48,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1727334821,
+        "lastModified": 1725228396,
-        "narHash": "sha256-80CJtKmLvPOUnqz9O6rLYUoTHtVXI3KCQ/ahPgpDACA=",
+        "narHash": "sha256-QBXwqyPuHUKBiuyzHBxqH/MpjPY9DQiY2M81P2t6b/0=",
         "ref": "refs/heads/main",
-        "rev": "31954b51367737defbae87fba053b068897416fb",
+        "rev": "02eb07cfd539c34c080cb1baf042e5e780c1fcc2",
-        "revCount": 16258,
+        "revCount": 16214,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/lix"
       },
@@ -126,11 +126,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727264057,
+        "lastModified": 1725001927,
-        "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=",
+        "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "759537f06e6999e141588ff1c9be7f3a5c060106",
+        "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
         "type": "github"
       },
       "original": {

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

@@ -7,38 +7,8 @@
 
 using namespace nix;
 
-struct Extractor : NARParseVisitor
+struct Extractor : ParseSink
 {
-    class MyFileHandle : public FileHandle
-    {
-        NarMemberData * memberData;
-        uint64_t expectedSize;
-        std::unique_ptr<HashSink> hashSink;
-
-        public:
-            MyFileHandle(NarMemberData * memberData, uint64_t size) : memberData(memberData)
-            {
-                expectedSize = size;
-                hashSink = std::make_unique<HashSink>(HashType::SHA256);
-            }
-
-            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();
-                }
-            }
-    };
-
     std::unordered_set<Path> filesToKeep {
         "/nix-support/hydra-build-products",
         "/nix-support/hydra-release-name",
@@ -46,6 +16,7 @@ struct Extractor : NARParseVisitor
     };
 
     NarMemberDatas & members;
+    NarMemberData * curMember = nullptr;
     Path prefix;
 
     Extractor(NarMemberDatas & members, Path  prefix)
@@ -57,15 +28,41 @@ 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
     {
-        auto 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;
+    }
 
-        return std::unique_ptr<MyFileHandle>(new MyFileHandle{memberData, size});
+    std::optional<uint64_t> expectedSize;
+    std::unique_ptr<HashSink> hashSink;
+
+    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