From 519ef830ca543d9aeac3674f4cedd80bf3b53087 Mon Sep 17 00:00:00 2001 From: Sven Heyll Date: Mon, 13 Mar 2017 23:49:24 +0100 Subject: [PATCH 1/6] Add mediabus --- build-constraints.yaml | 3 +++ debian-bootstrap.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 011eaaea..b57fdacf 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1706,6 +1706,9 @@ packages: - b9 - type-spec - pretty-types + - mediabus + - mediabus-fdk-aac + - mediabus-rtp # "Will Thompson @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 c0925f57..b1828b89 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -51,6 +51,7 @@ apt-get install -y \ libdevil-dev \ libedit-dev \ libedit2 \ + libfdk-aac-dev \ libfftw3-dev \ libflac-dev \ libfreenect-dev \ From 876ea253c90647d0725b0da2c00b1d15bd300834 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 30 Mar 2017 11:07:22 +0900 Subject: [PATCH 2/6] debian-bootstrap.sh: also remove libfdk-aac-dev on nightly --- debian-bootstrap.sh | 1 - 1 file changed, 1 deletion(-) 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 \ From 8c95b2ee4b39e29d7abfb54c6e677a2068bee337 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 1 May 2017 01:00:36 +0900 Subject: [PATCH 3/6] disable clr packages again since docker image failing to build (#2470) docker build is failing on llvm-4.0 for some reason (maybe the upstream repo changed) --- build-constraints.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 87b40c5c..362875f0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2,9 +2,10 @@ ghc-major-version: "8.0" # Constraints for brand new builds packages: "Jose Iborra @pepeiborra": - - clr-marshal - - clr-host - - clr-inline + [] + #- clr-marshal + #- clr-host + #- clr-inline "Joshua Koike @jano017": - discord-hs From b7d45e8cbefb8aa4feffece051b858861a3916b6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 1 May 2017 12:12:04 +0900 Subject: [PATCH 4/6] debian-bootstrap.sh: disable broken llvm-4.0 repo The following packages have unmet dependencies: llvm-4.0 : Depends: llvm-4.0-runtime (= 1:4.0~svn301550-1~exp1) but it is not going to be installed Depends: libllvm4.0 (>= 1:4.0-3~) but it is not going to be installed Recommends: llvm-4.0-dev but it is not going to be installed --- debian-bootstrap.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index fee40da3..f3669aa5 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -178,11 +178,12 @@ cd /tmp \ echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf.d/openjdk.conf \ && ldconfig -# llvm-4.0 for llvm-hs (separate since it needs wget) -wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \ - && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" \ - && apt-get update \ - && apt-get install -y llvm-4.0 +# currently the repo seems broken +# # llvm-4.0 for llvm-hs (separate since it needs wget) +# wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \ +# && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" \ +# && apt-get update \ +# && apt-get install -y llvm-4.0 ## non-free repo for mediabus-fdk-aac #apt-add-repository multiverse \ From b7dd28857f5043685fb230cf5d6dd4077406db97 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Tue, 9 May 2017 19:00:39 -0700 Subject: [PATCH 5/6] Attempt a fix of lens --- build-constraints.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index dd57c0c6..c258804b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3521,6 +3521,7 @@ expected-test-failures: - yesod-auth-basic # https://github.com/creichert/yesod-auth-basic/issues/1 # Stackage upper bounds, re-enable these when their upper bound is removed + - lens # doctest failure in 4.15.1, fixed in 4.15.2 but lens has an upper bound # Recursive deps https://github.com/fpco/stackage/issues/1818 @@ -3584,7 +3585,7 @@ expected-haddock-failures: - gtk - gtk3 - # Intermittent failures or unreliable. These tay pass when + # Intermittent failures or unreliable. These may pass when # re-enabled, but will eventually fail again. Only remove these # from expected-haddock-failures if we know a fix has been released. - gi-gtk # Uses all memory @@ -3948,6 +3949,8 @@ tell-me-when-its-released: - terminal-progress-bar-0.1.1 # Unskip test suite - req-0.2.0 # Remove from expected-test-failures https://github.com/mrkkrp/req/issues/14#issuecomment-287562784 - vivid-0.2.0.5 # Re-enable package (disabed per MonadRandom < 0.5) https://github.com/fpco/stackage/issues/2180 +- lens-4.15.2 # Test failures in lens-4.15.1 https://github.com/fpco/stackage/issues/2496 +- active-0.2.0.12 # Will likely contain fix for the lens-4.15.2 https://github.com/fpco/stackage/issues/2496 # Packages which should be hidden after registering, to avoid module name # conflicts. This is intended for at least two use cases: From 6daac8d8059dc7d5d6c470fab8a2d2c5a42827af Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Tue, 9 May 2017 21:27:32 -0700 Subject: [PATCH 6/6] Bounds for #2498 --- build-constraints.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index c258804b..ac4f1f09 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3138,6 +3138,14 @@ packages: # https://github.com/fpco/stackage/issues/2481 - megaparsec < 5.3.0 + + # https://github.com/fpco/stackage/issues/2498 + - graphviz < 2999.19.0.0 + - haskell-src-meta < 0.8 + - io-streams < 1.4.0.0 + - websockets < 0.11.0.0 + - websockets-rpc < 0.4.1 + - websockets-simple < 0.0.2.1 # end of packages # Package flags are applied to individual packages, and override the values of