official-images icon indicating copy to clipboard operation
official-images copied to clipboard

Upgrade haskell to ghc 9.6.6

Open jhrcek opened this issue 1 year ago • 2 comments

jhrcek avatar Jul 13 '24 14:07 jhrcek

Diff for bd100a993ebe3d0d3a34a3ff0d00f9340bac8d94:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index b074dfc..8b2d5a3 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -31,14 +31,14 @@ Architectures: amd64, arm64v8
 GitCommit: a722a82c30fa5e321bae769bbd7720e3a3ba874e
 Directory: 9.4/slim-buster
 
-Tags: 9.6.5-buster, 9.6-buster, 9.6.5, 9.6
+Tags: 9.6.6-buster, 9.6-buster, 9.6.6, 9.6
 Architectures: amd64, arm64v8
-GitCommit: a722a82c30fa5e321bae769bbd7720e3a3ba874e
+GitCommit: 947d2417457a06e7c012a606899b94ed9b6a59ba
 Directory: 9.6/buster
 
-Tags: 9.6.5-slim-buster, 9.6-slim-buster, 9.6.5-slim, 9.6-slim
+Tags: 9.6.6-slim-buster, 9.6-slim-buster, 9.6.6-slim, 9.6-slim
 Architectures: amd64, arm64v8
-GitCommit: a722a82c30fa5e321bae769bbd7720e3a3ba874e
+GitCommit: 947d2417457a06e7c012a606899b94ed9b6a59ba
 Directory: 9.6/slim-buster
 
 Tags: 9.8.2-buster, 9.8-buster, 9.8.2, 9.8
diff --git a/_bashbrew-list b/_bashbrew-list
index c38c47c..4dc892a 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -30,10 +30,10 @@ haskell:9.6
 haskell:9.6-buster
 haskell:9.6-slim
 haskell:9.6-slim-buster
-haskell:9.6.5
-haskell:9.6.5-buster
-haskell:9.6.5-slim
-haskell:9.6.5-slim-buster
+haskell:9.6.6
+haskell:9.6.6-buster
+haskell:9.6.6-slim
+haskell:9.6.6-slim-buster
 haskell:9.8
 haskell:9.8-buster
 haskell:9.8-slim
diff --git a/haskell_9.6-slim/Dockerfile b/haskell_9.6-slim/Dockerfile
index 8763cac..66d2100 100644
--- a/haskell_9.6-slim/Dockerfile
+++ b/haskell_9.6-slim/Dockerfile
@@ -94,7 +94,7 @@ RUN set -eux; \
     \
     cabal --version
 
-ARG GHC=9.6.5
+ARG GHC=9.6.6
 ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
 
 RUN set -eux; \
@@ -104,10 +104,10 @@ RUN set -eux; \
     # sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
     case "$ARCH" in \
         'aarch64') \
-            GHC_SHA256='fc4e2df394b9d6f48bdb0abaabad1c97825264cbe4e75e7463fc794cb3f87047'; \
+            GHC_SHA256='58d5ce65758ec5179b448e4e1a2f835924b4ada96cf56af80d011bed87d91fef'; \
             ;; \
         'x86_64') \
-            GHC_SHA256='3851029d4af6353e75f5a6d4055e0a3ab95ad986d71a603901000af048ff106e'; \
+            GHC_SHA256='15ee68cede5d114a672fb468b9545700edd70a68724ab4e9122c8a23aba8570b'; \
             ;; \
         *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
     esac; \
diff --git a/haskell_9.6/Dockerfile b/haskell_9.6/Dockerfile
index d6fab28..7edaaff 100644
--- a/haskell_9.6/Dockerfile
+++ b/haskell_9.6/Dockerfile
@@ -80,7 +80,7 @@ RUN set -eux; \
     \
     cabal --version
 
-ARG GHC=9.6.5
+ARG GHC=9.6.6
 ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
 
 RUN set -eux; \
@@ -90,10 +90,10 @@ RUN set -eux; \
     # sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
     case "$ARCH" in \
         'aarch64') \
-            GHC_SHA256='fc4e2df394b9d6f48bdb0abaabad1c97825264cbe4e75e7463fc794cb3f87047'; \
+            GHC_SHA256='58d5ce65758ec5179b448e4e1a2f835924b4ada96cf56af80d011bed87d91fef'; \
             ;; \
         'x86_64') \
-            GHC_SHA256='3851029d4af6353e75f5a6d4055e0a3ab95ad986d71a603901000af048ff106e'; \
+            GHC_SHA256='15ee68cede5d114a672fb468b9545700edd70a68724ab4e9122c8a23aba8570b'; \
             ;; \
         *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
     esac; \

Relevant Maintainers:

  • haskell: @tarleb @develop7

github-actions[bot] avatar Jul 13 '24 14:07 github-actions[bot]

Your comment is correct (https://github.com/haskell/docker-haskell/pull/132#issuecomment-2226938657). Debian Buster images should be removed or moved to a new base since Buster is end of life (https://github.com/docker-library/official-images/pull/17091#issuecomment-2201099734).

yosifkit avatar Jul 15 '24 18:07 yosifkit

Closing in favor of https://github.com/docker-library/official-images/pull/17333 :heart: :eyes:

tianon avatar Aug 09 '24 17:08 tianon