on master help sign in
Merge pull request #2509 from pepeiborra/master
f91d5c9Mihai Maruseac
build-constraints.yaml+1−1
@@ -8,7 +8,7 @@ packages:
8 - clr-marshal
8 - clr-marshal
9 - clr-host
9 - clr-host
10 - threepenny-editors
10 - threepenny-editors
11− # - clr-inline # https://github.com/fpco/stackage/pull/2470
11+ - clr-inline
12
12
13 "Joshua Koike <jkoike2013@gmail.com> @jano017":
13 "Joshua Koike <jkoike2013@gmail.com> @jano017":
14 - discord-hs
14 - discord-hs
debian-bootstrap.sh+5−1
@@ -7,7 +7,7 @@
7# wget -O - https://raw.github.com/fpco/stackage/master/debian-bootstrap.sh | bash -ex
7# wget -O - https://raw.github.com/fpco/stackage/master/debian-bootstrap.sh | bash -ex
8
8
9# NOTE: Requires that GHC and Cabal are installed and on your PATH. For
9# NOTE: Requires that GHC and Cabal are installed and on your PATH. For
10−# instructions, see:
10+# instructions,see:
11# http://www.stackage.org/install
11# http://www.stackage.org/install
12
12
13set -exu
13set -exu
@@ -20,6 +20,10 @@ apt-get install -y software-properties-common
20
20
21add-apt-repository ppa:hvr/ghc -y
21add-apt-repository ppa:hvr/ghc -y
22add-apt-repository -y ppa:marutter/rrutter
22add-apt-repository -y ppa:marutter/rrutter
23+apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
24+add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy main'
25+add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main'
26+add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main'
23
27
24GHCVER=8.0.2
28GHCVER=8.0.2
25
29