[Git][ghc/ghc][master] 2 commits: hadrian: fix hadrian building with ghc-9.10.1

[Marge Bot (@marge-bot)]

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


Commits:
be514bb4 by Cheng Shao at 2024-05-13T22:21:43-04:00
hadrian: fix hadrian building with ghc-9.10.1

- - - - -
ad38e954 by Cheng Shao at 2024-05-13T22:21:43-04:00
linters: fix lint-whitespace compilation with ghc-9.10.1

- - - - -


4 changed files:

- .gitlab/ci.sh
- hadrian/cabal.project
- hadrian/hadrian.cabal
- linters/lint-whitespace/lint-whitespace.cabal


Changes:

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


=====================================
hadrian/cabal.project
=====================================
@@ -4,7 +4,11 @@ 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-05-13T15:04:38Z
+
+-- unordered-containers-0.2.20-r1 requires template-haskell < 2.22
+-- ghc-9.10 has template-haskell-2.22.0.0
+allow-newer: unordered-containers:template-haskell
 
 -- 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/hadrian.cabal
=====================================
@@ -155,7 +155,7 @@ executable hadrian
     build-depends:       Cabal                >= 3.10    && < 3.11
                        , base                 >= 4.11    && < 5
                        , bytestring           >= 0.10    && < 0.13
-                       , containers           >= 0.5     && < 0.7
+                       , containers           >= 0.5     && < 0.8
                        , directory            >= 1.3.1.0 && < 1.4
                        , extra                >= 1.4.7
                        , filepath


=====================================
linters/lint-whitespace/lint-whitespace.cabal
=====================================
@@ -24,7 +24,7 @@ executable lint-whitespace
     process
       ^>= 1.6,
     containers
-      ^>= 0.6,
+      >= 0.6 && <0.8,
     base
        >= 4.14 && < 5,
     text



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2c0f8ddbdf351ed84395afa04a2654a7cbe2ad35...ad38e954bf088b43fa1cecfeaf474b6b9c11e2ed

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2c0f8ddbdf351ed84395afa04a2654a7cbe2ad35...ad38e954bf088b43fa1cecfeaf474b6b9c11e2ed
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/20240513/dc46dd28/attachment-0001.html>