nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-24 11:19:35 +01:00
Code Activity

Merge pull request #14620 from NixOS/revert-shared-tarball-cache

Browse source 
libfetchers: Don't have a single shared tarball cache
This commit is contained in:
John Ericson 2025-11-23 00:33:51 +00:00 • committed by GitHub
commit d5d4bafc2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libfetchers/git-utils.cc
View file

@ -1334,10 +1334,8 @@ namespace fetchers {
ref<GitRepo> Settings::getTarballCache() const ref<GitRepo> Settings::getTarballCache() const
{ {
auto tarballCache(_tarballCache.lock()); static auto repoDir = std::filesystem::path(getCacheDir()) / "tarball-cache";
if (!*tarballCache) return GitRepo::openRepo(repoDir, true, true);
*tarballCache = GitRepo::openRepo(std::filesystem::path(getCacheDir()) / "tarball-cache", true, true);
return ref<GitRepo>(*tarballCache);
} }
} // namespace fetchers } // namespace fetchers

2
src/libfetchers/include/nix/fetchers/fetch-settings.hh
View file

@ -135,8 +135,6 @@ struct Settings : public Config
private: private:
mutable Sync<std::shared_ptr<Cache>> _cache; mutable Sync<std::shared_ptr<Cache>> _cache;
mutable Sync<std::shared_ptr<GitRepo>> _tarballCache;
}; };
} // namespace nix::fetchers } // namespace nix::fetchers