lehmanator/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Allow use of path and filterSource in flakes

Browse source 
As filterSource and path perform work, add paths to allowedPaths.
This commit is contained in:
Tom Bereknyei 2021-08-22 18:45:42 -04:00
parent 7a54b10a8a
commit d90582be33
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libexpr/primops.cc
View file

@ -1886,6 +1886,20 @@ static void addPath(EvalState & state, const Pos & pos, const string & name, con
dstPath = state.store->printStorePath(*expectedStorePath); dstPath = state.store->printStorePath(*expectedStorePath);
mkString(v, dstPath, {dstPath}); mkString(v, dstPath, {dstPath});
if (state.allowedPaths)
state.allowedPaths->insert(v.string.s);
try {
state.realiseContext({});
} catch (InvalidPathError & e) {
throw EvalError({
.msg = hintfmt("cannot import '%1%', since path '%2%' is not valid", path, e.path),
.errPos = pos
});
} catch (Error & e) {
e.addTrace(pos, "while importing '%s'", path);
throw e;
}
} }