Upgrade stack to 2.3.1 (#1166)

* upgrade stack in Dockerfile.prebuilder * update installation instructions for Stack
wireapp · Jul 13, 2020 · 348a62a · 348a62a
1 parent 3610f89
commit 348a62a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/build/alpine/Dockerfile.prebuilder b/build/alpine/Dockerfile.prebuilder
@@ -40,7 +40,7 @@ RUN apk add --no-cache \
         sed
 
 # get static version of Haskell Stack and use system ghc by default
-ARG STACK_ALPINE_VERSION=2.1.3
+ARG STACK_ALPINE_VERSION=2.3.1
 RUN curl -sSfL https://github.com/commercialhaskell/stack/releases/download/v${STACK_ALPINE_VERSION}/stack-${STACK_ALPINE_VERSION}-linux-x86_64-static.tar.gz \
     | tar --wildcards -C /usr/local/bin --strip-components=1 -xzvf - '*/stack' && chmod 755 /usr/local/bin/stack && \
     stack config set system-ghc --global true
diff --git a/docs/developer/dependencies.md b/docs/developer/dependencies.md
@@ -17,7 +17,7 @@ sudo dnf install -y pkgconfig haskell-platform libstdc++-devel libstdc++-static
 
 ### Ubuntu / Debian:
 
-_Note_: Debian is not recommended due to this issue when running local integration tests: [#327](https://github.com/wireapp/wire-server/issues/327)*. This issue does not occur with Ubuntu.
+_Note_: Debian is not recommended due to this issue when running local integration tests: [#327](https://github.com/wireapp/wire-server/issues/327). This issue does not occur with Ubuntu.
 
 ```bash
 sudo apt install pkg-config libsodium-dev openssl-dev libtool automake build-essential libicu-dev libsnappy-dev libgeoip-dev protobuf-compiler libxml2-dev zlib1g-dev -y
@@ -59,16 +59,12 @@ sudo installer -pkg /Library/Developer/CommandLineTools/Packages/macOS_SDK_heade
 
 ## Haskell Stack
 
-When you're done, ensure `stack --version` is >= 1.6.5
+Please refer to [Stack's installation instructions](https://docs.haskellstack.org/en/stable/README/#how-to-install).
 
-You may wish to make executables installed by stack available, by e.g. adding the following to your shell profile:
+When you're done, ensure `stack --version` is recent, ideally the same as `STACK_ALPINE_VERSION` in [`build/alpine/Dockerfile.prebuilder`](../../build/alpine/Dockerfile.prebuilder).
 
-```bash
-export PATH=~/.local/bin:$PATH
-```
-
-### Ubuntu / Debian Unstable
-_Note_: Debian stretch packages too old of a version of haskell-stack. It is recommended to retrieve the version available from testing, or unstable, or to use stack to update stack.(https://github.com/commercialhaskell/stack/issues/3686)*
+### Ubuntu / Debian
+_Note_: The packaged versions of `haskell-stack` are too old. It is recommended to follow the generic instructions or to use stack to update stack (`stack upgrade`).
 
 ```bash
 sudo apt install haskell-stack -y