[commit: ghc] wip/nfs-locking: Add remote GHCi libraries (0afdf64)

[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/0afdf642a4a9209c578ddd8dd84cd2886bcd6e77/ghc

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

commit 0afdf642a4a9209c578ddd8dd84cd2886bcd6e77
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 18 12:27:16 2015 +0100

    Add remote GHCi libraries
    
    See GHC commit 4905b83a2d448c65ccced385343d4e8124548a3b.


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

0afdf642a4a9209c578ddd8dd84cd2886bcd6e77
 src/GHC.hs               | 14 ++++++++------
 src/Settings/Packages.hs |  3 ++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/GHC.hs b/src/GHC.hs
index 30414db..06140b1 100644
--- a/src/GHC.hs
+++ b/src/GHC.hs
@@ -1,9 +1,9 @@
 module GHC (
     array, base, ghcBoot, binary, bytestring, cabal, compiler, containers,
     compareSizes, deepseq, deriveConstants, directory, dllSplit, filepath,
-    genapply, genprimopcode, ghc, ghcCabal, ghcPkg, ghcPrim, ghcPwd, ghcTags,
+    genapply, genprimopcode, ghc, ghcCabal, ghci, ghcPkg, ghcPrim, ghcPwd, ghcTags,
     haddock, haskeline, hsc2hs, hoopl, hp2ps, hpc, hpcBin, integerGmp,
-    integerSimple, mkUserGuidePart, parallel, pretty, primitive, process,
+    integerSimple, iservBin, mkUserGuidePart, parallel, pretty, primitive, process,
     runghc, stm, templateHaskell, terminfo, time, transformers, unix, win32, xhtml,
 
     defaultKnownPackages, defaultTargetDirectory, defaultProgramPath
@@ -22,11 +22,11 @@ defaultKnownPackages :: [Package]
 defaultKnownPackages =
     [ array, base, ghcBoot, binary, bytestring, cabal, compiler
     , containers, compareSizes, deepseq, deriveConstants, directory, dllSplit
-    , filepath, genapply, genprimopcode, ghc, ghcCabal, ghcPkg, ghcPrim
+    , filepath, genapply, genprimopcode, ghc, ghcCabal, ghci, ghcPkg, ghcPrim
     , ghcPwd, ghcTags, haddock, haskeline, hsc2hs, hoopl, hp2ps, hpc, hpcBin
-    , integerGmp, integerSimple, mkUserGuidePart, parallel, pretty, primitive
-    , process, runghc, stm, templateHaskell, terminfo, time, transformers, unix
-    , win32, xhtml ]
+    , integerGmp, integerSimple, iservBin, mkUserGuidePart, parallel, pretty
+    , primitive , process, runghc, stm, templateHaskell, terminfo, time
+    , transformers, unix, win32, xhtml ]
 
 -- Package definitions (see Package.hs)
 array, base, ghcBoot, binary, bytestring, cabal, compiler, containers,
@@ -54,6 +54,7 @@ genapply        = utility  "genapply"
 genprimopcode   = utility  "genprimopcode"
 ghc             = topLevel "ghc-bin"        `setPath` "ghc"
 ghcCabal        = utility  "ghc-cabal"
+ghci            = library  "ghci"           `setPath` "libraries/ghci"
 ghcPkg          = utility  "ghc-pkg"
 ghcPrim         = library  "ghc-prim"
 ghcPwd          = utility  "ghc-pwd"
@@ -67,6 +68,7 @@ hpc             = library  "hpc"
 hpcBin          = utility  "hpc-bin"        `setPath` "utils/hpc"
 integerGmp      = library  "integer-gmp"
 integerSimple   = library  "integer-simple"
+iservBin        = topLevel "iserv-bin"      `setPath` "iserv"
 mkUserGuidePart = utility  "mkUserGuidePart"
 parallel        = library  "parallel"
 pretty          = library  "pretty"
diff --git a/src/Settings/Packages.hs b/src/Settings/Packages.hs
index febb254..718b8de 100644
--- a/src/Settings/Packages.hs
+++ b/src/Settings/Packages.hs
@@ -29,10 +29,11 @@ packagesStage1 = mconcat
     [ packagesStage0
     , append [ array, base, bytestring, containers, compareSizes, deepseq
              , directory, dllSplit, filepath
-             , ghcPrim, ghcPwd, haskeline, hpcBin, integerLibrary
+             , ghci, ghcPrim, ghcPwd, haskeline, hpcBin, integerLibrary
              , mkUserGuidePart, pretty, process, runghc, time ]
     , windowsHost      ? append [win32]
     , notM windowsHost ? append [unix]
+    , notM windowsHost ? append [iservBin]
     , buildHaddock     ? append [xhtml] ]
 
 packagesStage2 :: Packages