[commit: haddock] ghc-head, ghc-head1, wip/revert-ttg-2017-11-20, wip/ttg-2017-10-13, wip/ttg-2017-10-31, wip/ttg-2017-11-06, wip/ttg2-2017-11-10, wip/ttg3-2017-11-12, wip/ttg4-constraints-2017-11-13: Make compatible with Prelude.<> export in GHC 8.4/base-4.11 (0a64b5c)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/haddock

On branches: ghc-head,ghc-head1,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13
Link       : http://git.haskell.org/haddock.git/commitdiff/0a64b5cdc051c47b24151b8839ae9067f06d8d0d

>---------------------------------------------------------------

commit 0a64b5cdc051c47b24151b8839ae9067f06d8d0d
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Sep 21 23:27:52 2017 +0200

    Make compatible with Prelude.<> export in GHC 8.4/base-4.11


>---------------------------------------------------------------

0a64b5cdc051c47b24151b8839ae9067f06d8d0d
 haddock-api/haddock-api.cabal              | 2 +-
 haddock-api/src/Haddock/Backends/Hoogle.hs | 2 +-
 haddock-api/src/Haddock/Backends/LaTeX.hs  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index 023676b..3f27920 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 8e4e801..f1d8ddb 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 d4a3012..1cc23e6 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)