X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=base.cabal;h=f4fd2fe709752e8bf328a158321125d462cb4e28;hb=26d2805a6e58822d246cf9601fb226b0861e7f65;hp=4aead21c36736ec8a3ef983ccedf608e2fb92fdf;hpb=09521ae6f260453e810280f09d85a44ec3e54089;p=haskell-directory.git

diff --git a/base.cabal b/base.cabal
index 4aead21..f4fd2fe 100644
--- a/base.cabal
+++ b/base.cabal
@@ -1,5 +1,5 @@
 name:		base
-version:	1.0
+version:	2.1
 license:	BSD3
 license-file:	LICENSE
 maintainer:	libraries@haskell.org
@@ -25,13 +25,12 @@ exposed-modules:
 	Control.Monad.ST.Lazy,
 	Control.Monad.ST.Strict,
 	Control.Parallel,
-	-- Control.Parallel.Strategies,
+	Control.Parallel.Strategies,
 	Data.Array,
 	Data.Array.Base,
 	Data.Array.Diff,
 	Data.Array.IArray,
 	Data.Array.IO,
-	Data.Array.IO.Internals,
 	Data.Array.MArray,
 	Data.Array.ST,
 	Data.Array.Storable,
@@ -40,22 +39,25 @@ exposed-modules:
 	Data.Bool,
 	Data.ByteString,
 	Data.ByteString.Char8,
+	Data.ByteString.Lazy
+	Data.ByteString.Lazy.Char8
+	Data.ByteString.Base
+	Data.ByteString.Fusion
 	Data.Char,
 	Data.Complex,
 	Data.Dynamic,
 	Data.Either,
 	Data.Eq,
 	Data.Foldable,
-	Data.FiniteMap,
 	Data.Fixed,
-	Data.FunctorM,
-	-- Data.Generics,
-	-- Data.Generics.Aliases,
-	-- Data.Generics.Basics,
-	-- Data.Generics.Instances,
-	-- Data.Generics.Schemes,
-	-- Data.Generics.Text,
-	-- Data.Generics.Twins,
+	Data.Function,
+	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,
@@ -69,13 +71,13 @@ exposed-modules:
 	Data.Monoid,
 	Data.Ord,
 	Data.PackedString,
-	Data.Queue,
 	Data.Ratio,
 	Data.STRef,
 	Data.STRef.Lazy,
 	Data.STRef.Strict,
 	Data.Sequence,
 	Data.Set,
+	Data.String,
 	Data.Tree,
 	Data.Traversable,
 	Data.Tuple,
@@ -89,7 +91,7 @@ exposed-modules:
 	Foreign.C.Error,
 	Foreign.C.String,
 	Foreign.C.Types,
-	-- Foreign.Concurrent,
+	Foreign.Concurrent,
 	Foreign.ForeignPtr,
 	Foreign.Marshal,
 	Foreign.Marshal.Alloc,
@@ -100,6 +102,39 @@ 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,
@@ -120,12 +155,10 @@ exposed-modules:
 	System.Posix.Internals,
 	System.Posix.Signals,
 	System.Posix.Types,
-	-- System.Process,
+	System.Process,
 	System.Process.Internals,
 	System.Random,
 	System.Time,
-	Text.Html,
-	Text.Html.BlockTable,
 	Text.ParserCombinators.ReadP,
 	Text.ParserCombinators.ReadPrec,
 	Text.PrettyPrint,
@@ -133,10 +166,30 @@ exposed-modules:
 	Text.Printf,
 	Text.Read,
 	Text.Read.Lex,
-	Text.Regex,
-	Text.Regex.Posix,
 	Text.Show,
 	Text.Show.Functions
-include-dirs:	include, ../../ghc/includes
+	Unsafe.Coerce
+other-modules:
+	Data.Array.IO.Internals
+c-sources:
+	cbits/PrelIOUtils.c
+	cbits/WCsubst.c
+	cbits/Win32Utils.c
+	cbits/consUtils.c
+	cbits/dirUtils.c
+	cbits/execvpe.c
+	cbits/fpstring.c
+	cbits/inputReady.c
+	cbits/lockFile.c
+	cbits/longlong.c
+	cbits/runProcess.c
+	cbits/selectUtils.c
+	cbits/timeUtils.c
+include-dirs: include, ../../includes, ../../rts
 includes:	HsBase.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
+