git.iko.soy/stackage
on master help sign in
Merge pull request #1442 from juhp/master

take 2 at Ubuntu 16.04 Xenial (#1439)

commitb22c23a9b3a14b4931759e124de38c00b89f5336 authorJens Petersen <juhpetersen@gmail.com> dateMon 16 May 2016, 14:20 (10 years ago) parentcdfd6a52c455ea
3 files changed+14−30
compare with master
unifiedsplit
Dockerfile+1−1 build-constraints.yaml+3−5 debian-bootstrap.sh+10−24
Dockerfile+1−1
@@ -1,4 +1,4 @@
1−FROM ubuntu:14.04
1+FROM ubuntu:16.04
22
33ENV HOME /home/stackage
44ENV LANG en_US.UTF-8
build-constraints.yaml+3−5
@@ -1354,7 +1354,8 @@ packages:
13541354 "Michael Xavier <michael@michaelxavier.net> @MichaelXavier":
13551355 - angel
13561356 - uri-bytestring
1357− - phash
1357+ # https://github.com/MichaelXavier/phash/issues/5
1358+ #- phash
13581359 - cron
13591360 - tasty-tap
13601361 - tasty-fail-fast
@@ -2372,10 +2373,7 @@ skipped-builds:
23722373 - Win32-notify
23732374 - Win32-extras
23742375
2375− # The Docker image needs libsystemd-dev from Ubuntu 15.04+ for this.
2376− # See: https://github.com/fpco/stackage/issues/696
2377− - libsystemd-journal
2378−
2376+# end of skipped-builds
23792377
23802378
23812379# By skipping a test suite, we do not pull in the build dependencies
debian-bootstrap.sh+10−24
@@ -17,16 +17,16 @@ locale-gen en_US.UTF-8
1717
1818export DEBIAN_FRONTEND=noninteractive
1919apt-get update
20−apt-get install -y software-properties-common python-software-properties git
20+apt-get install -y software-properties-common
2121
2222add-apt-repository ppa:hvr/ghc -y
23−add-apt-repository -y ppa:zoogie/sdl2-snapshots
2423add-apt-repository -y ppa:marutter/rrutter
25−add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
24+# not sure what this was needed for
25+#add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
2626
2727# Get Stack
28−sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 575159689BEFB442
29−echo 'deb http://download.fpcomplete.com/ubuntu trusty main'|sudo tee /etc/apt/sources.list.d/fpco.list
28+apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 575159689BEFB442
29+echo 'deb http://download.fpcomplete.com/ubuntu xenial main'|tee /etc/apt/sources.list.d/fpco.list
3030
3131apt-get update
3232apt-get install -y \
@@ -74,13 +74,13 @@ apt-get install -y \
7474 libopenal-dev \
7575 libpango1.0-dev \
7676 libpcap0.8-dev \
77− libphash0-dev \
7877 libpq-dev \
7978 libsdl2-dev \
8079 libsnappy-dev \
8180 libsndfile1-dev \
8281 libsqlite3-dev \
8382 libssl-dev \
83+ libsystemd-dev \
8484 libtagc0-dev \
8585 libtre-dev \
8686 libudev-dev \
@@ -94,32 +94,18 @@ apt-get install -y \
9494 libzmq3-dev \
9595 llvm \
9696 m4 \
97+ nettle-dev \
9798 nodejs \
9899 npm \
99100 r-base \
100101 r-base-dev \
101− texlive-full \
102+ texlive \
102103 wget \
103104 zip \
104105 stack \
105− openjdk-7-jdk \
106+ openjdk-8-jdk \
106107 zlib1g-dev
107108
108−mkdir /tmp/nettle-build
109−(
110−cd /tmp/nettle-build
111−wget https://ftp.gnu.org/gnu/nettle/nettle-3.1.1.tar.gz
112−tar zxf nettle-3.1.1.tar.gz
113−cd nettle-3.1.1
114−./configure --prefix=/usr
115−make
116−make install
117−
118−mkdir -p /usr/lib/x86_64-linux-gnu/
119−ln -sfv /usr/lib/libnettle.so.6.1 /usr/lib/x86_64-linux-gnu/libnettle.so.6
120−)
121−rm -rf /tmp/nettle-build
122−
123109# Buggy versions of ld.bfd fail to link some Haskell packages:
124110# https://sourceware.org/bugzilla/show_bug.cgi?id=17689. Gold is
125111# faster anyways and uses less RAM.
@@ -127,4 +113,4 @@ update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.gold" 20
127113update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10
128114
129115# See: https://github.com/fpco/stackage/issues/1388
130−ln -n /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64/server/libjvm.so /usr/lib
116+ln -n /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/libjvm.so /usr/lib