Update tool dependencies (#2188)

* nix: update haskell.nix

* Dockerfile: parameterize over hlint and stylish-haskell versions

* hlint: 3.1 -> 3.2

* z3: 4.6.0 -> 4.8.8

* Dockerfile: Don't install rust

* Dockerfile: Remove -dev dependencies

Author: ttuegel

.hlint.yaml

@@ -79,6 +79,7 @@
 - ignore: {name: "Use infix"}
 - ignore: {name: "Use section"}
 - ignore: {name: "Use <$>"}
+- ignore: {name: "Use <&>"}
 - ignore: {name: "Redundant flip"}
 - ignore: {name: "Monad law, left identity"}
 - ignore: {name: "Monoid law, left identity"}

Dockerfile

@@ -7,20 +7,11 @@ RUN    ln --symbolic --no-dereference --force /usr/share/zoneinfo/$TZ /etc/local
 RUN    apt update                                                                \
     && apt upgrade --yes                                                         \
     && apt install --yes                                                         \
-           autoconf bison clang-6.0 cmake curl flex gcc git jq libboost-test-dev \
-           libffi-dev libgmp-dev libjemalloc-dev libmpfr-dev libtool             \
-           libyaml-cpp-dev libz3-dev make maven opam openjdk-8-jdk pandoc        \
-           pkg-config python3 python-pygments python-recommonmark python-sphinx  \
-           time zlib1g-dev
-
-RUN    git clone 'https://github.com/z3prover/z3' --branch=z3-4.6.0 \
-    && cd z3                                                        \
-    && python scripts/mk_make.py                                    \
-    && cd build                                                     \
-    && make -j8                                                     \
-    && make install                                                 \
-    && cd ../..                                                     \
-    && rm -rf z3
+           bison curl flex gcc git jq                                            \
+           make openjdk-8-jdk pandoc                                             \
+           libtinfo-dev                                                          \
+           python3 python-pygments python-recommonmark python-sphinx             \
+           time unzip wget
 
 RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
 
@@ -34,18 +25,26 @@ RUN /home/user/.install-stack/install-stack.sh
 
 USER $USER_ID:$GROUP_ID
 
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.28.0
-
 ENV LC_ALL=C.UTF-8
 
+ARG Z3=4.8.8
+RUN    cd /home/user \
+    && wget https://github.com/Z3Prover/z3/releases/download/z3-$Z3/z3-$Z3-x64-ubuntu-16.04.zip \
+    && unzip z3-$Z3-x64-ubuntu-16.04.zip \
+    && rm z3-$Z3-x64-ubuntu-16.04.zip \
+    && mv z3-$Z3-x64-ubuntu-16.04 z3
+ENV PATH=/home/user/z3/bin:$PATH
+
+ARG HLINT=3.2
 RUN    cd /home/user \
-    && curl https://github.com/ndmitchell/hlint/releases/download/v3.1/hlint-3.1-x86_64-linux.tar.gz -sSfL | tar xzf - \
-    && mv hlint-3.1 hlint
+    && curl https://github.com/ndmitchell/hlint/releases/download/v$HLINT/hlint-$HLINT-x86_64-linux.tar.gz -sSfL | tar xzf - \
+    && mv hlint-$HLINT hlint
 ENV PATH=/home/user/hlint:$PATH
 
+ARG STYLISH_HASKELL=0.11.0.0
 RUN    cd /home/user \
-    && curl https://github.com/jaspervdj/stylish-haskell/releases/download/v0.11.0.0/stylish-haskell-v0.11.0.0-linux-x86_64.tar.gz -sSfL | tar xzf - \
-    && mv stylish-haskell-v0.11.0.0-linux-x86_64 stylish-haskell
+    && curl https://github.com/jaspervdj/stylish-haskell/releases/download/v$STYLISH_HASKELL/stylish-haskell-v$STYLISH_HASKELL-linux-x86_64.tar.gz -sSfL | tar xzf - \
+    && mv stylish-haskell-v$STYLISH_HASKELL-linux-x86_64 stylish-haskell
 ENV PATH=/home/user/stylish-haskell:$PATH
 
 ADD --chown=user:user stack.yaml /home/user/.tmp-haskell/

nix/sources.json

@@ -17,24 +17,24 @@
         "homepage": "https://input-output-hk.github.io/haskell.nix",
         "owner": "input-output-hk",
         "repo": "haskell.nix",
-        "rev": "239d588fdc3d97f635c849d0f5c599ccb2f5a61a",
-        "sha256": "1z4kmksjgshb2s441mjs7kyvra2ad0rjryzsbax06yc9r5vkqz0j",
+        "rev": "33cd29ee330d34c8c99a9ce56fb3529b44cf3224",
+        "sha256": "1jgwz2iahvn43w398aanm4djzjmr5a2hcv1ijzi9vh79circ7ffz",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/haskell.nix/archive/239d588fdc3d97f635c849d0f5c599ccb2f5a61a.tar.gz",
+        "url": "https://github.com/input-output-hk/haskell.nix/archive/33cd29ee330d34c8c99a9ce56fb3529b44cf3224.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "hlint": {
-        "branch": "master",
+        "branch": "v3.2",
         "description": "Haskell source code suggestions",
         "homepage": null,
         "owner": "ndmitchell",
         "repo": "hlint",
-        "rev": "6c24ec497bbea3c40717d0a83c27fe3dc4936023",
-        "sha256": "02mg93psf34gcrffa9ghmvgszwcg0qw3bxhfzi39qp09m3vymc68",
+        "rev": "b2fd3a720bba011bd77ed15bc4141b8fb996566e",
+        "sha256": "1h2vi271y3c266b1hp1d18af8kr6nw6g1ys2k8v1cw5bjnm0rf7r",
         "type": "tarball",
-        "url": "https://github.com/ndmitchell/hlint/archive/6c24ec497bbea3c40717d0a83c27fe3dc4936023.tar.gz",
+        "url": "https://github.com/ndmitchell/hlint/archive/b2fd3a720bba011bd77ed15bc4141b8fb996566e.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
-        "version": "v3.1.6"
+        "version": "v3.2"
     },
     "niv": {
         "branch": "master",