1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 01:51:47 +02:00

Merge pull request #6436 from flox/tofile_allow

fix: builtins.toFile adds path to allowedPaths
This commit is contained in:
Théophane Hufschmitt 2022-04-22 08:50:54 +02:00 committed by GitHub
commit 35ca5fdf91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions

View file

@ -1798,15 +1798,16 @@ static void prim_toFile(EvalState & state, const Pos & pos, Value * * args, Valu
refs.insert(state.store->parseStorePath(path));
}
auto storePath = state.store->printStorePath(settings.readOnlyMode
auto storePath = settings.readOnlyMode
? state.store->computeStorePathForText(name, contents, refs)
: state.store->addTextToStore(name, contents, refs, state.repair));
: state.store->addTextToStore(name, contents, refs, state.repair);
/* Note: we don't need to add `context' to the context of the
result, since `storePath' itself has references to the paths
used in args[1]. */
v.mkString(storePath, {storePath});
/* Add the output of this to the allowed paths. */
state.allowAndSetStorePathString(storePath, v);
}
static RegisterPrimOp primop_toFile({