summaryrefslogtreecommitdiff
path: root/hadrian
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-11-11 19:43:37 -0500
committerBen Gamari <ben@smart-cactus.org>2019-11-13 17:01:21 -0500
commitdd49b3f079a4ff59fd9ed0a8ea5585f0fcc0e56a (patch)
tree46bceb45f2f238e8adfc1c3ae8e8a8a0f2adb6c0 /hadrian
parenta06cfb59d21c9cf6f53a8b1acedb075988a6c5ca (diff)
downloadhaskell-dd49b3f079a4ff59fd9ed0a8ea5585f0fcc0e56a.tar.gz
Bump Haskeline and add exceptions as boot library
Haskeline now depends upon exceptions. See #16752.
Diffstat (limited to 'hadrian')
-rw-r--r--hadrian/src/Packages.hs11
-rw-r--r--hadrian/src/Settings/Default.hs1
2 files changed, 7 insertions, 5 deletions
diff --git a/hadrian/src/Packages.hs b/hadrian/src/Packages.hs
index c4ae780fb3..e65e8c9709 100644
--- a/hadrian/src/Packages.hs
+++ b/hadrian/src/Packages.hs
@@ -3,8 +3,8 @@ module Packages (
-- * GHC packages
array, base, binary, bytestring, cabal, checkApiAnnotations, checkPpr,
compareSizes, compiler, containers, deepseq, deriveConstants, directory,
- filepath, genapply, genprimopcode, ghc, ghcBoot, ghcBootTh, ghcCompact,
- ghcHeap, ghci, ghcPkg, ghcPrim, haddock, haskeline,
+ exceptions, filepath, genapply, genprimopcode, ghc, ghcBoot, ghcBootTh,
+ ghcCompact, ghcHeap, ghci, ghcPkg, ghcPrim, haddock, haskeline,
hsc2hs, hp2ps, hpc, hpcBin, integerGmp, integerSimple, iserv, iservProxy,
libffi, libiserv, mtl, parsec, pretty, primitive, process, remoteIserv, rts,
runGhc, stm, templateHaskell, terminfo, text, time, timeout, touchy,
@@ -33,9 +33,9 @@ ghcPackages :: [Package]
ghcPackages =
[ array, base, binary, bytestring, cabal, checkPpr, checkApiAnnotations
, compareSizes, compiler, containers, deepseq, deriveConstants, directory
- , filepath, genapply, genprimopcode, ghc, ghcBoot, ghcBootTh, ghcCompact
- , ghcHeap, ghci, ghcPkg, ghcPrim, haddock, haskeline, hsc2hs, hp2ps
- , hpc, hpcBin, integerGmp, integerSimple, iserv, libffi, libiserv, mtl
+ , exceptions, filepath, genapply, genprimopcode, ghc, ghcBoot, ghcBootTh
+ , ghcCompact, ghcHeap, ghci, ghcPkg, ghcPrim, haddock, haskeline, hsc2hs
+ , hp2ps, hpc, hpcBin, integerGmp, integerSimple, iserv, libffi, libiserv, mtl
, parsec, pretty, process, rts, runGhc, stm, templateHaskell
, terminfo, text, time, touchy, transformers, unlit, unix, win32, xhtml
, timeout ]
@@ -58,6 +58,7 @@ containers = lib "containers" `setPath` "libraries/containers/con
deepseq = lib "deepseq"
deriveConstants = util "deriveConstants"
directory = lib "directory"
+exceptions = lib "exceptions"
filepath = lib "filepath"
genapply = util "genapply"
genprimopcode = util "genprimopcode"
diff --git a/hadrian/src/Settings/Default.hs b/hadrian/src/Settings/Default.hs
index 05e98555ea..0d60c39533 100644
--- a/hadrian/src/Settings/Default.hs
+++ b/hadrian/src/Settings/Default.hs
@@ -91,6 +91,7 @@ stage1Packages = do
, containers
, deepseq
, directory
+ , exceptions
, filepath
, ghc
, ghcCompact