Merge branch '8.4.1'

ivan-m · Apr 13, 2018 · e2f9fc1 · e2f9fc1
2 parents 8830fdd + cdf27e9
commit e2f9fc1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -31,6 +31,9 @@ matrix:
     - env: CABALVER=2.0 GHCVER=8.2.2
       compiler: ": #GHC 8.2.2"
       addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
+    - env: CABALVER=head GHCVER=8.4.1
+      compiler: ": #GHC 8.4.1"
+      addons: {apt: {packages: [cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
     - env: CABALVER=head GHCVER=head
       compiler: ": #GHC head"
       addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}

diff --git a/Text/PrettyPrint/Leijen/Text.hs b/Text/PrettyPrint/Leijen/Text.hs
@@ -126,7 +126,6 @@ import System.IO   (Handle, hPutChar, stdout)
 
 import           Data.Int               (Int64)
 import           Data.List              (intersperse)
-import           Data.Monoid            (Monoid(..))
 import qualified Data.Text              as TS
 import           Data.Text.Lazy         (Text)
 import qualified Data.Text.Lazy         as T

diff --git a/Text/PrettyPrint/Leijen/Text/Monadic.hs b/Text/PrettyPrint/Leijen/Text/Monadic.hs
@@ -70,19 +70,24 @@ module Text.PrettyPrint.Leijen.Text.Monadic (
    ) where
 
 import Prelude ()
-import Prelude.Compat hiding ((<$>))
 
+#if MIN_VERSION_base (4,9,0)
+import Prelude.Compat hiding ((<$>), (<>))
+#else
+import Prelude.Compat hiding ((<$>))
+#endif
 
-import           Text.PrettyPrint.Leijen.Text (Doc, Pretty (..), SimpleDoc (..),
-                                               displayB, displayIO, displayT, displayTStrict,
-                                               hPutDoc, putDoc, renderCompact,
-                                               renderOneLine, renderPretty)
+import           Text.PrettyPrint.Leijen.Text (Doc, Pretty(..), SimpleDoc(..),
+                                               displayB, displayIO, displayT,
+                                               displayTStrict, hPutDoc, putDoc,
+                                               renderCompact, renderOneLine,
+                                               renderPretty)
 import qualified Text.PrettyPrint.Leijen.Text as PP
 
-import Control.Applicative (liftA2, liftA3)
-import Data.String    (IsString (..))
-import qualified Data.Text as TS
-import Data.Text.Lazy (Text)
+import           Control.Applicative (liftA2, liftA3)
+import           Data.String         (IsString(..))
+import qualified Data.Text           as TS
+import           Data.Text.Lazy      (Text)
 
 infixr 5 </>,<//>,<$>,<$$>
 infixr 6 <>,<+>,<++>

diff --git a/wl-pprint-text.cabal b/wl-pprint-text.cabal
@@ -11,7 +11,7 @@ Category:            Text
 Build-type:          Simple
 Tested-With:        GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4,
                     GHC == 7.10.2, GHC == 8.0.1, GHC == 8.2.2,
-                    GHC == 8.3.*
+                    GHC == 8.4.1, GHC == 8.5.*
 Cabal-version:       >=1.6
 Extra-Source-Files: Changelog.md
                     README.md
@@ -24,6 +24,6 @@ Library
   Exposed-modules:     Text.PrettyPrint.Leijen.Text,
                        Text.PrettyPrint.Leijen.Text.Monadic
   Build-depends:       base >= 4.5.0.0 && < 5,
-                       base-compat >= 0.9 && < 0.10,
+                       base-compat == 0.10.*,
                        text >= 0.11.0.0 && < 1.3.0.0
   GHC-Options:         -Wall