[Git][ghc/ghc][wip/T24652] 2 commits: Remove unecessary stage0 packages

[Teo Camarasu (@teo)]

Teo Camarasu pushed to branch wip/T24652 at Glasgow Haskell Compiler / GHC


Commits:
10dc184c by Teo Camarasu at 2024-04-18T10:09:14+01:00
Remove unecessary stage0 packages

Historically quite a few packages had to be stage0 as they depended on
`template-haskell` and that was stage0. In #23536 we made it so that was
no longer the case. This allows us to remove a bunch of packages from
this list.

Resolves #24652

- - - - -
160cfe77 by Teo Camarasu at 2024-04-19T12:21:40+01:00
bump index state

- - - - -


4 changed files:

- .gitlab/ci.sh
- hadrian/cabal.project
- hadrian/src/Rules/ToolArgs.hs
- hadrian/src/Settings/Default.hs


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -7,7 +7,7 @@
 set -Eeuo pipefail
 
 # Configuration:
-HACKAGE_INDEX_STATE="2023-10-05T11:38:51Z"
+HACKAGE_INDEX_STATE="2024-04-03T11:41:05Z"
 MIN_HAPPY_VERSION="1.20"
 MIN_ALEX_VERSION="3.2.6"
 


=====================================
hadrian/cabal.project
=====================================
@@ -4,7 +4,7 @@ packages: ./
 
 -- This essentially freezes the build plan for hadrian
 -- It would be wise to keep this up to date with the state set in ci.sh
-index-state: 2023-10-05T11:38:51Z
+index-state: 2024-04-03T11:41:05Z 
 
 -- N.B. Compile with -O0 since this is not a performance-critical executable
 -- and the Cabal takes nearly twice as long to build with -O1. See #16817.


=====================================
hadrian/src/Rules/ToolArgs.hs
=====================================
@@ -132,17 +132,9 @@ mkToolTarget es p = do
 -- critically the `exe:ghc` component as that depends on the GHC library
 -- which takes a while to compile.
 toolTargets :: [Package]
-toolTargets = [ binary
-              , bytestring
-              , cabalSyntax
+toolTargets = [ cabalSyntax
               , cabal
               , compiler
-              , containers
-              , directory
-              , process
-              , exceptions
-              , filepath
-              , osString
               -- , ghc     -- # depends on ghc library
               -- , runGhc  -- # depends on ghc library
               , ghcBoot
@@ -157,15 +149,10 @@ toolTargets = [ binary
               , hsc2hs  -- # executable
               , hpc
               , hpcBin  -- # executable
-              , mtl
-              , parsec
-              , time
               , templateHaskellNext
-              , text
-              , transformers
               , semaphoreCompat
               , unlit  -- # executable
-              ] ++ if windowsHost then [ win32 ] else [ unix ]
+              ]
 
 -- | Create a mapping from files to which component it belongs to.
 dirMap :: Action [(FilePath, (Package, [String]))]


=====================================
hadrian/src/Settings/Default.hs
=====================================
@@ -80,40 +80,26 @@ stageBootPackages = return
 stage0Packages :: Action [Package]
 stage0Packages = do
     cross <- flag CrossCompiling
-    return $ [ binary
-             , bytestring
-             , cabalSyntax
+    return $ [ cabalSyntax
              , cabal
              , compiler
-             , containers
-             , directory
-             , process
-             , exceptions
-             , filepath
              , ghc
-             , runGhc
              , ghcBoot
              , ghcBootThNext
-             , ghcPlatform
              , ghcHeap
+             , ghcPkg
+             , ghcPlatform
              , ghcToolchain
              , ghci
-             , ghcPkg
              , haddock
-             , hsc2hs
+             , hp2ps
              , hpc
              , hpcBin
-             , mtl
-             , osString
-             , parsec
+             , hsc2hs
+             , runGhc
              , semaphoreCompat
-             , time
              , templateHaskellNext
-             , text
-             , transformers
              , unlit
-             , hp2ps
-             , if windowsHost then win32 else unix
              ]
           ++ [ terminfo | not windowsHost, not cross ]
           ++ [ timeout  | windowsHost                ]
@@ -143,12 +129,16 @@ stage1Packages = do
       [ libraries0 -- Build all Stage0 libraries in Stage1
       , [ array
         , base
+        , binary
+        , bytestring
         , containers
         , deepseq
+        , directory
         , exceptions
+        , filepath
         , ghc
-        , ghcBootTh
         , ghcBignum
+        , ghcBootTh
         , ghcCompact
         , ghcExperimental
         , ghcInternal
@@ -158,11 +148,18 @@ stage1Packages = do
         , hp2ps
         , hsc2hs
         , integerGmp
+        , mtl
+        , osString
+        , parsec
         , pretty
+        , process
         , rts
         , semaphoreCompat
-        , templateHaskell
         , stm
+        , templateHaskell
+        , text
+        , time
+        , transformers
         , unlit
         , xhtml
         , if winTarget then win32 else unix



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/290143b660beb1b602065a880cda116f8a3afe30...160cfe77c323796dc5b55dbd6840a5afd48eb4cb

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/290143b660beb1b602065a880cda116f8a3afe30...160cfe77c323796dc5b55dbd6840a5afd48eb4cb
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/20240419/22c49a6e/attachment-0001.html>