dhall-json 1.7.5 → 1.7.6

raw patch · 3 files changed

+15/−7 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• CHANGELOG.md +7/−0
• dhall-json.cabal +5/−5
• src/Dhall/JSONToDhall.hs +3/−2

@@ -1,3 +1,10 @@+1.7.6++* [Fix `hashable`-related test failures](https://github.com/dhall-lang/dhall-haskell/pull/2152)+* [Fix lower bound on `dhall`](https://github.com/dhall-lang/dhall-haskell/pull/2147)+* [Allow bytestring-0.11](https://github.com/dhall-lang/dhall-haskell/pull/2144)+* [Fix typos in `json-to-dhall --help` output](https://github.com/dhall-lang/dhall-haskell/pull/2160)+ 1.7.5  * Build against `dhall-1.38.0`, `tasty-1.4`, and `tasty-silver-3.2`

@@ -1,5 +1,5 @@ Name: dhall-json-Version: 1.7.5+Version: 1.7.6 Cabal-Version: >=1.10 Build-Type: Simple Tested-With: GHC == 8.4.3, GHC == 8.6.1@@ -42,9 +42,9 @@         aeson                     >= 1.4.6.0   && < 1.6 ,         aeson-pretty                              < 0.9 ,         aeson-yaml                >= 1.1.0     && < 1.2 ,-        bytestring                                < 0.11,+        bytestring                                < 0.12,         containers                >= 0.5.9     && < 0.7 ,-        dhall                     >= 1.36.0    && < 1.39,+        dhall                     >= 1.38.0    && < 1.39,         exceptions                >= 0.8.3     && < 0.11,         filepath                                  < 1.5 ,         lens-family-core          >= 1.0.0     && < 2.2 ,@@ -71,7 +71,7 @@         base                                   ,         aeson                                  ,         aeson-pretty         >= 0.8.5 && < 0.9 ,-        bytestring                       < 0.11,+        bytestring                             ,         dhall                                  ,         dhall-json                             ,         optparse-applicative                   ,@@ -99,7 +99,7 @@         base                                             ,         aeson                                            ,         ansi-terminal               >= 0.6.3.1  && < 0.12,-        bytestring                                 < 0.11,+        bytestring                                       ,         dhall                                            ,         dhall-json                                       ,         exceptions                  >= 0.8.3    && < 0.11,

@@ -445,7 +445,7 @@   where     uFirst  =  O.flag' UFirst             (  O.long "unions-first"-            <> O.help "The first value with the matching type (succefully parsed all the way down the tree) is accepted, even if not the only posible match. (DEFAULT)"+            <> O.help "The first value with the matching type (successfully parsed all the way down the tree) is accepted, even if not the only possible match. (DEFAULT)"             )     uNone   =  O.flag' UNone             (  O.long "unions-none"@@ -880,7 +880,8 @@                   , ("mapValue", val)                   ] -          let records = (fmap f . Seq.fromList . HM.toList) keyExprMap+          let records =+                (fmap f . Seq.fromList . List.sort . HM.toList) keyExprMap            let typeAnn = if HM.null o then Just t else Nothing