From b86f58f171c68018849bd572bb3b3e940fab1633 Mon Sep 17 00:00:00 2001 From: Michal Podhradsky Date: Thu, 16 Feb 2023 09:42:56 -0800 Subject: [PATCH] more readable cabal setup --- Dockerfile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7fc3158..1b2761f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -194,10 +194,8 @@ ARG REPO=https://github.com/GaloisInc/cryptol.git RUN git clone ${REPO} /tmp/${TOOL} WORKDIR /tmp/${TOOL} # Build fix -COPY < cabal.project.local +RUN echo " parameterized-utils < 2.1.6" >> cabal.project.local RUN \ git checkout ${TAG} \ && git submodule update --init \