[Git][ghc/ghc][wip/backports-9.10] Revert "hadrian: Bump directory bound to >=1.3.9"

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch wip/backports-9.10 at Glasgow Haskell Compiler / GHC


Commits:
400cfabe by Ben Gamari at 2025-03-05T10:05:55-05:00
Revert "hadrian: Bump directory bound to >=1.3.9"

This reverts commit 15ca7b2c06f9727b7a8c5ca663c3b6779489daa6 as it
breaks bootstrapping with 9.8 and 9.6, where `directory-1.3.9` is not
shipped.

- - - - -


4 changed files:

- .gitlab/ci.sh
- hadrian/cabal.project
- hadrian/hadrian.cabal
- hadrian/stack.yaml


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -7,8 +7,7 @@
 set -Eeuo pipefail
 
 # Configuration:
-# N.B. You may want to also update the index-state in hadrian/cabal.project.
-HACKAGE_INDEX_STATE="2025-02-03T15:14:19Z"
+HACKAGE_INDEX_STATE="2024-05-13T15:04:38Z"
 MIN_HAPPY_VERSION="1.20"
 MAX_HAPPY_VERSION="1.21" # Exclusive upper bound
 MIN_ALEX_VERSION="3.2.6"


=====================================
hadrian/cabal.project
=====================================
@@ -3,7 +3,7 @@ packages: ./
           ../libraries/ghc-platform/
 
 -- 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.
+-- It would be wise to keep this up to date with the state set in ci.sh
 index-state: 2025-02-03T15:14:19Z
 
 -- unordered-containers-0.2.20-r1 requires template-haskell < 2.22


=====================================
hadrian/hadrian.cabal
=====================================
@@ -156,10 +156,7 @@ executable hadrian
                        , base                 >= 4.11    && < 5
                        , bytestring           >= 0.10    && < 0.13
                        , containers           >= 0.5     && < 0.8
-
-                         -- N.B. directory >=1.3.9 as earlier versions are
-                         -- afflicted by #24382.
-                       , directory            >= 1.3.9.0 && < 1.4
+                       , directory            >= 1.3.1.0 && < 1.4
                        , extra                >= 1.4.7
                        , filepath
                        , time


=====================================
hadrian/stack.yaml
=====================================
@@ -21,10 +21,3 @@ nix:
 extra-deps:
    - Cabal-3.10.1.0
    - Cabal-syntax-3.10.1.0
-
-# needed due to Hadrian's lower bound on directory
-   - directory-1.3.9.0
-   - file-io-0.1.4
-   - filepath-1.4.300.2
-   - process-1.6.25.0
-   - unix-2.8.5.1
\ No newline at end of file



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/400cfabee02ee6b3c940e1657573c3e50222b27c

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/400cfabee02ee6b3c940e1657573c3e50222b27c
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/20250305/6519241a/attachment-0001.html>