From 08eb2ac5ec2280ee1df24ee01b0db6431884aa0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Kelemen=20Z?= Date: Mon, 9 Jul 2018 09:14:16 +0200 Subject: [PATCH 01/32] fswatch, haskell-tools-cli re-added --- build-constraints.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index baa18229..2f011e62 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2986,8 +2986,8 @@ packages: - haskell-tools-refactor - haskell-tools-rewrite - haskell-tools-demo - # - haskell-tools-cli # via fswatch - # - haskell-tools-daemon # via fswatch + - haskell-tools-cli + - haskell-tools-daemon - haskell-tools-debug "David Fisher @ddfisher": @@ -3492,6 +3492,9 @@ packages: "Owen Lynch @olynch": - natural-sort + "Zoltan Kelemen @kelemzol": + - fswatch + # 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 @@ -3514,7 +3517,7 @@ packages: # be removed from this list if they are fixed. "Unmaintained packages with compilation failures": - stackage-types < 0 - - fswatch < 0 # https://github.com/kelemzol/watch/issues/3 + # If you want to make sure a package is removed from stackage, # place it here with a `< 0` constraint and send a pull From 3dfa01cb1ed37ab618a1efb152bd0bc643c0f908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Kelemen=20Z?= Date: Mon, 9 Jul 2018 10:41:14 +0200 Subject: [PATCH 02/32] skip haskell-tools-{cli,deamon} # tasty-1.1.0.2 --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2f011e62..2ef09fa4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2986,8 +2986,8 @@ packages: - haskell-tools-refactor - haskell-tools-rewrite - haskell-tools-demo - - haskell-tools-cli - - haskell-tools-daemon + # - haskell-tools-cli # tasty 1.1.0.2 + # - haskell-tools-daemon # tasty 1.1.0.2 - haskell-tools-debug "David Fisher @ddfisher": From 3b2bb16ebe3873da8976dd7206234878a04bb7c6 Mon Sep 17 00:00:00 2001 From: Jonas Carpay Date: Mon, 9 Jul 2018 21:33:22 +0200 Subject: [PATCH 03/32] Re-enable apecs --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7848af31..40224b02 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2170,7 +2170,7 @@ packages: - GPipe < 0 # GHC 8.4 via base-4.11.0.0 "Jonas Carpay @jonascarpay": - - apecs < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build + - apecs "Spencer Janssen @spencerjanssen": - Xauth From d32ca90bcdda04dc055123d818dbd120bf220a65 Mon Sep 17 00:00:00 2001 From: John Biesnecker Date: Mon, 9 Jul 2018 18:42:03 -0700 Subject: [PATCH 04/32] Adding async-pool to build-constraints.yaml Chatted with @jwiegley already (https://github.com/jwiegley/async-pool/issues/11) and I'm going to maintain this package in stackage. --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7848af31..be4b0998 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3491,6 +3491,9 @@ packages: "Owen Lynch @olynch": - natural-sort + + "John Biesnecker @biesnecker": + - async-pool # If you stop maintaining a package you can move it here. # It will then be disabled if it starts causing problems. From 5e77447f6589e53bdb77ea445b7ef28b0c214314 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Tue, 10 Jul 2018 02:57:57 +0000 Subject: [PATCH 05/32] Disable req tests due to nondeterministic failures See mrkkrp/req#46 for further reference --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 53d11ce9..51357a0c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4068,6 +4068,7 @@ expected-test-failures: - wreq - http-client # https://github.com/snoyberg/http-client/issues/360 - http-client-tls # https://github.com/snoyberg/http-client/issues/360 + - req # https://github.com/mrkkrp/req/issues/46 # Compilation failures - yeshql # https://bitbucket.org/tdammers/yeshql/issues/1/stackage-nightly-test-failure From 9e99229aefc9497343daa407ca118c591ba63702 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Tue, 10 Jul 2018 05:06:09 +0000 Subject: [PATCH 06/32] Disable req-conduit tests for httpbin failures httpbin has been flaky recently, re-enable this (and the other req and http-client tests) after it's stabilized --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 51357a0c..98b25d8b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4069,6 +4069,7 @@ expected-test-failures: - http-client # https://github.com/snoyberg/http-client/issues/360 - http-client-tls # https://github.com/snoyberg/http-client/issues/360 - req # https://github.com/mrkkrp/req/issues/46 + - req-conduit # https://github.com/mrkkrp/req/issues/46 # Compilation failures - yeshql # https://bitbucket.org/tdammers/yeshql/issues/1/stackage-nightly-test-failure From fb01c1edfa5f35c4a36ad3587295589a74b72f46 Mon Sep 17 00:00:00 2001 From: Yuji Yamamoto Date: Tue, 10 Jul 2018 14:30:29 +0900 Subject: [PATCH 07/32] Add skews --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 98b25d8b..38c7b6f5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2474,6 +2474,7 @@ packages: - yes-precure5-command - th-strict-compat - main-tester + - skews "Hans-Christian Esperer @hce": - avwx From cd017449236875d8400a8de155c217fc5f72663b Mon Sep 17 00:00:00 2001 From: ncaq Date: Tue, 10 Jul 2018 17:39:28 +0900 Subject: [PATCH 08/32] fixed: yesod-form-bootstrap4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit by [deleted: addClass closed #2 ยท ncaq/yesod-form-bootstrap4@7315a49](https://github.com/ncaq/yesod-form-bootstrap4/commit/7315a49e952c6ab46fa7a20d896ac21c5c8a8637) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 98b25d8b..fbd52751 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3038,7 +3038,7 @@ packages: # - haskell-import-graph # fgl via graphviz - string-transform - uniq-deep - - yesod-form-bootstrap4 < 0 # https://github.com/ncaq/yesod-form-bootstrap4/issues/2 + - yesod-form-bootstrap4 - yesod-recaptcha2 "Andrei Barbu @abarbu": From a25bd3bf54904cae8952ef4cc4936e96a3ebe2a7 Mon Sep 17 00:00:00 2001 From: Andre Van Der Merwe Date: Tue, 10 Jul 2018 10:46:08 +0200 Subject: [PATCH 09/32] add hyraxAbif --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 98b25d8b..3cfd7b59 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3391,6 +3391,7 @@ packages: "Andre Van Der Merwe @andrevdm": - bhoogle < 0 # GHC 8.4 via protolude + - hyraxAbif "David Millar-Durrant @DavidM-D": - indexed-list-literals From 21e9a76cad445311770b7e0752c69fafd66669ff Mon Sep 17 00:00:00 2001 From: Andre Van Der Merwe Date: Tue, 10 Jul 2018 14:15:25 +0200 Subject: [PATCH 10/32] adding hyraxAbif rebuild with cabal version 2.0 rather than 2.2 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3cfd7b59..27ac2276 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3390,7 +3390,7 @@ packages: - streaming-wai "Andre Van Der Merwe @andrevdm": - - bhoogle < 0 # GHC 8.4 via protolude + - bhoogle < 0 # GHC 8.4 via protolude - hyraxAbif "David Millar-Durrant @DavidM-D": From cd090fc3b27b328a6289b497f1ecaaa0b57a5b28 Mon Sep 17 00:00:00 2001 From: jkachmar Date: Tue, 10 Jul 2018 10:14:15 -0400 Subject: [PATCH 11/32] JuicyPixels bounds #3818 --- build-constraints.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index fba52878..0b533a66 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -731,7 +731,7 @@ packages: - FontyFruity - Rasterific - svg-tree - - rasterific-svg + - rasterific-svg < 0 # JuicyPixels 3.3 commercialhaskell/stackage#3818 - asciidiagram < 0 # GHC 8.4 via rasterific-svg "Patrick Brisbin @pbrisbin": @@ -1367,7 +1367,7 @@ packages: - github - insert-ordered-containers - integer-logarithms - - JuicyPixels-scale-dct + - JuicyPixels-scale-dct < 0 # JuicyPixels 3.3 commercialhaskell/stackage#3818 - kleene - lattices - microstache @@ -2265,7 +2265,7 @@ packages: - path-io - hspec-megaparsec - zip - - JuicyPixels-extra + - JuicyPixels-extra < 0 # JuicyPixels 3.3 commercialhaskell/stackate#3818 - identicon - pagination - text-metrics @@ -2817,7 +2817,7 @@ packages: "Anton Gushcha @ncrashed": - aeson-injector < 0 # GHC 8.4 via base-4.11.0.0 - - JuicyPixels-blp + - JuicyPixels-blp < 0 # JuicyPixels 3.3 commercialhaskell/stackate#3818 "Al Zohali @zohl": # - servant-auth-cookie # servant 0.13 From 829044f581607a71e634fc8a223c2dc2ff4827c3 Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Tue, 10 Jul 2018 16:14:59 +0000 Subject: [PATCH 12/32] Unblock tintin build failure theam/tintin#38 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0b533a66..682727f1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -245,7 +245,7 @@ packages: "Nikita Tchayka @nickseagull": - ramus - require - - tintin + - tintin < 0 # strange build failure theam/tintin#38 "Simon Jakobi @sjakobi": - path From 18fbfe8be0f2c5f77c6e72453faea50c424ed52d Mon Sep 17 00:00:00 2001 From: Jack Conrad Kiefer II Date: Tue, 10 Jul 2018 10:39:16 -0600 Subject: [PATCH 13/32] Renable herms in the build plan Sorry for being MIA for a bit! `semigroups-0.18.5` is no longer an issue and has been fixed as a dependency in `herms-1.9.0.2`. I've gone through the standard motions and everything seems to be building just fine with the nightlies on my end :) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 682727f1..52ce1f04 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3416,7 +3416,7 @@ packages: - cryptocompare "Jack Kiefer @JackKiefer": - - herms < 0 # semigroups 0.18.5 + - herms "Sergey Vinokurov @sergv": - tasty-ant-xml From 1a29b62b592684931f902cbf0147c54de2ab6659 Mon Sep 17 00:00:00 2001 From: Lennart Spitzner Date: Tue, 10 Jul 2018 22:52:43 +0200 Subject: [PATCH 14/32] Re-enable butcher, brittany --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 682727f1..a24799c6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2887,10 +2887,10 @@ packages: "Lennart Spitzner @lspitzner": - multistate - pqueue - - butcher < 0 # via free-5.1 + - butcher - czipwith - data-tree-print - - brittany < 0 # via butcher + - brittany "Ryan Mulligan @ryantm": - HDBC-mysql From cdfb786fecdf78db1d20bd34b39e34177a4e218d Mon Sep 17 00:00:00 2001 From: Xia Li-yao Date: Tue, 10 Jul 2018 16:54:13 -0400 Subject: [PATCH 15/32] Add generic-data and scanf --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 682727f1..8240f915 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -262,7 +262,9 @@ packages: "Li-yao Xia @Lysxia": - boltzmann-samplers + - generic-data - generic-random + - scanf - show-combinators "Tobias Dammers @tdammers": From b4deff878bec1aa1067496cf8c008a1e73ea40c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Facundo=20Dom=C3=ADnguez?= Date: Tue, 10 Jul 2018 10:05:20 -0300 Subject: [PATCH 16/32] Add inline-c back. --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fba52878..e40eddf6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2315,6 +2315,7 @@ packages: - distributed-process-simplelocalnet < 0 # GHC 8.4 via network-transport-tcp - distributed-process-tests < 0 # GHC 8.4 via distributed-process - distributed-static + - inline-c - jvm-batching < 0 # GHC 8.4 via inline-java - network-transport - network-transport-tests From 3cedefcf8d012a0c2aa9c6a79b3cb2d064e2f7b5 Mon Sep 17 00:00:00 2001 From: Justin Le Date: Tue, 10 Jul 2018 14:14:57 -0700 Subject: [PATCH 17/32] Added back in vector-sized and dependent packages --- build-constraints.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 682727f1..4f0d5bf4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1824,16 +1824,16 @@ packages: - auto - backprop - configurator-export - - hamilton < 0 # via vector-sized - - hmatrix-backprop < 0 # via vector-sized - - hmatrix-vector-sized < 0 # via vector-sized + - hamilton + - hmatrix-backprop + - hmatrix-vector-sized - one-liner-instances < 0 # via one-liner - prompt - tagged-binary # - type-combinators-singletons # GHC 8.4 via type-combinators - typelits-witnesses - uncertain - - vector-sized < 0 # via distributive-0.6 + - vector-sized "Ian Duncan @iand675": - feature-flags From ed8a0dd67a9685dd2c367f3634acf23ec4296cf6 Mon Sep 17 00:00:00 2001 From: jkachmar Date: Wed, 11 Jul 2018 01:24:30 -0400 Subject: [PATCH 18/32] Unblocks yaml-0.9.0 #3823 --- build-constraints.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index a4803ac9..5085dee4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -382,7 +382,7 @@ packages: - yesod - yesod-auth - authenticate-oauth - - yesod-bin + # - yesod-bin # yaml-0.9.0 commercialhaskell/stackage#3823 - yesod-eventsource - yesod-gitrepo - yesod-newsfeed @@ -830,7 +830,7 @@ packages: - bench - dhall - dhall-bash - - dhall-json + # - dhall-json # yaml-0.9.0 commercialhaskell/stackage#3823 # - dhall-nix # deriving-compat via hnix - dhall-text @@ -1378,7 +1378,7 @@ packages: - regex-applicative-text - servant-dhall - servant-swagger-ui - - servant-yaml + # - servant-yaml # yaml-0.9.0 commercialhaskell/stackage#3823 - singleton-bool - spdx < 0 # GHC 8.4 via base-4.11.0.0 - splitmix @@ -1966,9 +1966,9 @@ packages: - atomic-write - dbcleaner - dotenv - - hapistrano + - hapistrano < 0 # yaml-0.9.0 commercialhaskell/stackage#3823 - inflections - - stache + - stache < 0 # yaml-0.9.0 commercialhaskell/stackage#3823 - scalendar "Sergey Alirzaev @l29ah": @@ -2256,7 +2256,7 @@ packages: - strict-base-types - withdependencies - hruby - - language-puppet + - language-puppet < 0 # yaml-0.9.0 commercialhaskell/stackage#3823 - tar-conduit "Mark Karpov @mrkkrp": @@ -2282,10 +2282,10 @@ packages: - stache - parser-combinators - modern-uri - - mmark - - mmark-ext + - mmark < 0 # yaml-0.9.0 commercialhaskell/stackage#3823 + - mmark-ext < 0 # mmark via yaml-0.9.0 commercialhaskell/stackage#3823 - html-entity-map - - mmark-cli + - mmark-cli < 0 # mmark via yaml-0.9.0 commercialhaskell/stackage#3823 - ghc-syntax-highlighter - facts From 5f64afb6da012ed7d0513db6c327a8f53f7262e1 Mon Sep 17 00:00:00 2001 From: Andre Van Der Merwe Date: Wed, 11 Jul 2018 14:59:24 +0200 Subject: [PATCH 19/32] added hyraxAbif --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 27ac2276..3cfd7b59 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3390,7 +3390,7 @@ packages: - streaming-wai "Andre Van Der Merwe @andrevdm": - - bhoogle < 0 # GHC 8.4 via protolude + - bhoogle < 0 # GHC 8.4 via protolude - hyraxAbif "David Millar-Durrant @DavidM-D": From 9bb111278b6e7af9c80785b6b95e7b79c8ed1df3 Mon Sep 17 00:00:00 2001 From: jkachmar Date: Wed, 11 Jul 2018 10:53:20 -0400 Subject: [PATCH 20/32] Unblocks via cabal2nix NixOS/cabal2nix#359 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5085dee4..1477ecc9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2203,7 +2203,7 @@ packages: - nagios-check "Peter Simons @peti": - - cabal2nix + - cabal2nix < 0 # build failure via hpack-0.29 NixOS/cabal2nix#359 - cabal2spec - distribution-nixpkgs - flexible-defaults From f1b0e3ac5898036594afbebab1abf5e8964334fd Mon Sep 17 00:00:00 2001 From: jkachmar Date: Wed, 11 Jul 2018 10:54:16 -0400 Subject: [PATCH 21/32] Restores http-client and req test suites --- build-constraints.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1477ecc9..1cce9af3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4069,10 +4069,6 @@ expected-test-failures: - courier # https://github.com/hargettp/courier/issues/19 - main-tester # https://github.com/fpco/stackage/pull/3528 - wreq - - http-client # https://github.com/snoyberg/http-client/issues/360 - - http-client-tls # https://github.com/snoyberg/http-client/issues/360 - - req # https://github.com/mrkkrp/req/issues/46 - - req-conduit # https://github.com/mrkkrp/req/issues/46 # Compilation failures - yeshql # https://bitbucket.org/tdammers/yeshql/issues/1/stackage-nightly-test-failure From 56f7289ac92799144561af183d59ddae811db228 Mon Sep 17 00:00:00 2001 From: jkachmar Date: Wed, 11 Jul 2018 11:03:40 -0400 Subject: [PATCH 22/32] http-client test suite still failing --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1cce9af3..2bac5022 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4069,6 +4069,8 @@ expected-test-failures: - courier # https://github.com/hargettp/courier/issues/19 - main-tester # https://github.com/fpco/stackage/pull/3528 - wreq + - http-client # https://github.com/snoyberg/http-client/issues/360 + - http-client-tls # https://github.com/snoyberg/http-client/issues/360 # Compilation failures - yeshql # https://bitbucket.org/tdammers/yeshql/issues/1/stackage-nightly-test-failure From 699a3fcf893565b8569a84d6bc7c85bd1777a15e Mon Sep 17 00:00:00 2001 From: jkachmar Date: Wed, 11 Jul 2018 11:08:12 -0400 Subject: [PATCH 23/32] Restores blocked packages * JuicyPixels-extra (via JuicyPixels 3.3) * rasterific-svg (via JuicyPixels 3.3) * asciidiagram (via rasterific-svg) * language-puppet (via yaml-0.9.0) --- build-constraints.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2bac5022..0c3a390a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -731,8 +731,8 @@ packages: - FontyFruity - Rasterific - svg-tree - - rasterific-svg < 0 # JuicyPixels 3.3 commercialhaskell/stackage#3818 - - asciidiagram < 0 # GHC 8.4 via rasterific-svg + - rasterific-svg + - asciidiagram "Patrick Brisbin @pbrisbin": - gravatar @@ -2256,7 +2256,7 @@ packages: - strict-base-types - withdependencies - hruby - - language-puppet < 0 # yaml-0.9.0 commercialhaskell/stackage#3823 + - language-puppet - tar-conduit "Mark Karpov @mrkkrp": @@ -2265,7 +2265,7 @@ packages: - path-io - hspec-megaparsec - zip - - JuicyPixels-extra < 0 # JuicyPixels 3.3 commercialhaskell/stackate#3818 + - JuicyPixels-extra - identicon - pagination - text-metrics From 63e99cf5830cdc240cf45a388f1a8bd13f1c1825 Mon Sep 17 00:00:00 2001 From: jkachmar Date: Wed, 11 Jul 2018 11:43:41 -0400 Subject: [PATCH 24/32] Disables brittany (blocked by yaml #3823) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 07682737..19c9f83d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2892,7 +2892,7 @@ packages: - butcher - czipwith - data-tree-print - - brittany + - brittany < 0 # via yaml-0.9.0 commercialhaskell/stackage#3823 "Ryan Mulligan @ryantm": - HDBC-mysql From 36f1ea76f4058b66f62acf6ce5987d07c0f8664e Mon Sep 17 00:00:00 2001 From: Andre Van Der Merwe Date: Wed, 11 Jul 2018 18:53:24 +0200 Subject: [PATCH 25/32] bhoogle bounds fix --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6b2272d1..299a6eab 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3394,7 +3394,7 @@ packages: - streaming-wai "Andre Van Der Merwe @andrevdm": - - bhoogle < 0 # GHC 8.4 via protolude + - bhoogle - hyraxAbif "David Millar-Durrant @DavidM-D": From 70d4352c0f42bd01c3d9c33cbf394f8613bf467b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Facundo=20Dom=C3=ADnguez?= Date: Wed, 11 Jul 2018 16:28:19 -0300 Subject: [PATCH 26/32] Add back inline-java and related packages. --- build-constraints.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6b2272d1..eb4f4208 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1870,13 +1870,14 @@ packages: - cassette < 0 # build failure with GHC 8.4 - choice - distributed-closure - - inline-java < 0 # GHC 8.4 via ghc-8.4.1 + - inline-java - inline-r < 0 # GHC 8.4 via inline-c - # - jni # GHC 8.4 via inline-c - # - jvm # GHC 8.4 via inline-c - - jvm-streaming < 0 # GHC 8.4 via inline-java + - jni + - jvm + - jvm-batching + - jvm-streaming - H < 0 # GHC 8.4 via inline-r - - sparkle < 0 # GHC 8.4 via inline-java + - sparkle - th-lift "Christopher Reichert @creichert": From 24bfd000a49d66f943dbe9ea72dd851285fce639 Mon Sep 17 00:00:00 2001 From: M Farkas-Dyck Date: Wed, 11 Jul 2018 12:57:45 -0800 Subject: [PATCH 27/32] Add either-both package --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6b2272d1..b5737bef 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3461,6 +3461,7 @@ packages: - alg - category - constraint + - either-both - filtrable - hs-functors - lenz From 85b83d52d974d2f53909f60c5d0f59a17da10fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Facundo=20Dom=C3=ADnguez?= Date: Wed, 11 Jul 2018 17:59:04 -0300 Subject: [PATCH 28/32] Remove duplicate entry for jvm-batching. --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index eb4f4208..541c8099 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1874,7 +1874,6 @@ packages: - inline-r < 0 # GHC 8.4 via inline-c - jni - jvm - - jvm-batching - jvm-streaming - H < 0 # GHC 8.4 via inline-r - sparkle @@ -2319,7 +2318,7 @@ packages: - distributed-process-tests < 0 # GHC 8.4 via distributed-process - distributed-static - inline-c - - jvm-batching < 0 # GHC 8.4 via inline-java + - jvm-batching - network-transport - network-transport-tests - network-transport-tcp < 0 # BuildFailureException Process exited with ExitFailure 1: dist/build/TestTCP/TestTCP From b133f8cc3633b57723d0a8914606d58e2ecb8761 Mon Sep 17 00:00:00 2001 From: jkachmar Date: Wed, 11 Jul 2018 19:17:03 -0400 Subject: [PATCH 29/32] Constrain mwc-random #3828 --- build-constraints.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6b2272d1..bc60c97b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3588,6 +3588,11 @@ packages: # https://github.com/commercialhaskell/stackage/issues/3787 - semigroupoids < 5.3 + # needed by foldl, in turn needed by many others (mono-traversable, + # turtle, etc.) + # https://github.com/commercialhaskell/stackage/issues/3828 + - mwc-random < 0.14 + # end of packages # Package flags are applied to individual packages, and override the values of From 1a06265f7afb59069b39a8f67c950c477aca66e0 Mon Sep 17 00:00:00 2001 From: jkachmar Date: Wed, 11 Jul 2018 20:54:54 -0400 Subject: [PATCH 30/32] Restores some unblocked yaml-0.9.0 dependees #3823 * hapistrano * mmark * mmark-cli * mmark-ext * stache --- build-constraints.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 88fe3b3a..42a52dd2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1968,9 +1968,9 @@ packages: - atomic-write - dbcleaner - dotenv - - hapistrano < 0 # yaml-0.9.0 commercialhaskell/stackage#3823 + - hapistrano - inflections - - stache < 0 # yaml-0.9.0 commercialhaskell/stackage#3823 + - stache - scalendar "Sergey Alirzaev @l29ah": @@ -2284,10 +2284,10 @@ packages: - stache - parser-combinators - modern-uri - - mmark < 0 # yaml-0.9.0 commercialhaskell/stackage#3823 - - mmark-ext < 0 # mmark via yaml-0.9.0 commercialhaskell/stackage#3823 + - mmark + - mmark-ext - html-entity-map - - mmark-cli < 0 # mmark via yaml-0.9.0 commercialhaskell/stackage#3823 + - mmark-cli - ghc-syntax-highlighter - facts From 8a308a13bad71c02bf456882ba31665322890dc3 Mon Sep 17 00:00:00 2001 From: jkachmar Date: Wed, 11 Jul 2018 21:00:29 -0400 Subject: [PATCH 31/32] Restores inline-r and H (via inline-c) --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 42a52dd2..bb7825be 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1871,11 +1871,11 @@ packages: - choice - distributed-closure - inline-java - - inline-r < 0 # GHC 8.4 via inline-c + - inline-r - jni - jvm - jvm-streaming - - H < 0 # GHC 8.4 via inline-r + - H - sparkle - th-lift From cb50e27922d3634ab45789f012628ce4f0c8ff4d Mon Sep 17 00:00:00 2001 From: Joe Kachmar Date: Thu, 12 Jul 2018 01:20:23 +0000 Subject: [PATCH 32/32] Revert "Added back in vector-sized and dependent packages" --- build-constraints.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ff9a8686..5ac61e70 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1826,16 +1826,16 @@ packages: - auto - backprop - configurator-export - - hamilton - - hmatrix-backprop - - hmatrix-vector-sized + - hamilton < 0 # via vector-sized + - hmatrix-backprop < 0 # via vector-sized + - hmatrix-vector-sized < 0 # via vector-sized - one-liner-instances < 0 # via one-liner - prompt - tagged-binary # - type-combinators-singletons # GHC 8.4 via type-combinators - typelits-witnesses - uncertain - - vector-sized + - vector-sized < 0 # via distributive-0.6 "Ian Duncan @iand675": - feature-flags