From 4387543c15c5c98e1012cc85f6b6fff79de11a75 Mon Sep 17 00:00:00 2001 From: Lennart Kolmodin Date: Fri, 17 Dec 2010 18:32:03 +0000 Subject: 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. --- haddock.cabal | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'haddock.cabal') 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 -- cgit v1.2.3