Skip to content

Commit ecb916d

Browse files
committed
Bump to dhall-1.38.0. Let dhall format pick the output encoding based on the input.
1 parent 611a705 commit ecb916d

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

src/Spago/Dhall.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import qualified Dhall.Format
1616
import qualified Dhall.Import
1717
import qualified Dhall.Map
1818
import qualified Dhall.Parser as Parser
19-
import qualified Dhall.Pretty
2019
import Dhall.TypeCheck (typeOf)
2120
import Dhall.Util as Dhall
2221
import qualified Lens.Family
@@ -34,9 +33,10 @@ format pathText = liftIO $
3433
f Dhall.Write
3534
Right _ -> pure ()
3635
where
36+
f :: OutputMode -> IO ()
3737
f = Dhall.Format.format
3838
. Dhall.Format.Format
39-
Dhall.Pretty.ASCII
39+
Nothing
4040
Dhall.NoCensor
4141
(Dhall.PossiblyTransitiveInputFile (Text.unpack pathText) Dhall.NonTransitive)
4242

src/Spago/PackageSet.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import qualified Data.Map.Strict as Map
1919
import qualified Data.Text as Text
2020
import qualified Data.Versions as Version
2121
import qualified Dhall.Freeze
22-
import qualified Dhall.Pretty
2322
import Dhall.Import (PrettyHttpException(..))
2423
import qualified Safe
2524
import qualified System.FilePath
@@ -283,7 +282,7 @@ freeze path = do
283282
(Dhall.PossiblyTransitiveInputFile path Dhall.NonTransitive)
284283
Dhall.Freeze.OnlyRemoteImports
285284
Dhall.Freeze.Secure
286-
Dhall.Pretty.ASCII
285+
Nothing
287286
Dhall.NoCensor
288287

289288

stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extra-deps:
55
- async-pool-0.9.1@sha256:4015140f896c3f1652b06a679b0ade2717d05557970c283ea2c372a71be2a6a1,1605
66
- base-compat-0.11.1@sha256:e49c1ce84f556621ef1142a169e4349049c516f5b3e3c3ec6830be503e7d4a93,7140
77
- binary-instances-1.0.0.1@sha256:e234be994da675479a3661f050d4a1d53565c9ed7786d9a68b7a29ba8b54b5a7,2659
8-
- dhall-1.37.1
8+
- dhall-1.38.0
99
- directory-1.3.6.1@sha256:3dc9c69c8e09ec95a7a45c6d06abe0f0d2f604439c37e5f88e5a6c335b088d71,2810
1010
- generic-lens-2.0.0.0@sha256:7409fa0ce540d0bd41acf596edd1c5d0c0ab1cd1294d514cf19c5c24e8ef2550,3866
1111
- generic-lens-core-2.0.0.0@sha256:40b063c4a1399b3cdb19f2df1fae5a1a82f3313015c7c3e47fc23b8ef1b3e443,2913

0 commit comments

Comments
 (0)