@@ -27,10 +27,6 @@ add-apt-repository -y ppa:marutter/rrutter
27# Set the GHC version
27# Set the GHC version
28GHCVER=8.0.2
28GHCVER=8.0.2
31−apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 575159689BEFB442
32−echo 'deb http://download.fpcomplete.com/ubuntu xenial main'|tee /etc/apt/sources.list.d/fpco.list
34apt-get update
30apt-get update
35apt-get install -y \
31apt-get install -y \
36 build-essential \
32 build-essential \
@@ -122,13 +118,14 @@ apt-get install -y \
123 r-base-dev \
119 r-base-dev \
124 ruby-dev \
120 ruby-dev \
130 zlib1g-dev
125 zlib1g-dev
127+curl -sSL https://get.haskellstack.org/ | sh
132# Put documentation where we expect it
129# Put documentation where we expect it
133mv /opt/ghc/$GHCVER/share/doc/ghc-$GHCVER/ /opt/ghc/$GHCVER/share/doc/ghc
130mv /opt/ghc/$GHCVER/share/doc/ghc-$GHCVER/ /opt/ghc/$GHCVER/share/doc/ghc