aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2020-06-17 14:53:16 -0400
committerGitHub <noreply@github.com>2020-06-17 14:53:16 -0400
commit556b5121bbceeb3a2c4bb94c2fd25b60657d82ab (patch)
tree71c4303e0b9cac9550770165bf6cb2c7c737312d
parenta1cc87c864242377833ab383f1df72583ab4a01d (diff)
parent7475d84fa8d3a764dd8b54f8513f21170103f976 (diff)
Merge pull request #1199 from bgamari/wip/ghc-8.12
haddock: Bounds bumps for GHC 8.12
-rw-r--r--haddock-api/haddock-api.cabal4
-rw-r--r--haddock-library/haddock-library.cabal4
-rw-r--r--haddock.cabal4
3 files changed, 6 insertions, 6 deletions
diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index 750f15a6..759e12f6 100644
--- a/haddock-api/haddock-api.cabal
+++ b/haddock-api/haddock-api.cabal
@@ -13,7 +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
+tested-with: GHC==8.12.*, GHC==8.10.*, GHC==8.8.1
extra-source-files:
CHANGES.md
@@ -43,7 +43,7 @@ library
default-language: Haskell2010
-- this package typically supports only single major versions
- build-depends: base ^>= 4.13.0
+ build-depends: base ^>= 4.15.0
, Cabal ^>= 2.4.0
, ghc ^>= 8.11
, ghc-paths ^>= 0.1.0.9
diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal
index feb98e2f..8c20d7ad 100644
--- a/haddock-library/haddock-library.cabal
+++ b/haddock-library/haddock-library.cabal
@@ -17,7 +17,7 @@ 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
+tested-with: GHC==8.12.*, GHC==8.10.*, GHC==8.8.1
extra-source-files:
CHANGES.md
@@ -26,7 +26,7 @@ common lib-defaults
default-language: Haskell2010
build-depends:
- , base >= 4.5 && < 4.15
+ , base >= 4.5 && < 4.16
, bytestring ^>= 0.9.2.1 || ^>= 0.10.0.0
, containers ^>= 0.4.2.1 || ^>= 0.5.0.0 || ^>= 0.6.0.1
, transformers ^>= 0.3.0.0 || ^>= 0.4.1.0 || ^>= 0.5.0.0
diff --git a/haddock.cabal b/haddock.cabal
index e830d8fe..52113bd1 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.10.*, GHC==8.8.1, GHC==8.6.5
+tested-with: GHC==8.12.*, GHC==8.10.*, GHC==8.8.1
extra-source-files:
CHANGES.md
@@ -64,7 +64,7 @@ executable haddock
-- haddock typically only supports a single GHC major version
build-depends:
- base ^>= 4.12.0.0 || ^>= 4.13.0.0 || ^>= 4.14.0.0
+ base ^>= 4.13.0.0 || ^>= 4.14.0.0 || ^>= 4.15.0.0
if flag(in-ghc-tree)
hs-source-dirs: haddock-api/src, haddock-library/src