NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 23:03:53 -04:00
Code Activity

GitHub fetcher: Don't emit treeHash yet

Browse source 
But do accept it if it's there, so we don't choke on future lock files
that do have the treeHash attribute.
This commit is contained in:
Eelco Dolstra 2024-03-08 12:40:14 +01:00
parent 61b006ddf6
commit 6d245182e8
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libfetchers/github.cc
View file

@ -111,6 +111,7 @@ struct GitArchiveInputScheme : InputScheme
"narHash", "narHash",
"lastModified", "lastModified",
"host", "host",
"treeHash",
}; };
} }
@ -268,7 +269,9 @@ struct GitArchiveInputScheme : InputScheme
{ {
auto [input, tarballInfo] = downloadArchive(store, _input); auto [input, tarballInfo] = downloadArchive(store, _input);
#if 0
input.attrs.insert_or_assign("treeHash", tarballInfo.treeHash.gitRev()); input.attrs.insert_or_assign("treeHash", tarballInfo.treeHash.gitRev());
#endif
input.attrs.insert_or_assign("lastModified", uint64_t(tarballInfo.lastModified)); input.attrs.insert_or_assign("lastModified", uint64_t(tarballInfo.lastModified));
auto accessor = getTarballCache()->getAccessor(tarballInfo.treeHash, false); auto accessor = getTarballCache()->getAccessor(tarballInfo.treeHash, false);