diff --git a/Dockerfile b/Dockerfile index 533f7ed..02f17f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:stable-20230814-slim +FROM debian:stable-20241016-slim LABEL org.opencontainers.image.source="https://github.com/flipstone/haskell-tools" @@ -7,7 +7,7 @@ ENV LANG="C.UTF-8" LANGUAGE="C.UTF-8" LC_ALL="C.UTF-8" ARG DEBIAN_FRONTEND=noninteractive ARG BOOTSTRAP_HASKELL_MINIMAL=1 ARG BOOTSTRAP_HASKELL_NONINTERACTIVE=1 -ARG GHCUP_INSTALL_BASE_PREFIX=/usr/local +ENV GHCUP_INSTALL_BASE_PREFIX=/usr/local ADD install-tools.sh /install-tools.sh @@ -40,5 +40,9 @@ RUN ghcup install ghc $GHC_VERSION --set ARG HLS_VERSION RUN ghcup install hls $HLS_VERSION --set +# CABAL_VERSION is managed in tool-versions.env +ARG CABAL_VERSION +RUN ghcup install cabal $CABAL_VERSION --set + ADD stack.yaml /stack.yaml RUN /bin/sh /install-tools.sh diff --git a/stack.yaml b/stack.yaml index 3aefee3..897b15a 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,6 +1,6 @@ system-ghc: true install-ghc: false -resolver: lts-22.22 +resolver: lts-22.39 packages: [] extra-deps: - - weeder-2.8.0 + - weeder-2.9.0 diff --git a/tool-versions.env b/tool-versions.env index 6e6210d..469d6df 100644 --- a/tool-versions.env +++ b/tool-versions.env @@ -1,4 +1,4 @@ -GHC_VERSION=9.6.5 -STACK_VERSION=2.15.7 -HLS_VERSION=2.8.0.0 - +GHC_VERSION=9.6.6 +STACK_VERSION=3.1.1 +HLS_VERSION=2.9.0.1 +CABAL_VERSION=3.12.1.0