From c321990cf5ab86a1240bc3d2417116e2df4e52ff Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 Mar 2019 13:52:42 +0000 Subject: [PATCH] Revert "More fixes for moving to Stack-installed GHC" This reverts commit 7c92436248afe4b21099d0babc2af87d72d9c9ac. --- debian-bootstrap.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 66cf7ff9..bf79803b 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -27,12 +27,15 @@ stack setup --resolver ghc-$GHCVER apt-get update apt-get install -y software-properties-common +add-apt-repository ppa:hvr/ghc -y add-apt-repository -y ppa:marutter/rrutter apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy main' add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main' add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main' +GHCVER=8.6.4 + apt-get update apt-get install -y \ apt-transport-https \ @@ -44,6 +47,10 @@ apt-get install -y \ fsharp \ g++ \ gawk \ + ghc-$GHCVER \ + ghc-$GHCVER-dyn \ + ghc-$GHCVER-htmldocs \ + ghc-$GHCVER-prof \ git \ gnupg \ gradle \