diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-02-23 10:28:13 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-02-23 10:28:13 -0500 |
| commit | 844c0c47a223e2e1bb3767afc05639269dad8ee9 (patch) | |
| tree | c5603db417765a909081a564859004b2d4e0b9dd | |
| parent | e185254b6cb8a7811eeed1f993612c90b2ff757e (diff) | |
| parent | 59932f1749394fedc3533bea1474bc9e207824e1 (diff) | |
Merge remote-tracking branch 'upstream/ghc-head' into HEAD
| -rw-r--r-- | haddock-api/haddock-api.cabal | 1 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/InterfaceFile.hs | 2 | ||||
| -rw-r--r-- | haddock-library/haddock-library.cabal | 2 | ||||
| -rw-r--r-- | haddock-test/haddock-test.cabal | 3 | ||||
| -rw-r--r-- | haddock.cabal | 4 |
5 files changed, 8 insertions, 4 deletions
diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal index 5eb69345..2c892de6 100644 --- a/haddock-api/haddock-api.cabal +++ b/haddock-api/haddock-api.cabal @@ -13,6 +13,7 @@ bug-reports: https://github.com/haskell/haddock/issues copyright: (c) Simon Marlow, David Waern category: Documentation build-type: Simple +tested-with: GHC==8.10.*, GHC==8.8.1, GHC==8.6.5 extra-source-files: CHANGES.md diff --git a/haddock-api/src/Haddock/InterfaceFile.hs b/haddock-api/src/Haddock/InterfaceFile.hs index 4890a937..be9f4293 100644 --- a/haddock-api/src/Haddock/InterfaceFile.hs +++ b/haddock-api/src/Haddock/InterfaceFile.hs @@ -82,7 +82,7 @@ binaryInterfaceMagic = 0xD0Cface -- (2) set `binaryInterfaceVersionCompatibility` to [binaryInterfaceVersion] -- binaryInterfaceVersion :: Word16 -#if (__GLASGOW_HASKELL__ >= 811) && (__GLASGOW_HASKELL__ < 813) +#if MIN_VERSION_ghc(8,11,0) && !MIN_VERSION_ghc(8,13,0) binaryInterfaceVersion = 34 binaryInterfaceVersionCompatibility :: [Word16] diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal index 9cc011de..feb98e2f 100644 --- a/haddock-library/haddock-library.cabal +++ b/haddock-library/haddock-library.cabal @@ -17,6 +17,8 @@ maintainer: Alec Theriault <alec.theriault@gmail.com>, Alex Biehl <ale homepage: http://www.haskell.org/haddock/ bug-reports: https://github.com/haskell/haddock/issues category: Documentation +tested-with: GHC==8.10.*, GHC==8.8.1, GHC==8.6.5 + extra-source-files: CHANGES.md diff --git a/haddock-test/haddock-test.cabal b/haddock-test/haddock-test.cabal index a656d707..f5105f92 100644 --- a/haddock-test/haddock-test.cabal +++ b/haddock-test/haddock-test.cabal @@ -1,3 +1,4 @@ +cabal-version: >= 1.10 name: haddock-test version: 0.0.1 synopsis: Test utilities for Haddock @@ -9,8 +10,8 @@ bug-reports: https://github.com/haskell/haddock/issues copyright: (c) Simon Marlow, David Waern category: Documentation build-type: Simple -cabal-version: >= 1.10 stability: experimental +tested-with: GHC==8.10.*, GHC==8.8.1, GHC==8.6.5 library default-language: Haskell2010 diff --git a/haddock.cabal b/haddock.cabal index 0d3e9d9f..c8a3239e 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -33,7 +33,7 @@ bug-reports: https://github.com/haskell/haddock/issues copyright: (c) Simon Marlow, David Waern category: Documentation build-type: Simple -tested-with: GHC==8.6.* +tested-with: GHC==8.10.*, GHC==8.8.1, GHC==8.6.5 extra-source-files: CHANGES.md @@ -64,7 +64,7 @@ executable haddock -- haddock typically only supports a single GHC major version build-depends: - base ^>= 4.14.0.0 + base ^>= 4.12.0.0 || ^>= 4.13.0.0 || ^>= 4.14.0.0 if flag(in-ghc-tree) hs-source-dirs: haddock-api/src, haddock-library/src |