[commit: haddock] v2.17: Set version bounds for haddock & haddock-api (cdfe923)

[git at git.haskell.org]

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

On branch  : v2.17
Link       : http://git.haskell.org/haddock.git/commitdiff/cdfe923ad53cb8a26dabf1bc05082e42566d3b82

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

commit cdfe923ad53cb8a26dabf1bc05082e42566d3b82
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Apr 12 14:31:16 2017 +0200

    Set version bounds for haddock & haddock-api
    
    The version bounds support GHC 8.0.1 and GHC 8.0.2


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

cdfe923ad53cb8a26dabf1bc05082e42566d3b82
 haddock-api/haddock-api.cabal | 39 ++++++++++++++++++++-------------------
 haddock.cabal                 |  6 ++++--
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index c9e2167..3ee4d65 100644
--- a/haddock-api/haddock-api.cabal
+++ b/haddock-api/haddock-api.cabal
@@ -33,28 +33,29 @@ data-files:
   latex/haddock.sty
 
 library
-  default-language:
-      Haskell2010
+  default-language: Haskell2010
 
-  build-depends:
-      base >= 4.3 && < 4.10
-    , bytestring
-    , filepath
-    , directory
-    , containers
-    , transformers
-    , deepseq
-    , array
-    , xhtml >= 3000.2 && < 3000.3
-    , Cabal >= 1.10
-    , ghc-boot
-    , ghc >= 8.0 && < 8.2
+  -- this package typically supports only single major versions
+  build-depends: base            == 4.9.*
+               , Cabal           == 1.24.*
+               , ghc             == 8.0.*
+               , ghc-paths       == 0.1.*
+               , haddock-library >= 1.4.2 && < 1.5
+               , xhtml           == 3000.2.*
 
-    , ghc-paths
-    , haddock-library == 1.4.*
+  -- Versions for the dependencies below are transitively pinned by
+  -- the non-reinstallable `ghc` package and hence need no version
+  -- bounds
+  build-depends: array
+               , bytestring
+               , containers
+               , deepseq
+               , directory
+               , filepath
+               , ghc-boot
+               , transformers
 
-  hs-source-dirs:
-      src
+  hs-source-dirs: src
 
   ghc-options: -funbox-strict-fields -Wall -fwarn-tabs -O2
 
diff --git a/haddock.cabal b/haddock.cabal
index 9defb2a..67a5b30 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -42,8 +42,10 @@ executable haddock
   hs-source-dirs:       driver
   ghc-options:          -funbox-strict-fields -Wall -fwarn-tabs -O2 -threaded
 
+  -- haddock typically only supports a single GHC major version
   build-depends:
-    base >= 4.3 && < 4.10
+    base == 4.9.*
+
   if flag(in-ghc-tree)
     hs-source-dirs: haddock-api/src, haddock-library/vendor/attoparsec-0.12.1.1, haddock-library/src
     cpp-options: -DIN_GHC_TREE
@@ -119,7 +121,7 @@ executable haddock
       Haddock.Syb
       Haddock.Convert
   else
-    build-depends:  haddock-api == 2.17.*
+    build-depends:  haddock-api >= 2.17.4 && < 2.18
 
 test-suite driver-test
   type:             exitcode-stdio-1.0