X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=base.cabal;h=67005376d0e43273320b0ed53c3ed62be6b37ed8;hb=88f389fc1807aac92b4b026c2b09b2ec6266d05b;hp=b6670db461c4355fa00a70a1572b89f7324bb972;hpb=6219c25c6eace2604eadc1fb8112dc710f66888e;p=ghc-base.git

diff --git a/base.cabal b/base.cabal
index b6670db..6700537 100644
--- a/base.cabal
+++ b/base.cabal
@@ -1,5 +1,5 @@
 name:           base
-version:        4.2.0.0
+version:        4.3.1.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
@@ -40,6 +40,9 @@ Library {
             GHC.Base,
             GHC.Classes,
             GHC.Conc,
+            GHC.Conc.IO,
+            GHC.Conc.Signal,
+            GHC.Conc.Sync,
             GHC.ConsoleHandler,
             GHC.Constants,
             GHC.Desugar,
@@ -49,6 +52,7 @@ Library {
             GHC.Exception,
             GHC.Exts,
             GHC.Float,
+            GHC.Float.RealFracMethods,
             GHC.ForeignPtr,
             GHC.MVar,
             GHC.IO,
@@ -65,6 +69,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,
@@ -92,16 +97,9 @@ 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
     }
     exposed-modules:
         Control.Applicative,
@@ -133,6 +131,7 @@ Library {
         Data.Fixed,
         Data.Foldable
         Data.Function,
+        Data.Functor,
         Data.HashTable,
         Data.IORef,
         Data.Int,
@@ -202,11 +201,27 @@ Library {
         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
     }
-    extensions: CPP
+    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
+    }
     -- We need to set the package name to base (without a version number)
     -- as it's magic.
     ghc-options: -package-name base