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

diff --git a/base.cabal b/base.cabal
index 5cb1d5b..dbba7cc 100644
--- a/base.cabal
+++ b/base.cabal
@@ -1,5 +1,5 @@
 name:           base
-version:        4.0.0.0
+version:        4.3.1.0
 license:        BSD3
 license-file:   LICENSE
 maintainer:     libraries@haskell.org
@@ -9,30 +9,42 @@ 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
-                include/HsBaseConfig.h
+                include/HsBaseConfig.h include/EventConfig.h
 extra-source-files:
                 config.guess config.sub install-sh
                 aclocal.m4 configure.ac configure
                 include/CTypes.h
 
 source-repository head
-    type:     darcs
-    location: http://darcs.haskell.org/packages/base/
+    type:     git
+    location: http://darcs.haskell.org/packages/base.git/
+
+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,
             GHC.Base,
             GHC.Classes,
             GHC.Conc,
+            GHC.Conc.IO,
+            GHC.Conc.Signal,
+            GHC.Conc.Sync,
             GHC.ConsoleHandler,
+            GHC.Constants,
             GHC.Desugar,
             GHC.Enum,
             GHC.Environment,
@@ -40,10 +52,43 @@ Library {
             GHC.Exception,
             GHC.Exts,
             GHC.Float,
+            GHC.Float.RealFracMethods,
+            GHC.Foreign,
+            GHC.Float.ConversionUtils,
             GHC.ForeignPtr,
-            GHC.Handle,
+            GHC.HetMet,
+            GHC.HetMet.CodeTypes,
+            GHC.HetMet.GArrow,
+            GHC.HetMet.GArrowKappa,
+            GHC.HetMet.GArrowInstances,
+            GHC.HetMet.Private,
+            GHC.HetMet.Arrow,
+            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.Encoding.Failure,
+            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,16 +107,10 @@ Library {
             GHC.Weak,
             GHC.Word,
             System.Timeout
-        extensions: MagicHash, ExistentialQuantification, Rank2Types,
-                    ScopedTypeVariables, UnboxedTuples,
-                    ForeignFunctionInterface, UnliftedFFITypes,
-                    DeriveDataTypeable, GeneralizedNewtypeDeriving,
-                    FlexibleInstances, StandaloneDeriving,
-                    PatternGuards, EmptyDataDecls, NoImplicitPrelude
-
-        if impl(ghc < 6.10) 
-           -- PatternSignatures was deprecated in 6.10
-           extensions: PatternSignatures
+        if os(windows)
+            exposed-modules: GHC.IO.Encoding.CodePage.Table
+                             GHC.Conc.Windows
+                             GHC.Windows
     }
     exposed-modules:
         Control.Applicative,
@@ -92,6 +131,8 @@ Library {
         Control.Monad.ST
         Control.Monad.ST.Lazy
         Control.Monad.ST.Strict
+        Control.Monad.Group
+        Control.Monad.Zip
         Data.Bits,
         Data.Bool,
         Data.Char,
@@ -103,6 +144,7 @@ Library {
         Data.Fixed,
         Data.Foldable
         Data.Function,
+        Data.Functor,
         Data.HashTable,
         Data.IORef,
         Data.Int,
@@ -166,16 +208,33 @@ 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 EventConfig.h WCsubst.h consUtils.h Typeable.h
     if os(windows) {
-        extra-libraries: wsock32, msvcrt, kernel32, user32, shell32
+        extra-libraries: wsock32, user32, shell32
+    }
+    if !os(windows) {
+        exposed-modules:
+            GHC.Event
+        other-modules:
+            GHC.Event.Array
+            GHC.Event.Clock
+            GHC.Event.Control
+            GHC.Event.EPoll
+            GHC.Event.IntMap
+            GHC.Event.Internal
+            GHC.Event.KQueue
+            GHC.Event.Manager
+            GHC.Event.PSQ
+            GHC.Event.Poll
+            GHC.Event.Thread
+            GHC.Event.Unique
     }
-    extensions: CPP
     -- We need to set the package name to base (without a version number)
     -- as it's magic.
     ghc-options: -package-name base