Rewrite of signal-handling (base patch; see also ghc and unix patches)

[ghc-base.git] / base.cabal

diff --git a/base.cabal b/base.cabal
index 4a08fae..ce2c66d 100644 (file)
--- a/base.cabal
+++ b/base.cabal
@@ -1,37 +1,39 @@
 name:           base
-version:        3.0
+version:        4.0.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.6
+build-type: Configure
 extra-tmp-files:
                 config.log config.status autom4te.cache
-                include/HsBaseConfig.h GHC/Prim.hs GHC/PrimopWrappers.hs
+                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/
 
 Library {
-    -- This is actually something of a hack, as if we are using
-    -- GHC and we don't have an rts package for some reason, we
-    -- actually ought to fail.
     if impl(ghc) {
-        build-depends: rts
+        build-depends: rts, ghc-prim, integer
         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.Dotnet,
+            GHC.Desugar,
             GHC.Enum,
             GHC.Environment,
             GHC.Err,
@@ -47,8 +49,6 @@ Library {
             GHC.Num,
             GHC.PArr,
             GHC.Pack,
-            GHC.Prim,
-            GHC.PrimopWrappers,
             GHC.Ptr,
             GHC.Read,
             GHC.Real,
@@ -62,10 +62,21 @@ 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
     }
     exposed-modules:
         Control.Applicative,
         Control.Arrow,
+        Control.Category,
         Control.Concurrent,
         Control.Concurrent.Chan,
         Control.Concurrent.MVar,
@@ -73,12 +84,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,
@@ -86,6 +99,7 @@ Library {
         Data.Dynamic,
         Data.Either,
         Data.Eq,
+        Data.Data,
         Data.Fixed,
         Data.Foldable
         Data.Function,
@@ -98,9 +112,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,
@@ -126,7 +140,7 @@ Library {
         Foreign.Storable,
         Numeric,
         Prelude,
-        System.Console.GetOpt,
+        System.Console.GetOpt
         System.CPUTime,
         System.Environment,
         System.Exit,
@@ -154,20 +168,16 @@ Library {
         cbits/consUtils.c
         cbits/dirUtils.c
         cbits/inputReady.c
-        cbits/lockFile.c
-        cbits/longlong.c
         cbits/selectUtils.c
     include-dirs: include
     includes:    HsBase.h
-    install-includes:    HsBase.h HsBaseConfig.h WCsubst.h dirUtils.h lockFile.h consUtils.h Typeable.h
-    if os(mingw32) {
+    install-includes:    HsBase.h HsBaseConfig.h WCsubst.h dirUtils.h consUtils.h Typeable.h
+    if os(windows) {
         extra-libraries: wsock32, msvcrt, kernel32, user32, shell32
     }
-    extensions:    CPP
-    -- XXX is there an extension for using # in varids?
+    extensions: CPP
     -- We need to set the package name to base (without a version number)
     -- as it's magic.
-    ghc-options: -fglasgow-exts -package-name base
+    ghc-options: -package-name base
     nhc98-options: -H4M -K3M
 }
-