concurrent, unique, timeout have now been split off from base

diff --git a/compiler/ghc.cabal b/compiler/ghc.cabal
index 8d37b58..b1de64e 100644 (file)
--- a/compiler/ghc.cabal
+++ b/compiler/ghc.cabal
@@ -46,7 +46,8 @@ Library
         Build-Depends: base       < 3
 
     if flag(base4)
-        Build-Depends: st         >= 0.1 && < 0.2
+        Build-Depends: concurrent >= 0.1 && < 0.2,
+                       st         >= 0.1 && < 0.2
 
     if flag(base3) || flag(base4)
         Build-Depends: directory  >= 1   && < 1.1,

diff --git a/libraries/Makefile b/libraries/Makefile
index e78a5c8..43216ba 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -41,7 +41,7 @@ include $(TOP)/mk/cabal-flags.mk
 
 # Any libraries listed here should also be in ../packages
 
-SUBDIRS  = ghc-prim $(INTEGER_LIBRARY) base st getopt base3-compat array packedstring
+SUBDIRS  = ghc-prim $(INTEGER_LIBRARY) base concurrent unique timeout st getopt base3-compat array packedstring
 SUBDIRS += containers bytestring old-locale old-time filepath 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix

diff --git a/packages b/packages
index 99c24a8..0302ee4 100644 (file)
--- a/packages
+++ b/packages
@@ -8,6 +8,7 @@ libraries/base                          packages/base                   darcs
 libraries/base3-compat                  packages/base3-compat           darcs
 libraries/bytestring                    packages/bytestring             darcs
 libraries/Cabal                         packages/Cabal                  darcs
+libraries/concurrent                    packages/concurrent             darcs
 libraries/containers                    packages/containers             darcs
 libraries/directory                     packages/directory              darcs
 libraries/editline                      packages/editline               darcs
@@ -25,6 +26,8 @@ libraries/process                       packages/process                darcs
 libraries/random                        packages/random                 darcs
 libraries/st                            packages/st                     darcs
 libraries/template-haskell              packages/template-haskell       darcs
+libraries/timeout                       packages/timeout                darcs
+libraries/unique                        packages/unique                 darcs
 libraries/unix                          packages/unix                   darcs
 libraries/Win32                         packages/Win32                  darcs
 libraries/HUnit             extralibs   packages/HUnit                  darcs

diff --git a/utils/ghc-pkg/ghc-pkg.cabal b/utils/ghc-pkg/ghc-pkg.cabal
index 1e862a7..0ab3534 100644 (file)
--- a/utils/ghc-pkg/ghc-pkg.cabal
+++ b/utils/ghc-pkg/ghc-pkg.cabal
@@ -31,7 +31,8 @@ Executable ghc-pkg
         Build-Depends: base       < 3
 
     if flag(base4)
-        Build-Depends: getopt     >= 0.1 && < 0.2
+        Build-Depends: concurrent >= 0.1 && < 0.2,
+                       getopt     >= 0.1 && < 0.2
 
     if flag(base3) || flag(base4)
         Build-Depends: directory  >= 1   && < 1.1,