diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2015-10-31 22:13:26 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2015-10-31 22:14:43 +0000 |
| commit | 0413c544b60c063ef286777d3008c4e33b4afbcd (patch) | |
| tree | dc78cd20cc9f41c5495afb4b14a3c5798b07d9a1 /haddock.cabal | |
| parent | b2d4b230c2446d241fd8730cd158e4fe6b7305df (diff) | |
| parent | 987b5062482e20a032fb6358e655265b0b7a3cd2 (diff) | |
Merge remote-tracking branch 'origin/ghc-head' into wip/spj-wildcard-refactor
Conflicts:
haddock-api/src/Haddock/Convert.hs
Diffstat (limited to 'haddock.cabal')
| -rw-r--r-- | haddock.cabal | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/haddock.cabal b/haddock.cabal index 3b6002f1..56e62e60 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -45,7 +45,7 @@ executable haddock ghc-options: -funbox-strict-fields -Wall -fwarn-tabs -O2 build-depends: - base >= 4.3 && < 4.9 + base >= 4.3 && < 4.10 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 |