aboutsummaryrefslogtreecommitdiff
path: root/haddock-api
diff options
context:
space:
mode:
Diffstat (limited to 'haddock-api')
-rw-r--r--haddock-api/haddock-api.cabal42
-rw-r--r--haddock-api/src/Haddock/Types.hs4
2 files changed, 24 insertions, 22 deletions
diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index 921e16eb..20b656b9 100644
--- a/haddock-api/haddock-api.cabal
+++ b/haddock-api/haddock-api.cabal
@@ -1,5 +1,5 @@
name: haddock-api
-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
@@ -33,28 +33,29 @@ data-files:
latex/haddock.sty
library
- default-language:
- Haskell2010
+ default-language: Haskell2010
- build-depends:
- base >= 4.3 && < 4.11
- , bytestring
- , filepath
- , directory
- , containers
- , transformers
- , deepseq
- , array
- , xhtml >= 3000.2 && < 3000.3
- , Cabal >= 1.10
- , ghc-boot
- , ghc == 8.2.*
+ -- this package typically supports only single major versions
+ build-depends: base == 4.10.*
+ , Cabal == 2.0.*
+ , ghc == 8.2.*
+ , 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
@@ -125,4 +126,5 @@ test-suite spec
source-repository head
type: git
+ subdir: haddock-api
location: https://github.com/haskell/haddock.git
diff --git a/haddock-api/src/Haddock/Types.hs b/haddock-api/src/Haddock/Types.hs
index a6dd6354..803995cc 100644
--- a/haddock-api/src/Haddock/Types.hs
+++ b/haddock-api/src/Haddock/Types.hs
@@ -460,8 +460,8 @@ instance (NFData a, NFData mod)
DocExamples a -> a `deepseq` ()
DocHeader a -> a `deepseq` ()
-#if __GLASGOW_HASKELL__ < 801
--- These were added to GHC itself in 8.2.1
+#if !MIN_VERSION_ghc(8,0,2)
+-- These were added to GHC itself in 8.0.2
instance NFData Name where rnf x = seq x ()
instance NFData OccName where rnf x = seq x ()
instance NFData ModuleName where rnf x = seq x ()