Merge branch 'ubuntu-24-ghc-9.2' into develop

haskell · Jul 29, 2024 · 6355a6e · 6355a6e
2 parents 86086fd + 7a8d7ef
commit 6355a6e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/bindists.yaml b/.github/workflows/bindists.yaml
@@ -61,6 +61,9 @@ jobs:
           - image: ubuntu:22.04
             installCmd: apt-get update && apt-get install -y
             toolRequirements: build-essential curl libffi-dev libffi7 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5
+          - image: ubuntu:24.04
+            installCmd: apt-get update && apt-get install -y
+            toolRequirements: build-essential curl libffi-dev libffi8 libgmp-dev libgmp10 libncurses-dev libncurses6 libtinfo6
           - image: archlinux:latest
             installCmd: pacman -Syu --noconfirm
             toolRequirements: which gcc gmp libffi make ncurses perl tar xz

diff --git a/ghcup-0.0.8.yaml b/ghcup-0.0.8.yaml
@@ -2991,10 +2991,15 @@ ghcupDownloads:
             unknown_versioning: *ghc-928-64-deb10
           Linux_Ubuntu:
             '< 20': *ghc-928-64-deb9
-            '>= 20': &ghc-928-64-ubuntu20
+            '( >= 20 && < 24)': &ghc-928-64-ubuntu20
               dlUri: https://downloads.haskell.org/ghc/9.2.8/ghc-9.2.8-x86_64-ubuntu20.04-linux.tar.xz
               dlSubdir: ghc-9.2.8
               dlHash: 6e4adc184a53ca9d9dd8c11c6611d0643fdc3b76550ae769e378d9edb2bda745
+            '>= 24': &ghc-928-64-ubuntu24
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/9.2.8/ghc-9.2.8-x86_64-ubuntu24.04-linux.tar.xz
+              dlSubdir: ghc-9.2.8-x86_64-unknown-linux
+              dlHash: a66077e802bbc40d9f567dce25c7ef14c6b4747d5e84671be450fd7e8e0beb5c
+            unknown_versioning: *ghc-928-64-ubuntu24
           Linux_Mint:
             '< 20': *ghc-928-64-deb9
             '>= 20': *ghc-928-64-ubuntu20

diff --git a/ghcup-0.0.8.yaml.sig b/ghcup-0.0.8.yaml.sig