wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 08:31:16 +02:00
Code Activity

Resolve merge conflict

Browse source
This commit is contained in:
Eelco Dolstra 2024-12-16 18:01:52 +01:00 • committed by GitHub
parent f986f7e89b
commit a924db7d0b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libexpr/eval.cc
View file

@ -3123,14 +3123,7 @@ std::optional<std::string> EvalState::resolveLookupPathPath(const LookupPath::Pa
allowPath(path);
if (store->isInStore(path)) {
try {
<<<<<<< HEAD
StorePathSet closure;
store->computeFSClosure(store->toStorePath(path).first, closure);
for (auto & p : closure)
allowPath(p);
=======
allowClosure(store->toStorePath(path.path.abs()).first);
>>>>>>> 08361f031 (EvalState::realiseContext(): Allow access to the entire closure)
allowClosure(store->toStorePath(path).first);
} catch (InvalidPath &) { }
}
}