NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 10:50:24 -04:00
Code Activity

Sync tarball cache within tarball cache Activity

Browse source
This commit is contained in:
Robert Hensing 2024-08-26 11:39:14 +02:00
parent d0f8a92363
commit 97ff2ed455
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libfetchers/github.cc
View file

@ -261,11 +261,12 @@ struct GitArchiveInputScheme : InputScheme
auto tarballCache = getTarballCache(); auto tarballCache = getTarballCache();
auto parseSink = tarballCache->getFileSystemObjectSink(); auto parseSink = tarballCache->getFileSystemObjectSink();
auto lastModified = unpackTarfileToSink(archive, *parseSink); auto lastModified = unpackTarfileToSink(archive, *parseSink);
auto tree = parseSink->sync();
act.reset(); act.reset();
TarballInfo tarballInfo { TarballInfo tarballInfo {
.treeHash = tarballCache->dereferenceSingletonDirectory(parseSink->sync()), .treeHash = tarballCache->dereferenceSingletonDirectory(tree),
.lastModified = lastModified .lastModified = lastModified
}; };

3
src/libfetchers/tarball.cc
View file

@ -170,6 +170,7 @@ static DownloadTarballResult downloadTarball_(
auto tarballCache = getTarballCache(); auto tarballCache = getTarballCache();
auto parseSink = tarballCache->getFileSystemObjectSink(); auto parseSink = tarballCache->getFileSystemObjectSink();
auto lastModified = unpackTarfileToSink(archive, *parseSink); auto lastModified = unpackTarfileToSink(archive, *parseSink);
auto tree = parseSink->sync();
act.reset(); act.reset();
@ -184,7 +185,7 @@ static DownloadTarballResult downloadTarball_(
} else { } else {
infoAttrs.insert_or_assign("etag", res->etag); infoAttrs.insert_or_assign("etag", res->etag);
infoAttrs.insert_or_assign("treeHash", infoAttrs.insert_or_assign("treeHash",
tarballCache->dereferenceSingletonDirectory(parseSink->sync()).gitRev()); tarballCache->dereferenceSingletonDirectory(tree).gitRev());
infoAttrs.insert_or_assign("lastModified", uint64_t(lastModified)); infoAttrs.insert_or_assign("lastModified", uint64_t(lastModified));
if (res->immutableUrl) if (res->immutableUrl)
infoAttrs.insert_or_assign("immutableUrl", *res->immutableUrl); infoAttrs.insert_or_assign("immutableUrl", *res->immutableUrl);