git.iko.soy/stackage
on master help sign in
take 2 at Ubuntu 16.04 Xenial (#1439)
2c455eaJens Petersen
Dockerfile+1−1
compare with master
unifiedsplit
@@ -1,4 +1,4 @@
1−FROM ubuntu:14.04
1+FROM ubuntu:16.04
2
2
3ENV HOME /home/stackage
3ENV HOME /home/stackage
4ENV LANG en_US.UTF-8
4ENV LANG en_US.UTF-8
build-constraints.yaml+3−5
@@ -1353,7 +1353,8 @@ packages:
1353 "Michael Xavier <michael@michaelxavier.net> @MichaelXavier":
1353 "Michael Xavier <michael@michaelxavier.net> @MichaelXavier":
1354 - angel
1354 - angel
1355 - uri-bytestring
1355 - uri-bytestring
1356+ # https://github.com/MichaelXavier/phash/issues/5
1356− - phash
1357+ #- phash
1357 - cron
1358 - cron
1358 - tasty-tap
1359 - tasty-tap
1359 - tasty-fail-fast
1360 - tasty-fail-fast
@@ -2359,10 +2360,7 @@ skipped-builds:
2359 - Win32-notify
2360 - Win32-notify
2360 - Win32-extras
2361 - Win32-extras
2361
2362
2362− # The Docker image needs libsystemd-dev from Ubuntu 15.04+ for this.
2363+# end of skipped-builds
2363− # See: https://github.com/fpco/stackage/issues/696
2364− - libsystemd-journal
2365−
2366
2364
2367
2365
2368# By skipping a test suite, we do not pull in the build dependencies
2366# 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
17
17
18export DEBIAN_FRONTEND=noninteractive
18export DEBIAN_FRONTEND=noninteractive
19apt-get update
19apt-get update
20−apt-get install -y software-properties-common python-software-properties git
20+apt-get install -y software-properties-common
21
21
22add-apt-repository ppa:hvr/ghc -y
22add-apt-repository ppa:hvr/ghc -y
23−add-apt-repository -y ppa:zoogie/sdl2-snapshots
24add-apt-repository -y ppa:marutter/rrutter
23add-apt-repository -y ppa:marutter/rrutter
24+# not sure what this was needed for
25−add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
25+#add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
26
26
27# Get Stack
27# Get Stack
28−sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 575159689BEFB442
28+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
29+echo 'deb http://download.fpcomplete.com/ubuntu xenial main'|tee /etc/apt/sources.list.d/fpco.list
30
30
31apt-get update
31apt-get update
32apt-get install -y \
32apt-get install -y \
@@ -74,13 +74,13 @@ apt-get install -y \
74 libopenal-dev \
74 libopenal-dev \
75 libpango1.0-dev \
75 libpango1.0-dev \
76 libpcap0.8-dev \
76 libpcap0.8-dev \
77− libphash0-dev \
78 libpq-dev \
77 libpq-dev \
79 libsdl2-dev \
78 libsdl2-dev \
80 libsnappy-dev \
79 libsnappy-dev \
81 libsndfile1-dev \
80 libsndfile1-dev \
82 libsqlite3-dev \
81 libsqlite3-dev \
83 libssl-dev \
82 libssl-dev \
83+ libsystemd-dev \
84 libtagc0-dev \
84 libtagc0-dev \
85 libtre-dev \
85 libtre-dev \
86 libudev-dev \
86 libudev-dev \
@@ -94,32 +94,18 @@ apt-get install -y \
94 libzmq3-dev \
94 libzmq3-dev \
95 llvm \
95 llvm \
96 m4 \
96 m4 \
97+ nettle-dev \
97 nodejs \
98 nodejs \
98 npm \
99 npm \
99 r-base \
100 r-base \
100 r-base-dev \
101 r-base-dev \
101− texlive-full \
102+ texlive \
102 wget \
103 wget \
103 zip \
104 zip \
104 stack \
105 stack \
105− openjdk-7-jdk \
106+ openjdk-8-jdk \
106 zlib1g-dev
107 zlib1g-dev
107
108
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−
123# Buggy versions of ld.bfd fail to link some Haskell packages:
109# Buggy versions of ld.bfd fail to link some Haskell packages:
124# https://sourceware.org/bugzilla/show_bug.cgi?id=17689. Gold is
110# https://sourceware.org/bugzilla/show_bug.cgi?id=17689. Gold is
125# faster anyways and uses less RAM.
111# faster anyways and uses less RAM.
@@ -127,4 +113,4 @@ update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.gold" 20
127update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10
113update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10
128
114
129# See: https://github.com/fpco/stackage/issues/1388
115# 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