[Git][ghc/ghc][master] 3 commits: Bump Cabal submodule to allow text-2.1 and bytestring-0.12

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
56cc85fb by Bodigrim at 2023-09-21T12:56:21-04:00
Bump Cabal submodule to allow text-2.1 and bytestring-0.12

- - - - -
0cd6148c by Matthew Pickering at 2023-09-21T12:56:21-04:00
hadrian: Generate Distribution/Fields/Lexer.x before creating a source-dist

- - - - -
b10ba6a3 by Bodigrim at 2023-09-21T12:56:21-04:00
Bump hadrian's index-state to upgrade alex at least to 3.2.7.3

- - - - -


3 changed files:

- hadrian/cabal.project
- hadrian/src/Rules/SourceDist.hs
- libraries/Cabal


Changes:

=====================================
hadrian/cabal.project
=====================================
@@ -3,7 +3,7 @@ packages: ./
           ../libraries/ghc-platform/
 
 -- This essentially freezes the build plan for hadrian
-index-state: 2023-03-30T10:00:00Z
+index-state: 2023-09-18T18:43:12Z
 
 -- 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/SourceDist.hs
=====================================
@@ -187,4 +187,5 @@ prepareTree dest = do
         , (stage0InTree , hpcBin,        "src/HpcParser.y",    "src/HpcParser.hs")
         , (stage0InTree , genprimopcode, "Parser.y",           "Parser.hs")
         , (stage0InTree , genprimopcode, "Lexer.x",            "Lexer.hs")
+        , (stage0InTree , cabalSyntax  , "src/Distribution/Fields/Lexer.x",  "src/Distribution/Fields/Lexer.hs")
         ]


=====================================
libraries/Cabal
=====================================
@@ -1 +1 @@
-Subproject commit baa767a90dd8c0d3bafd82b48ff8e83b779f238a
+Subproject commit a0d815c4773a9d7aa0f48cc5bd08947d282dc917



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a4fde569b31a64abb7c223548995aa6ecc009e98...b10ba6a33c5ee0376c7389ff6ac0961f38cfddd5

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a4fde569b31a64abb7c223548995aa6ecc009e98...b10ba6a33c5ee0376c7389ff6ac0961f38cfddd5
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/20230921/16b3b6d1/attachment-0001.html>