HASKELL: GHC 8.4.4 and 8.6.2

[psftw]

Note: existing tests will spit out extra warning output but still pass. There is another PR to address this that I'll link here

[psftw]

#5121 (haskell test update)

[yosifkit]

Diff:

diff --git a/_bashbrew-arches b/_bashbrew-arches
index 04f4713..fb967fa 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,2 +1,2 @@
-haskell:8.2 @ amd64
+haskell:8.4 @ amd64
 haskell:latest @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 277b838..129f4b9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,6 +1,6 @@
 haskell:8
-haskell:8.2
-haskell:8.2.2
 haskell:8.4
-haskell:8.4.3
+haskell:8.4.4
+haskell:8.6
+haskell:8.6.2
 haskell:latest
diff --git a/haskell_8.2/Dockerfile b/haskell_8.4/Dockerfile
similarity index 74%
rename from haskell_8.2/Dockerfile
rename to haskell_8.4/Dockerfile
index 61e3123..464b713 100644
--- a/haskell_8.2/Dockerfile
+++ b/haskell_8.4/Dockerfile
@@ -9,20 +9,20 @@ RUN apt-get update && \
     echo 'deb http://downloads.haskell.org/debian stretch main' > /etc/apt/sources.list.d/ghc.list && \
     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA3CBA3FFE22B574 && \
     apt-get update && \
-    apt-get install -y --no-install-recommends ghc-8.2.2 cabal-install-2.2 \
+    apt-get install -y --no-install-recommends ghc-8.4.4 cabal-install-2.4 \
         zlib1g-dev libtinfo-dev libsqlite3-dev g++ netbase xz-utils make && \
-    curl -fSL https://github.com/commercialhaskell/stack/releases/download/v1.7.1/stack-1.7.1-linux-x86_64.tar.gz -o stack.tar.gz && \
-    curl -fSL https://github.com/commercialhaskell/stack/releases/download/v1.7.1/stack-1.7.1-linux-x86_64.tar.gz.asc -o stack.tar.gz.asc && \
+    curl -fSL https://github.com/commercialhaskell/stack/releases/download/v1.9.1/stack-1.9.1-linux-x86_64.tar.gz -o stack.tar.gz && \
+    curl -fSL https://github.com/commercialhaskell/stack/releases/download/v1.9.1/stack-1.9.1-linux-x86_64.tar.gz.asc -o stack.tar.gz.asc && \
     apt-get purge -y --auto-remove curl && \
     export GNUPGHOME="$(mktemp -d)" && \
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys C5705533DA4F78D8664B5DC0575159689BEFB442 && \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys C5705533DA4F78D8664B5DC0575159689BEFB442 && \
     gpg --batch --verify stack.tar.gz.asc stack.tar.gz && \
     tar -xf stack.tar.gz -C /usr/local/bin --strip-components=1 && \
     /usr/local/bin/stack config set system-ghc --global true && \
     /usr/local/bin/stack config set install-ghc --global false && \
     rm -rf "$GNUPGHOME" /var/lib/apt/lists/* /stack.tar.gz.asc /stack.tar.gz
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/cabal/2.2/bin:/opt/ghc/8.2.2/bin:$PATH
+ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/cabal/2.4/bin:/opt/ghc/8.4.4/bin:$PATH
 
 ## run ghci by default unless a command is specified
 CMD ["ghci"]
diff --git a/haskell_latest/Dockerfile b/haskell_latest/Dockerfile
index 95e7a64..6951294 100644
--- a/haskell_latest/Dockerfile
+++ b/haskell_latest/Dockerfile
@@ -9,20 +9,20 @@ RUN apt-get update && \
     echo 'deb http://downloads.haskell.org/debian stretch main' > /etc/apt/sources.list.d/ghc.list && \
     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA3CBA3FFE22B574 && \
     apt-get update && \
-    apt-get install -y --no-install-recommends ghc-8.4.3 cabal-install-2.2 \
+    apt-get install -y --no-install-recommends ghc-8.6.2 cabal-install-2.4 \
         zlib1g-dev libtinfo-dev libsqlite3-dev g++ netbase xz-utils make && \
-    curl -fSL https://github.com/commercialhaskell/stack/releases/download/v1.7.1/stack-1.7.1-linux-x86_64.tar.gz -o stack.tar.gz && \
-    curl -fSL https://github.com/commercialhaskell/stack/releases/download/v1.7.1/stack-1.7.1-linux-x86_64.tar.gz.asc -o stack.tar.gz.asc && \
+    curl -fSL https://github.com/commercialhaskell/stack/releases/download/v1.9.1/stack-1.9.1-linux-x86_64.tar.gz -o stack.tar.gz && \
+    curl -fSL https://github.com/commercialhaskell/stack/releases/download/v1.9.1/stack-1.9.1-linux-x86_64.tar.gz.asc -o stack.tar.gz.asc && \
     apt-get purge -y --auto-remove curl && \
     export GNUPGHOME="$(mktemp -d)" && \
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys C5705533DA4F78D8664B5DC0575159689BEFB442 && \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys C5705533DA4F78D8664B5DC0575159689BEFB442 && \
     gpg --batch --verify stack.tar.gz.asc stack.tar.gz && \
     tar -xf stack.tar.gz -C /usr/local/bin --strip-components=1 && \
     /usr/local/bin/stack config set system-ghc --global true && \
     /usr/local/bin/stack config set install-ghc --global false && \
     rm -rf "$GNUPGHOME" /var/lib/apt/lists/* /stack.tar.gz.asc /stack.tar.gz
 
-ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/cabal/2.2/bin:/opt/ghc/8.4.3/bin:$PATH
+ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/cabal/2.4/bin:/opt/ghc/8.6.2/bin:$PATH
 
 ## run ghci by default unless a command is specified
 CMD ["ghci"]

[yosifkit]

Build test of #5120; 691d3255; amd64 (haskell):

$ bashbrew build haskell:8.6.2
Building bashbrew/cache:f9afa48fe16b1c81d160871db3d1253e4a060b4effb3c598b1b77d5aad7909b0 (haskell:8.6.2)
Tagging haskell:8.6.2
Tagging haskell:8.6
Tagging haskell:8
Tagging haskell:latest

$ test/run.sh haskell:8.6.2
testing haskell:8.6.2
	'utc' [1/8]...passed
	'cve-2014--shellshock' [2/8]...passed
	'no-hard-coded-passwords' [3/8]...passed
	'override-cmd' [4/8]...passed
	'haskell-cabal' [5/8]...passed
	'haskell-stack' [6/8]...passed
	'haskell-ghci' [7/8]...passed
	'haskell-runhaskell' [8/8]...passed


$ bashbrew build haskell:8.4.4
Building bashbrew/cache:a2043aa48ac143db9aac1144c56a5cffa781138b40ebb9f6de5e0dabae3bd55b (haskell:8.4.4)
Tagging haskell:8.4.4
Tagging haskell:8.4

$ test/run.sh haskell:8.4.4
testing haskell:8.4.4
	'utc' [1/8]...passed
	'cve-2014--shellshock' [2/8]...passed
	'no-hard-coded-passwords' [3/8]...passed
	'override-cmd' [4/8]...passed
	'haskell-cabal' [5/8]...passed
	'haskell-stack' [6/8]...passed
	'haskell-ghci' [7/8]...passed
	'haskell-runhaskell' [8/8]...passed