parsec, regex-base, regex-compat, regex-posix are no longer core-packages

diff --git a/libraries/Makefile b/libraries/Makefile
index e0ecc62..881cfc2 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -12,8 +12,7 @@ TOP=.
 include $(TOP)/mk/boilerplate.mk
 endif
 
 include $(TOP)/mk/boilerplate.mk
 endif
 

-SUBDIRS = base filepath haskell98 template-haskell readline \
-         regex-base regex-posix regex-compat parsec Cabal
+SUBDIRS = base filepath haskell98 template-haskell readline Cabal

 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix

@@ -25,6 +24,10 @@ endif
 # Set GhcBootLibs=YES from the command line to work with just the libraries
 # needed to bootstrap GHC.
 ifneq "$(GhcBootLibs)" "YES"
 # Set GhcBootLibs=YES from the command line to work with just the libraries
 # needed to bootstrap GHC.
 ifneq "$(GhcBootLibs)" "YES"

+SUBDIRS += $(wildcard regex-base)
+SUBDIRS += $(wildcard regex-posix)
+SUBDIRS += $(wildcard regex-compat)
+SUBDIRS += $(wildcard parsec)

 SUBDIRS += $(wildcard haskell-src)
 SUBDIRS += $(wildcard html)
 SUBDIRS += $(wildcard network)
 SUBDIRS += $(wildcard haskell-src)
 SUBDIRS += $(wildcard html)
 SUBDIRS += $(wildcard network)

diff --git a/libraries/core-packages b/libraries/core-packages
index c713985..c1b6adf 100644 (file)
--- a/libraries/core-packages
+++ b/libraries/core-packages
@@ -3,10 +3,6 @@ Cabal
 filepath
 haskell98
 readline
 filepath
 haskell98
 readline

-regex-base
-regex-compat
-regex-posix
-parsec

 stm
 template-haskell
 unix
 stm
 template-haskell
 unix

diff --git a/libraries/extra-packages b/libraries/extra-packages
index fda24ec..75f14cf 100644 (file)
--- a/libraries/extra-packages
+++ b/libraries/extra-packages
@@ -14,5 +14,9 @@ haskell-src
 html
 mtl
 network
 html
 mtl
 network

+parsec
+regex-base
+regex-compat
+regex-posix

 time
 xhtml
 time
 xhtml