remove conflicting import for nhc98

[haskell-directory.git] / base.cabal

diff --git a/base.cabal b/base.cabal
index f691346..3360c80 100644 (file)
--- a/base.cabal
+++ b/base.cabal
@@ -1,5 +1,5 @@
 name:          base
-version:       1.0
+version:       2.0
 license:       BSD3
 license-file:  LICENSE
 maintainer:    libraries@haskell.org
@@ -9,6 +9,7 @@ description:
        and a large collection of useful libraries ranging from data
        structures to parsing combinators and debugging utilities.
 exposed-modules:
+       Control.Applicative,
        Control.Arrow,
        Control.Concurrent,
        Control.Concurrent.Chan,
@@ -19,6 +20,7 @@ exposed-modules:
        Control.Exception,
        Control.Monad,
        Control.Monad.Fix,
+       Control.Monad.Instances,
        Control.Monad.ST,
        Control.Monad.ST.Lazy,
        Control.Monad.ST.Strict,
@@ -36,12 +38,19 @@ exposed-modules:
        Data.Array.Unboxed,
        Data.Bits,
        Data.Bool,
+       Data.ByteString,
+       Data.ByteString.Char8,
+    Data.ByteString.Lazy
+    Data.ByteString.Lazy.Char8
+    Data.ByteString.Base
+    Data.ByteString.Fusion
        Data.Char,
        Data.Complex,
        Data.Dynamic,
        Data.Either,
        Data.Eq,
-       Data.FiniteMap,
+       Data.Foldable,
+       Data.Fixed,
        Data.FunctorM,
        -- Data.Generics,
        -- Data.Generics.Aliases,
@@ -71,6 +80,7 @@ exposed-modules:
        Data.Sequence,
        Data.Set,
        Data.Tree,
+       Data.Traversable,
        Data.Tuple,
        Data.Typeable,
        Data.Unique,
@@ -117,8 +127,6 @@ exposed-modules:
        System.Process.Internals,
        System.Random,
        System.Time,
-       Text.Html,
-       Text.Html.BlockTable,
        Text.ParserCombinators.ReadP,
        Text.ParserCombinators.ReadPrec,
        Text.PrettyPrint,
@@ -126,8 +134,6 @@ exposed-modules:
        Text.Printf,
        Text.Read,
        Text.Read.Lex,
-       Text.Regex,
-       Text.Regex.Posix,
        Text.Show,
        Text.Show.Functions
 include-dirs:  include, ../../ghc/includes