From f6b7c039a58ff9937fffcc5771a8b22b926b62a4 Mon Sep 17 00:00:00 2001 From: Tim McGilchrist Date: Tue, 10 Nov 2015 09:57:21 +1100 Subject: [PATCH 01/41] Add airship Airship is a Webmachine-inspired HTTP library. --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index bd7ea243..258ec007 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1604,6 +1604,7 @@ packages: "Tim McGilchrist @lambda_foo": - riak + - airship "Yuras Shumovich @Yuras": - pdf-toolbox-core From 3f705563ede6581f5b9dee1fd628cdaa125750db Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 11 Nov 2015 11:28:48 +0900 Subject: [PATCH 02/41] constraints-0.6 breaks lifted-async --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index e7553487..7e91fbc4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1711,6 +1711,9 @@ packages: # https://github.com/fpco/stackage/issues/968 - bifunctors < 5.1 + # https://github.com/fpco/stackage/issues/973 + - constraints < 0.6 + # end of packages From 6ca0984fc5aa7f3618cabebbd4c961fe7e7a21aa Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 11 Nov 2015 14:04:49 +0900 Subject: [PATCH 03/41] try combining the constraints constraint not sure why it is not working... --- build-constraints.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 784bbb49..19af132a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -277,7 +277,8 @@ packages: #- compensated GHC 7.10 - compressed - concurrent-supply - - constraints + # https://github.com/fpco/stackage/issues/973 + - constraints < 0.6 - contravariant - distributive - either @@ -1712,9 +1713,6 @@ packages: # https://github.com/fpco/stackage/issues/968 - bifunctors < 5.1 - # https://github.com/fpco/stackage/issues/973 - - constraints < 0.6 - # end of packages From 389c803e4d7179f30f0140b8dce1c1c9147256ae Mon Sep 17 00:00:00 2001 From: Tim McGilchrist Date: Thu, 12 Nov 2015 09:57:05 +1100 Subject: [PATCH 04/41] Update build-constraints.yaml --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 258ec007..0712dc43 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1602,7 +1602,7 @@ packages: "Tim Baumann @timjb": - engine-io-yesod - "Tim McGilchrist @lambda_foo": + "Tim McGilchrist @tmcgilchrist": - riak - airship From 7acf3b44a0e1a7c837036313b76709975e6c5832 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 13 Nov 2015 13:03:02 +0900 Subject: [PATCH 05/41] upperbound ghc-mod (#974) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 19af132a..a9abca22 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -660,7 +660,7 @@ packages: # - system-canonicalpath "Daniel Gröber ": - - ghc-mod + - ghc-mod < 5.4.0.0 - cabal-helper "Yann Esposito ": From 5093a4cb63fb3a1d8da1620102b6bc65c88f540d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 13 Nov 2015 13:16:49 +0900 Subject: [PATCH 06/41] add DRBG constraint for #946 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index c81b2601..11763470 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1701,6 +1701,7 @@ packages: - cereal < 0.5 - messagepack < 0.5.0 - messagepack-rpc < 0.5.1 + - DRBG < 0.5.5 # https://github.com/fpco/stackage/issues/957 - exact-pi < 0.3 From de7b7af77b4cdc856072b77f196f9ebe551c95ca Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 13 Nov 2015 14:01:06 +0900 Subject: [PATCH 07/41] Revert "upperbound ghc-mod (#974)" and add @DanielG This reverts commit 7acf3b44a0e1a7c837036313b76709975e6c5832. --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 11763470..9d5ca00f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -659,8 +659,8 @@ packages: # https://github.com/d12frosted/CanonicalPath/issues/5 # - system-canonicalpath - "Daniel Gröber ": - - ghc-mod < 5.4.0.0 + "Daniel Gröber @DanielG": + - ghc-mod - cabal-helper "Yann Esposito ": From bcfaad491b6de6466b9d7cc8e7dd0ae913ae1648 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 13 Nov 2015 18:04:00 +0900 Subject: [PATCH 08/41] disable the ghc-mod testsuite (#974) due to Hackage metadata change to doctest < 0.10.1 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9d5ca00f..42f98fd2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1844,6 +1844,9 @@ skipped-tests: # https://github.com/fpco/stackage/issues/934 - cacophony + # https://github.com/fpco/stackage/issues/974 + - ghc-mod + # end of skipped-tests From 77ee5a4f7df8d96be9a1fbc29662037f19643c77 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 14 Nov 2015 22:18:39 +0900 Subject: [PATCH 09/41] constraint retry < 0.7 for stack (#975) --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 42f98fd2..f3f8a2bd 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1715,6 +1715,8 @@ packages: # https://github.com/fpco/stackage/issues/968 - bifunctors < 5.1 + # https://github.com/fpco/stackage/issues/975 + - retry < 0.7 # end of packages From 670c8470b30d0fb6372c111689de101dbf422027 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 14 Nov 2015 23:04:26 +0900 Subject: [PATCH 10/41] allow hindent testsuite to fail (chrisdone/hindent#166) --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index f3f8a2bd..b05f061b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2160,6 +2160,8 @@ expected-test-failures: - hworker - hworker-ses + # https://github.com/chrisdone/hindent/issues/166 + - hindent # end of expected-test-failures From b0ece3e71743e3848991320cc062735148cc3572 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 15 Nov 2015 22:02:37 +0900 Subject: [PATCH 11/41] upperbound lucid-svg (#976) --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b05f061b..f7a7874c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -866,7 +866,8 @@ packages: - palette #- diagrams-canvas GHC 7.10, via blank-canvas - diagrams-rasterific - - lucid-svg + # https://github.com/fpco/stackage/issues/976 + - lucid-svg < 0.6.0.0 - diagrams-html5 - static-canvas From 9077ad20d1e3e670aa171f8bb9f8e2222a9faa8d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 15 Nov 2015 22:09:48 +0900 Subject: [PATCH 12/41] upperbound diagrams-svg for lucid-svg (#976) --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f7a7874c..3c55b8d6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -365,7 +365,8 @@ packages: - diagrams-core - diagrams-lib - diagrams-postscript - - diagrams-svg + # https://github.com/fpco/stackage/issues/976 + - diagrams-svg < 1.3.1.8 - dual-tree - force-layout - haxr From 4cbc36c3592030df90b4cbbab2e0b564d4affa06 Mon Sep 17 00:00:00 2001 From: John Galt Date: Sun, 15 Nov 2015 12:02:30 -0500 Subject: [PATCH 13/41] Added blake2 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3c55b8d6..e4483e23 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1632,6 +1632,7 @@ packages: "John Galt @centromere": - cacophony - pipes-cacophony + - blake2 "Adam Curtis @kallisti-dev": - webdriver From b75a782bff51e336d1613d83d829509b8f40d5ee Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Nov 2015 14:45:36 +0900 Subject: [PATCH 14/41] 0.3.0.8 fails to build (diagrams/diagrams-haddock#26) --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e4483e23..2514954a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -360,7 +360,8 @@ packages: - BlogLiterately-diagrams - diagrams - diagrams-builder - - diagrams-haddock + # https://github.com/diagrams/diagrams-haddock/issues/26 + - diagrams-haddock < 0.3.0.8 - diagrams-contrib - diagrams-core - diagrams-lib From ef2afeec7acd3020440ef8e3cb07923f7bf59626 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Nov 2015 15:03:09 +0900 Subject: [PATCH 15/41] pandoc-1.15.2 test fails (jgm/pandoc#2537) --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2514954a..5e5c40d3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2166,6 +2166,9 @@ expected-test-failures: # https://github.com/chrisdone/hindent/issues/166 - hindent + + # https://github.com/jgm/pandoc/issues/2537 + - pandoc # end of expected-test-failures From d7c59dfc4a23d3dd2400a9112a64908136a71260 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Nov 2015 15:07:05 +0900 Subject: [PATCH 16/41] build.sh: simplify setup by using $TAG --- automated/build.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index 9b7fbc0e..8b9ed5cb 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -7,13 +7,6 @@ TARGET=$1 TAG=$(echo $TARGET | cut -d- -f 1) IMAGE=snoyberg/stackage:$TAG -if [ "$TAG" = "nightly" ] -then - TROOT=$ROOT/nightly -else - TROOT=$ROOT/$(echo $TARGET | cut -d. -f 1) -fi - PLAN_FILE=current-plan.yaml DOCMAP_FILE=current-docmap.yaml BUNDLE_FILE=current.bundle @@ -21,8 +14,8 @@ BUNDLE_FILE=current.bundle CABAL_DIR=$ROOT/cabal GHC_DIR=$ROOT/ghc DOT_STACKAGE_DIR=$ROOT/dot-stackage -WORKDIR=$TROOT/work -SSH_DIR=$ROOT/ssh-$(echo $TARGET | cut -d- -f 1) +WORKDIR=$ROOT/$TAG/work +SSH_DIR=$ROOT/ssh-$TAG mkdir -p \ "$CABAL_DIR" \ From 9d7600ececb9ff721a2892831fa5495276b98998 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Nov 2015 15:15:50 +0900 Subject: [PATCH 17/41] ghc-mod doctest upperbound raised on Hackage (#974) --- build-constraints.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5e5c40d3..d9d02c80 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1849,10 +1849,6 @@ skipped-tests: # https://github.com/fpco/stackage/issues/934 - cacophony - - # https://github.com/fpco/stackage/issues/974 - - ghc-mod - # end of skipped-tests From ee3daf9c7d5bf3ef4dfff5d64f64ea75ef8fdbf8 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 16 Nov 2015 19:24:37 +0100 Subject: [PATCH 18/41] Trim some whitespace --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index d9d02c80..9999e55d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1611,7 +1611,7 @@ packages: "Tim McGilchrist @tmcgilchrist": - riak - airship - + "Yuras Shumovich @Yuras": - pdf-toolbox-core - pdf-toolbox-content @@ -1637,7 +1637,7 @@ packages: "Adam Curtis @kallisti-dev": - webdriver - + "Luke Iannini @lukexi": - inline-c - inline-c-cpp @@ -1645,7 +1645,7 @@ packages: "Emin Karayel ": - sync-mht - + "Michael Schröder @mcschroeder": - ttrie From a9189b9f5cd1e2ddd95c10819ea3af53008edc5a Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 16 Nov 2015 19:41:08 +0100 Subject: [PATCH 19/41] Remove pandoc boundary --- build-constraints.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9999e55d..6dd010b5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1685,10 +1685,6 @@ packages: # https://github.com/idontgetoutmuch/largeword/pull/12 - largeword < 1.2.4 - # https://github.com/jgm/pandoc/issues/2466 - # Can be removed after > 1.15.1.1 is out. - - pandoc < 1.15.1.1 || > 1.15.1.1 - # https://github.com/fpco/stackage/issues/942 - semigroups < 0.18 From 3c3dc1d1054ad47036fb0523be59a5f4c97fe1af Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 16 Nov 2015 19:41:25 +0100 Subject: [PATCH 20/41] Remove HaskellNet upper bound and close #960 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6dd010b5..02aae1b6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1709,9 +1709,6 @@ packages: # https://github.com/fpco/stackage/issues/959 - th-orphans < 0.13 - # https://github.com/fpco/stackage/issues/960 - - HaskellNet < 0.5 - # https://github.com/fpco/stackage/issues/968 - bifunctors < 5.1 From 25abcd869d8a64fa02f8a5880572511fd27eeba3 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 16 Nov 2015 19:41:37 +0100 Subject: [PATCH 21/41] Remove th-orphans upper bound and close #959 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 02aae1b6..57255f8d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1706,9 +1706,6 @@ packages: # https://github.com/fpco/stackage/issues/957 - exact-pi < 0.3 - # https://github.com/fpco/stackage/issues/959 - - th-orphans < 0.13 - # https://github.com/fpco/stackage/issues/968 - bifunctors < 5.1 From ceb57787cb0efd34ea6213b9f2706bab72b37803 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 16 Nov 2015 19:43:49 +0100 Subject: [PATCH 22/41] Remove JuicyPixels-repa bounds, see http://matrix.hackage.haskell.org/package/JuicyPixels-repa --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 57255f8d..a8d8e01d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -45,7 +45,7 @@ packages: - repa-io - repa-algorithms - repa-devil - - JuicyPixels-repa < 0.6.1 || > 0.7 # GHC 7.10 (e-mail sent by @bergmark) + - JuicyPixels-repa - cereal-conduit - binary-conduit - lzma-conduit From 308dd79e0d3a209c25834aad283a5aa4d44dd6e4 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 16 Nov 2015 20:21:21 +0100 Subject: [PATCH 23/41] Re-enable retry's test-suite --- build-constraints.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index a8d8e01d..a2419465 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1814,8 +1814,6 @@ skipped-tests: - vector - Cabal - MissingH - # https://github.com/Soostone/retry/issues/30 - - retry - fft # https://github.com/fpco/stackage/issues/602 From 46ae5ee1a6e768380aecc8a3ff81de9b50aad82d Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Mon, 16 Nov 2015 21:47:48 +0200 Subject: [PATCH 24/41] Update build-constraints.yaml --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index a2419465..06b9390d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1648,6 +1648,9 @@ packages: "Michael Schröder @mcschroeder": - ttrie + + "Andrew Lelechenko @Bodigrim": + - exp-pairs "Stackage upper bounds": # https://github.com/fpco/stackage/issues/537 From 53dcbee93608696e4eee0a2c63e9c7b55456731a Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Tue, 17 Nov 2015 00:29:44 +0100 Subject: [PATCH 25/41] Revert "Re-enable retry's test-suite". This requires the upper bound excluding retry-0.7 to be lifted. This reverts commit 308dd79e0d3a209c25834aad283a5aa4d44dd6e4. --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index a2419465..a8d8e01d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1814,6 +1814,8 @@ skipped-tests: - vector - Cabal - MissingH + # https://github.com/Soostone/retry/issues/30 + - retry - fft # https://github.com/fpco/stackage/issues/602 From 4918ff23a34d83a119d9392b4c8a3cbdab1ff608 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Tue, 17 Nov 2015 01:40:01 +0100 Subject: [PATCH 26/41] disable exp-pairs due to test-suite failure #979 --- build-constraints.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b104dba7..9fb1dc23 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1648,9 +1648,10 @@ packages: "Michael Schröder @mcschroeder": - ttrie - - "Andrew Lelechenko @Bodigrim": - - exp-pairs + + # https://github.com/fpco/stackage/pull/979 + # "Andrew Lelechenko @Bodigrim": + # - exp-pairs "Stackage upper bounds": # https://github.com/fpco/stackage/issues/537 From 7493443bddd1a667e8877e6b3947717f54187694 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 17 Nov 2015 19:05:55 +0900 Subject: [PATCH 27/41] Revert "pandoc-1.15.2 test fails (jgm/pandoc#2537)" should be fixed in pandoc-1.15.2.1 This reverts commit ef2afeec7acd3020440ef8e3cb07923f7bf59626. --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9fb1dc23..ad9d541b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2156,9 +2156,6 @@ expected-test-failures: # https://github.com/chrisdone/hindent/issues/166 - hindent - - # https://github.com/jgm/pandoc/issues/2537 - - pandoc # end of expected-test-failures From 39897046398c7dc3fcffeff5badcd00e9cf02643 Mon Sep 17 00:00:00 2001 From: Stefan Kersten Date: Tue, 17 Nov 2015 16:29:24 +0100 Subject: [PATCH 28/41] Add hsndfile package `hsndfile` is a Haskell wrapper for the libsndfile C library for cross-platform soundfile I/O. --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index ad9d541b..ce98b738 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1653,6 +1653,9 @@ packages: # "Andrew Lelechenko @Bodigrim": # - exp-pairs + "Stefan Kersten @kaoskorobase": + - hsndfile + "Stackage upper bounds": # https://github.com/fpco/stackage/issues/537 - zlib < 0.6 From 6fd5193d67b7aa39c4c609c9f14682db557df5db Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Tue, 17 Nov 2015 17:00:19 +0100 Subject: [PATCH 29/41] Add libsndfile1-dev for hsndfile #980 --- debian-bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 9d817e89..1ac0f74e 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -54,6 +54,7 @@ apt-get install -y \ libpq-dev \ libsdl2-dev \ libsnappy-dev \ + libsndfile1-dev \ libsqlite3-dev \ libssl-dev \ libtagc0-dev \ From 8b2b4d6be80806dae7cdf5c626f869cbdaa8c518 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Tue, 17 Nov 2015 21:47:14 +0100 Subject: [PATCH 30/41] Remove upper bounds and close #944 --- build-constraints.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ce98b738..3b2fa2a4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1695,15 +1695,6 @@ packages: # https://github.com/fpco/stackage/issues/942 - semigroups < 0.18 - # https://github.com/fpco/stackage/issues/944 - - linear < 1.20 - - reflection < 2.1 - - diagrams-lib < 1.3.0.4 - - luminance < 0.6 - - luminance-samples < 0.6 - - lens < 4.13 - - semigroups < 0.17 - # https://github.com/fpco/stackage/issues/946 - cereal < 0.5 - messagepack < 0.5.0 From 9ce75d3554f24b4d57bca1f0415b3cd7eef00805 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Wed, 18 Nov 2015 13:23:10 +0100 Subject: [PATCH 31/41] revert lens and reflection upper bounds (#944) --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3b2fa2a4..986d5a7d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1709,6 +1709,10 @@ packages: # https://github.com/fpco/stackage/issues/975 - retry < 0.7 + + # https://github.com/fpco/stackage/issues/944 + - lens < 4.13 + - reflection < 2.1 # end of packages From 790c22ac887f076cffdc54e362b2903672e2e409 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Wed, 18 Nov 2015 15:36:21 +0100 Subject: [PATCH 32/41] Upper bound for #981 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 986d5a7d..2f720bd0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1713,6 +1713,9 @@ packages: # https://github.com/fpco/stackage/issues/944 - lens < 4.13 - reflection < 2.1 + + # https://github.com/fpco/stackage/issues/981 + - haskell-src-exts < 1.17 # end of packages From 4ee5eb90a703fe58297efdb8443e223ee256822b Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Wed, 18 Nov 2015 16:13:31 +0100 Subject: [PATCH 33/41] Disable hsndfile #980 --- build-constraints.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2f720bd0..835b0e7f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1653,8 +1653,9 @@ packages: # "Andrew Lelechenko @Bodigrim": # - exp-pairs - "Stefan Kersten @kaoskorobase": - - hsndfile + # https://github.com/fpco/stackage/pull/980 + # "Stefan Kersten @kaoskorobase": + # - hsndfile "Stackage upper bounds": # https://github.com/fpco/stackage/issues/537 From 9cb3fe3a67ead87421446918e2cd2500d5868612 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Thu, 19 Nov 2015 01:17:11 +0100 Subject: [PATCH 34/41] Trying to include hledger-ui again #938 --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 835b0e7f..8be7f9a9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -632,8 +632,7 @@ packages: "Simon Michael ": - hledger - # https://github.com/fpco/stackage/issues/938 - # - hledger-ui + - hledger-ui - hledger-web - shelltestrunner From f328e7e7275bf79b5d7ebdfca990f20330644864 Mon Sep 17 00:00:00 2001 From: yihuang Date: Thu, 19 Nov 2015 09:48:22 +0800 Subject: [PATCH 35/41] Add tagstream-conduit --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8be7f9a9..dcbd987e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1655,6 +1655,9 @@ packages: # https://github.com/fpco/stackage/pull/980 # "Stefan Kersten @kaoskorobase": # - hsndfile + + "yihuang @yihuang": + - tagstream-conduit "Stackage upper bounds": # https://github.com/fpco/stackage/issues/537 From 6dd2edacb03717f3cf3f60bf8b4c29bf6654e376 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Thu, 19 Nov 2015 14:44:10 +0100 Subject: [PATCH 36/41] Upper bounds for #981 --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index dcbd987e..0cc3c006 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1719,6 +1719,8 @@ packages: # https://github.com/fpco/stackage/issues/981 - haskell-src-exts < 1.17 + - derive < 2.5.23 + - hlint < 1.9.23 # end of packages From f0da78004c228aefdf9b92bdcb368eac070b89e7 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Thu, 19 Nov 2015 15:37:49 +0100 Subject: [PATCH 37/41] Disable some amazonka test-suites that don't work with lens 4.13 brendanhay/amazonka#251 --- build-constraints.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0cc3c006..6858ff58 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1655,7 +1655,7 @@ packages: # https://github.com/fpco/stackage/pull/980 # "Stefan Kersten @kaoskorobase": # - hsndfile - + "yihuang @yihuang": - tagstream-conduit @@ -1849,8 +1849,13 @@ skipped-tests: # https://github.com/fpco/stackage/issues/934 - cacophony -# end of skipped-tests + # Build error with lens-4.13 + # https://github.com/brendanhay/amazonka/issues/251 + - amazonka-ec2 + - amazonka-s3 + - amasonka-swf +# end of skipped-tests # Tests which we should build and run, but which are expected to fail. We # should not fail a build based on a test failure for one of these packages. From 7a5a8e9e95379ee50dcf680d8b25de879f75858e Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Thu, 19 Nov 2015 15:39:43 +0100 Subject: [PATCH 38/41] Disable hledger-ui because of the same build error #938 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6858ff58..aad117d3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -632,7 +632,7 @@ packages: "Simon Michael ": - hledger - - hledger-ui + # - hledger-ui - hledger-web - shelltestrunner From 7d6f47c6ccd3a4c4cb8b52b67ea6eb11bd0ad780 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Thu, 19 Nov 2015 16:13:55 +0100 Subject: [PATCH 39/41] Fix amazonka-swf typo --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index aad117d3..d60b77cb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1854,7 +1854,7 @@ skipped-tests: # https://github.com/brendanhay/amazonka/issues/251 - amazonka-ec2 - amazonka-s3 - - amasonka-swf + - amazonka-swf # end of skipped-tests # Tests which we should build and run, but which are expected to fail. We From c9c786da1532ebeb9ace0a6fdb4dcaa2d64fd1e5 Mon Sep 17 00:00:00 2001 From: Omari Norman Date: Thu, 19 Nov 2015 10:39:14 -0500 Subject: [PATCH 40/41] add ofx to Omari Norman's packages --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index d60b77cb..f84f7372 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -143,6 +143,7 @@ packages: - prednote - cartel - Earley + - ofx "Neil Mitchell": - hlint From 4947aa5a63fc9b15d1a19607db48a136151968bb Mon Sep 17 00:00:00 2001 From: RyanGlScott Date: Thu, 19 Nov 2015 10:45:29 -0800 Subject: [PATCH 41/41] Place generic-deriving under a maintainer --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f84f7372..951505cf 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -332,7 +332,6 @@ packages: - gl - lens-aeson - zlib-lens - - generic-deriving - hyperloglog "Andrew Farmer ": @@ -1372,6 +1371,7 @@ packages: "Ryan Scott @RyanGlScott": - base-orphans + - generic-deriving - invariant - keycode - text-show