X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=base.cabal;h=0d3d30d46366adaac80f65c310a5dac54b61f9f9;hb=2b88e86142ffbf79dad8596082ec301627a5682c;hp=5cb1d5b2d0fd306d6875d72b4bc854970fc8bf98;hpb=754e3648b3e91efac42e311aca06828a3bb69f88;p=ghc-base.git

diff --git a/base.cabal b/base.cabal
index 5cb1d5b..0d3d30d 100644
--- a/base.cabal
+++ b/base.cabal
@@ -1,5 +1,5 @@
 name:           base
-version:        4.0.0.0
+version:        4.3.0.0
 license:        BSD3
 license-file:   LICENSE
 maintainer:     libraries@haskell.org
@@ -9,7 +9,7 @@ description:
     This package contains the Prelude and its support libraries,
     and a large collection of useful libraries ranging from data
     structures to parsing combinators and debugging utilities.
-cabal-version:  >=1.2
+cabal-version:  >=1.6
 build-type: Configure
 extra-tmp-files:
                 config.log config.status autom4te.cache
@@ -23,9 +23,17 @@ source-repository head
     type:     darcs
     location: http://darcs.haskell.org/packages/base/
 
+Flag integer-simple
+    Description: Use integer-simple
+
 Library {
     if impl(ghc) {
-        build-depends: rts, ghc-prim, integer
+        if flag(integer-simple)
+            build-depends: integer-simple
+        else
+            build-depends: integer-gmp
+            cpp-options: -DOPTIMISE_INTEGER_GCD_LCM
+        build-depends: rts, ghc-prim
         exposed-modules:
             Foreign.Concurrent,
             GHC.Arr,
@@ -33,6 +41,7 @@ Library {
             GHC.Classes,
             GHC.Conc,
             GHC.ConsoleHandler,
+            GHC.Constants,
             GHC.Desugar,
             GHC.Enum,
             GHC.Environment,
@@ -41,9 +50,31 @@ Library {
             GHC.Exts,
             GHC.Float,
             GHC.ForeignPtr,
-            GHC.Handle,
+            GHC.MVar,
             GHC.IO,
+            GHC.IO.IOMode,
+            GHC.IO.Buffer,
+            GHC.IO.Device,
+            GHC.IO.BufferedIO,
+            GHC.IO.FD,
+            GHC.IO.Exception,
+            GHC.IO.Encoding,
+            GHC.IO.Encoding.Latin1,
+            GHC.IO.Encoding.UTF8,
+            GHC.IO.Encoding.UTF16,
+            GHC.IO.Encoding.UTF32,
+            GHC.IO.Encoding.Types,
+            GHC.IO.Encoding.Iconv,
+            GHC.IO.Encoding.CodePage,
+            GHC.IO.Handle,
+            GHC.IO.Handle.Types,
+            GHC.IO.Handle.Internals,
+            GHC.IO.Handle.FD,
+            GHC.IO.Handle.Text,
             GHC.IOBase,
+            GHC.Handle,
+            GHC.IORef,
+            GHC.IOArray,
             GHC.Int,
             GHC.List,
             GHC.Num,
@@ -62,6 +93,8 @@ Library {
             GHC.Weak,
             GHC.Word,
             System.Timeout
+        if os(windows)
+            exposed-modules: GHC.IO.Encoding.CodePage.Table
         extensions: MagicHash, ExistentialQuantification, Rank2Types,
                     ScopedTypeVariables, UnboxedTuples,
                     ForeignFunctionInterface, UnliftedFFITypes,
@@ -103,6 +136,7 @@ Library {
         Data.Fixed,
         Data.Foldable
         Data.Function,
+        Data.Functor,
         Data.HashTable,
         Data.IORef,
         Data.Int,
@@ -166,14 +200,15 @@ Library {
         cbits/WCsubst.c
         cbits/Win32Utils.c
         cbits/consUtils.c
-        cbits/dirUtils.c
+        cbits/iconv.c
         cbits/inputReady.c
         cbits/selectUtils.c
+        cbits/primFloat.c
     include-dirs: include
     includes:    HsBase.h
-    install-includes:    HsBase.h HsBaseConfig.h WCsubst.h dirUtils.h consUtils.h Typeable.h
+    install-includes:    HsBase.h HsBaseConfig.h WCsubst.h consUtils.h Typeable.h
     if os(windows) {
-        extra-libraries: wsock32, msvcrt, kernel32, user32, shell32
+        extra-libraries: wsock32, user32, shell32
     }
     extensions: CPP
     -- We need to set the package name to base (without a version number)