From 6d245182e8900ad86cf767108289afc879293e8c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 8 Mar 2024 12:40:14 +0100 Subject: [PATCH] GitHub fetcher: Don't emit treeHash yet But do accept it if it's there, so we don't choke on future lock files that do have the treeHash attribute. --- src/libfetchers/github.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libfetchers/github.cc b/src/libfetchers/github.cc index d9d348756..1ca639419 100644 --- a/src/libfetchers/github.cc +++ b/src/libfetchers/github.cc @@ -111,6 +111,7 @@ struct GitArchiveInputScheme : InputScheme "narHash", "lastModified", "host", + "treeHash", }; } @@ -268,7 +269,9 @@ struct GitArchiveInputScheme : InputScheme { auto [input, tarballInfo] = downloadArchive(store, _input); + #if 0 input.attrs.insert_or_assign("treeHash", tarballInfo.treeHash.gitRev()); + #endif input.attrs.insert_or_assign("lastModified", uint64_t(tarballInfo.lastModified)); auto accessor = getTarballCache()->getAccessor(tarballInfo.treeHash, false);