Skip to content

Commit 3d23b93

Browse files
authored
cabal: upgrade to v3.10.2.0 (#114)
* cabal: upgrade to v3.10.2.0 * try upgraded cabal for 9.4
1 parent feaa699 commit 3d23b93

File tree

7 files changed

+25
-24
lines changed

7 files changed

+25
-24
lines changed

9.4/buster/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ RUN set -eux; \
4343
\
4444
stack --version;
4545

46-
ARG CABAL_INSTALL=3.8.1.0
47-
ARG CABAL_INSTALL_RELEASE_KEY=E9EC5616017C3EE26B33468CCE1ED8AE0B011D8C
46+
ARG CABAL_INSTALL=3.10.2.0
47+
ARG CABAL_INSTALL_RELEASE_KEY=EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF
4848

4949
RUN set -eux; \
5050
cd /tmp; \
@@ -55,10 +55,10 @@ RUN set -eux; \
5555
# sha256 from https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS
5656
case "$ARCH" in \
5757
'aarch64') \
58-
CABAL_INSTALL_SHA256='c7fa9029f2f829432dd9dcf764e58605fbb7431db79234feb3e46684a9b37214'; \
58+
CABAL_INSTALL_SHA256='004ed4a7ca890fadee23f58f9cb606c066236a43e16b34be2532b177b231b06d'; \
5959
;; \
6060
'x86_64') \
61-
CABAL_INSTALL_SHA256='c71a1a46fd42d235bb86be968660815c24950e5da2d1ff4640da025ab520424b'; \
61+
CABAL_INSTALL_SHA256='bdeb27c008b09c3b86f8a2768018d62a1aee02565304d123fda87ed432549418'; \
6262
;; \
6363
*) echo >&2 "error: unsupported architecture '$ARCH'"; exit 1 ;; \
6464
esac; \

9.4/slim-buster/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ RUN set -eux; \
5757
\
5858
stack --version;
5959

60-
ARG CABAL_INSTALL=3.8.1.0
61-
ARG CABAL_INSTALL_RELEASE_KEY=E9EC5616017C3EE26B33468CCE1ED8AE0B011D8C
60+
ARG CABAL_INSTALL=3.10.2.0
61+
ARG CABAL_INSTALL_RELEASE_KEY=EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF
6262

6363
RUN set -eux; \
6464
cd /tmp; \
@@ -69,10 +69,10 @@ RUN set -eux; \
6969
# sha256 from https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS
7070
case "$ARCH" in \
7171
'aarch64') \
72-
CABAL_INSTALL_SHA256='c7fa9029f2f829432dd9dcf764e58605fbb7431db79234feb3e46684a9b37214'; \
72+
CABAL_INSTALL_SHA256='004ed4a7ca890fadee23f58f9cb606c066236a43e16b34be2532b177b231b06d'; \
7373
;; \
7474
'x86_64') \
75-
CABAL_INSTALL_SHA256='c71a1a46fd42d235bb86be968660815c24950e5da2d1ff4640da025ab520424b'; \
75+
CABAL_INSTALL_SHA256='bdeb27c008b09c3b86f8a2768018d62a1aee02565304d123fda87ed432549418'; \
7676
;; \
7777
*) echo >&2 "error: unsupported architecture '$ARCH'"; exit 1 ;; \
7878
esac; \

9.6/buster/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ RUN set -eux; \
4343
\
4444
stack --version;
4545

46-
ARG CABAL_INSTALL=3.8.1.0
47-
ARG CABAL_INSTALL_RELEASE_KEY=E9EC5616017C3EE26B33468CCE1ED8AE0B011D8C
46+
ARG CABAL_INSTALL=3.10.2.0
47+
ARG CABAL_INSTALL_RELEASE_KEY=EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF
4848

4949
RUN set -eux; \
5050
cd /tmp; \
@@ -55,10 +55,10 @@ RUN set -eux; \
5555
# sha256 from https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS
5656
case "$ARCH" in \
5757
'aarch64') \
58-
CABAL_INSTALL_SHA256='c7fa9029f2f829432dd9dcf764e58605fbb7431db79234feb3e46684a9b37214'; \
58+
CABAL_INSTALL_SHA256='004ed4a7ca890fadee23f58f9cb606c066236a43e16b34be2532b177b231b06d'; \
5959
;; \
6060
'x86_64') \
61-
CABAL_INSTALL_SHA256='c71a1a46fd42d235bb86be968660815c24950e5da2d1ff4640da025ab520424b'; \
61+
CABAL_INSTALL_SHA256='bdeb27c008b09c3b86f8a2768018d62a1aee02565304d123fda87ed432549418'; \
6262
;; \
6363
*) echo >&2 "error: unsupported architecture '$ARCH'"; exit 1 ;; \
6464
esac; \

9.6/slim-buster/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ RUN set -eux; \
5757
\
5858
stack --version;
5959

