Skip to content

Update haskell #16977

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jun 13, 2024
Merged

Update haskell #16977

merged 1 commit into from
Jun 13, 2024

Conversation

develop7
Copy link
Contributor

Add GHC 9.10

Fixes haskell/docker-haskell#131

@develop7
Update haskell
9f76eaa 
Add GHC 9.10
@github-actions GitHub Actions
Copy link

Diff for 9f76eaa: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 0cc9e31..b074dfc 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -41,12 +41,22 @@ Architectures: amd64, arm64v8
 GitCommit: a722a82c30fa5e321bae769bbd7720e3a3ba874e
 Directory: 9.6/slim-buster
 
-Tags: 9.8.2-buster, 9.8-buster, 9-buster, buster, 9.8.2, 9.8, 9, latest
+Tags: 9.8.2-buster, 9.8-buster, 9.8.2, 9.8
 Architectures: amd64, arm64v8
 GitCommit: a722a82c30fa5e321bae769bbd7720e3a3ba874e
 Directory: 9.8/buster
 
-Tags: 9.8.2-slim-buster, 9.8-slim-buster, 9-slim-buster, slim-buster, 9.8.2-slim, 9.8-slim, 9-slim, slim
+Tags: 9.8.2-slim-buster, 9.8-slim-buster, 9.8.2-slim, 9.8-slim
 Architectures: amd64, arm64v8
 GitCommit: a722a82c30fa5e321bae769bbd7720e3a3ba874e
 Directory: 9.8/slim-buster
+
+Tags: 9.10.1-buster, 9.10-buster, 9-buster, buster, 9, latest
+Architectures: amd64, arm64v8
+GitCommit: ca3084159e14e2a753fe633789347a9d8633e5ea
+Directory: 9.10/buster
+
+Tags: 9.10.1-slim-buster, 9.10-slim-buster, 9-slim-buster, slim-buster, 9-slim, slim
+Architectures: amd64, arm64v8
+GitCommit: ca3084159e14e2a753fe633789347a9d8633e5ea
+Directory: 9.10/slim-buster
diff --git a/_bashbrew-list b/_bashbrew-list
index 4d122e5..c38c47c 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -42,6 +42,10 @@ haskell:9.8.2
 haskell:9.8.2-buster
 haskell:9.8.2-slim
 haskell:9.8.2-slim-buster
+haskell:9.10-buster
+haskell:9.10-slim-buster
+haskell:9.10.1-buster
+haskell:9.10.1-slim-buster
 haskell:buster
 haskell:latest
 haskell:slim
