From 0aa9dfa224f3520a8312907ec69a3e751a6bc180 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 2 Jun 2020 18:20:46 -0400 Subject: [PATCH 1/2] Bump cabal-install to 3.2.0.0 --- aarch64-linux-deb10/Dockerfile | 2 +- armv7-linux-deb10/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aarch64-linux-deb10/Dockerfile b/aarch64-linux-deb10/Dockerfile index dc81097..24cdce5 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 881d053..0118c57 100644 --- a/armv7-linux-deb10/Dockerfile +++ b/armv7-linux-deb10/Dockerfile @@ -50,7 +50,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-armv7l-debian9-linux.tar.xz | tar -Jx && \ mv cabal /usr/local/bin/cabal -- GitLab From 2c67d6b37c3a7ee3278f13b0e158a9f2f74650d8 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 1 Sep 2020 15:05:56 -0400 Subject: [PATCH 2/2] armv7: Build cabal-install --- armv7-linux-deb10/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/armv7-linux-deb10/Dockerfile b/armv7-linux-deb10/Dockerfile index 0118c57..5bfb578 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/* @@ -51,8 +52,8 @@ RUN curl -L https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0. # Cabal ENV CABAL_VERSION 3.2.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 +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 -- GitLab