diff options
| author | Lennart Kolmodin <kolmodin@gentoo.org> | 2010-12-17 18:32:03 +0000 |
|---|---|---|
| committer | Lennart Kolmodin <kolmodin@gentoo.org> | 2010-12-17 18:32:03 +0000 |
| commit | 4387543c15c5c98e1012cc85f6b6fff79de11a75 (patch) | |
| tree | ab4582f745f500de716a896ce036c5bf0aa68fec | |
| parent | 30d49c2613505b2fcf827e37a3d779a923124844 (diff) | |
Revise haddock.cabal given that we now require ghc-7
default-language should be Haskell2010, slight new semantics for extensions.
Rewrite into clearer dependencies of base and Cabal.
| -rw-r--r-- | haddock.cabal | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/haddock.cabal b/haddock.cabal index edc94a39..48ff5a89 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -1,6 +1,6 @@ name: haddock version: 2.9.0 -cabal-version: >= 1.6 +cabal-version: >= 1.10 license: BSD3 build-type: Simple license-file: LICENSE @@ -73,15 +73,16 @@ flag test manual: True executable haddock + default-language: Haskell2010 build-depends: - base >= 4.0.0.0 && < 4.4.0.0, + base == 4.3.*, filepath, directory, pretty, containers, array, xhtml >= 3000.2 && < 3000.3, - Cabal >= 1.5, + Cabal >= 1.10, ghc >= 7.0 && < 7.2 if flag(in-ghc-tree) @@ -95,7 +96,7 @@ executable haddock main-is: Main.hs hs-source-dirs: src - extensions: CPP, DeriveDataTypeable, + default-extensions: CPP, DeriveDataTypeable, ScopedTypeVariables, MagicHash ghc-options: -funbox-strict-fields -O2 -Wall -fwarn-tabs @@ -132,15 +133,16 @@ executable haddock Haddock.Convert library + default-language: Haskell2010 build-depends: - base >= 4.0.0.0 && < 4.4.0.0, + base == 4.3.*, filepath, directory, pretty, containers, array, xhtml >= 3000.2 && < 3000.3, - Cabal >= 1.5, + Cabal >= 1.10, ghc >= 7.0 && < 7.2 if flag(in-ghc-tree) @@ -153,7 +155,7 @@ library build-depends: QuickCheck >= 2.1 && < 3 hs-source-dirs: src - extensions: CPP, DeriveDataTypeable, + default-extensions: CPP, DeriveDataTypeable, ScopedTypeVariables, MagicHash ghc-options: -funbox-strict-fields -O2 -Wall -fwarn-tabs |