Switches from text-format to formatting (#330)

default.nix

@@ -1,12 +1,12 @@
 { mkDerivation, ansi-terminal, ansi-wl-pprint, base
 , base16-bytestring, bytestring, case-insensitive, containers
 , contravariant, cryptonite, deepseq, directory, exceptions
-, filepath, haskeline, http-client, http-client-tls
+, filepath, formatting, haskeline, http-client, http-client-tls
 , insert-ordered-containers, lens-family-core, memory, mtl
 , optparse-generic, parsers, prettyprinter
 , prettyprinter-ansi-terminal, repline, scientific, stdenv, tasty
-, tasty-hunit, text, text-format, transformers, trifecta
-, unordered-containers, vector
+, tasty-hunit, text, transformers, trifecta, unordered-containers
+, vector
 }:
 mkDerivation {
   pname = "dhall";
@@ -17,10 +17,11 @@ mkDerivation {
   libraryHaskellDepends = [
     ansi-wl-pprint base base16-bytestring bytestring case-insensitive
     containers contravariant cryptonite directory exceptions filepath
-    http-client http-client-tls insert-ordered-containers
+    formatting http-client http-client-tls insert-ordered-containers
     lens-family-core memory parsers prettyprinter
-    prettyprinter-ansi-terminal scientific text text-format
-    transformers trifecta unordered-containers vector
+    prettyprinter-ansi-terminal scientific text transformers trifecta
+    unordered-containers vector
+
   ];
   executableHaskellDepends = [
     ansi-terminal base haskeline mtl optparse-generic prettyprinter

dhall.cabal

@@ -164,6 +164,7 @@ Library
         exceptions                  >= 0.8.3    && < 0.11,
         directory                   >= 1.3      && < 1.4 ,
         filepath                    >= 1.4      && < 1.5 ,
+        formatting                  >= 6.3      && < 6.4 ,
         http-client                 >= 0.4.30   && < 0.6 ,
         http-client-tls             >= 0.2.0    && < 0.4 ,
         insert-ordered-containers   >= 0.1.0.1  && < 0.3 ,
@@ -174,7 +175,6 @@ Library
         prettyprinter-ansi-terminal >= 1.1.1    && < 1.2 ,
         scientific                  >= 0.3.0.0  && < 0.4 ,
         text                        >= 0.11.1.0 && < 1.3 ,
-        text-format                              < 0.4 ,
         transformers                >= 0.2.0.0  && < 0.6 ,
         trifecta                    >= 1.6      && < 1.8 ,
         unordered-containers        >= 0.1.3.0  && < 0.3 ,

nix/formatting.nix

@@ -0,0 +1,16 @@
+{ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
+, integer-gmp, old-locale, scientific, stdenv, text, time
+, transformers
+}:
+mkDerivation {
+  pname = "formatting";
+  version = "6.3.1";
+  sha256 = "56303c8dff977ef9eb66b67fc30eb079f867201558f5fe6b442ffa06561fd479";
+  libraryHaskellDepends = [
+    array base bytestring clock ghc-prim integer-gmp old-locale
+    scientific text time transformers
+  ];
+  testHaskellDepends = [ base hspec ];
+  description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
+  license = stdenv.lib.licenses.bsd3;
+}

release.nix

@@ -16,6 +16,9 @@ let
                   (haskellPackagesNew.callPackage ./default.nix { })
                 );
 
+          formatting =
+            haskellPackagesNew.callPackage ./nix/formatting.nix { };
+
           prettyprinter =
             haskellPackagesNew.callPackage ./nix/prettyprinter.nix { };
         };

src/Dhall.hs

@@ -70,7 +70,6 @@ import Data.Functor.Contravariant (Contravariant(..))
 import Data.Monoid ((<>))
 import Data.Scientific (Scientific)
 import Data.Sequence (Seq)
-import Data.Text.Buildable (Buildable(..))
 import Data.Text.Lazy (Text)
 import Data.Typeable (Typeable)
 import Data.Vector (Vector)
@@ -79,6 +78,7 @@ import Dhall.Core (Expr(..), Chunks(..))
 import Dhall.Import (Imported(..))
 import Dhall.Parser (Src(..))
 import Dhall.TypeCheck (DetailedTypeError(..), TypeError, X)
+import Formatting.Buildable (Buildable(..))
 import GHC.Generics
 import Numeric.Natural (Natural)
 import Prelude hiding (maybe, sequence)

src/Dhall/Core.hs

@@ -62,12 +62,12 @@ import Data.Monoid ((<>))
 import Data.String (IsString(..))
 import Data.Scientific (Scientific)
 import Data.Sequence (Seq, ViewL(..), ViewR(..))
-import Data.Text.Buildable (Buildable(..))
 import Data.Text.Lazy (Text)
 import Data.Text.Lazy.Builder (Builder)
 import Data.Text.Prettyprint.Doc (Pretty)
 import Data.Traversable
 import {-# SOURCE #-} Dhall.Pretty.Internal
+import Formatting.Buildable (Buildable(..))
 import Numeric.Natural (Natural)
 import Prelude hiding (succ)
 

src/Dhall/Import.hs

@@ -129,7 +129,6 @@ import Data.ByteString.Lazy (ByteString)
 import Data.CaseInsensitive (CI)
 import Data.Map (Map)
 import Data.Monoid ((<>))
-import Data.Text.Buildable (build)
 import Data.Text.Lazy (Text)
 import Data.Text.Lazy.Builder (Builder)
 #if MIN_VERSION_base(4,8,0)
@@ -137,6 +136,7 @@ import Data.Text.Lazy.Builder (Builder)
 import Data.Traversable (traverse)
 #endif
 import Data.Typeable (Typeable)
+import Formatting.Buildable (build)
 import System.FilePath ((</>))
 import Dhall.Core
     ( Expr(..)

src/Dhall/Parser.hs

@@ -30,11 +30,11 @@ import Data.Monoid ((<>))
 import Data.Sequence (ViewL(..))
 import Data.Scientific (Scientific)
 import Data.String (IsString(..))
-import Data.Text.Buildable (Buildable(..))
 import Data.Text.Lazy (Text)
 import Data.Text.Lazy.Builder (Builder)
 import Data.Typeable (Typeable)
 import Dhall.Core
+import Formatting.Buildable (Buildable(..))
 import Numeric.Natural (Natural)
 import Prelude hiding (const, pi)
 import Text.PrettyPrint.ANSI.Leijen (Doc)

src/Dhall/Pretty/Internal.hs

@@ -30,10 +30,10 @@ import Data.Foldable
 import Data.HashMap.Strict.InsOrd (InsOrdHashMap)
 import Data.Monoid ((<>))
 import Data.Scientific (Scientific)
-import Data.Text.Buildable (Buildable(..))
 import Data.Text.Lazy (Text)
 import Data.Text.Lazy.Builder (Builder)
 import Data.Text.Prettyprint.Doc (Doc, Pretty, space)
+import Formatting.Buildable (Buildable(..))
 import Numeric.Natural (Natural)
 import Prelude hiding (succ)
 import qualified Data.Text.Prettyprint.Doc.Render.Terminal as Terminal

src/Dhall/Pretty/Internal.hs-boot

@@ -1,10 +1,10 @@
 module Dhall.Pretty.Internal where
 
 import Data.Scientific (Scientific)
-import Data.Text.Buildable (Buildable)
 import Data.Text.Lazy (Text)
 import Data.Text.Lazy.Builder (Builder)
 import Data.Text.Prettyprint.Doc (Pretty, Doc)
+import Formatting.Buildable (Buildable)
 import Numeric.Natural (Natural)
 import Prelude
 

src/Dhall/TypeCheck.hs

@@ -26,7 +26,6 @@ import Data.Foldable (forM_, toList)
 import Data.Monoid ((<>))
 import Data.Sequence (Seq, ViewL(..))
 import Data.Set (Set)
-import Data.Text.Buildable (Buildable(..))
 import Data.Text.Lazy (Text)
 import Data.Text.Lazy.Builder (Builder)
 import Data.Text.Prettyprint.Doc (Pretty(..))
@@ -34,6 +33,7 @@ import Data.Traversable (forM)
 import Data.Typeable (Typeable)
 import Dhall.Core (Const(..), Chunks(..), Expr(..), Var(..))
 import Dhall.Context (Context)
+import Formatting.Buildable (Buildable(..))
 
 import qualified Data.Foldable
 import qualified Data.HashMap.Strict.InsOrd

stack.yaml

@@ -1,3 +1,4 @@
 resolver: lts-9.6
 extra-deps:
-    - prettyprinter-1.2.0.1
+- prettyprinter-1.2.0.1
+- formatting-6.3.1