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

Make builtins.toString much better behaved

Browse source
This commit is contained in:
John Wiegley 2018-05-09 16:54:24 -07:00
parent 575d317f6b
commit 8ebac49b95
No known key found for this signature in database
GPG key ID: C144D8F4F19FE630
2 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Nix/Builtins.hs
View file

@ -266,8 +266,7 @@ nixPath = fmap nvList $ flip foldNixPath [] $ \p mn rest ->
nvStr (Text.pack (fromMaybe "" mn)) mempty) ]) : rest
toString :: MonadNix e m => m (NValue m) -> m (NValue m)
toString str =
str >>= normalForm >>= valueText False >>= toNix @(Text, DList Text)
toString str = str >>= coerceToString False >>= toNix . Text.pack
hasAttr :: forall e m. MonadNix e m => m (NValue m) -> m (NValue m) -> m (NValue m)
hasAttr x y =

37
src/Nix/Exec.hs
View file

@ -422,26 +422,29 @@ execBinaryOp scope span op lval rarg = do
toInt = pure . bin nvConstantP . NInt
toFloat = pure . bin nvConstantP . NFloat
coerceToString :: MonadNix e m => NValue m -> m String
coerceToString = \case
NVConstant (NBool b)
| b -> pure "1"
| otherwise -> pure ""
NVConstant (NInt n) -> pure $ show n
NVConstant (NFloat n) -> pure $ show n
NVConstant NNull -> pure ""
coerceToString :: MonadNix e m => Bool -> NValue m -> m String
coerceToString copyToStore = go
where
go = \case
NVConstant (NBool b)
| b -> pure "1"
| otherwise -> pure ""
NVConstant (NInt n) -> pure $ show n
NVConstant (NFloat n) -> pure $ show n
NVConstant NNull -> pure ""
NVStr t _ -> pure $ Text.unpack t
NVPath p -> unStorePath <$> addPath p
NVList l -> unwords <$> traverse (`force` coerceToString) l
NVStr t _ -> pure $ Text.unpack t
NVPath p | copyToStore -> unStorePath <$> addPath p
| otherwise -> pure p
NVList l -> unwords <$> traverse (`force` go) l
v@(NVSet s _) | Just p <- M.lookup "__toString" s ->
force p $ (`callFunc` pure v) >=> coerceToString
v@(NVSet s _) | Just p <- M.lookup "__toString" s ->
force p $ (`callFunc` pure v) >=> go
NVSet s _ | Just p <- M.lookup "outPath" s ->
force p coerceToString
NVSet s _ | Just p <- M.lookup "outPath" s ->
force p go
v -> throwError $ ErrorCall $ "Expected a string, but saw: " ++ show v
v -> throwError $ ErrorCall $ "Expected a string, but saw: " ++ show v
newtype Lazy m a = Lazy
{ runLazy :: ReaderT (Context (Lazy m) (NThunk (Lazy m)))
@ -574,7 +577,7 @@ instance (MonadFix m, MonadCatch m, MonadIO m, Alternative m,
"__ignoreNulls" -> pure Nothing
_ -> force v $ \case
NVConstant NNull | ignoreNulls -> pure Nothing
v' -> Just <$> (toNix =<< Text.pack <$> coerceToString v')
v' -> Just <$> (toNix =<< Text.pack <$> coerceToString True v')
nixInstantiateExpr expr = do
traceM $ "Executing: "