From 5bff7a47d63f1ed4a187807a15f99089ee6ce43f Mon Sep 17 00:00:00 2001 From: Alexey Kuleshevich Date: Mon, 10 Apr 2017 20:27:29 +0300 Subject: [PATCH 1/8] Re-enable wai-middleware-auth, since fpco/wai-middleware-auth#3 was fixed --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c904df4f..77dc9ddb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2848,8 +2848,7 @@ packages: - printcess "Alexey Kuleshevich @lehins": - [] - # - wai-middleware-auth # https://github.com/fpco/wai-middleware-auth/issues/3 + - wai-middleware-auth # - hip # via repa: bounds: vector "Hans-Peter Deifel @hpdeifel": From 14aaee1e1b9aeca28e44cf6c71fad97bad5040a9 Mon Sep 17 00:00:00 2001 From: koepket Date: Fri, 28 Apr 2017 16:13:51 +0200 Subject: [PATCH 2/8] add koepket's hinterface package --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9b27658c..7b1ab7b2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1,6 +1,9 @@ ghc-major-version: "8.0" # Constraints for brand new builds packages: + "Timo Koepke @koepket": + - hinterface + "Jose Iborra @pepeiborra": - clr-marshal - clr-host From f3bc78f55260d0aee30273b9cd475fc3dafeda0c Mon Sep 17 00:00:00 2001 From: Sebastian Witte Date: Sat, 29 Apr 2017 16:33:49 +0200 Subject: [PATCH 3/8] Reenable nvim-hs nvim-hs-contrib nvim-hs-ghcid --- build-constraints.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 652d5ee7..d400fa1b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3017,10 +3017,9 @@ packages: - uri-bytestring-aeson "Sebastian Witte @saep": - [] - # - nvim-hs # build failure https://github.com/fpco/stackage/pull/2457 - # - nvim-hs-contrib # per nvim-hs - # - nvim-hs-ghcid # per nvim-hs + - nvim-hs + - nvim-hs-contrib + - nvim-hs-ghcid # If you stop maintaining a package you can move it here. # It will then be disabled if it starts causing problems. From 344398255753587740410e39434bfc249413c21e Mon Sep 17 00:00:00 2001 From: Sam Protas Date: Sun, 30 Apr 2017 23:42:46 -0400 Subject: [PATCH 4/8] add triplesec --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 06ae820a..31f1e534 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3022,6 +3022,9 @@ packages: - nvim-hs-contrib - nvim-hs-ghcid + "Sam Protas @SamProtas": + - triplesec + # If you stop maintaining a package you can move it here. # It will then be disabled if it starts causing problems. # See https://github.com/fpco/stackage/issues/1056 From cd4b7fc4f5ad7816659496dca578004468eb0bc0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 1 May 2017 12:12:04 +0900 Subject: [PATCH 5/8] 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 d13e89a56331939acf74e2a16cbadd39a18725b3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 1 May 2017 12:14:51 +0900 Subject: [PATCH 6/8] Revert "disable clr packages again since docker image failing to build (#2470)" This reverts commit 0dd592c3f46ea8a177f251c8b0350093cf0303bf. --- build-constraints.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 289ed29f..dcba1a5c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5,10 +5,9 @@ packages: - hinterface "Jose Iborra @pepeiborra": - [] - # - clr-marshal - # - clr-host - # - clr-inline + - clr-marshal + - clr-host + - clr-inline "Joshua Koike @jano017": - discord-hs From de6f8ba7e8ddb54edce3e3e20f0dc07e29c4d764 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 1 May 2017 12:28:32 +0900 Subject: [PATCH 7/8] add juhp/stackage-query --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index dcba1a5c..dd57c0c6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1087,6 +1087,7 @@ packages: "Jens Petersen @juhp": - cabal-rpm + - stackage-query # - cabal-sort # BLOCKED directory 1.3 - idris # bounds: safe - libffi From a75a7c029502792b88ca1e1379b9bfe24551f5b8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 1 May 2017 17:19:16 +0900 Subject: [PATCH 8/8] debian-bootstrap.sh: clr-host needs libmono-2.0-dev (#2470) --- debian-bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index f3669aa5..db413754 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -75,6 +75,7 @@ apt-get install -y \ libmagickcore-dev \ libmagickwand-dev \ libmarkdown2-dev \ + libmono-2.0-dev \ libmp3lame-dev \ libmpfr-dev \ libmysqlclient-dev \