Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 682bf979 by Mike Pilgrem at 2025-11-16T16:44:14+00:00 Fix #26293 Valid stack.yaml for hadrian - - - - - 2 changed files: - hadrian/stack.yaml - hadrian/stack.yaml.lock Changes: ===================================== hadrian/stack.yaml ===================================== @@ -1,6 +1,16 @@ +# This is a Stack project-level configuration file. It allows Stack to build the +# project packages described by hadrian.cabal, +# ../utils/ghc-toolchain/ghc-toolchain.cabal and +# ../libraries/ghc-platform/ghc-platform.cabal. +# +# When Stack has been configured to build GHC from source (that is, +# compiler: ghc-git-<commit>-<flavour>), unless another snapshot is specified, +# Stack also uses this configuration file to specify the version of GHC that +# will be used to build GHC from source. + # GHC's configure script reports that GHC versions 9.10 and greater are required -# to build GHC from source. -resolver: lts-24.2 # GHC 9.10.2 +# to build GHC from source: +snapshot: lts-24.20 # GHC 9.10.3 packages: - '.' @@ -8,23 +18,27 @@ packages: - '../libraries/ghc-platform' nix: - enable: false - packages: - - autoconf - - automake - - gcc - - git - - ncurses - - perl - - ghc-toolchain + enable: false + packages: + - autoconf + - automake + - gcc + - git + - ncurses + - perl + - ghc-toolchain -extra-deps: -- Cabal-3.14.0.0 -- Cabal-syntax-3.14.0.0 +flags: + directory: + os-string: true # False, by default + process: + os-string: true # False, by default -# needed due to Hadrian's lower bound on directory +extra-deps: +# Needed due to Hadrian's lower bound on Cabal >= 3.13: +- Cabal-3.14.2.0 +- Cabal-syntax-3.14.2.0 +# Needed due to Hadrian's lower bound on directory >= 1.3.9.0: - 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 +# Needed because process depends on directory, which has been pruned: +- process-1.6.26.1 ===================================== hadrian/stack.yaml.lock ===================================== @@ -5,57 +5,36 @@ packages: - completed: - hackage: Cabal-3.14.0.0@sha256:604ea78fd41acf5382d3578aad5e90d66065a823fca4207ed144ef209daf3c7f,13720 + hackage: Cabal-3.14.2.0@sha256:f98aa86a37b9920dc6dfc8d79119a10df69542734f158a1c66ff144592f1d004,14148 pantry-tree: - sha256: 9bd496dbb7d0a1bc1e9147cedbede83003c86ceec66c06594fe292710618bc43 + sha256: 6094a5f661024a46193c4b27ec92123bf4677bec2f275ab14405eeee98fe8d9e size: 12219 original: - hackage: Cabal-3.14.0.0 + hackage: Cabal-3.14.2.0 - completed: - hackage: Cabal-syntax-3.14.0.0@sha256:6cd7666c675c29981392d031a9ad402f578234b6195a304c886b84510b0c21cd,7380 + hackage: Cabal-syntax-3.14.2.0@sha256:16766e2cd18f98bf259d2caf2b507764ebdfff0b16c2fb5b293fc57c1137af6f,7380 pantry-tree: - sha256: 2aed3c4195554d93ed1e25c4bacdf8eb7f3e006622bbd17a2e27d4bd0de0cd32 + sha256: 737f9522e754f8c1610a115a01bb264924a7cde1c931e285f3758ba46f145443 size: 10977 original: - hackage: Cabal-syntax-3.14.0.0 + hackage: Cabal-syntax-3.14.2.0 - completed: - hackage: directory-1.3.9.0@sha256:2490137bb7738bd79392959458ef5f276219ea5ba8a9a56d3e0b06315c1bb917,3307 + hackage: directory-1.3.9.0@sha256:ed6784601c6a800d4c1e40efbc9f20cf33ae2f25cac301fc239f9c91947b816b,3307 pantry-tree: - sha256: cf35b0c2755674f913078c588c88fc169d928ce09f292c648af9f1dbc3167131 + sha256: 2cd113a92cacbc5a9fc04bce56b12037a81e837c91ec82462835aa495125f4c7 size: 3386 original: hackage: directory-1.3.9.0 - completed: - hackage: file-io-0.1.4@sha256:e3e1866eab82cb28f6a5f28507643da3987008b737e66a3c7398f39f16d824dc,3251 + hackage: process-1.6.26.1@sha256:6def2e07c317f52f4d30c43e92f97b7bc5f7c27cb1270d386b15dce429e1180f,2947 pantry-tree: - sha256: f5401e2f822eafa465b8c661303275ebcbfd6c0a34a9943379b8f580da64af03 - size: 858 + sha256: 4cdf369a03c496a02a67d6d963884ae7b57eead30407881316983394b73cdc2e + size: 1869 original: - hackage: file-io-0.1.4 -- completed: - hackage: filepath-1.4.300.2@sha256:24f794247fcb8d26388aaec87b8e3577649f462a744bb09f01e85a60a435d5ab,6128 - pantry-tree: - sha256: 086c1298421eaf07ca46666938bcb750ccbdcf386410e7d597f76d313d3ce98c - size: 3998 - original: - hackage: filepath-1.4.300.2 -- completed: - hackage: process-1.6.25.0@sha256:9a0b2ef8096517fa0e0c7a5e9a5c2ae5744ed824c3331005f9408245810df345,2640 - pantry-tree: - sha256: 9c7927cd4d7f2f4c64251256eb6904800b3922fa5c5424c60f0e08441693e12b - size: 1790 - original: - hackage: process-1.6.25.0 -- completed: - hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 - pantry-tree: - sha256: b961320db69795a16c4ef4eebb0a3e7ddbbbe506fa1e22dde95ee8d8501bfbe5 - size: 5821 - original: - hackage: unix-2.8.5.1 + hackage: process-1.6.26.1 snapshots: - completed: - sha256: cd28bd74375205718f1d5fa221730a9c17a203059708b1eb95f4b20d68bf82d9 - size: 724943 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/maste... - original: lts-24.2 + sha256: 92becf9417de918f477cc79583b70700cbead6c5028fc4c4415f04fab5fb5354 + size: 726332 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/maste... + original: lts-24.20 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/682bf9799b3c3037ee484732bd83c3d2... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/682bf9799b3c3037ee484732bd83c3d2... You're receiving this email because of your account on gitlab.haskell.org.