Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Haskell ghc 9.4.5 -> 9.4.6 #15262

Merged
merged 1 commit into from
Aug 25, 2023

Conversation

jhrcek
Copy link
Contributor

@jhrcek jhrcek commented Aug 25, 2023

Includes changes from haskell/docker-haskell#110

@github-actions
Copy link

Diff for ef51110:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 27dafe9..e056f99 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -21,14 +21,14 @@ Architectures: amd64, arm64v8
 GitCommit: 13262afb82e457645a9b9f3f3eadb8e5acd4b5c1
 Directory: 9.2/slim-buster
 
-Tags: 9.4.5-buster, 9.4-buster, 9.4.5, 9.4
+Tags: 9.4.6-buster, 9.4-buster, 9.4.6, 9.4
 Architectures: amd64, arm64v8
-GitCommit: 13262afb82e457645a9b9f3f3eadb8e5acd4b5c1
+GitCommit: 8d518f4f5eb5d0949e0b6d3086e6c1d1e05ed85b
 Directory: 9.4/buster
 
-Tags: 9.4.5-slim-buster, 9.4-slim-buster, 9.4.5-slim, 9.4-slim
+Tags: 9.4.6-slim-buster, 9.4-slim-buster, 9.4.6-slim, 9.4-slim
 Architectures: amd64, arm64v8
-GitCommit: 13262afb82e457645a9b9f3f3eadb8e5acd4b5c1
+GitCommit: 8d518f4f5eb5d0949e0b6d3086e6c1d1e05ed85b
 Directory: 9.4/slim-buster
 
 Tags: 9.6.2-buster, 9.6-buster, 9-buster, buster, 9.6.2, 9.6, 9, latest
diff --git a/_bashbrew-list b/_bashbrew-list
index 69e9090..2458843 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -22,10 +22,10 @@ haskell:9.4
 haskell:9.4-buster
 haskell:9.4-slim
 haskell:9.4-slim-buster
-haskell:9.4.5
-haskell:9.4.5-buster
-haskell:9.4.5-slim
-haskell:9.4.5-slim-buster
+haskell:9.4.6
+haskell:9.4.6-buster
+haskell:9.4.6-slim
+haskell:9.4.6-slim-buster
 haskell:9.6
 haskell:9.6-buster
 haskell:9.6-slim
diff --git a/haskell_9.4-slim/Dockerfile b/haskell_9.4-slim/Dockerfile
index 39c17cd..741a78e 100644
--- a/haskell_9.4-slim/Dockerfile
+++ b/haskell_9.4-slim/Dockerfile
@@ -94,7 +94,7 @@ RUN set -eux; \
     \
     cabal --version
 
-ARG GHC=9.4.5
+ARG GHC=9.4.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='ecf16ec503e739e727174b29e5acbe4cf0c54737dd4d5eda046e09323f9ee248'; \
+            GHC_SHA256='b27e4e4d760216457c20fdce3ec419e1bac905608e6577c2c2fa15f4a3779370'; \
             ;; \
         'x86_64') \
-            GHC_SHA256='a44c39c4cc9a147de6dd31762995a9e47467cc91757800d80667b8cd60a9b226'; \
+            GHC_SHA256='6061c20ff4e154e81944dfc9f37afff5aaa05ce51ad25db3425ff85bb85a92a3'; \
             ;; \
         *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
     esac; \
diff --git a/haskell_9.4/Dockerfile b/haskell_9.4/Dockerfile
index d324cc3..8bfd483 100644
--- a/haskell_9.4/Dockerfile
+++ b/haskell_9.4/Dockerfile
@@ -80,7 +80,7 @@ RUN set -eux; \
     \
     cabal --version
 
-ARG GHC=9.4.5
+ARG GHC=9.4.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='ecf16ec503e739e727174b29e5acbe4cf0c54737dd4d5eda046e09323f9ee248'; \
+            GHC_SHA256='b27e4e4d760216457c20fdce3ec419e1bac905608e6577c2c2fa15f4a3779370'; \
             ;; \
         'x86_64') \
-            GHC_SHA256='a44c39c4cc9a147de6dd31762995a9e47467cc91757800d80667b8cd60a9b226'; \
+            GHC_SHA256='6061c20ff4e154e81944dfc9f37afff5aaa05ce51ad25db3425ff85bb85a92a3'; \
             ;; \
         *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
     esac; \

Relevant Maintainers:

@AlistairB
Copy link
Contributor

Lgtm, thanks!

@yosifkit yosifkit merged commit 296a91e into docker-library:master Aug 25, 2023
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants