Skip to content

Commit 1a7e578

Browse files
committed
IHaskell 2025-05-04
GHC 9.8.4 Stackage lts-23.21 JupyterLab 4.4.1 Stack 3.5.1
1 parent 02cb8e0 commit 1a7e578

2 files changed

Lines changed: 22 additions & 24 deletions

File tree

Dockerfile

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
ARG BASE_CONTAINER=jupyter/base-notebook:lab-3.2.4@sha256:438e87954dedd8b3c0088c89923ed29c9e14f139428c98d79c9ebabe55adc01d
2-
3-
# JupyterLab versions > 3.2.4 have this bug:
4-
# https://github.com/jupyterlab/jupyterlab/issues/13383
5-
1+
# https://quay.io/repository/jupyter/base-notebook
2+
# lab-4.4.1
3+
ARG BASE_CONTAINER=quay.io/jupyter/base-notebook:x86_64-lab-4.4.1
4+
# ARG BASE_CONTAINER=quay.io/jupyter/base-notebook/x86_64-lab-4.4.1@sha256:af7a4d3476399b0f772caad841c5b07b0143e7b9ecf26712f4e17ae687d9e6d2
65
FROM $BASE_CONTAINER
7-
# https://hub.docker.com/r/jupyter/base-notebook/tags
86

97
LABEL maintainer="James Brock <jamesbrock@gmail.com>"
108

@@ -65,7 +63,7 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
6563
#
6664
# curl -sSL https://get.haskellstack.org/ | sh
6765
#
68-
ARG STACK_VERSION="2.11.1"
66+
ARG STACK_VERSION="3.5.1"
6967
ARG STACK_BINDIST="stack-${STACK_VERSION}-linux-x86_64"
7068
RUN cd /tmp \
7169
&& curl -sSL --output ${STACK_BINDIST}.tar.gz https://github.com/commercialhaskell/stack/releases/download/v${STACK_VERSION}/${STACK_BINDIST}.tar.gz \
@@ -107,15 +105,15 @@ ENV PATH ${PATH}:/opt/bin
107105
# The resolver for all stack builds will be chosen from
108106
# the IHaskell/stack.yaml in this commit.
109107
# https://github.com/gibiansky/IHaskell/commits/master
110-
# IHaskell 2022-12-19
111-
ARG IHASKELL_COMMIT=1c22a874ac0c8ed019229f4a0cd5a0bfda017357
108+
# IHaskell 2025-05-04
109+
ARG IHASKELL_COMMIT=08686e821f93fde0bcecf82b9febc4135b22bb8a
112110

113111
# Specify a git branch for hvega
114112
# https://github.com/DougBurke/hvega/commits/main
115-
# hvega 2022-06-16
116-
# hvega-0.12.0.3
117-
# ihaskell-hvega-0.5.0.3
118-
ARG HVEGA_COMMIT=2b453c230294b889564339853de02b0c1829a081
113+
# hvega 2025-03-12
114+
# hvega-0.12.0.7
115+
# ihaskell-hvega-0.5.0.6
116+
ARG HVEGA_COMMIT=5e18d53b7748dc5e23c6cd6c38dc722f01e2dde6
119117

120118
# Clone IHaskell and install ghc from the IHaskell resolver
121119
RUN cd /opt \
@@ -127,9 +125,9 @@ RUN cd /opt \
127125
&& fix-permissions $STACK_ROOT \
128126
&& fix-permissions /opt/hvega \
129127
&& stack setup \
130-
&& fix-permissions $STACK_ROOT \
128+
&& fix-permissions $STACK_ROOT
131129
# Clean 176MB
132-
&& rm /opt/stack/programs/x86_64-linux/ghc*.tar.xz
130+
# && rm /opt/stack/programs/x86_64-linux/ghc*.tar.xz
133131

134132
# Build IHaskell
135133
#

global-project.stack.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
resolver: nightly-2023-05-17
2-
# GHC 9.4.5
1+
resolver: lts-23.21
2+
# GHC 9.8.4
33

44
# Stack global project /opt/stack/global-project/stack.yaml in the Docker image.
55
# https://docs.haskellstack.org/en/stable/yaml_configuration/#yaml-configuration
@@ -37,11 +37,11 @@ extra-deps:
3737
- /opt/hvega/hvega
3838
- /opt/hvega/ihaskell-hvega
3939

40-
- Chart-cairo-1.9.3
41-
- cairo-0.13.10.0
42-
- diagrams-cairo-1.4.2
43-
- pango-0.13.10.0
44-
- glib-0.13.10.0
45-
- gtk2hs-buildtools-0.13.10.0
46-
- plot-0.2.3.11
40+
- Chart-cairo-1.9.4.1
41+
- cairo-0.13.12.0
42+
- diagrams-cairo-1.4.2.1
43+
- pango-0.13.12.0
44+
- glib-0.13.12.0
45+
- gtk2hs-buildtools-0.13.12.0
46+
- plot-0.2.3.12
4747

0 commit comments

Comments
 (0)