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

Coerce URIs to strings

Browse source
This commit is contained in:
John Wiegley 2018-04-17 21:41:26 -07:00
parent b4ef85ae1c
commit 25f1e02966
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Nix/Convert.hs
View file

@ -137,6 +137,7 @@ instance (Framed e m, MonadVar m, MonadFile m)
instance (Framed e m, MonadVar m, MonadFile m, MonadEffects m)
=> FromValue Text m (NValueNF m) where
fromValueMay = \case
Fix (NVConstant (NUri u)) -> pure $ Just u
Fix (NVStr t _) -> pure $ Just t
Fix (NVPath p) -> Just . Text.pack . unStorePath <$> addPath p
Fix (NVSet s _) -> case M.lookup "outPath" s of
@ -151,6 +152,7 @@ instance (Framed e m, MonadVar m, MonadFile m, MonadEffects m,
MonadThunk (NValue m) (NThunk m) m)
=> FromValue Text m (NValue m) where
fromValueMay = \case
NVConstant (NUri u) -> pure $ Just u
NVStr t _ -> pure $ Just t
NVPath p -> Just . Text.pack . unStorePath <$> addPath p
NVSet s _ -> case M.lookup "outPath" s of
@ -164,6 +166,7 @@ instance (Framed e m, MonadVar m, MonadFile m, MonadEffects m,
instance (Framed e m, MonadVar m, MonadFile m, MonadEffects m)
=> FromValue (Text, DList Text) m (NValueNF m) where
fromValueMay = \case
Fix (NVConstant (NUri u)) -> pure $ Just (u, mempty)
Fix (NVStr t d) -> pure $ Just (t, d)
Fix (NVPath p) -> Just . (,mempty) . Text.pack . unStorePath <$> addPath p
Fix (NVSet s _) -> case M.lookup "outPath" s of
@ -178,6 +181,7 @@ instance (Framed e m, MonadVar m, MonadFile m, MonadEffects m,
MonadThunk (NValue m) (NThunk m) m)
=> FromValue (Text, DList Text) m (NValue m) where
fromValueMay = \case
NVConstant (NUri u) -> pure $ Just (u, mempty)
NVStr t d -> pure $ Just (t, d)
NVPath p -> Just . (,mempty) . Text.pack . unStorePath <$> addPath p
NVSet s _ -> case M.lookup "outPath" s of