Skip to content

Commit

Permalink
IHaskell 2022-12-19
Browse files Browse the repository at this point in the history
JupyterLab v3.2.4
Stack v2.9.1
resolver: lts-20.11
GHC 9.2.5
  • Loading branch information
jamesdbrock committed Feb 21, 2023
1 parent 059383a commit aea6696
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 32 deletions.
20 changes: 13 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ARG BASE_CONTAINER=jupyter/base-notebook:lab-3.1.17@sha256:4d30116ec280251db5553725fbccc23da7e6feafbbcbf6a4d3ae57c1088cd837
# JupyterLab versions > 3.1.17 have this bug:
ARG BASE_CONTAINER=jupyter/base-notebook:lab-3.2.4@sha256:438e87954dedd8b3c0088c89923ed29c9e14f139428c98d79c9ebabe55adc01d

# JupyterLab versions > 3.2.4 have this bug:
# https://github.com/jupyterlab/jupyterlab/issues/13383

FROM $BASE_CONTAINER
Expand Down Expand Up @@ -64,7 +65,7 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
#
# curl -sSL https://get.haskellstack.org/ | sh
#
ARG STACK_VERSION="2.7.5"
ARG STACK_VERSION="2.9.1"
ARG STACK_BINDIST="stack-${STACK_VERSION}-linux-x86_64"
RUN cd /tmp \
&& curl -sSL --output ${STACK_BINDIST}.tar.gz https://github.com/commercialhaskell/stack/releases/download/v${STACK_VERSION}/${STACK_BINDIST}.tar.gz \
Expand Down Expand Up @@ -106,8 +107,8 @@ ENV PATH ${PATH}:/opt/bin
# The resolver for all stack builds will be chosen from
# the IHaskell/stack.yaml in this commit.
# https://github.com/gibiansky/IHaskell/commits/master
# IHaskell 2022-11-01
ARG IHASKELL_COMMIT=7d0b9b070aa821db1a4d38826e146fd2c41d1c0b
# IHaskell 2022-12-19
ARG IHASKELL_COMMIT=1c22a874ac0c8ed019229f4a0cd5a0bfda017357

# Specify a git branch for hvega
# https://github.com/DougBurke/hvega/commits/main
Expand All @@ -122,8 +123,6 @@ RUN cd /opt \
&& mv *IHaskell* IHaskell \
&& curl -L "https://github.com/DougBurke/hvega/tarball/$HVEGA_COMMIT" | tar xzf - \
&& mv *hvega* hvega \
# Copy the Stack global project resolver from the IHaskell resolver.
&& grep 'resolver:' /opt/IHaskell/stack.yaml >> $STACK_ROOT/global-project/stack.yaml \
&& fix-permissions /opt/IHaskell \
&& fix-permissions $STACK_ROOT \
&& fix-permissions /opt/hvega \
Expand Down Expand Up @@ -237,3 +236,10 @@ RUN mkdir -p $EXAMPLES_PATH \
&& cp /opt/IHaskell/ihaskell-display/ihaskell-plot/PlotExample.ipynb ihaskell-plot/ \
&& fix-permissions $EXAMPLES_PATH

# Enable this for debugging the kernel messages
# RUN conda install --quiet --yes \
# 'jupyterlab-kernelspy' && \
# conda clean --all -f -y && \
# fix-permissions "${CONDA_DIR}" && \
# fix-permissions "/home/${NB_USER}"

28 changes: 3 additions & 25 deletions global-project.stack.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
resolver: lts-20.11
# GHC 9.2.5

# Stack global project /opt/stack/global-project/stack.yaml in the Docker image.
# https://docs.haskellstack.org/en/stable/yaml_configuration/#yaml-configuration

Expand Down Expand Up @@ -34,28 +37,3 @@ extra-deps:
- /opt/hvega/hvega
- /opt/hvega/ihaskell-hvega

# extra-deps from IHaskell/stack.yaml
- active-0.2.0.14
- Chart-cairo-1.9.3
- diagrams-1.4
- diagrams-cairo-1.4.1.1
- diagrams-contrib-1.4.4
- diagrams-core-1.5.0
- diagrams-lib-1.4.4
- diagrams-svg-1.4.3
- cairo-0.13.8.1
- pango-0.13.8.1
- glib-0.13.8.1
# https://github.com/haskell/ThreadScope/issues/122#issuecomment-1178457328
- gtk2hs-buildtools-0.13.8.3
- magic-1.1
- plot-0.2.3.11
# - static-canvas-0.2.0.3
- statestack-0.3
- vinyl-0.13.0
- dual-tree-0.2.2.1
- monoid-extras-0.6
- svg-builder-0.1.1
- force-layout-0.4.0.6

# Resolver copied from IHaskell/stack.yaml, see the Dockerfile.

0 comments on commit aea6696

Please sign in to comment.