X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=base.cabal;h=8e49e3225e3545216b8fa315415a2db952c77cab;hb=1c5d86f9ab468292f9a52b079e25578ac83d07e2;hp=6965569233a21d94e17b28dfbee87bdbb3e6b537;hpb=ec7d7ba5e16fddc419a5f0da82a66764f5537c55;p=ghc-base.git

diff --git a/base.cabal b/base.cabal
index 6965569..8e49e32 100644
--- a/base.cabal
+++ b/base.cabal
@@ -20,8 +20,8 @@ extra-source-files:
                 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
@@ -52,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,
@@ -69,6 +77,7 @@ Library {
             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,
@@ -99,16 +108,7 @@ Library {
         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
+                             GHC.Windows
     }
     exposed-modules:
         Control.Applicative,
@@ -129,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,
@@ -216,22 +218,21 @@ Library {
     }
     if !os(windows) {
         exposed-modules:
-            System.Event
+            GHC.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
+            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