[Git][ghc/ghc][wip/ghc-9.12-rc1] 2 commits: Add haskeline to stage0Packages

[Zubin (@wz1000)]

Zubin pushed to branch wip/ghc-9.12-rc1 at Glasgow Haskell Compiler / GHC


Commits:
90b49376 by Zubin Duggal at 2024-11-27T18:55:49+05:30
Add haskeline to stage0Packages

Otherwise we link against boot inplace and boot unix as boot haskeline
depends on boot unix.

- - - - -
77f340a2 by Zubin Duggal at 2024-11-27T18:58:23+05:30
Fix ghc-e005 after HasCallstack changes

- - - - -


2 changed files:

- hadrian/src/Settings/Default.hs
- testsuite/tests/ghc-e/should_run/ghc-e005.stderr


Changes:

=====================================
hadrian/src/Settings/Default.hs
=====================================
@@ -94,6 +94,7 @@ stage0Packages = do
              , ghcPlatform
              , ghcToolchain
              , ghci
+             , haskeline
              , haddockApi
              , haddockLibrary
              , haddock


=====================================
testsuite/tests/ghc-e/should_run/ghc-e005.stderr
=====================================
@@ -4,19 +4,3 @@ foo
 
 HasCallStack backtrace:
   error, called at ghc-e005.hs:12:10 in main:Main
-
-
-HasCallStack backtrace:
-  throwIO, called at libraries/exceptions/src/Control/Monad/Catch.hs:371:12 in exceptions-0.10.7-inplace:Control.Monad.Catch
-  throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:490:21 in exceptions-0.10.7-inplace:Control.Monad.Catch
-  throwM, called at compiler/GHC/Driver/Monad.hs:167:54 in ghc-9.13-inplace:GHC.Driver.Monad
-  throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:490:21 in exceptions-0.10.7-inplace:Control.Monad.Catch
-  throwM, called at ghc/GHCi/UI/Monad.hs:295:15 in ghc-bin-9.13.20241115-inplace:GHCi.UI.Monad
-  throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:490:21 in exceptions-0.10.7-inplace:Control.Monad.Catch
-  throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:490:21 in exceptions-0.10.7-inplace:Control.Monad.Catch
-  throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:490:21 in exceptions-0.10.7-inplace:Control.Monad.Catch
-  throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:490:21 in exceptions-0.10.7-inplace:Control.Monad.Catch
-  throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:490:21 in exceptions-0.10.7-inplace:Control.Monad.Catch
-  throwM, called at libraries/haskeline/System/Console/Haskeline/InputT.hs:53:39 in haskeline-0.8.2.1-inplace:System.Console.Haskeline.InputT
-  throwM, called at ghc/GHCi/UI/Monad.hs:221:3 in ghc-bin-9.13.20241115-inplace:GHCi.UI.Monad
-



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7bc6877fd5d41c6d5900678ad5e73ed30f366569...77f340a24561cea8a6f2ada296b3ea356ab1823c

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7bc6877fd5d41c6d5900678ad5e73ed30f366569...77f340a24561cea8a6f2ada296b3ea356ab1823c
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20241127/41f16c02/attachment-0001.html>