From 2c455eaf9a00dfca7d0e6057d99e0597165251bc Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Fri, 13 May 2016 15:46:42 +0900
Subject: [PATCH] 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
---
 Dockerfile             |  2 +-
 build-constraints.yaml |  8 +++-----
 debian-bootstrap.sh    | 34 ++++++++++------------------------
 3 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4c4e1012..59041d90 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 
 ENV HOME /home/stackage
 ENV LANG en_US.UTF-8
diff --git a/build-constraints.yaml b/build-constraints.yaml
index 6aad2eaa..cffbe17b 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1353,7 +1353,8 @@ packages:
     "Michael Xavier <michael@michaelxavier.net> @MichaelXavier":
         - angel
         - uri-bytestring
-        - phash
+        # https://github.com/MichaelXavier/phash/issues/5
+        #- phash
         - cron
         - tasty-tap
         - tasty-fail-fast
@@ -2359,10 +2360,7 @@ skipped-builds:
     - Win32-notify
     - Win32-extras
 
-    # The Docker image needs libsystemd-dev from Ubuntu 15.04+ for this.
-    # See: https://github.com/fpco/stackage/issues/696
-    - libsystemd-journal
-
+# end of skipped-builds
 
 
 # By skipping a test suite, we do not pull in the build dependencies
diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index 8cf7a572..3103ee04 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -17,16 +17,16 @@ locale-gen en_US.UTF-8
 
 export DEBIAN_FRONTEND=noninteractive
 apt-get update
-apt-get install -y software-properties-common python-software-properties git
+apt-get install -y software-properties-common
 
 add-apt-repository ppa:hvr/ghc -y
-add-apt-repository -y ppa:zoogie/sdl2-snapshots
 add-apt-repository -y ppa:marutter/rrutter
-add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
+# not sure what this was needed for
+#add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
 
 # Get Stack
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 575159689BEFB442
-echo 'deb http://download.fpcomplete.com/ubuntu trusty main'|sudo tee /etc/apt/sources.list.d/fpco.list
+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 \
@@ -74,13 +74,13 @@ apt-get install -y \
     libopenal-dev \
     libpango1.0-dev \
     libpcap0.8-dev \
-    libphash0-dev \
     libpq-dev \
     libsdl2-dev \
     libsnappy-dev \
     libsndfile1-dev \
     libsqlite3-dev \
     libssl-dev \
+    libsystemd-dev \
     libtagc0-dev \
     libtre-dev \
     libudev-dev \
@@ -94,32 +94,18 @@ apt-get install -y \
     libzmq3-dev \
     llvm \
     m4 \
+    nettle-dev \
     nodejs \
     npm \
     r-base \
     r-base-dev \
-    texlive-full \
+    texlive \
     wget \
     zip \
     stack \
-    openjdk-7-jdk \
+    openjdk-8-jdk \
     zlib1g-dev
 
-mkdir /tmp/nettle-build
-(
-cd /tmp/nettle-build
-wget https://ftp.gnu.org/gnu/nettle/nettle-3.1.1.tar.gz
-tar zxf nettle-3.1.1.tar.gz
-cd nettle-3.1.1
-./configure --prefix=/usr
-make
-make install
-
-mkdir -p /usr/lib/x86_64-linux-gnu/
-ln -sfv /usr/lib/libnettle.so.6.1 /usr/lib/x86_64-linux-gnu/libnettle.so.6
-)
-rm -rf /tmp/nettle-build
-
 # Buggy versions of ld.bfd fail to link some Haskell packages:
 # https://sourceware.org/bugzilla/show_bug.cgi?id=17689. Gold is
 # faster anyways and uses less RAM.
@@ -127,4 +113,4 @@ update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.gold" 20
 update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10
 
 # See: https://github.com/fpco/stackage/issues/1388
-ln -n /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64/server/libjvm.so /usr/lib
+ln -n /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/libjvm.so /usr/lib