X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=base.cabal;h=5e1a6d5eb56a72faf30c1ff506b8c54120ee9751;hb=85ed71ab833a40f5acfeb4610a0aa3c3c3e1a35b;hp=032010d4907e8d9f6cc2cd66c74f4d6a799b2fed;hpb=689dd035ca641ac6f8dea8337364c65b4b4aacd7;p=ghc-base.git

diff --git a/base.cabal b/base.cabal
index 032010d..5e1a6d5 100644
--- a/base.cabal
+++ b/base.cabal
@@ -1,5 +1,5 @@
 name:           base
-version:        4.1.0.0
+version:        4.3.0.0
 license:        BSD3
 license-file:   LICENSE
 maintainer:     libraries@haskell.org
@@ -13,7 +13,7 @@ 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
@@ -23,16 +23,28 @@ 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,
             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,
@@ -56,6 +68,7 @@ Library {
             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,
@@ -83,6 +96,9 @@ Library {
             GHC.Weak,
             GHC.Word,
             System.Timeout
+        if os(windows)
+            exposed-modules: GHC.IO.Encoding.CodePage.Table
+                             GHC.Conc.Windows
         extensions: MagicHash, ExistentialQuantification, Rank2Types,
                     ScopedTypeVariables, UnboxedTuples,
                     ForeignFunctionInterface, UnliftedFFITypes,
@@ -90,7 +106,7 @@ Library {
                     FlexibleInstances, StandaloneDeriving,
                     PatternGuards, EmptyDataDecls, NoImplicitPrelude
 
-        if impl(ghc < 6.10) 
+        if impl(ghc < 6.10)
            -- PatternSignatures was deprecated in 6.10
            extensions: PatternSignatures
     }
@@ -124,6 +140,7 @@ Library {
         Data.Fixed,
         Data.Foldable
         Data.Function,
+        Data.Functor,
         Data.HashTable,
         Data.IORef,
         Data.Int,
@@ -187,14 +204,33 @@ Library {
         cbits/WCsubst.c
         cbits/Win32Utils.c
         cbits/consUtils.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 consUtils.h Typeable.h
+    install-includes:    HsBase.h HsBaseConfig.h EventConfig.h WCsubst.h consUtils.h Typeable.h
     if os(windows) {
         extra-libraries: wsock32, user32, shell32
     }
+    if !os(windows) {
+        exposed-modules:
+            System.Event
+        other-modules:
+            System.Event.Array
+            System.Event.Clock
+            System.Event.Control
+            System.Event.EPoll
+            System.Event.IntMap
+            System.Event.Internal
+            System.Event.KQueue
+            System.Event.Manager
+            System.Event.PSQ
+            System.Event.Poll
+            System.Event.Thread
+            System.Event.Unique
+    }
     extensions: CPP
     -- We need to set the package name to base (without a version number)
     -- as it's magic.