X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=base.cabal;h=b0c68e82c63148fff5e732a04030682d61085ad3;hb=f3f90f1ce9063cf63ea75318440b7fc6809350ef;hp=597f2b3422595f73b8d4b51c01b4e793cc1ad7e7;hpb=30e5d4bf871970f5a3c4af4b703132a31e462854;p=ghc-base.git

diff --git a/base.cabal b/base.cabal
index 597f2b3..b0c68e8 100644
--- a/base.cabal
+++ b/base.cabal
@@ -1,5 +1,5 @@
 name:		base
-version:	2.0
+version:	2.1
 license:	BSD3
 license-file:	LICENSE
 maintainer:	libraries@haskell.org
@@ -24,8 +24,6 @@ exposed-modules:
 	Control.Monad.ST,
 	Control.Monad.ST.Lazy,
 	Control.Monad.ST.Strict,
-	Control.Parallel,
-	Control.Parallel.Strategies,
 	Data.Array,
 	Data.Array.Base,
 	Data.Array.Diff,
@@ -51,13 +49,13 @@ exposed-modules:
 	Data.Foldable,
 	Data.Fixed,
 	Data.Function,
-	-- Data.Generics,
-	-- Data.Generics.Aliases,
-	-- Data.Generics.Basics,
-	-- Data.Generics.Instances,
-	-- Data.Generics.Schemes,
-	-- Data.Generics.Text,
-	-- Data.Generics.Twins,
+	Data.Generics,
+	Data.Generics.Aliases,
+	Data.Generics.Basics,
+	Data.Generics.Instances,
+	Data.Generics.Schemes,
+	Data.Generics.Text,
+	Data.Generics.Twins,
 	Data.Graph,
 	Data.HashTable,
 	Data.IORef,
@@ -77,6 +75,7 @@ exposed-modules:
 	Data.STRef.Strict,
 	Data.Sequence,
 	Data.Set,
+	Data.String,
 	Data.Tree,
 	Data.Traversable,
 	Data.Tuple,
@@ -90,7 +89,7 @@ exposed-modules:
 	Foreign.C.Error,
 	Foreign.C.String,
 	Foreign.C.Types,
-	-- Foreign.Concurrent,
+	Foreign.Concurrent,
 	Foreign.ForeignPtr,
 	Foreign.Marshal,
 	Foreign.Marshal.Alloc,
@@ -101,41 +100,84 @@ exposed-modules:
 	Foreign.Ptr,
 	Foreign.StablePtr,
 	Foreign.Storable,
+	GHC.Arr,
+	GHC.Base,
+	GHC.Conc,
+	GHC.ConsoleHandler,
+	GHC.Dotnet,
+	GHC.Enum,
+	GHC.Err,
+	GHC.Exception,
+	GHC.Exts,
+	GHC.Float,
+	GHC.ForeignPtr,
+	GHC.Handle,
+	GHC.IO,
+	GHC.IOBase,
+	GHC.Int,
+	GHC.List,
+	GHC.Num,
+	GHC.PArr,
+	GHC.Pack,
+	GHC.Prim,
+	GHC.PrimopWrappers,
+	GHC.Ptr,
+	GHC.Read,
+	GHC.Real,
+	GHC.ST,
+	GHC.STRef,
+	GHC.Show,
+	GHC.Stable,
+	GHC.Storable,
+	GHC.TopHandler,
+	GHC.Unicode,
+	GHC.Weak,
+	GHC.Word,
 	Numeric,
 	Prelude,
-	System.Cmd,
 	System.Console.GetOpt,
 	System.CPUTime,
-	System.Directory,
-	System.Directory.Internals,
 	System.Environment,
 	System.Exit,
 	System.IO,
 	System.IO.Error,
 	System.IO.Unsafe,
 	System.Info,
-	System.Locale,
 	System.Mem,
 	System.Mem.StableName,
 	System.Mem.Weak,
 	System.Posix.Internals,
 	System.Posix.Signals,
 	System.Posix.Types,
-	-- System.Process,
-	System.Process.Internals,
-	System.Random,
-	System.Time,
+	System.Timeout,
 	Text.ParserCombinators.ReadP,
 	Text.ParserCombinators.ReadPrec,
-	Text.PrettyPrint,
-	Text.PrettyPrint.HughesPJ,
 	Text.Printf,
 	Text.Read,
 	Text.Read.Lex,
 	Text.Show,
 	Text.Show.Functions
+	Unsafe.Coerce
 other-modules:
 	Data.Array.IO.Internals
-include-dirs:	include, ../../ghc/includes
+c-sources:
+	cbits/PrelIOUtils.c
+	cbits/WCsubst.c
+	cbits/Win32Utils.c
+	cbits/consUtils.c
+	cbits/dirUtils.c
+	cbits/fpstring.c
+	cbits/inputReady.c
+	cbits/lockFile.c
+	cbits/longlong.c
+	cbits/selectUtils.c
+include-dirs: include, ../../includes, ../../rts
 includes:	HsBase.h
+install-includes:	HsBase.h HsBaseConfig.h WCsubst.h dirUtils.h lockFile.h consUtils.h Typeable.h
 extensions:	CPP
+-- XXX is there an extension for using # in varids?
+-- We need to set the package name to base (without a version number)
+-- as it's magic.
+ghc-options: -fglasgow-exts -package-name base
+nhc98-options: -H4M -K3M
+