[Git][ghc/ghc][wip/T25623] Require alex >= 3.5.2 (#25623)

[Brandon Chinn (@brandonchinn178)]

Brandon Chinn pushed to branch wip/T25623 at Glasgow Haskell Compiler / GHC


Commits:
177df06f by Brandon Chinn at 2025-01-07T19:55:45-08:00
Require alex >= 3.5.2 (#25623)

- - - - -


6 changed files:

- .gitlab-ci.yml
- .gitlab/ci.sh
- .gitlab/darwin/nix/sources.json
- compiler/GHC/Parser/Lexer.x
- compiler/ghc.cabal.in
- hadrian/cabal.project


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -2,7 +2,7 @@ variables:
   GIT_SSL_NO_VERIFY: "1"
 
   # Commit of ghc/ci-images repository from which to pull Docker images
-  DOCKER_REV: eb4d3389fd62e4f7321a0c8799014ec1f4da0708
+  DOCKER_REV: f8b8b8910097a88185835e0c929b8bb03fadfe61
 
   # Sequential version number of all cached things.
   # Bump to invalidate GitLab CI cache.


=====================================
.gitlab/ci.sh
=====================================
@@ -8,9 +8,9 @@ set -Eeuo pipefail
 
 # Configuration:
 # N.B. You may want to also update the index-state in hadrian/cabal.project.
-HACKAGE_INDEX_STATE="2024-10-30T22:56:00Z"
+HACKAGE_INDEX_STATE="2025-01-04T21:29:42Z"
 MIN_HAPPY_VERSION="1.20"
-MIN_ALEX_VERSION="3.2.6"
+MIN_ALEX_VERSION="3.5.2.0"
 
 TOP="$(pwd)"
 if [ ! -d "$TOP/.gitlab" ]; then


=====================================
.gitlab/darwin/nix/sources.json
=====================================
@@ -17,10 +17,10 @@
         "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
+        "rev": "07f572aeeaef429c75f4f867b35dc3acae3b5517",
         "sha256": "1anwxmjpm21msnnlrjdz19w31bxnbpn4kgf93sn3npihi7wf4a8h",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/2893f56de08021cffd9b6b6dfc70fd9ccd51eb60.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/07f572aeeaef429c75f4f867b35dc3acae3b5517.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }


=====================================
compiler/GHC/Parser/Lexer.x
=====================================
@@ -3467,11 +3467,6 @@ topNoLayoutContainsCommas [] = False
 topNoLayoutContainsCommas (ALRLayout _ _ : ls) = topNoLayoutContainsCommas ls
 topNoLayoutContainsCommas (ALRNoLayout b _ : _) = b
 
--- If the generated alexScan/alexScanUser functions are called multiple times
--- in this file, alexScanUser gets broken out into a separate function and
--- increases memory usage. Make sure GHC inlines this function and optimizes it.
-{-# INLINE alexScanUser #-}
-
 lexToken :: P (PsLocated Token)
 lexToken = do
   inp@(AI loc1 buf) <- getInput


=====================================
compiler/ghc.cabal.in
=====================================
@@ -102,7 +102,7 @@ Library
               FunTypes.h
 
     if flag(build-tool-depends)
-      build-tool-depends: alex:alex >= 3.2.6, happy:happy >= 1.20.0, genprimopcode:genprimopcode, deriveConstants:deriveConstants
+      build-tool-depends: alex:alex >= 3.5.2, happy:happy >= 1.20.0, genprimopcode:genprimopcode, deriveConstants:deriveConstants
 
     if flag(with-libzstd)
       if flag(static-libzstd)


=====================================
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 .gitlab/ci.sh.
-index-state: 2024-10-30T22:56:00Z
+index-state: 2025-01-04T21:29:42Z
 
 -- unordered-containers-0.2.20-r1 requires template-haskell < 2.22
 -- ghc-9.10 has template-haskell-2.22.0.0



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/177df06fef34c3f29496611239ab59dd444abcde

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/177df06fef34c3f29496611239ab59dd444abcde
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/20250107/9a1bd73e/attachment-0001.html>