aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2017-09-21 23:27:52 +0200
committerHerbert Valerio Riedel <hvr@gnu.org>2017-09-21 23:27:52 +0200
commit0a64b5cdc051c47b24151b8839ae9067f06d8d0d (patch)
treec9748b421b5cfc93dc7c691136af0b9bacda7963
parent2f6c11305cca9f50833b99dac729ce76e46aa235 (diff)
Make compatible with Prelude.<> export in GHC 8.4/base-4.11
-rw-r--r--haddock-api/haddock-api.cabal2
-rw-r--r--haddock-api/src/Haddock/Backends/Hoogle.hs2
-rw-r--r--haddock-api/src/Haddock/Backends/LaTeX.hs1
3 files changed, 3 insertions, 2 deletions
diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index 023676b3..3f279205 100644
--- a/haddock-api/haddock-api.cabal
+++ b/haddock-api/haddock-api.cabal
@@ -38,7 +38,7 @@ library
default-language: Haskell2010
-- this package typically supports only single major versions
- build-depends: base >= 4.10.0
+ build-depends: base ^>= 4.11.0
, Cabal ^>= 2.0.0
, ghc ^>= 8.3
, ghc-paths ^>= 0.1.0.9
diff --git a/haddock-api/src/Haddock/Backends/Hoogle.hs b/haddock-api/src/Haddock/Backends/Hoogle.hs
index 8e4e801e..f1d8ddb2 100644
--- a/haddock-api/src/Haddock/Backends/Hoogle.hs
+++ b/haddock-api/src/Haddock/Backends/Hoogle.hs
@@ -178,7 +178,7 @@ ppClass dflags decl subdocs =
whereWrapper elems = vcat'
[ text "where" <+> lbrace
- , nest 4 . vcat . map (<> semi) $ elems
+ , nest 4 . vcat . map (Outputable.<> semi) $ elems
, rbrace
]
diff --git a/haddock-api/src/Haddock/Backends/LaTeX.hs b/haddock-api/src/Haddock/Backends/LaTeX.hs
index d4a3012e..1cc23e6e 100644
--- a/haddock-api/src/Haddock/Backends/LaTeX.hs
+++ b/haddock-api/src/Haddock/Backends/LaTeX.hs
@@ -37,6 +37,7 @@ import Data.Char
import Control.Monad
import Data.Maybe
import Data.List
+import Prelude hiding ((<>))
import Haddock.Doc (combineDocumentation)