60-
ARG CABAL_INSTALL=3.8.1.0
61-
ARG CABAL_INSTALL_RELEASE_KEY=E9EC5616017C3EE26B33468CCE1ED8AE0B011D8C
60+
ARG CABAL_INSTALL=3.10.2.0
61+
ARG CABAL_INSTALL_RELEASE_KEY=EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF
6262

6363
RUN set -eux; \
6464
cd /tmp; \
@@ -69,10 +69,10 @@ RUN set -eux; \
6969
# sha256 from https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS
7070
case "$ARCH" in \
7171
'aarch64') \
72-
CABAL_INSTALL_SHA256='c7fa9029f2f829432dd9dcf764e58605fbb7431db79234feb3e46684a9b37214'; \
72+
CABAL_INSTALL_SHA256='004ed4a7ca890fadee23f58f9cb606c066236a43e16b34be2532b177b231b06d'; \
7373
;; \
7474
'x86_64') \
75-
CABAL_INSTALL_SHA256='c71a1a46fd42d235bb86be968660815c24950e5da2d1ff4640da025ab520424b'; \
75+
CABAL_INSTALL_SHA256='bdeb27c008b09c3b86f8a2768018d62a1aee02565304d123fda87ed432549418'; \
7676
;; \
7777
*) echo >&2 "error: unsupported architecture '$ARCH'"; exit 1 ;; \
7878
esac; \

9.8/buster/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ RUN set -eux; \
4343
\
4444
stack --version;
4545

46-
ARG CABAL_INSTALL=3.8.1.0
47-
ARG CABAL_INSTALL_RELEASE_KEY=E9EC5616017C3EE26B33468CCE1ED8AE0B011D8C
46+
ARG CABAL_INSTALL=3.10.2.0
47+
ARG CABAL_INSTALL_RELEASE_KEY=EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF
4848

4949
RUN set -eux; \
5050
cd /tmp; \
@@ -55,10 +55,10 @@ RUN set -eux; \
5555
# sha256 from https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS
5656
case "$ARCH" in \
5757
'aarch64') \
58-
CABAL_INSTALL_SHA256='c7fa9029f2f829432dd9dcf764e58605fbb7431db79234feb3e46684a9b37214'; \
58+
CABAL_INSTALL_SHA256='004ed4a7ca890fadee23f58f9cb606c066236a43e16b34be2532b177b231b06d'; \
5959
;; \
6060
'x86_64') \
61-
CABAL_INSTALL_SHA256='c71a1a46fd42d235bb86be968660815c24950e5da2d1ff4640da025ab520424b'; \
61+
CABAL_INSTALL_SHA256='bdeb27c008b09c3b86f8a2768018d62a1aee02565304d123fda87ed432549418'; \
6262
;; \
6363
*) echo >&2 "error: unsupported architecture '$ARCH'"; exit 1 ;; \
6464
esac; \

9.8/slim-buster/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ RUN set -eux; \
5757
\
5858
stack --version;
5959

60-
ARG CABAL_INSTALL=3.8.1.0
61-
ARG CABAL_INSTALL_RELEASE_KEY=E9EC5616017C3EE26B33468CCE1ED8AE0B011D8C
60+
ARG CABAL_INSTALL=3.10.2.0
61+
ARG CABAL_INSTALL_RELEASE_KEY=EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF
6262

6363
RUN set -eux; \
6464
cd /tmp; \
@@ -69,10 +69,10 @@ RUN set -eux; \
6969
# sha256 from https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS
7070
case "$ARCH" in \
7171
'aarch64') \
72-
CABAL_INSTALL_SHA256='c7fa9029f2f829432dd9dcf764e58605fbb7431db79234feb3e46684a9b37214'; \
72+
CABAL_INSTALL_SHA256='004ed4a7ca890fadee23f58f9cb606c066236a43e16b34be2532b177b231b06d'; \
7373
;; \
7474
'x86_64') \
75-
CABAL_INSTALL_SHA256='c71a1a46fd42d235bb86be968660815c24950e5da2d1ff4640da025ab520424b'; \
75+
CABAL_INSTALL_SHA256='bdeb27c008b09c3b86f8a2768018d62a1aee02565304d123fda87ed432549418'; \
7676
;; \
7777
*) echo >&2 "error: unsupported architecture '$ARCH'"; exit 1 ;; \
7878
esac; \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ An [example](https://github.com/haskell/docker-haskell/commit/d25abd175c94517494
111111
4. Update the PGP key if the person doing the release has changed. You can build the image locally at this point to see if it works or not. If it fails you need to update the PGP key. You need to find the key from the person doing the release on the ubuntu keyserver. See below for known releasers.
112112

113113
* [Mikolaj Konarski](https://keyserver.ubuntu.com/pks/lookup?search=mikolaj.konarski%40gmail.com&fingerprint=on&op=index)
114+
* [Hécate](https://keyserver.ubuntu.com/pks/lookup?search=hecate%40glitchbra.in&fingerprint=on&op=index)
114115

115116
An [example](https://github.com/haskell/docker-haskell/commit/73cf1f7f950cd34bf7cc9691067b0e7761016c1a)
116117

0 commit comments

Comments
 (0)