From 20bb7bab0297c85e30aec70e97cb55abe08061e1 Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Sun, 12 Feb 2017 06:49:39 -0800 Subject: [PATCH 1/2] debian-bootstrap.sh: use get.haskellstack.org to install stack Since download.fpcomplete.com Ubuntu/Debian package repos are being phased out. --- debian-bootstrap.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 93d04aff..fd226af9 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -27,10 +27,6 @@ add-apt-repository -y ppa:marutter/rrutter # Set the GHC version GHCVER=8.0.2 -# Get Stack -apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 575159689BEFB442 -echo 'deb http://download.fpcomplete.com/ubuntu xenial main'|tee /etc/apt/sources.list.d/fpco.list - apt-get update apt-get install -y \ build-essential \ @@ -122,13 +118,14 @@ apt-get install -y \ r-base \ r-base-dev \ ruby-dev \ - stack \ wget \ xclip \ z3 \ zip \ zlib1g-dev +curl -sSL https://get.haskellstack.org/ | sh + # Put documentation where we expect it mv /opt/ghc/$GHCVER/share/doc/ghc-$GHCVER/ /opt/ghc/$GHCVER/share/doc/ghc From 93738c5865fdd0627508617215d01b78d4e2bf74 Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Sun, 12 Feb 2017 07:01:27 -0800 Subject: [PATCH 2/2] Install locales before running locale-gen --- debian-bootstrap.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index fd226af9..8c718702 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -13,7 +13,6 @@ set -exu mkdir /home/stackage -p -locale-gen en_US.UTF-8 export DEBIAN_FRONTEND=noninteractive apt-get update @@ -110,6 +109,7 @@ apt-get install -y \ libzip-dev \ libzmq3-dev \ llvm-3.7 \ + locales \ m4 \ nettle-dev \ nodejs \ @@ -124,6 +124,8 @@ apt-get install -y \ zip \ zlib1g-dev +locale-gen en_US.UTF-8 + curl -sSL https://get.haskellstack.org/ | sh # Put documentation where we expect it