Skip to content

Commit 3a85dbd

Browse files
Merge pull request #2 from marijnvanwezel/1-use-release-of-hls-for-ghc-984
Use release version of HLS
2 parents 1d09644 + 4ecd94f commit 3a85dbd

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG GHC_VERSION=9.8.4
55
ARG STACK_VERSION=3.1.1
66
ARG STACK_RESOLVER=lts-23.8
77
ARG CABAL_VERSION=3.12.1.0
8-
ARG HLS_GIT_REF=25c5d82ce09431a1b53dfa1784a276a709f5e479
8+
ARG HLS_VERSION=2.10.0.0
99

1010
ENV LANG=C.UTF-8 \
1111
DEBIAN_FRONTEND=noninteractive \
@@ -15,7 +15,7 @@ ENV LANG=C.UTF-8 \
1515
STACK_VERSION=${STACK_VERSION} \
1616
STACK_RESOLVER=${STACK_RESOLVER} \
1717
CABAL_VERSION=${CABAL_VERSION} \
18-
HLS_GIT_REF=${HLS_GIT_REF}
18+
HLS_VERSION=${HLS_VERSION}
1919

2020
RUN ulimit -n 8192
2121
RUN apt-get update --yes && \
@@ -69,8 +69,8 @@ RUN ((stack ghc -- --version 2>/dev/null) || true) && \
6969
stack config --system-ghc set resolver ${STACK_RESOLVER}
7070
RUN printf "ghc-options:\n \"\$everything\": -haddock\n" >> ~/.stack/config.yaml
7171

72-
# Compile HLS from source
73-
RUN ghcup compile hls --ghc ${GHC_VERSION} --git-ref ${HLS_GIT_REF} --set
72+
# Install HLS
73+
RUN ghcup install hls ${HLS_VERSION} --set
7474

7575
# Install useful dependencies
7676
RUN cabal update && \

0 commit comments

Comments
 (0)