X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=base.cabal;h=8e49e3225e3545216b8fa315415a2db952c77cab;hb=7dbb606d7b57cdad87a0ffbdb6ea4a274ebca7c0;hp=c17d3516156e177253c9eeb8104d96e5246b01cf;hpb=428b6c66cd56f0a56fa118d3ac4ca3eacbf73320;p=ghc-base.git

diff --git a/base.cabal b/base.cabal
index c17d351..8e49e32 100644
--- a/base.cabal
+++ b/base.cabal
@@ -1,5 +1,5 @@
 name:           base
-version:        4.1.0.0
+version:        4.3.1.0
 license:        BSD3
 license-file:   LICENSE
 maintainer:     libraries@haskell.org
@@ -13,15 +13,15 @@ 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
@@ -32,7 +32,7 @@ Library {
             build-depends: integer-simple
         else
             build-depends: integer-gmp
-            ghc-options: -DOPTIMISE_INTEGER_GCD_LCM
+            cpp-options: -DOPTIMISE_INTEGER_GCD_LCM
         build-depends: rts, ghc-prim
         exposed-modules:
             Foreign.Concurrent,
@@ -40,7 +40,11 @@ Library {
             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,
@@ -48,7 +52,15 @@ Library {
             GHC.Exception,
             GHC.Exts,
             GHC.Float,
+            GHC.Float.RealFracMethods,
+            GHC.Foreign,
+            GHC.Float.ConversionUtils,
             GHC.ForeignPtr,
+            GHC.HetMet,
+            GHC.HetMet.CodeTypes,
+            GHC.HetMet.GArrow,
+            GHC.HetMet.GArrowInstances,
+            GHC.HetMet.Arrow,
             GHC.MVar,
             GHC.IO,
             GHC.IO.IOMode,
@@ -64,6 +76,8 @@ Library {
             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,
@@ -91,16 +105,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,
@@ -121,6 +129,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,
@@ -132,6 +142,7 @@ Library {
         Data.Fixed,
         Data.Foldable
         Data.Function,
+        Data.Functor,
         Data.HashTable,
         Data.IORef,
         Data.Int,
@@ -201,11 +212,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