Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics

[ghc-base.git] / base.cabal

diff --git a/base.cabal b/base.cabal
index ecb0d2d..b4a6ee7 100644 (file)
--- 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,6 +52,8 @@ Library {
             GHC.Exception,
             GHC.Exts,
             GHC.Float,
+            GHC.Float.RealFracMethods,
+            GHC.Float.ConversionUtils,
             GHC.ForeignPtr,
             GHC.MVar,
             GHC.IO,
@@ -99,13 +101,6 @@ 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,
-                    NondecreasingIndentation
     }
     exposed-modules:
         Control.Applicative,
@@ -213,22 +208,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