dhall-nix 1.1.2 → 1.1.3
raw patch · 3 files changed
+9/−6 lines, 3 filesdep −trifectadep ~dhallPVP ok
version bump matches the API change (PVP)
Dependencies removed: trifecta
Dependency ranges changed: dhall
API changes (from Hackage documentation)
Files
- dhall-nix.cabal +3/−4
- exec/Main.hs +1/−2
- src/Dhall/Nix.hs +5/−0
dhall-nix.cabal view
@@ -1,5 +1,5 @@ Name: dhall-nix-Version: 1.1.2+Version: 1.1.3 Cabal-Version: >=1.8.0.2 Build-Type: Simple Tested-With: GHC == 8.0.1@@ -30,7 +30,7 @@ base >= 4.8.0.0 && < 5 , containers < 0.6 , data-fix < 0.3 ,- dhall >= 1.12 && < 1.13,+ dhall >= 1.13 && < 1.14, formatting >= 6.3 && < 6.4 , hnix >= 0.3.4 && < 0.5 , insert-ordered-containers >= 0.1.0.1 && < 0.3 ,@@ -50,6 +50,5 @@ dhall-nix , hnix , optparse-generic >= 1.1.1 && < 1.4,- text ,- trifecta >= 1.0 && < 1.8+ text GHC-Options: -Wall
exec/Main.hs view
@@ -4,7 +4,6 @@ import Control.Exception (SomeException) import System.Exit (ExitCode(..))-import Text.Trifecta.Delta (Delta(..)) import qualified Control.Exception import qualified Data.Text.Lazy.IO@@ -26,7 +25,7 @@ inText <- Data.Text.Lazy.IO.getContents - expr <- case Dhall.Parser.exprFromText (Directed "(stdin)" 0 0 0 0) inText of+ expr <- case Dhall.Parser.exprFromText "(stdin)" inText of Left err -> Control.Exception.throwIO err Right expr -> return expr
src/Dhall/Nix.hs view
@@ -486,6 +486,7 @@ let e11 = Fix (NApp (Fix (NApp "combine" a')) b') return (Fix (NLet [NamedVar ["combine"] combine] e11))+ loop (CombineTypes _ _) = return (Fix (NSet [])) loop (Merge a b _) = do a' <- loop a b' <- loop b@@ -500,5 +501,9 @@ a' <- loop a let b' = Data.Text.Lazy.toStrict b return (Fix (NSelect a' [StaticKey b'] Nothing))+ loop (Project a b) = do+ a' <- loop a+ let b' = fmap (StaticKey . Data.Text.Lazy.toStrict) (toList b)+ return (Fix (NSet [Inherit (Just a') b'])) loop (Note _ b) = loop b loop (Embed (X x)) = x