diff options
| author | Alex Biehl <alexbiehl@gmail.com> | 2017-04-26 07:49:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 07:49:10 +0200 |
| commit | 67d6345e7b941008080ea79ea462229f0f377d50 (patch) | |
| tree | 4f0ab040b919b325d34a04dec467ac5ac397becc /haddock.cabal | |
| parent | 4346ad26ac1346aa5e59991315f6969c844bea60 (diff) | |
Cherry-picked remaining commits from haddock-2.17.4-release (#603)
* Release haddock/haddock-api 2.17.4 and haddock-library 1.4.3
* Set version bounds for haddock-library
NB: This allows GHC 8.2.1's base
* Set version bounds for haddock & haddock-api
The version bounds support GHC 8.2
* Merge (temporary) v2.17.3 branch into v2.17
This allows us to delete the v2.17.3 branch
* Fixup changelog
* Pin down haddock-api to a single version
as otherwise `haddock`'s package version has no proper meaning
* fix source-repo spec for haddock-api
Diffstat (limited to 'haddock.cabal')
| -rw-r--r-- | haddock.cabal | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/haddock.cabal b/haddock.cabal index fa8a3531..598f2b9a 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -1,5 +1,5 @@ name: haddock -version: 2.17.3 +version: 2.17.4 synopsis: A documentation-generation tool for Haskell libraries description: Haddock is a documentation-generation tool for Haskell libraries @@ -43,6 +43,7 @@ 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.11 if flag(in-ghc-tree) @@ -120,7 +121,9 @@ executable haddock Haddock.Syb Haddock.Convert else - build-depends: haddock-api == 2.17.* + -- in order for haddock's advertised version number to have proper meaning, + -- we pin down to a single haddock-api version. + build-depends: haddock-api == 2.17.4 test-suite driver-test type: exitcode-stdio-1.0 |