cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Don't register invalid paths as GC roots

Browse source 
Unfortunately this doesn't work. Maybe we should keep separate roots
for each path.
This commit is contained in:
Eelco Dolstra 2019-06-04 20:34:08 +02:00
parent 4ec1a9ab40
commit 45b5c606ac
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/nix/installables.cc
View file

@ -207,11 +207,16 @@ void makeFlakeClosureGCRoot(Store & store,
/* Note: due to lazy fetching, these paths might not exist /* Note: due to lazy fetching, these paths might not exist
yet. */ yet. */
for (auto & dep : flake.flakeInputs) { for (auto & dep : flake.flakeInputs) {
closure.insert(dep.second.computeStorePath(store)); auto path = dep.second.computeStorePath(store);
if (store.isValidPath(path))
closure.insert(path);
queue.push(dep.second); queue.push(dep.second);
} }
for (auto & dep : flake.nonFlakeInputs) for (auto & dep : flake.nonFlakeInputs) {
closure.insert(dep.second.computeStorePath(store)); auto path = dep.second.computeStorePath(store);
if (store.isValidPath(path))
closure.insert(path);
}
} }
if (closure.empty()) return; if (closure.empty()) return;