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

Return string instead of context in appendContext

Browse source
This commit is contained in:
Ken Micklas 2019-03-10 16:41:00 -04:00
parent 9ce7d7ebe2
commit 765b2f9cfc
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Nix/Builtins.hs
View file

@ -1145,7 +1145,6 @@ appendContext :: forall e m. MonadNix e m
=> m (NValue m) -> m (NValue m) -> m (NValue m)
appendContext x y = x >>= \x' -> y >>= \y' -> case (x', y') of
(NVStr ns, NVSet attrs _) -> do
let context = toNixLikeContext $ principledGetContext ns
newContextValues <- forM attrs $ force' >=> \case
NVSet attrs _ -> do
-- TODO: Fail for unexpected keys.
@ -1160,9 +1159,8 @@ appendContext x y = x >>= \x' -> y >>= \y' -> case (x', y') of
return $ NixLikeContextValue path allOutputs outputs
x -> throwError $ ErrorCall $
"Invalid types for context value in builtins.appendContext: " ++ show x
values :: AttrSet (NThunk m) <- traverse (fmap valueThunk . toValue) $
M.unionWith (<>) newContextValues $ getNixLikeContext context
toValue values
toValue $ principledMakeNixString (principledStringIgnoreContext ns) $
fromNixLikeContext $ NixLikeContext $ M.unionWith (<>) newContextValues $ getNixLikeContext $ toNixLikeContext $ principledGetContext ns
(x, y) -> throwError $ ErrorCall $ "Invalid types for builtins.appendContext: "
++ show (x, y)