diff options
| -rw-r--r-- | haddock.cabal | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/haddock.cabal b/haddock.cabal index 42872fc2..4af5e71f 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -65,13 +65,15 @@ flag in-ghc-tree executable haddock build-depends: + base >= 4.0.0.0 && < 4.2.0.0, haskell98, - ghc >= 6.8.2 && < 6.13, filepath, directory, pretty, containers, - array + array, + Cabal >= 1.5, + ghc >= 6.10.1 && < 6.13 if flag(in-ghc-tree) cpp-options: -DIN_GHC_TREE @@ -79,12 +81,6 @@ executable haddock else build-depends: ghc-paths - if impl(ghc >= 6.9) - build-depends: Cabal >= 1.5 - build-depends: base >= 4.0.0.0 && < 4.2.0.0 - else - build-depends: base < 4.0.0.0 - main-is: Main.hs hs-source-dirs: src extensions: CPP, PatternGuards, DeriveDataTypeable, @@ -116,9 +112,7 @@ executable haddock -- Cabal doesn't define __GHC_PATCHLEVEL__ if impl(ghc == 6.10.1) cpp-options: -D__GHC_PATCHLEVEL__=1 - if impl(ghc == 6.8.3) - cpp-options: -D__GHC_PATCHLEVEL__=3 - if impl(ghc == 6.8.2) || impl(ghc >= 6.10.1.20090223) + if impl(ghc >= 6.10.1.20090223) cpp-options: -D__GHC_PATCHLEVEL__=2 library @@ -135,9 +129,7 @@ library -- Cabal doesn't define __GHC_PATCHLEVEL__ if impl(ghc == 6.10.1) cpp-options: -D__GHC_PATCHLEVEL__=1 - if impl(ghc == 6.8.3) - cpp-options: -D__GHC_PATCHLEVEL__=3 - if impl(ghc == 6.8.2) || impl(ghc >= 6.10.1.20090223) + if impl(ghc >= 6.10.1.20090223) cpp-options: -D__GHC_PATCHLEVEL__=2 if flag(in-ghc-tree) |