Skip to content

Commit

Permalink
more readable cabal setup
Browse files Browse the repository at this point in the history
  • Loading branch information
podhrmic committed Feb 16, 2023
1 parent 81c461f commit b86f58f
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ RUN \
&& chmod +x /usr/local/bin/ghcup
ENV PATH="/root/.ghcup/bin:${PATH}"
RUN \
ghcup install ghc 8.8.4 \
&& ghcup set ghc 8.8.4 \
ghcup install ghc 8.10.7 \
&& ghcup set ghc 8.10.7 \
&& ghcup install cabal
RUN cabal update

Expand All @@ -194,10 +194,8 @@ ARG REPO=https://github.com/GaloisInc/cryptol.git
RUN git clone ${REPO} /tmp/${TOOL}
WORKDIR /tmp/${TOOL}
# Build fix
COPY <<EOF cabal.project.local
constraints:
parameterized-utils < 2.1.6
EOF
RUN echo "constraints:" > cabal.project.local
RUN echo " parameterized-utils < 2.1.6" >> cabal.project.local
RUN \
git checkout ${TAG} \
&& git submodule update --init \
Expand Down

0 comments on commit b86f58f

Please sign in to comment.