git.iko.soy/stackage
on master help sign in
take 2 at Ubuntu 16.04 Xenial (#1439)

- not sure if ppa:zoogie/sdl2-snapshots was ever really needed (#444): there seem to be newer sdl packages in 14.04 Trusty already. - not sure what the ppa:openstack-ubuntu-testing/icehouse was needed for: that ppa is not available for 16.04, commenting it out for now. - libsystemd-dev is needed to build libsystemd-journal (#696) - 16.04 has openjdk-8 rather than 7 (#1388) - libphash does not seem to be in Xenial, disabling phash for now (#618) - use nettle-dev from ubuntu (hopefully 3.2 is compatible enough with 3.1) - don't need to install git first - python-software-properties is a dependency of software-properties-common - this should allow the gi-gtk stack to build since it needs newer gtk stack - switch from texlive-full to texlive to save time and space (not sure what requires texlive?) this builds for me locally

commit2c455eaf9a00dfca7d0e6057d99e0597165251bc authorJens Petersen <petersen@redhat.com> dateFri 13 May 2016, 15:46 (10 years ago) parent18b2e51
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
@@ -1353,7 +1353,8 @@ packages:
13531353 "Michael Xavier <michael@michaelxavier.net> @MichaelXavier":
13541354 - angel
13551355 - uri-bytestring
1356− - phash
1356+ # https://github.com/MichaelXavier/phash/issues/5
1357+ #- phash
13571358 - cron
13581359 - tasty-tap
13591360 - tasty-fail-fast
@@ -2359,10 +2360,7 @@ skipped-builds:
23592360 - Win32-notify
23602361 - Win32-extras
23612362
2362− # The Docker image needs libsystemd-dev from Ubuntu 15.04+ for this.
2363− # See: https://github.com/fpco/stackage/issues/696
2364− - libsystemd-journal
2365−
2363+# end of skipped-builds
23662364
23672365
23682366# 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