diff --git a/aarch64-linux-deb10/Dockerfile b/aarch64-linux-deb10/Dockerfile index dc81097879917a47dba2e4c8abb4db148e2386df..24cdce548addc14dff6817493d122c99f0ead0e1 100644 --- a/aarch64-linux-deb10/Dockerfile +++ b/aarch64-linux-deb10/Dockerfile @@ -49,7 +49,7 @@ RUN curl -L https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0. llc --version # Cabal -ENV CABAL_VERSION 3.0.0.0 +ENV CABAL_VERSION 3.2.0.0 RUN curl -L http://home.smart-cactus.org/~ben/ghc/cabal-install-$CABAL_VERSION-aarch64-debian9-linux.tar.xz | tar -Jx && \ mv cabal /usr/local/bin/cabal diff --git a/armv7-linux-deb10/Dockerfile b/armv7-linux-deb10/Dockerfile index 881d05377f6b2a27f6d5d4b231204eb88f4d0aed..5bfb5787f6f614566339e7b8918a2e81e09e0b54 100644 --- a/armv7-linux-deb10/Dockerfile +++ b/armv7-linux-deb10/Dockerfile @@ -15,6 +15,7 @@ RUN apt-get update \ libtinfo5 \ # Documentation tools python3-sphinx texlive-xetex texlive-latex-extra texlive-binaries texlive-fonts-recommended lmodern texlive-generic-extra \ + cabal-install \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -50,9 +51,9 @@ RUN curl -L https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0. llc --version # Cabal -ENV CABAL_VERSION 3.0.0.0 -RUN curl -L http://home.smart-cactus.org/~ben/ghc/cabal-install-$CABAL_VERSION-armv7l-debian9-linux.tar.xz | tar -Jx && \ - mv cabal /usr/local/bin/cabal +ENV CABAL_VERSION 3.2.0.0 +RUN cabal update && cabal install "cabal-install==$CABAL_VERSION" && \ + mv "$HOME/.cabal/bin/cabal" /usr/local/bin/cabal ENV PATH /home/ghc/.local/bin:/opt/ghc/$GHC_VERSION/bin:$PATH