diff --git a/aarch64-linux-deb10/Dockerfile b/aarch64-linux-deb10/Dockerfile index 1302ea6d77ff7a7761557778f9ff0c827000cec2..dc81097879917a47dba2e4c8abb4db148e2386df 100644 --- a/aarch64-linux-deb10/Dockerfile +++ b/aarch64-linux-deb10/Dockerfile @@ -62,8 +62,8 @@ USER ghc WORKDIR /home/ghc/ # Build Haskell tools -RUN cabal update && \ - cabal install hscolour happy alex --constraint 'happy ^>= 1.19.10' +RUN cabal v2-update && \ + cabal install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"] diff --git a/armv7-linux-deb10/Dockerfile b/armv7-linux-deb10/Dockerfile index 904ef22f575d31535a9c1d8fc48645f231789dc2..881d05377f6b2a27f6d5d4b231204eb88f4d0aed 100644 --- a/armv7-linux-deb10/Dockerfile +++ b/armv7-linux-deb10/Dockerfile @@ -63,8 +63,8 @@ USER ghc WORKDIR /home/ghc/ # Build Haskell tools -RUN cabal update && \ - cabal install hscolour happy alex --constraint 'happy ^>= 1.19.10' +RUN cabal v2-update && \ + cabal install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"] diff --git a/i386-linux-deb9/Dockerfile b/i386-linux-deb9/Dockerfile index 7f36ce5ca2c49daba233a6109e15c3c3c06445b0..9004d87af5e749ab49476aeb6275c89d53cdb2d9 100644 --- a/i386-linux-deb9/Dockerfile +++ b/i386-linux-deb9/Dockerfile @@ -43,7 +43,7 @@ WORKDIR /home/ghc/ # Build Haskell tools RUN cabal v2-update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"] diff --git a/linters/Dockerfile b/linters/Dockerfile index c4e68094b4ab50fdf9683b6d18e1f393d4c77af1..e2ba40dc08c3a9ed2c9892bb6daea4723d6f7c9f 100644 --- a/linters/Dockerfile +++ b/linters/Dockerfile @@ -56,7 +56,7 @@ WORKDIR /home/ghc/ # Build Haskell tools RUN cabal v2-update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH # Build Linting tools @@ -67,7 +67,7 @@ RUN apt-get update -qq; apt-get install --no-install-recommends -qy python3-pip RUN pip3 install mypy==0.701 USER ghc -RUN cabal update +RUN cabal v2-update ENV LINTER_COMMIT b5650c094c98daec9416ceac92ca2cf3c099640f RUN git clone https://gitlab.haskell.org/ghc/git-haskell-org-hooks && \ git -C git-haskell-org-hooks checkout $LINTER_COMMIT diff --git a/x86_64-linux-alpine/Dockerfile b/x86_64-linux-alpine/Dockerfile index b6fcf70487748829d4222e5656c3203044dc2fdc..6f335db8d13e0bc49ebbf21250a49d1a0b789c13 100644 --- a/x86_64-linux-alpine/Dockerfile +++ b/x86_64-linux-alpine/Dockerfile @@ -61,7 +61,8 @@ ENV PATH /home/ghc/.cabal/bin:$PATH # Build Haskell tools RUN cabal user-config update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-update && \ + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV SPHINXBUILD /usr/bin/sphinx-build-3 CMD ["bash"] diff --git a/x86_64-linux-centos7/Dockerfile b/x86_64-linux-centos7/Dockerfile index 9c57a9b2253fd30891202df978db047d81ba47c7..3f65e6319588e8a732138cb841a66fbdf48b51f5 100644 --- a/x86_64-linux-centos7/Dockerfile +++ b/x86_64-linux-centos7/Dockerfile @@ -55,7 +55,7 @@ WORKDIR /home/ghc/ # Build Haskell tools RUN cabal v2-update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"] diff --git a/x86_64-linux-deb10/Dockerfile b/x86_64-linux-deb10/Dockerfile index 89950fbdf557d6b4a3e8dd9b9c21e91e1f273c3d..d46b37bb12163ceb647128fa731121b3c920dc9d 100644 --- a/x86_64-linux-deb10/Dockerfile +++ b/x86_64-linux-deb10/Dockerfile @@ -71,7 +71,7 @@ WORKDIR /home/ghc/ # Build Haskell tools RUN cabal v2-update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"] diff --git a/x86_64-linux-deb8/Dockerfile b/x86_64-linux-deb8/Dockerfile index b7f5177d50a084a89021586e51e6367dc434c8c0..26bec11fd0a49e63de0355891971be528023ab4b 100644 --- a/x86_64-linux-deb8/Dockerfile +++ b/x86_64-linux-deb8/Dockerfile @@ -41,7 +41,7 @@ WORKDIR /home/ghc/ # Build Haskell tools RUN cabal v2-update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"] diff --git a/x86_64-linux-deb9/Dockerfile b/x86_64-linux-deb9/Dockerfile index 646f103ad4a673a0b28525c95fc0d19548ef6bbc..04bfcba3b291e8b578b769f71ad95b041a9590a8 100644 --- a/x86_64-linux-deb9/Dockerfile +++ b/x86_64-linux-deb9/Dockerfile @@ -56,7 +56,7 @@ WORKDIR /home/ghc/ # Build Haskell tools RUN cabal v2-update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"] diff --git a/x86_64-linux-fedora27/Dockerfile b/x86_64-linux-fedora27/Dockerfile index c8a36b6b4ef73d7f0b1773aa30ee1bdfca69e99d..03c128773ee3a5c5bfca3fa07b0caf800ab14a66 100644 --- a/x86_64-linux-fedora27/Dockerfile +++ b/x86_64-linux-fedora27/Dockerfile @@ -49,7 +49,7 @@ WORKDIR /home/ghc/ # Build Haskell tools RUN cabal v2-update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"] diff --git a/x86_64-linux-ubuntu2004/Dockerfile b/x86_64-linux-ubuntu2004/Dockerfile index 58a91283d558680a15d99742afa813aa703ac86a..5a4861530c7c31a9c0d9e0c908d4d90fa19057fb 100644 --- a/x86_64-linux-ubuntu2004/Dockerfile +++ b/x86_64-linux-ubuntu2004/Dockerfile @@ -57,7 +57,7 @@ WORKDIR /home/ghc/ # Build Haskell tools RUN cabal v2-update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' + cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.20.0' ENV PATH /home/ghc/.cabal/bin:$PATH CMD ["bash"]