X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=base.cabal;h=9bdfd2cb4cd4b92a4abc208782f01bdd3b28c447;hb=a2c9e6e2854a04c0959bb6879549bc7513f79de9;hp=05fd3e76b97ce679fe38395686f9f1ea9e1787d3;hpb=c5b70b85a0f07c40320bfaa7219f64d73e857bfb;p=ghc-base.git

diff --git a/base.cabal b/base.cabal
index 05fd3e7..9bdfd2c 100644
--- a/base.cabal
+++ b/base.cabal
@@ -1,36 +1,47 @@
 name:           base
-version:        3.0
+version:        4.2.0.0
 license:        BSD3
 license-file:   LICENSE
 maintainer:     libraries@haskell.org
+bug-reports: http://hackage.haskell.org/trac/ghc/newticket?component=libraries/base
 synopsis:       Basic libraries
 description:
     This package contains the Prelude and its support libraries,
     and a large collection of useful libraries ranging from data
     structures to parsing combinators and debugging utilities.
-cabal-version:  >=1.2
+cabal-version:  >=1.6
 build-type: Configure
 extra-tmp-files:
                 config.log config.status autom4te.cache
                 include/HsBaseConfig.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/
+
+Flag integer-simple
+    Description: Use integer-simple
 
 Library {
     if impl(ghc) {
-        build-depends: rts, ghc-prim, integer
+        if flag(integer-simple)
+            build-depends: integer-simple
+        else
+            build-depends: integer-gmp
+            cpp-options: -DOPTIMISE_INTEGER_GCD_LCM
+        build-depends: rts, ghc-prim
         exposed-modules:
-            Data.Generics,
-            Data.Generics.Aliases,
-            Data.Generics.Basics,
-            Data.Generics.Instances,
-            Data.Generics.Schemes,
-            Data.Generics.Text,
-            Data.Generics.Twins,
             Foreign.Concurrent,
             GHC.Arr,
             GHC.Base,
+            GHC.Classes,
             GHC.Conc,
             GHC.ConsoleHandler,
+            GHC.Constants,
             GHC.Desugar,
             GHC.Enum,
             GHC.Environment,
@@ -39,9 +50,31 @@ Library {
             GHC.Exts,
             GHC.Float,
             GHC.ForeignPtr,
-            GHC.Handle,
+            GHC.MVar,
             GHC.IO,
+            GHC.IO.IOMode,
+            GHC.IO.Buffer,
+            GHC.IO.Device,
+            GHC.IO.BufferedIO,
+            GHC.IO.FD,
+            GHC.IO.Exception,
+            GHC.IO.Encoding,
+            GHC.IO.Encoding.Latin1,
+            GHC.IO.Encoding.UTF8,
+            GHC.IO.Encoding.UTF16,
+            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,
+            GHC.IO.Handle.FD,
+            GHC.IO.Handle.Text,
             GHC.IOBase,
+            GHC.Handle,
+            GHC.IORef,
+            GHC.IOArray,
             GHC.Int,
             GHC.List,
             GHC.Num,
@@ -60,12 +93,18 @@ Library {
             GHC.Weak,
             GHC.Word,
             System.Timeout
+        if os(windows)
+            exposed-modules: GHC.IO.Encoding.CodePage.Table
         extensions: MagicHash, ExistentialQuantification, Rank2Types,
                     ScopedTypeVariables, UnboxedTuples,
                     ForeignFunctionInterface, UnliftedFFITypes,
                     DeriveDataTypeable, GeneralizedNewtypeDeriving,
-                    FlexibleInstances, PatternSignatures, StandaloneDeriving,
-                    PatternGuards
+                    FlexibleInstances, StandaloneDeriving,
+                    PatternGuards, EmptyDataDecls, NoImplicitPrelude
+
+        if impl(ghc < 6.10) 
+           -- PatternSignatures was deprecated in 6.10
+           extensions: PatternSignatures
     }
     exposed-modules:
         Control.Applicative,
@@ -78,13 +117,14 @@ Library {
         Control.Concurrent.QSemN,
         Control.Concurrent.SampleVar,
         Control.Exception,
+        Control.Exception.Base
         Control.OldException,
         Control.Monad,
         Control.Monad.Fix,
         Control.Monad.Instances,
-        Control.Monad.ST,
-        Control.Monad.ST.Lazy,
-        Control.Monad.ST.Strict,
+        Control.Monad.ST
+        Control.Monad.ST.Lazy
+        Control.Monad.ST.Strict
         Data.Bits,
         Data.Bool,
         Data.Char,
@@ -92,9 +132,11 @@ Library {
         Data.Dynamic,
         Data.Either,
         Data.Eq,
+        Data.Data,
         Data.Fixed,
         Data.Foldable
         Data.Function,
+        Data.Functor,
         Data.HashTable,
         Data.IORef,
         Data.Int,
@@ -104,9 +146,9 @@ Library {
         Data.Monoid,
         Data.Ord,
         Data.Ratio,
-        Data.STRef,
-        Data.STRef.Lazy,
-        Data.STRef.Strict,
+        Data.STRef
+        Data.STRef.Lazy
+        Data.STRef.Strict
         Data.String,
         Data.Traversable
         Data.Tuple,
@@ -132,7 +174,7 @@ Library {
         Foreign.Storable,
         Numeric,
         Prelude,
-        System.Console.GetOpt,
+        System.Console.GetOpt
         System.CPUTime,
         System.Environment,
         System.Exit,
@@ -158,14 +200,15 @@ Library {
         cbits/WCsubst.c
         cbits/Win32Utils.c
         cbits/consUtils.c
-        cbits/dirUtils.c
+        cbits/iconv.c
         cbits/inputReady.c
         cbits/selectUtils.c
+        cbits/primFloat.c
     include-dirs: include
     includes:    HsBase.h
-    install-includes:    HsBase.h HsBaseConfig.h WCsubst.h dirUtils.h consUtils.h Typeable.h
+    install-includes:    HsBase.h HsBaseConfig.h WCsubst.h consUtils.h Typeable.h
     if os(windows) {
-        extra-libraries: wsock32, msvcrt, kernel32, user32, shell32
+        extra-libraries: wsock32, user32, shell32
     }
     extensions: CPP
     -- We need to set the package name to base (without a version number)