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

Require flake.nix to be an attrset (not a non-trivial thunk)

Browse source
This commit is contained in:
Eelco Dolstra 2019-09-09 17:34:38 +02:00
parent c87840ae14
commit f97d3753a1
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/flake/flake.cc
View file

@ -198,9 +198,7 @@ static SourceInfo fetchFlake(EvalState & state, const FlakeRef & resolvedRef)
static void expectType(EvalState & state, ValueType type,
Value & value, const Pos & pos)
{
if (value.type == tThunk &&
((type == tAttrs && dynamic_cast<ExprAttrs *>(value.thunk.expr)) ||
(type == tLambda && dynamic_cast<ExprLambda *>(value.thunk.expr))))
if (value.type == tThunk && value.isTrivial())
state.forceValue(value, pos);
if (value.type != type)
throw Error("expected %s but got %s at %s",
@ -231,8 +229,7 @@ Flake getFlake(EvalState & state, const FlakeRef & flakeRef)
throw Error("source tree referenced by '%s' does not contain a '%s/flake.nix' file", resolvedRef, resolvedRef.subdir);
Value vInfo;
// FIXME: don't evaluate vInfo.
state.evalFile(realFlakeFile, vInfo); // FIXME: symlink attack
state.evalFile(realFlakeFile, vInfo, true); // FIXME: symlink attack
expectType(state, tAttrs, vInfo, Pos(state.symbols.create(realFlakeFile), 0, 0));