From 8d3d8417c18e0a056421acc14d2c0d25459fe8d6 Mon Sep 17 00:00:00 2001 From: Andrei Dziahel Date: Thu, 19 Mar 2026 20:35:11 +0100 Subject: [PATCH] fix: GHC 9.12.4 --- .github/workflows/debian.yml | 16 ++++++++-------- 9.12/bookworm.yaml | 8 ++++---- 9.12/bookworm/Dockerfile | 8 ++++---- 9.12/bullseye.yaml | 13 ++++++------- 9.12/bullseye/Dockerfile | 10 +++++----- 9.12/slim-bookworm.yaml | 8 ++++---- 9.12/slim-bookworm/Dockerfile | 8 ++++---- 9.12/slim-bullseye.yaml | 13 ++++++------- 9.12/slim-bullseye/Dockerfile | 10 +++++----- 9 files changed, 46 insertions(+), 48 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index bf5c9673..d59152a6 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['9.14.1', '9.12.2', '9.10.3', '9.8.4', '9.6.7'] + ghc: ['9.14.1', '9.12.4', '9.10.3', '9.8.4', '9.6.7'] deb: ['bullseye', 'slim-bullseye'] include: - ghc: '9.14.1' @@ -41,16 +41,16 @@ jobs: - ghc: '9.14.1' ghc_minor: '9.14' deb: 'slim-bullseye' - - ghc: '9.12.2' + - ghc: '9.12.4' ghc_minor: '9.12' deb: 'bookworm' - - ghc: '9.12.2' + - ghc: '9.12.4' ghc_minor: '9.12' deb: 'slim-bookworm' - - ghc: '9.12.2' + - ghc: '9.12.4' ghc_minor: '9.12' deb: 'bullseye' - - ghc: '9.12.2' + - ghc: '9.12.4' ghc_minor: '9.12' deb: 'slim-bullseye' - ghc: '9.10.3' @@ -85,7 +85,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['9.6.7', '9.8.4', '9.10.3', '9.12.2', '9.14.1'] + ghc: ['9.6.7', '9.8.4', '9.10.3', '9.12.4', '9.14.1'] # native arm runner; still avoid slim variants here deb: ['bullseye'] include: @@ -93,7 +93,7 @@ jobs: ghc_minor: '9.14' deb: 'bookworm' # bookworm (debian 12) - - ghc: '9.12.2' + - ghc: '9.12.4' ghc_minor: '9.12' deb: 'bookworm' # bullseye (debian 11) @@ -104,7 +104,7 @@ jobs: - ghc: '9.6.7' ghc_minor: '9.6' exclude: - - ghc: '9.12.2' + - ghc: '9.12.4' deb: 'bullseye' - ghc: '9.14.1' deb: 'bullseye' diff --git a/9.12/bookworm.yaml b/9.12/bookworm.yaml index b778dde9..fa231bf9 100644 --- a/9.12/bookworm.yaml +++ b/9.12/bookworm.yaml @@ -4,11 +4,11 @@ distro: abbr: 'deb12' image: 'debian:bookworm' ghc: - version: "9.12.2" - release_key: "FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD" + version: "9.12.4" + release_key: "88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4" sha256sum: - "aarch64": 'bee95bc91a621d8a2e9a9d86dac28ff839605e87316518dae12c779709bd58f1' - "x86_64": '447ec2fcc773ae9ebc3f39766c719641631274f9b765d7426a8cbe9241677c9f' + "aarch64": '8d093562f4d54b69fc57f94c021138d8595554407bc2828962cf6bdd394a6c97' + "x86_64": 'cdc60a66f1c89604975c896b3c7577b079b602d8fb093af0f4b2b0912fa47bd1' cabal_install: sha256sum: "aarch64": 'f763fb2af2bc1ff174b7361a7d51109a585954f87a0e14f86d144f3bce28f7a9' diff --git a/9.12/bookworm/Dockerfile b/9.12/bookworm/Dockerfile index be075871..7f45c582 100644 --- a/9.12/bookworm/Dockerfile +++ b/9.12/bookworm/Dockerfile @@ -96,8 +96,8 @@ RUN set -eux; \ \ cabal --version -ARG GHC='9.12.2' -ARG GHC_RELEASE_KEY='FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD' +ARG GHC='9.12.4' +ARG GHC_RELEASE_KEY='88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4' RUN set -eux; \ cd /tmp; \ @@ -106,10 +106,10 @@ RUN set -eux; \ # sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS \ case "$ARCH" in \ 'aarch64') \ - GHC_SHA256='bee95bc91a621d8a2e9a9d86dac28ff839605e87316518dae12c779709bd58f1'; \ + GHC_SHA256='8d093562f4d54b69fc57f94c021138d8595554407bc2828962cf6bdd394a6c97'; \ ;; \ 'x86_64') \ - GHC_SHA256='447ec2fcc773ae9ebc3f39766c719641631274f9b765d7426a8cbe9241677c9f'; \ + GHC_SHA256='cdc60a66f1c89604975c896b3c7577b079b602d8fb093af0f4b2b0912fa47bd1'; \ ;; \ *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \ esac; \ diff --git a/9.12/bullseye.yaml b/9.12/bullseye.yaml index 72ec3349..f99a619e 100644 --- a/9.12/bullseye.yaml +++ b/9.12/bullseye.yaml @@ -4,11 +4,11 @@ distro: abbr: 'deb11' image: 'debian:bullseye' ghc: - version: "9.12.2" - release_key: "FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD" + version: "9.12.4" + release_key: "88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4" sha256sum: - "aarch64": '6048eae62ede069459398fa6f2e92ab9719e1b83e93a9014e6a410c54ed2755f' # hash from deb10 bindist - "x86_64": '47d5faba492545b49b8dd49a79e64b4ef8eb4b1632d4ddc64355ce4e812eec75' + "aarch64": 'e0e2b536e56f08ee9b6eb9c2c4fe43f8d289257afb786ea8f5538c5c7b252f2f' # hash from deb10 bindist + "x86_64": '3699fc558231c81836f632f09e36e01381141d7df42ab26a0db6b1b7d0c74f30' cabal_install: sha256sum: "aarch64": '5e8c47a055d5b744741039a7061ee43ec7d080d1251784e7a4cd836403e42523' @@ -16,7 +16,6 @@ cabal_install: overrides: ghc: "aarch64": - # GHC 9.12.2 doesn't have a deb11 bindist for aarch64 for some reason, so we're using the deb10 one instead - url: "https://downloads.haskell.org/~ghc/9.12.2/ghc-9.12.2-aarch64-deb10-linux.tar.xz" + # GHC 9.12.4 doesn't have a deb11 bindist for aarch64 for some reason, so we're using the deb10 one instead + url: "https://downloads.haskell.org/~ghc/9.12.4/ghc-9.12.4-aarch64-deb10-linux.tar.xz" _globals: !include '_globals.yaml' - diff --git a/9.12/bullseye/Dockerfile b/9.12/bullseye/Dockerfile index ba9b8a37..6e7cf8db 100644 --- a/9.12/bullseye/Dockerfile +++ b/9.12/bullseye/Dockerfile @@ -96,8 +96,8 @@ RUN set -eux; \ \ cabal --version -ARG GHC='9.12.2' -ARG GHC_RELEASE_KEY='FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD' +ARG GHC='9.12.4' +ARG GHC_RELEASE_KEY='88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4' RUN set -eux; \ cd /tmp; \ @@ -106,11 +106,11 @@ RUN set -eux; \ # sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS \ case "$ARCH" in \ 'aarch64') \ - GHC_SHA256='6048eae62ede069459398fa6f2e92ab9719e1b83e93a9014e6a410c54ed2755f'; \ - GHC_URL='https://downloads.haskell.org/~ghc/9.12.2/ghc-9.12.2-aarch64-deb10-linux.tar.xz'; \ + GHC_SHA256='e0e2b536e56f08ee9b6eb9c2c4fe43f8d289257afb786ea8f5538c5c7b252f2f'; \ + GHC_URL='https://downloads.haskell.org/~ghc/9.12.4/ghc-9.12.4-aarch64-deb10-linux.tar.xz'; \ ;; \ 'x86_64') \ - GHC_SHA256='47d5faba492545b49b8dd49a79e64b4ef8eb4b1632d4ddc64355ce4e812eec75'; \ + GHC_SHA256='3699fc558231c81836f632f09e36e01381141d7df42ab26a0db6b1b7d0c74f30'; \ ;; \ *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \ esac; \ diff --git a/9.12/slim-bookworm.yaml b/9.12/slim-bookworm.yaml index 257b055b..0155b4a1 100644 --- a/9.12/slim-bookworm.yaml +++ b/9.12/slim-bookworm.yaml @@ -4,11 +4,11 @@ distro: abbr: 'deb12' image: 'debian:bookworm-slim' ghc: - version: "9.12.2" - release_key: "FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD" + version: "9.12.4" + release_key: "88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4" sha256sum: - "aarch64": 'bee95bc91a621d8a2e9a9d86dac28ff839605e87316518dae12c779709bd58f1' - "x86_64": '447ec2fcc773ae9ebc3f39766c719641631274f9b765d7426a8cbe9241677c9f' + "aarch64": '8d093562f4d54b69fc57f94c021138d8595554407bc2828962cf6bdd394a6c97' + "x86_64": 'cdc60a66f1c89604975c896b3c7577b079b602d8fb093af0f4b2b0912fa47bd1' cabal_install: sha256sum: "aarch64": 'f763fb2af2bc1ff174b7361a7d51109a585954f87a0e14f86d144f3bce28f7a9' diff --git a/9.12/slim-bookworm/Dockerfile b/9.12/slim-bookworm/Dockerfile index 98e457ae..867c8aa2 100644 --- a/9.12/slim-bookworm/Dockerfile +++ b/9.12/slim-bookworm/Dockerfile @@ -96,8 +96,8 @@ RUN set -eux; \ \ cabal --version -ARG GHC='9.12.2' -ARG GHC_RELEASE_KEY='FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD' +ARG GHC='9.12.4' +ARG GHC_RELEASE_KEY='88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4' RUN set -eux; \ cd /tmp; \ @@ -106,10 +106,10 @@ RUN set -eux; \ # sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS \ case "$ARCH" in \ 'aarch64') \ - GHC_SHA256='bee95bc91a621d8a2e9a9d86dac28ff839605e87316518dae12c779709bd58f1'; \ + GHC_SHA256='8d093562f4d54b69fc57f94c021138d8595554407bc2828962cf6bdd394a6c97'; \ ;; \ 'x86_64') \ - GHC_SHA256='447ec2fcc773ae9ebc3f39766c719641631274f9b765d7426a8cbe9241677c9f'; \ + GHC_SHA256='cdc60a66f1c89604975c896b3c7577b079b602d8fb093af0f4b2b0912fa47bd1'; \ ;; \ *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \ esac; \ diff --git a/9.12/slim-bullseye.yaml b/9.12/slim-bullseye.yaml index f1486944..f60d1ea5 100644 --- a/9.12/slim-bullseye.yaml +++ b/9.12/slim-bullseye.yaml @@ -4,11 +4,11 @@ distro: abbr: 'deb11' image: 'debian:bullseye-slim' ghc: - version: "9.12.2" - release_key: "FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD" + version: "9.12.4" + release_key: "88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4" sha256sum: - "aarch64": '6048eae62ede069459398fa6f2e92ab9719e1b83e93a9014e6a410c54ed2755f' # hash from deb10 bindist - "x86_64": '47d5faba492545b49b8dd49a79e64b4ef8eb4b1632d4ddc64355ce4e812eec75' + "aarch64": 'e0e2b536e56f08ee9b6eb9c2c4fe43f8d289257afb786ea8f5538c5c7b252f2f' # hash from deb10 bindist + "x86_64": '3699fc558231c81836f632f09e36e01381141d7df42ab26a0db6b1b7d0c74f30' cabal_install: sha256sum: "aarch64": '5e8c47a055d5b744741039a7061ee43ec7d080d1251784e7a4cd836403e42523' @@ -16,7 +16,6 @@ cabal_install: overrides: ghc: "aarch64": - # GHC 9.12.2 doesn't have a deb11 bindist for aarch64 for some reason, so we're using the deb10 one instead - url: "https://downloads.haskell.org/~ghc/9.12.2/ghc-9.12.2-aarch64-deb10-linux.tar.xz" + # GHC 9.12.4 doesn't have a deb11 bindist for aarch64 for some reason, so we're using the deb10 one instead + url: "https://downloads.haskell.org/~ghc/9.12.4/ghc-9.12.4-aarch64-deb10-linux.tar.xz" _globals: !include '_globals.yaml' - diff --git a/9.12/slim-bullseye/Dockerfile b/9.12/slim-bullseye/Dockerfile index 205a0fbe..3ee58268 100644 --- a/9.12/slim-bullseye/Dockerfile +++ b/9.12/slim-bullseye/Dockerfile @@ -96,8 +96,8 @@ RUN set -eux; \ \ cabal --version -ARG GHC='9.12.2' -ARG GHC_RELEASE_KEY='FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD' +ARG GHC='9.12.4' +ARG GHC_RELEASE_KEY='88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4' RUN set -eux; \ cd /tmp; \ @@ -106,11 +106,11 @@ RUN set -eux; \ # sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS \ case "$ARCH" in \ 'aarch64') \ - GHC_SHA256='6048eae62ede069459398fa6f2e92ab9719e1b83e93a9014e6a410c54ed2755f'; \ - GHC_URL='https://downloads.haskell.org/~ghc/9.12.2/ghc-9.12.2-aarch64-deb10-linux.tar.xz'; \ + GHC_SHA256='e0e2b536e56f08ee9b6eb9c2c4fe43f8d289257afb786ea8f5538c5c7b252f2f'; \ + GHC_URL='https://downloads.haskell.org/~ghc/9.12.4/ghc-9.12.4-aarch64-deb10-linux.tar.xz'; \ ;; \ 'x86_64') \ - GHC_SHA256='47d5faba492545b49b8dd49a79e64b4ef8eb4b1632d4ddc64355ce4e812eec75'; \ + GHC_SHA256='3699fc558231c81836f632f09e36e01381141d7df42ab26a0db6b1b7d0c74f30'; \ ;; \ *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \ esac; \