X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=base.cabal;h=04caae1496aefb2fbf5c3a3fc33b016774c0aa34;hb=4277f8687cf5085e92404b6540025f8a51fdda35;hp=4ea4e3dcf05db18b23dac57ffa38b45396022b5f;hpb=de76ff60453a0a57a9a942e4f0130ec2eca921f0;p=ghc-base.git

diff --git a/base.cabal b/base.cabal
index 4ea4e3d..04caae1 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,
@@ -95,16 +98,13 @@ Library {
             System.Timeout
         if os(windows)
             exposed-modules: GHC.IO.Encoding.CodePage.Table
+                             GHC.Conc.Windows
         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
     }
     exposed-modules:
         Control.Applicative,
@@ -136,6 +136,7 @@ Library {
         Data.Fixed,
         Data.Foldable
         Data.Function,
+        Data.Functor,
         Data.HashTable,
         Data.IORef,
         Data.Int,
@@ -205,10 +206,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
     }
+    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.