From e06b88dc9f595f6e7ccf1893defa05b1ee2563b5 Mon Sep 17 00:00:00 2001 From: Emily Pillmore Date: Tue, 18 Feb 2020 00:03:58 -0500 Subject: [PATCH 01/18] add base16, base16-lens, base32, base32-lens --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 49fa8cdd..0f2ff3fb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -42,6 +42,10 @@ packages: - lens-regex-pcre < 0 # via pcre-heavy "Emily Pillmore @topos": + - base16 + - base16-lens + - base32 + - base32-lens - base64 - base64-lens - lens-process < 0 # via lens-4.18.1 From d83e0c5cfea90bb6a1a4a6738bd48eaaed5e56a2 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Tue, 18 Feb 2020 19:10:39 +0100 Subject: [PATCH 02/18] Re-introduce servant upper bounds for #5191 --- build-constraints.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 881a5567..fd9ea702 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4680,6 +4680,18 @@ packages: - haskeline < 0.8.0 - structured-cli < 2.6 + # https://github.com/commercialhaskell/stackage/issues/5191 - compilation failures + - servant < 0.17 + - servant-client < 0.17 + - servant-server < 0.17 + - servant-client-core < 0.17 + - servant-docs < 0.11.5 + - servant-foreign < 0.15.1 + - servant-lucid < 0.9.0.1 + - servant-mock < 0.8.6 + - servant-swagger < 1.1.8 + - aur < 6.3.0 + # end of packages # Package flags are applied to individual packages, and override the values of From 38cb5f89d3812588b2f0fe83f32a4cbaec187b8a Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Tue, 18 Feb 2020 20:03:38 +0100 Subject: [PATCH 03/18] Expect egison tests to fail egison/egison#150 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fd9ea702..f6dfe27d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5487,6 +5487,7 @@ expected-benchmark-failures: - raaz # https://github.com/commercialhaskell/stackage/issues/4766 - thyme - xmlgen # https://github.com/skogsbaer/xmlgen/issues/6 + - egison # https://github.com/egison/egison/issues/150 # end of expected-benchmark-failures From 0572d4ec28406012049f58cebed39c54ef6350d4 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Tue, 18 Feb 2020 20:05:30 +0100 Subject: [PATCH 04/18] Remove polysemy upper bound and close #5183 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f6dfe27d..966cbc6f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -67,7 +67,7 @@ packages: - configurator-pg < 0 # via base-4.13.0.0 "Sandy Maguire @isovector": - - polysemy < 1.3.0.0 # https://github.com/commercialhaskell/stackage/issues/5183 + - polysemy - polysemy-plugin < 0 # via polysemy - polysemy-zoo < 0 # via hedis - ecstasy From 5fa02e3ff26e4da3e535247a71dd21bd8ef98994 Mon Sep 17 00:00:00 2001 From: Clint Adams Date: Tue, 18 Feb 2020 22:05:51 -0500 Subject: [PATCH 05/18] Re-enable cabal-debian, unblocked by debian's switch from bzlib to bz2 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index df979e29..8668a391 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1184,7 +1184,7 @@ packages: - hopenpgp-tools < 0 # hOpenPGP & ixset-typed - opensource - debian - - cabal-debian < 0 # via debian + - cabal-debian "Piyush P Kurur @piyush-kurur": - raaz < 0 # via base-4.13.0.0 From 77cc3ceb298a96a90c0ae34bb7813431a6f25d28 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Wed, 19 Feb 2020 14:26:28 +0100 Subject: [PATCH 06/18] Add fusion-plugin-types --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index df979e29..a43b5f2c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -515,6 +515,7 @@ packages: - xls "Pranay Sashank @pranaysashank": + - fusion-plugin-types - fusion-plugin "Aleksey Uimanov @s9gf4ult": From 55dd735a06d6799cd168a8c95808be004e1a2f58 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Wed, 19 Feb 2020 10:03:32 +0100 Subject: [PATCH 07/18] add amqp-utils depends on magic, maybe @jgoerzen wants to take his part --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index df979e29..9830b087 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4159,6 +4159,10 @@ packages: - type-natural - sized + "Frank Doepper @woffs": + - amqp-utils + - magic + "Grandfathered dependencies": - network - Boolean From 26690e66055fa1b28c98216da6a8e557d86ba451 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Wed, 19 Feb 2020 15:34:27 +0100 Subject: [PATCH 08/18] Revert "Re-enable cabal-debian, unblocked by debian's switch from bzlib to bz2" #5192 This reverts commit 5fa02e3ff26e4da3e535247a71dd21bd8ef98994. --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5f63ef92..b41203e3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1185,7 +1185,7 @@ packages: - hopenpgp-tools < 0 # hOpenPGP & ixset-typed - opensource - debian - - cabal-debian + - cabal-debian < 0 # build failure https://github.com/commercialhaskell/stackage/pull/5192#issuecomment-588263681 "Piyush P Kurur @piyush-kurur": - raaz < 0 # via base-4.13.0.0 From 1154569771c146c81ccb75e49d6bf1a8a6f62209 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Wed, 19 Feb 2020 16:14:04 +0100 Subject: [PATCH 09/18] Re-enable egison benchmarks egison/egison#150 --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b41203e3..590dc575 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5496,7 +5496,6 @@ expected-benchmark-failures: - raaz # https://github.com/commercialhaskell/stackage/issues/4766 - thyme - xmlgen # https://github.com/skogsbaer/xmlgen/issues/6 - - egison # https://github.com/egison/egison/issues/150 # end of expected-benchmark-failures From eeb5b20cd9f97e4e604301edef90ab6cffe526d3 Mon Sep 17 00:00:00 2001 From: Brandon Chinn Date: Wed, 19 Feb 2020 16:12:45 -0800 Subject: [PATCH 10/18] Add hpc-lcov --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 590dc575..e97fadfa 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4103,6 +4103,7 @@ packages: "Brandon Chinn @brandon-leapyear": - aeson-schemas - github-rest + - hpc-lcov - th-test-utils "Akshay Mankar @akshaymankar": From c270b9936c3a2ae271a92dc764ad5d343f44e423 Mon Sep 17 00:00:00 2001 From: Alexey Kotlyarov Date: Thu, 20 Feb 2020 10:21:33 +1100 Subject: [PATCH 11/18] Add back serverless-haskell --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 590dc575..30d37ae1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3826,7 +3826,7 @@ packages: "Alexey Kotlyarov @koterpillar": - appendmap - - serverless-haskell < 0 # via aeson-extra + - serverless-haskell "Guru Devanla @gdevanla": - pptable From bbc449d8dbeb73b1161f5367e7a7b732a28f7da0 Mon Sep 17 00:00:00 2001 From: Jonathan Knowles Date: Thu, 20 Feb 2020 09:43:59 +0800 Subject: [PATCH 12/18] Add `bech32-th` package. --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 590dc575..b3c717aa 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3290,6 +3290,7 @@ packages: "Jonathan Knowles @jonathanknowles": - bech32 + - bech32-th - roc-id "Mahdi Dibaiee @mdibaiee": From 83aa53c7f433a7573b720826e88b2c8b8ec66456 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 20 Feb 2020 14:31:55 +0800 Subject: [PATCH 13/18] add resolv --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 590dc575..f7300116 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4474,6 +4474,7 @@ packages: - relapse - relational-schemas - rerebase + - resolv - resource-pool - resourcet - rfc5051 @@ -4987,6 +4988,7 @@ skipped-tests: - psqueues # via QuickCheck-2.12.6.1 - pure-zlib # via QuickCheck-2.12.6.1 - records-sop # via hspec-2.7.0 + - resolv # via tasty-1.2 - serialise - servant # via hspec-2.7.0 - servant-client # via hspec-2.7.0 From 776064c5175499ac889c5a4c717f387f523cb332 Mon Sep 17 00:00:00 2001 From: Pavel Krajcevski Date: Thu, 20 Feb 2020 22:23:02 -0800 Subject: [PATCH 14/18] Re-enable HCodecs after Mokosha/HCodecs#2 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1a2ef52d..084e897e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1356,7 +1356,7 @@ packages: - netwire-input-glfw - yoga - freetype2 - - HCodecs < 0 # MonadFail + - HCodecs "Emanuel Borsboom @borsboom": - BoundedChan From fbd8e5a89d46e0307484a906ddde119cf9a648ee Mon Sep 17 00:00:00 2001 From: Clint Adams Date: Fri, 21 Feb 2020 08:59:55 -0500 Subject: [PATCH 15/18] Re-enable cabal-debian --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 084e897e..b2e9fe82 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1185,7 +1185,7 @@ packages: - hopenpgp-tools < 0 # hOpenPGP & ixset-typed - opensource - debian - - cabal-debian < 0 # build failure https://github.com/commercialhaskell/stackage/pull/5192#issuecomment-588263681 + - cabal-debian "Piyush P Kurur @piyush-kurur": - raaz < 0 # via base-4.13.0.0 From 1b19f4e4d5bb74b478e2b1694109140cc27827fc Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Fri, 21 Feb 2020 16:25:25 -0800 Subject: [PATCH 16/18] add haskell-igraph --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b2e9fe82..ec07d9cb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2127,6 +2127,7 @@ packages: "Kai Zhang @kaizhang": - matrices + - haskell-igraph "Michel Boucey @MichelBoucey": - IPv6Addr From c9ff3e17fe6682ab1ff63ee96e8aab3a7b6278bc Mon Sep 17 00:00:00 2001 From: Doug Burke Date: Sat, 22 Feb 2020 08:20:19 -0500 Subject: [PATCH 17/18] Re-enable swish-0.10.0.3 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b2e9fe82..20a6a295 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3706,7 +3706,7 @@ packages: - qm-interpolated-string "Douglas Burke @DougBurke": - - swish < 0 # via base-4.13.0.0 + - swish - hvega - ihaskell-hvega < 0 From 9fd10d4c09ae2e101e92e6309064ee97d85b3978 Mon Sep 17 00:00:00 2001 From: Ziyang Liu Date: Sat, 22 Feb 2020 08:40:27 -0800 Subject: [PATCH 18/18] add multi-containers --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b2e9fe82..6c25d1fb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4166,6 +4166,9 @@ packages: - amqp-utils - magic + "Ziyang Liu @zliu41": + - multi-containers + "Grandfathered dependencies": - network - Boolean