mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-13 01:36:15 +02:00
Allow use of path and filterSource in flakes
As filterSource and path perform work, add paths to allowedPaths.
This commit is contained in:
parent
7a54b10a8a
commit
d90582be33
1 changed files with 14 additions and 0 deletions
|
@ -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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue