From 4d50e575467bff138953b88177b2509aa47ada6f Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 19 Nov 2024 18:59:08 +0100 Subject: [PATCH] Bump fetcher cache version We're getting more reports in https://github.com/NixOS/nix/issues/10985 It appears that something hasn't gone right process-wise. I find this mistake not to be worth investigating, but rather something to pay attention to going forward. Let's nip this in the bud. Closes https://github.com/NixOS/nix/issues/10985 (cherry picked from commit e948c8e03304a899893fffc1238d0d6025ed2564) # Conflicts: # src/libfetchers/cache.cc --- src/libfetchers/cache.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libfetchers/cache.cc b/src/libfetchers/cache.cc index 7019b0325..636389b93 100644 --- a/src/libfetchers/cache.cc +++ b/src/libfetchers/cache.cc @@ -36,7 +36,11 @@ struct CacheImpl : Cache { auto state(_state.lock()); +<<<<<<< HEAD auto dbPath = getCacheDir() + "/nix/fetcher-cache-v2.sqlite"; +======= + auto dbPath = getCacheDir() + "/fetcher-cache-v3.sqlite"; +>>>>>>> e948c8e03 (Bump fetcher cache version) createDirs(dirOf(dbPath)); state->db = SQLite(dbPath);