Commit d2dddad4 authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Add mtl, parsec and text as Stage0 packages

See #393, #395
parent 23c86025
......@@ -6,9 +6,9 @@ module GHC (
genapply, genprimopcode, ghc, ghcBoot, ghcBootTh, ghcCabal, ghcCompact, ghci,
ghcPkg, ghcPrim, ghcTags, ghcSplit, haddock, haskeline, hsc2hs, hp2ps,
hpc, hpcBin, integerGmp, integerSimple, iservBin, libffi, mkUserGuidePart,
parallel, pretty, primitive, process, rts, runGhc, stm, templateHaskell,
terminfo, time, touchy, transformers, unlit, unix, win32, xhtml,
defaultKnownPackages,
mtl, parsec, parallel, pretty, primitive, process, rts, runGhc, stm,
templateHaskell, terminfo, text, time, touchy, transformers, unlit, unix,
win32, xhtml, defaultKnownPackages,
-- * Package information
builderProvenance, programName, nonCabalContext, nonHsMainPackage, autogenPath,
......@@ -36,9 +36,9 @@ defaultKnownPackages =
, filepath, genapply, genprimopcode, ghc, ghcBoot, ghcBootTh, ghcCabal
, ghcCompact, ghci, ghcPkg, ghcPrim, ghcTags, haddock, haskeline, hsc2hs
, hp2ps, hpc, hpcBin, integerGmp, integerSimple, iservBin, libffi
, mkUserGuidePart, parallel, pretty, primitive, process, rts, runGhc, stm
, templateHaskell, terminfo, time, touchy, transformers, unlit, unix, win32
, xhtml ]
, mkUserGuidePart, mtl, parsec, parallel, pretty, primitive, process, rts
, runGhc, stm, templateHaskell, terminfo, text, time, touchy, transformers
, unlit, unix, win32, xhtml ]
-- | Package definitions, see 'Package'.
array = lib "array"
......@@ -78,6 +78,8 @@ integerSimple = lib "integer-simple"
iservBin = prg "iserv-bin" `setPath` "iserv"
libffi = top "libffi"
mkUserGuidePart = util "mkUserGuidePart"
mtl = lib "mtl"
parsec = lib "parsec"
parallel = lib "parallel"
pretty = lib "pretty"
primitive = lib "primitive"
......@@ -87,6 +89,7 @@ runGhc = util "runghc"
stm = lib "stm"
templateHaskell = lib "template-haskell"
terminfo = lib "terminfo"
text = lib "text"
time = lib "time"
touchy = util "touchy"
transformers = lib "transformers"
......
......@@ -116,7 +116,10 @@ stage0Packages = do
, hp2ps
, hpc
, mkUserGuidePart
, mtl
, parsec
, templateHaskell
, text
, transformers
, unlit ] ++
[ terminfo | not win, not ios ] ++
......
......@@ -12,7 +12,7 @@ ghcCabalPackageArgs = stage0 ? package ghcCabal ? builder Ghc ? do
cabalDeps <- expr $ pkgDependencies cabal
(_, cabalVersion) <- expr $ cabalNameVersion (pkgCabalFile cabal)
mconcat
[ pure [ "-package " ++ pkgName pkg | pkg <- cabalDeps ]
[ pure [ "-package " ++ pkgName pkg | pkg <- cabalDeps, pkg /= parsec ]
, arg "--make"
, arg "-j"
, arg ("-DCABAL_VERSION=" ++ replace "." "," cabalVersion)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment