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

Commits:

2 changed files:

Changes:

  • hadrian/stack.yaml
    1 
    +# This is a Stack project-level configuration file. It allows Stack to build the
    2 
    +# project packages described by hadrian.cabal,
    3 
    +# ../utils/ghc-toolchain/ghc-toolchain.cabal and
    4 
    +# ../libraries/ghc-platform/ghc-platform.cabal.
    5 
    +#
    6 
    +# When Stack has been configured to build GHC from source (that is,
    7 
    +# compiler: ghc-git-<commit>-<flavour>), unless another snapshot is specified,
    8 
    +# Stack also uses this configuration file to specify the version of GHC that
    9 
    +# will be used to build GHC from source.
    10 
    +
    1 11 
     # GHC's configure script reports that GHC versions 9.10 and greater are required
    2 
    -# to build GHC from source.
    3 
    -resolver: lts-24.2 # GHC 9.10.2
    12 
    +# to build GHC from source:
    13 
    +snapshot: lts-24.20 # GHC 9.10.3
    4 14
    5 15 
     packages:
    6 16 
     - '.'
    ... ... @@ -8,23 +18,27 @@ packages:
    8 18 
     - '../libraries/ghc-platform'
    9 19
    10 20 
     nix:
    11 
    -   enable: false
    12 
    -   packages:
    13 
    -   - autoconf
    14 
    -   - automake
    15 
    -   - gcc
    16 
    -   - git
    17 
    -   - ncurses
    18 
    -   - perl
    19 
    -   - ghc-toolchain
    21 
    +  enable: false
    22 
    +  packages:
    23 
    +  - autoconf
    24 
    +  - automake
    25 
    +  - gcc
    26 
    +  - git
    27 
    +  - ncurses
    28 
    +  - perl
    29 
    +  - ghc-toolchain
    20 30
    21 
    -extra-deps:
    22 
    -- Cabal-3.14.0.0
    23 
    -- Cabal-syntax-3.14.0.0
    31 
    +flags:
    32 
    +  directory:
    33 
    +    os-string: true # False, by default
    34 
    +  process:
    35 
    +    os-string: true # False, by default
    24 36
    25 
    -# needed due to Hadrian's lower bound on directory
    37 
    +extra-deps:
    38 
    +# Needed due to Hadrian's lower bound on Cabal >= 3.13:
    39 
    +- Cabal-3.14.2.0
    40 
    +- Cabal-syntax-3.14.2.0
    41 
    +# Needed due to Hadrian's lower bound on directory >= 1.3.9.0:
    26 42 
     - directory-1.3.9.0
    27 
    -- file-io-0.1.4
    28 
    -- filepath-1.4.300.2
    29 
    -- process-1.6.25.0
    30 
    -- unix-2.8.5.1
    43 
    +# Needed because process depends on directory, which has been pruned:
    44 
    +- process-1.6.26.1

  • hadrian/stack.yaml.lock
    ... ... @@ -5,57 +5,36 @@
    5 5
    6 6 
     packages:
    7 7 
     - completed:
    8 
    -    hackage: Cabal-3.14.0.0@sha256:604ea78fd41acf5382d3578aad5e90d66065a823fca4207ed144ef209daf3c7f,13720
    8 
    +    hackage: Cabal-3.14.2.0@sha256:f98aa86a37b9920dc6dfc8d79119a10df69542734f158a1c66ff144592f1d004,14148
    9 9 
         pantry-tree:
    10 
    -      sha256: 9bd496dbb7d0a1bc1e9147cedbede83003c86ceec66c06594fe292710618bc43
    10 
    +      sha256: 6094a5f661024a46193c4b27ec92123bf4677bec2f275ab14405eeee98fe8d9e
    11 11 
           size: 12219
    12 12 
       original:
    13 
    -    hackage: Cabal-3.14.0.0
    13 
    +    hackage: Cabal-3.14.2.0
    14 14 
     - completed:
    15 
    -    hackage: Cabal-syntax-3.14.0.0@sha256:6cd7666c675c29981392d031a9ad402f578234b6195a304c886b84510b0c21cd,7380
    15 
    +    hackage: Cabal-syntax-3.14.2.0@sha256:16766e2cd18f98bf259d2caf2b507764ebdfff0b16c2fb5b293fc57c1137af6f,7380
    16 16 
         pantry-tree:
    17 
    -      sha256: 2aed3c4195554d93ed1e25c4bacdf8eb7f3e006622bbd17a2e27d4bd0de0cd32
    17 
    +      sha256: 737f9522e754f8c1610a115a01bb264924a7cde1c931e285f3758ba46f145443
    18 18 
           size: 10977
    19 19 
       original:
    20 
    -    hackage: Cabal-syntax-3.14.0.0
    20 
    +    hackage: Cabal-syntax-3.14.2.0
    21 21 
     - completed:
    22 
    -    hackage: directory-1.3.9.0@sha256:2490137bb7738bd79392959458ef5f276219ea5ba8a9a56d3e0b06315c1bb917,3307
    22 
    +    hackage: directory-1.3.9.0@sha256:ed6784601c6a800d4c1e40efbc9f20cf33ae2f25cac301fc239f9c91947b816b,3307
    23 23 
         pantry-tree:
    24 
    -      sha256: cf35b0c2755674f913078c588c88fc169d928ce09f292c648af9f1dbc3167131
    24 
    +      sha256: 2cd113a92cacbc5a9fc04bce56b12037a81e837c91ec82462835aa495125f4c7
    25 25 
           size: 3386
    26 26 
       original:
    27 27 
         hackage: directory-1.3.9.0
    28 28 
     - completed:
    29 
    -    hackage: file-io-0.1.4@sha256:e3e1866eab82cb28f6a5f28507643da3987008b737e66a3c7398f39f16d824dc,3251
    29 
    +    hackage: process-1.6.26.1@sha256:6def2e07c317f52f4d30c43e92f97b7bc5f7c27cb1270d386b15dce429e1180f,2947
    30 30 
         pantry-tree:
    31 
    -      sha256: f5401e2f822eafa465b8c661303275ebcbfd6c0a34a9943379b8f580da64af03
    32 
    -      size: 858
    31 
    +      sha256: 4cdf369a03c496a02a67d6d963884ae7b57eead30407881316983394b73cdc2e
    32 
    +      size: 1869
    33 33 
       original:
    34 
    -    hackage: file-io-0.1.4
    35 
    -- completed:
    36 
    -    hackage: filepath-1.4.300.2@sha256:24f794247fcb8d26388aaec87b8e3577649f462a744bb09f01e85a60a435d5ab,6128
    37 
    -    pantry-tree:
    38 
    -      sha256: 086c1298421eaf07ca46666938bcb750ccbdcf386410e7d597f76d313d3ce98c
    39 
    -      size: 3998
    40 
    -  original:
    41 
    -    hackage: filepath-1.4.300.2
    42 
    -- completed:
    43 
    -    hackage: process-1.6.25.0@sha256:9a0b2ef8096517fa0e0c7a5e9a5c2ae5744ed824c3331005f9408245810df345,2640
    44 
    -    pantry-tree:
    45 
    -      sha256: 9c7927cd4d7f2f4c64251256eb6904800b3922fa5c5424c60f0e08441693e12b
    46 
    -      size: 1790
    47 
    -  original:
    48 
    -    hackage: process-1.6.25.0
    49 
    -- completed:
    50 
    -    hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808
    51 
    -    pantry-tree:
    52 
    -      sha256: b961320db69795a16c4ef4eebb0a3e7ddbbbe506fa1e22dde95ee8d8501bfbe5
    53 
    -      size: 5821
    54 
    -  original:
    55 
    -    hackage: unix-2.8.5.1
    34 
    +    hackage: process-1.6.26.1
    56 35 
     snapshots:
    57 36 
     - completed:
    58 
    -    sha256: cd28bd74375205718f1d5fa221730a9c17a203059708b1eb95f4b20d68bf82d9
    59 
    -    size: 724943
    60 
    -    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/2.yaml
    61 
    -  original: lts-24.2
    37 
    +    sha256: 92becf9417de918f477cc79583b70700cbead6c5028fc4c4415f04fab5fb5354
    38 
    +    size: 726332
    39 
    +    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/20.yaml
    40 
    +  original: lts-24.20

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications · Help