diff --git a/haskell_slim/Dockerfile b/haskell_9.8-slim/Dockerfile
similarity index 100%
copy from haskell_slim/Dockerfile
copy to haskell_9.8-slim/Dockerfile
diff --git a/haskell_latest/Dockerfile b/haskell_9.8/Dockerfile
similarity index 100%
copy from haskell_latest/Dockerfile
copy to haskell_9.8/Dockerfile
diff --git a/haskell_latest/Dockerfile b/haskell_latest/Dockerfile
index ff5e5ed..49f637f 100644
--- a/haskell_latest/Dockerfile
+++ b/haskell_latest/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update && \
         libtinfo-dev && \
     rm -rf /var/lib/apt/lists/*
 
-ARG STACK=2.15.5
+ARG STACK=2.15.7
 ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
 
 RUN set -eux; \
@@ -19,10 +19,10 @@ RUN set -eux; \
     # sha256 from https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz.sha256
     case "$ARCH" in \
         'aarch64') \
-            STACK_SHA256='52cd9d9c2ee4dbf2841bba856f5fca15fbf6ba23fced7256aa3f7c8b76381c91'; \
+            STACK_SHA256='f0c4b038c7e895902e133a2f4c4c217e03c4be44aa5da48aec9f7947f4af090b'; \
             ;; \
         'x86_64') \
-            STACK_SHA256='d55f8554932aad23f7b1198e0d5ebe332073d73fe60e3f324d0b315c156d8c43'; \
+            STACK_SHA256='4e635d6168f7578a5694a0d473c980c3c7ed35d971acae969de1fd48ef14e030'; \
             ;; \
         *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
     esac; \
@@ -80,8 +80,8 @@ RUN set -eux; \
     \
     cabal --version
 
-ARG GHC=9.8.2
-ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
+ARG GHC=9.10.1
+ARG GHC_RELEASE_KEY=FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD
 
 RUN set -eux; \
     cd /tmp; \
@@ -90,10 +90,10 @@ RUN set -eux; \
     # sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
     case "$ARCH" in \
         'aarch64') \
-            GHC_SHA256='9a3776fd8dc02f95b751f0e44823d6727dea2c212857e2c5c5f6a38a034d1575'; \
+            GHC_SHA256='e6df50e62b696e3a8b759670fc79207ccc26e88a79a047561ca1ccb8846157dd'; \
             ;; \
         'x86_64') \
-            GHC_SHA256='7449e1c8ef351ec326f36d9eba2885ba7b75d9900df35b2069c4d6fd151b09eb'; \
+            GHC_SHA256='7fbdca8971c89a54cff8e88aee825c2ef2bcc9f7a050ee1e1e844763e39c361f'; \
             ;; \
         *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
     esac; \
diff --git a/haskell_slim/Dockerfile b/haskell_slim/Dockerfile
index 72eba6d..533ef62 100644
--- a/haskell_slim/Dockerfile
+++ b/haskell_slim/Dockerfile
@@ -23,7 +23,7 @@ RUN apt-get update && \
         zlib1g-dev && \
     rm -rf /var/lib/apt/lists/*
 
-ARG STACK=2.15.5
+ARG STACK=2.15.7
 ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
 
 RUN set -eux; \
@@ -33,10 +33,10 @@ RUN set -eux; \
     # sha256 from https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz.sha256
     case "$ARCH" in \
         'aarch64') \
-            STACK_SHA256='52cd9d9c2ee4dbf2841bba856f5fca15fbf6ba23fced7256aa3f7c8b76381c91'; \
+            STACK_SHA256='f0c4b038c7e895902e133a2f4c4c217e03c4be44aa5da48aec9f7947f4af090b'; \
             ;; \
         'x86_64') \
-            STACK_SHA256='d55f8554932aad23f7b1198e0d5ebe332073d73fe60e3f324d0b315c156d8c43'; \
+            STACK_SHA256='4e635d6168f7578a5694a0d473c980c3c7ed35d971acae969de1fd48ef14e030'; \
             ;; \
         *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
     esac; \
@@ -94,8 +94,8 @@ RUN set -eux; \
     \
     cabal --version
 
-ARG GHC=9.8.2
-ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
+ARG GHC=9.10.1
+ARG GHC_RELEASE_KEY=FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD
 
 RUN set -eux; \
     cd /tmp; \
@@ -104,10 +104,10 @@ RUN set -eux; \
     # sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
     case "$ARCH" in \
         'aarch64') \
-            GHC_SHA256='9a3776fd8dc02f95b751f0e44823d6727dea2c212857e2c5c5f6a38a034d1575'; \
+            GHC_SHA256='e6df50e62b696e3a8b759670fc79207ccc26e88a79a047561ca1ccb8846157dd'; \
             ;; \
         'x86_64') \
-            GHC_SHA256='7449e1c8ef351ec326f36d9eba2885ba7b75d9900df35b2069c4d6fd151b09eb'; \
+            GHC_SHA256='7fbdca8971c89a54cff8e88aee825c2ef2bcc9f7a050ee1e1e844763e39c361f'; \
             ;; \
         *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
     esac; \

Relevant Maintainers:

@tianon
Copy link
Member

tianon commented Jun 12, 2024

Debian Buster's LTS team maintenance ends June 30th, 2024 😬

So old versions will need to be updated or removed very very soon, but new versions should definitely be built on something newer 😅

@develop7 develop7 marked this pull request as ready for review June 12, 2024 22:27
@develop7 develop7 requested a review from a team as a code owner June 12, 2024 22:27
@develop7
Copy link
Contributor Author

@tianon thank you for the heads-up, upgrading from buster is certainly on the list

@yosifkit yosifkit merged commit 98c5b68 into docker-library:master Jun 13, 2024
@develop7 develop7 mentioned this pull request Jun 13, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yosifkit yosifkit yosifkit approved these changes

Assignees
No one assigned
Labels
library/haskell
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Cut a release with the new GHC 9.10 image
3 participants
@develop7 @tianon @yosifkit