picnoir/hnix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix a scoping bug introduced by 4cedcca9ad

Browse source
This commit is contained in:
John Wiegley 2018-03-30 15:09:02 -07:00
parent 2672610fea
commit 94d4b5960c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Nix/Eval.hs
View file

@ -246,7 +246,7 @@ buildArgument params arg = case params of
buildThunk $ clearScopes $ do
traceM $ "Evaluating default argument with args: "
++ show (newScope args)
pushScope args $ pushScopes scope $ forceThunk =<< f
pushScopes scope $ pushScope args $ forceThunk =<< f
This x | isVariadic -> const (pure x)
| otherwise -> error $ "Unexpected parameter: " ++ show k
These x _ -> const (pure x)
@ -311,7 +311,7 @@ evalBinds allowDynamic recursive = buildResult . concat <=< mapM go
else traverse (deferInScope scope) s
encapsulate scope f attrs =
buildThunk . clearScopes . pushScope attrs . pushScopes scope $ f
buildThunk . clearScopes . pushScopes scope . pushScope attrs $ f
insert m (path, value) = attrSetAlter path m value