From 0f8336fa38a0e2c072a9913d33bf428dac564de1 Mon Sep 17 00:00:00 2001
From: Sven Heyll <sven.heyll@gmail.com>
Date: Mon, 13 Mar 2017 23:49:24 +0100
Subject: [PATCH 1/4] Add mediabus (#2371)

---
 build-constraints.yaml | 3 +++
 debian-bootstrap.sh    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index d82b3f70..7ccc8bb4 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1720,6 +1720,9 @@ packages:
         - b9
         - type-spec
         - pretty-types
+        - mediabus
+        - mediabus-fdk-aac
+        - mediabus-rtp
 
     # "Will Thompson <will@willthompson.co.uk> @wjt":
         # - bustle # build failure against haskell-src-exts https://github.com/vasylp/hgettext/issues/10
diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index d9b8b8c5..63c1a6a8 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -53,6 +53,7 @@ apt-get install -y \
     libdevil-dev \
     libedit-dev \
     libedit2 \
+    libfdk-aac-dev \
     libfftw3-dev \
     libflac-dev \
     libfreenect-dev \

From d1aef32f1da26da70960cadcccd8e4f443c152ef Mon Sep 17 00:00:00 2001
From: Oleg Grenrus <oleg.grenrus@iki.fi>
Date: Wed, 29 Mar 2017 14:36:39 +0300
Subject: [PATCH 2/4] Add functor-classes-compat

---
 build-constraints.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index d82b3f70..739a008b 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1107,6 +1107,7 @@ packages:
         - binary-tagged
         - cabal-doctest
         - edit-distance
+        - functor-classes-compat
         - generics-sop-lens
         - github
         - insert-ordered-containers
@@ -3048,6 +3049,10 @@ package-flags:
         ghc_7_7: false
         ghc_8_0: true
 
+    functor-classes-compat:
+        containers: false
+        unordered-containers: false # https://github.com/fpco/stackage/issues/2386
+
 # end of package-flags
 
 # Special configure options for individual packages

From 72eb28c8b1e1fb764841c6b5e4c877828dd87265 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Thu, 30 Mar 2017 10:46:06 +0900
Subject: [PATCH 3/4] re-disable ghcjs-hplay again (transient-haskell/axiom#16)

---
 build-constraints.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 8803bb2e..ba598451 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -354,7 +354,7 @@ packages:
         - MFlow
         - transient
         - transient-universe
-        - ghcjs-hplay
+        # - ghcjs-hplay # https://github.com/transient-haskell/axiom/issues/16
 
     "Edward Kmett <ekmett@gmail.com> @ekmett":
         - ad

From 0a5d7b589ef356d2d53b76b3c406ad8859df7639 Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Thu, 30 Mar 2017 10:53:13 +0900
Subject: [PATCH 4/4] disable mediabus-fdk-aac for now since it needs non-free
 fdk-aac (#2371)

---
 build-constraints.yaml | 2 +-
 debian-bootstrap.sh    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index ba598451..2676b004 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1722,7 +1722,7 @@ packages:
         - type-spec
         - pretty-types
         - mediabus
-        - mediabus-fdk-aac
+        #- mediabus-fdk-aac # needs non-free libfdk-aac-dev
         - mediabus-rtp
 
     # "Will Thompson <will@willthompson.co.uk> @wjt":
diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh
index 63c1a6a8..d9b8b8c5 100755
--- a/debian-bootstrap.sh
+++ b/debian-bootstrap.sh
@@ -53,7 +53,6 @@ apt-get install -y \
     libdevil-dev \
     libedit-dev \
     libedit2 \
-    libfdk-aac-dev \
     libfftw3-dev \
     libflac-dev \
     libfreenect-dev \