From e5078cf99752f8539d9b9bc9dd975c81a9757432 Mon Sep 17 00:00:00 2001 From: Pete Bevin Date: Sun, 22 Oct 2017 11:47:03 -0400 Subject: [PATCH 01/13] Fix typo in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 28b27427..55305e7d 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ Build the package set --------------------- Generally only the stackage build server run by the stackage curator -team and people intrested in incorporating stackage snapshots into an +team and people interested in incorporating stackage snapshots into an OS distribution need to build the entire package set. If you're interested in trying this yourself, please check out [the curator guide](https://github.com/fpco/stackage/blob/master/CURATORS.md), From 6280275d74251d4e8de8eedcd5b8b10f670de93e Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 23 Oct 2017 21:04:48 -0400 Subject: [PATCH 02/13] add partial-semigroup package --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fc5c941b..cafbe31d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3400,6 +3400,9 @@ packages: - ghc-core - colorize-haskell + "Chris Martin @chris-martin": + - partial-semigroup + # 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 84cadd87afa7ce761548c9580ec54cbbcbf1aa49 Mon Sep 17 00:00:00 2001 From: Kostiantyn Rybnikov Date: Tue, 24 Oct 2017 11:40:36 +0300 Subject: [PATCH 03/13] hprotoc fix --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index fc5c941b..4e9d2b77 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1925,7 +1925,7 @@ packages: "Kostiantyn Rybnikov @k-bx": - protocol-buffers - - hprotoc < 0 # compilation failure https://github.com/k-bx/protocol-buffers/issues/45 + - hprotoc - protocol-buffers-descriptor - ekg-core - digits From acf8f9459f8ddaba1e3ae966ec006c1458a9b88f Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Tue, 24 Oct 2017 07:31:14 -0500 Subject: [PATCH 04/13] Add monad-memo For https://github.com/lspitzner/brittany/issues/2. --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fc5c941b..fb6ac446 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1661,6 +1661,7 @@ packages: # - gloss-rendering # Maintained by @benl23x5. # GHC 8.2.1 - gpolyline # Maintained by @fegu. # - lackey # GHC 8.2.1 + - monad-memo # Maintained by @EduardSergeev. # - octane # GHC 8.2.1 # - overloaded-records # Maintained by @trskop. # GHC 8.2.1 - postgresql-simple-migration # Maintained by @ameingast. From 870bf92a16b3043c7614827700f0d86a1b17ed09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Heikki=20Johannes=20Hild=C3=A9n?= Date: Tue, 24 Oct 2017 17:22:34 +0300 Subject: [PATCH 05/13] Update build-constraints.yaml --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fc5c941b..d404f69a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2462,6 +2462,7 @@ packages: "Johannes Hilden @laserpants": - hashids + - fuzzyset "Joe Hermaszewski @expipiplus1": [] From 6b8c2e882036c66b174017f88a340271661fd00d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Oct 2017 00:29:57 +0900 Subject: [PATCH 06/13] servant-auth-cookie < 0.5.0.6 (#2976) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fc5c941b..85b3835c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3473,6 +3473,7 @@ packages: # https://github.com/fpco/stackage/issues/2976 - http-types < 0.10 + - servant-auth-cookie < 0.5.0.6 # https://github.com/fpco/stackage/issues/2978 - conduit-extra < 1.2.0 From ccd2c54e66dacc545708b2dabf9d31e3625d0845 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Oct 2017 11:04:34 +0900 Subject: [PATCH 07/13] katip-elasticsearch benchmark not compiling (Soostone/katip#74) --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7f4d1c8a..112dea92 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4000,6 +4000,7 @@ expected-benchmark-failures: - raaz # https://github.com/raaz-crypto/raaz/issues/338 - http2 - xxhash # https://github.com/christian-marie/xxhash/issues/4 + - katip-elasticsearch # https://github.com/Soostone/katip/issues/74 # end of expected-benchmark-failures @@ -4233,6 +4234,7 @@ tell-me-when-its-released: - cryptohash-sha1-0.11.100.1 # re-enable benchmarks, https://github.com/fpco/stackage/issues/2538#issuecomment-304458844 - cryptohash-sha256-0.11.100.1 # re-enable benchmarks, https://github.com/fpco/stackage/issues/2538#issuecomment-304458844 - freer-effects-0.3.0.1 # re-enable extensible benchmarks +- katip-elasticsearch-0.4.0.1 # re-enable benchmarks # Packages which should be hidden after registering, to avoid module name # conflicts. This is intended for at least two use cases: From a26fb3ce62ebb34d7b430834f0d602698f2e0a46 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Oct 2017 11:24:09 +0900 Subject: [PATCH 08/13] monad-memo-0.4.1 testsuite not compiling (EduardSergeev/monad-memo#3) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 112dea92..d373397e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3933,6 +3933,7 @@ expected-test-failures: - xmlgen # https://github.com/skogsbaer/xmlgen/issues/6 - yesod-auth-basic # https://github.com/creichert/yesod-auth-basic/issues/1 - servant-swagger # aeson https://github.com/fpco/stackage/issues/2879#issuecomment-331759441 + - monad-memo # https://github.com/EduardSergeev/monad-memo/issues/3 # Stackage upper bounds, re-enable these when their upper bound is removed From f0fc0e9f149b3de681ce20860ff12576760e27b9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Oct 2017 14:25:51 +0900 Subject: [PATCH 09/13] Drop "hasql < 0.20" (#2958) --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index d373397e..82333abd 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3458,9 +3458,6 @@ packages: - llvm-hs < 5.1.0 - llvm-hs-pure < 5.1.0 - # https://github.com/fpco/stackage/issues/2958 - - hasql < 0.20 - # https://github.com/fpco/stackage/issues/2967 - swagger2 < 2.2 From a02cfdf9b5c21747d166a077c4f53c5e3c2aa74c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Oct 2017 14:31:09 +0900 Subject: [PATCH 10/13] monad-memo-0.4.1 benchmark not compiling (EduardSergeev/monad-memo#3) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 82333abd..a7f45459 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3999,6 +3999,7 @@ expected-benchmark-failures: - http2 - xxhash # https://github.com/christian-marie/xxhash/issues/4 - katip-elasticsearch # https://github.com/Soostone/katip/issues/74 + - monad-memo # https://github.com/EduardSergeev/monad-memo/issues/3 # end of expected-benchmark-failures From 2817f5cde6d463a8466a644715f7ee4b7ed317b1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Oct 2017 14:35:15 +0900 Subject: [PATCH 11/13] persistent-mysql-2.6.2 haddock failure (yesodweb/persistent#724) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index a7f45459..aa469da2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4025,6 +4025,7 @@ expected-haddock-failures: - MemoTrie # https://github.com/conal/MemoTrie/issues/10 - text-generic-pretty # https://github.com/fpco/stackage/pull/2160 - cubicbezier # https://github.com/kuribas/cubicbezier/issues/4 + - persistent-mysql # https://github.com/yesodweb/persistent/issues/724 # Haddock bugs - swagger2 # https://github.com/GetShopTV/swagger2/issues/66 From a0c29896c622d09ee6e0b66c4030bfa2f8915072 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Oct 2017 15:46:55 +0900 Subject: [PATCH 12/13] rose-trees failed to rebuild (athanclark/rose-trees#7) --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index aa469da2..5e3f0184 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1755,17 +1755,17 @@ packages: - monadoid - n-tuple - path-extra - - pred-trie + # - pred-trie # rose-trees https://github.com/athanclark/rose-trees/issues/7 - pred-set - path-extra - poly-arity - quickcheck-combinators - - rose-trees + # - rose-trees # https://github.com/athanclark/rose-trees/issues/7 - sets - timemap - tmapchan - tmapmvar - - tries + # - tries # rose-trees https://github.com/athanclark/rose-trees/issues/7 - unit-constraint - unfoldable-restricted - urlpath From a863a992f437b0614e27e9b18174331494138aac Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Oct 2017 17:24:13 +0900 Subject: [PATCH 13/13] drop llvm-hs bounds (#2957) --- build-constraints.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5e3f0184..5e287186 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3454,10 +3454,6 @@ packages: # https://github.com/fpco/stackage/issues/2860 - language-c < 0.7 - # https://github.com/fpco/stackage/issues/2957 - - llvm-hs < 5.1.0 - - llvm-hs-pure < 5.1.0 - # https://github.com/fpco/stackage/issues/2967 - swagger2 < 2.2