Skip to content

Commit

Permalink
Updates debian base and tools
Browse files Browse the repository at this point in the history
- Updates debian base to current stable
- GHC to 9.6.6
- HLS, stack, weeder updated to latest
- Adds cabal
  • Loading branch information
telser committed Oct 23, 2024
1 parent 5314c42 commit eb5da39
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
8 changes: 6 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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

Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions tool-versions.env
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit eb5da39

Please sign in to comment.