[commit: ghc] wip/nfs-locking: Add mtl, parsec and text as Stage0 packages (d2dddad)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/d2dddad4564c6597d497d226fcfbf5e3f7b70c18/ghc

>---------------------------------------------------------------

commit d2dddad4564c6597d497d226fcfbf5e3f7b70c18
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Fri Aug 18 23:41:24 2017 +0100

    Add mtl, parsec and text as Stage0 packages
    
    See #393, #395


>---------------------------------------------------------------

d2dddad4564c6597d497d226fcfbf5e3f7b70c18
 src/GHC.hs                        | 15 +++++++++------
 src/Settings/Default.hs           |  3 +++
 src/Settings/Packages/GhcCabal.hs |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/GHC.hs b/src/GHC.hs
index 0b3d035..2a641e5 100644
--- a/src/GHC.hs
+++ b/src/GHC.hs
@@ -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"
diff --git a/src/Settings/Default.hs b/src/Settings/Default.hs
index 707bc6f..c97b79f 100644
--- a/src/Settings/Default.hs
+++ b/src/Settings/Default.hs
@@ -116,7 +116,10 @@ stage0Packages = do
            , hp2ps
            , hpc
            , mkUserGuidePart
+           , mtl
+           , parsec
            , templateHaskell
+           , text
            , transformers
            , unlit                       ] ++
            [ terminfo | not win, not ios ] ++
diff --git a/src/Settings/Packages/GhcCabal.hs b/src/Settings/Packages/GhcCabal.hs
index fb23297..17ea482 100644
--- a/src/Settings/Packages/GhcCabal.hs
+++ b/src/Settings/Packages/GhcCabal.hs
@@ -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)