From 8103865b706c0015d64d905b75fbaced563ec9a2 Mon Sep 17 00:00:00 2001 From: Michael Gilliland Date: Thu, 18 Mar 2021 11:09:16 -0400 Subject: [PATCH 01/14] Add freckle engineering stanza and include sendgrid-v3 package. This is probably a little unconventional in a few ways. This attempts to add packages maintained by the freckle engineering team to its own stanza. It also takes "stackage ownership" of `sendgrid-v3`, originally requested here https://github.com/marcelbuesing/sendgrid-v3/issues/13 Ping @pbrisbin since I moved your Freckle packages and @marcelbuesing since `sendgrid-v3` is your package. --- build-constraints.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index df346b28..81251ecf 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1085,17 +1085,15 @@ packages: - yesod-markdown - yesod-paginator - # Freckle packages I'm maintaining for us + "Freckle Engineering github.com/freckle": - bcp47 - bcp47-orphans - faktory - graphula - hspec-expectations-json - yesod-page-cursor < 0 # https://github.com/commercialhaskell/stackage/issues/5948 - - "Michael Gilliland @mjgpy3": - # Freckle packages I'm maintaining for us - nonempty-zipper + - sendgrid-v3 "Felipe Lessa @meteficha": - fb From 327e70c4e93e4de8a35bd576a6ca149ba6fa645d Mon Sep 17 00:00:00 2001 From: Michael Gilliland Date: Thu, 18 Mar 2021 11:24:31 -0400 Subject: [PATCH 02/14] Use freckle github user rather than path --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 81251ecf..e3e31eee 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1085,7 +1085,7 @@ packages: - yesod-markdown - yesod-paginator - "Freckle Engineering github.com/freckle": + "Freckle Engineering @freckle": - bcp47 - bcp47-orphans - faktory From 30db02f3d0a2abfbd4e110c355617bc7f2a6ae8b Mon Sep 17 00:00:00 2001 From: Michael Gilliland Date: Thu, 18 Mar 2021 11:36:58 -0400 Subject: [PATCH 03/14] Add package yesod-auth-oauth2 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index e3e31eee..2f19bd51 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1094,6 +1094,7 @@ packages: - yesod-page-cursor < 0 # https://github.com/commercialhaskell/stackage/issues/5948 - nonempty-zipper - sendgrid-v3 + - yesod-auth-oauth2 "Felipe Lessa @meteficha": - fb From 23d45e505aaa2653ce586277b5830e9ee794afdd Mon Sep 17 00:00:00 2001 From: Iris Ward Date: Fri, 19 Mar 2021 14:47:52 +0000 Subject: [PATCH 04/14] Re-enable typenums --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index be5ce8a0..f36b7873 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -263,7 +263,7 @@ packages: - butter < 0 # MonadFail "Iris Ward @AdituV": - - typenums < 0 # ghc 8.10.1 #5450/closed + - typenums "Jude Taylor @pikajude": - th-printf From ecfd0003884559da72ab8d885042d482112f84aa Mon Sep 17 00:00:00 2001 From: Michael Gilliland Date: Fri, 19 Mar 2021 11:43:05 -0400 Subject: [PATCH 05/14] Add some freckle handles to freckle eng packages --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2f19bd51..d2d79ef2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1085,7 +1085,7 @@ packages: - yesod-markdown - yesod-paginator - "Freckle Engineering @freckle": + "Freckle Engineering @pbrisbin @halogenandtoast @mjgpy3": - bcp47 - bcp47-orphans - faktory From 8a1bc55d5a9d59f397dc97e42b2ff417eab764d7 Mon Sep 17 00:00:00 2001 From: Artem Pelenitsyn Date: Fri, 19 Mar 2021 12:21:18 -0400 Subject: [PATCH 06/14] add BNFC-meta, alex-meta, happy-meta --- build-constraints.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index be5ce8a0..002e8e9e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4548,6 +4548,11 @@ packages: "Brooklyn Zelenka @expede": - rescue + "Artem Pelenitsyn @ulysses4ever": + - alex-meta + - happy-meta + - BNFC-meta + "Grandfathered dependencies": - Boolean - Decimal From 3142c5ba2d04f18acfbc32d51fb419afe2a2cd77 Mon Sep 17 00:00:00 2001 From: Michael Gilliland Date: Fri, 19 Mar 2021 19:45:25 -0400 Subject: [PATCH 07/14] Add `hspec-junit-formatter` package --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index d2d79ef2..2e4996ff 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1095,6 +1095,7 @@ packages: - nonempty-zipper - sendgrid-v3 - yesod-auth-oauth2 + - hspec-junit-formatter "Felipe Lessa @meteficha": - fb From 28cbcc58a2d7ed09a6790960fed91373f9d3fde2 Mon Sep 17 00:00:00 2001 From: Viacheslav Lotsmanov Date: Sat, 20 Mar 2021 07:46:49 +0200 Subject: [PATCH 08/14] Add place-cursor-at This package is maintained by me, Viacheslav Lotsmanov --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index be5ce8a0..bba21941 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3877,6 +3877,7 @@ packages: - stripe-wreq < 0 # via wreq "Viacheslav Lotsmanov @unclechu": + - place-cursor-at - qm-interpolated-string "Douglas Burke @DougBurke": From cd34a4c1983b692661abe3cfa351e98933cf1f40 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sat, 20 Mar 2021 14:00:09 +0100 Subject: [PATCH 09/14] Expect sendgrid-v3 tests to fail #5951 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 82f93e5c..5a4eac69 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -7652,6 +7652,7 @@ expected-test-failures: - http-client # httpbin issues, https://github.com/snoyberg/http-client/issues/439 - http-directory # httpbin issues, https://github.com/juhp/http-directory/issues/1 - faktory # connection refused, https://github.com/commercialhaskell/stackage/issues/5905 + - sendgrid-v3 # Requires sendgrid API key in env #5951/closed # Missing test files in sdist # Hopefully gets fixed in the next release... From 504ab57c1a747c6273aaa5e54d32753c9a97de15 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sat, 20 Mar 2021 23:53:15 +0100 Subject: [PATCH 10/14] Move clash-prelude to skipped-tests #5926 --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8a3e3d85..16e1159c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -7506,6 +7506,9 @@ skipped-tests: # via vector-0.12.2 https://github.com/commercialhaskell/stackage/issues/5851 - lens + # was in expected test failures, but seems we may have to skip entirely for unknown reasons, previously: https://github.com/clash-lang/clash-compiler/issues/1622 + - clash-prelude + # end of skipped-tests # Tests listed in expected-test-failures configure correctly but may fail to run @@ -7832,9 +7835,6 @@ expected-test-failures: # https://github.com/input-output-hk/bech32/issues/31 - bech32 - # https://github.com/clash-lang/clash-compiler/issues/1622 - - clash-prelude - # doctest - headroom - xml-indexed-cursor From 5c0aa93473acf82be76f85bb2e458f934041d7b1 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sun, 21 Mar 2021 14:06:39 +0100 Subject: [PATCH 11/14] MAINTAINERS.md: s/library/package --- MAINTAINERS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 748abf34..4f98c831 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -26,7 +26,7 @@ don't maintain this package yourself it is preferable that the actual maintainer is also the stackage maintainer, but you are allowed to add it under your own name. -If your library depends on a C library, please add it to the `debian-bootstrap.sh` script. +If your package depends on a C library, please add it to the `debian-bootstrap.sh` script. After doing that commit with a message like "add foo-bar" and send a pull request. From 43fc7c2e88d156c9a33e606f1f0f77abbac4b404 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sun, 21 Mar 2021 14:12:03 +0100 Subject: [PATCH 12/14] MAINTAINERS.md: Remove outdated cabal instructions, I'm not sure how to do this now --- MAINTAINERS.md | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 4f98c831..b1bb2c96 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -42,26 +42,11 @@ of: * It won't notify you of restrictive upper bounds in your package if Stackage has the same upper bounds. For that reason, we recommend using [Packdeps](http://packdeps.haskellers.com/) (see "Following - dependency upgrades" below). + dependency upgrades" below). You can also run `cabal outdated`. * If the latest Stackage Nightly is missing some of the latest packages, your build above may succeed whereas the Travis job may fail. Again: Packdeps will help you detect this situation. -Alternatively, you can build with `cabal`. Note that this may end up -using older dependency versions: - -``` -$ ghc --version # Should be the same as the latest nightly, it's in the title of https://www.stackage.org/nightly -$ cabal update -$ cabal get PACKAGE -$ cd PACKAGE-* -$ cabal sandbox init # Should give "Creating a new sandbox" and not "Using an existing sandbox". -$ cabal install --enable-tests --enable-benchmarks --dry-run | grep latest # Should give no results -$ cabal install --enable-tests --enable-benchmarks --allow-newer -$ cabal test -$ cabal haddock -``` - ## Github and Notifications Stackage uses Github notifications to reduce overhead of contacting individual From b56abe0583753f9f00e368e926c8a0f4d8895014 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sun, 21 Mar 2021 14:15:59 +0100 Subject: [PATCH 13/14] pandoc upper bound for #5956 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 16e1159c..37905983 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -6895,6 +6895,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5941 - http-api-data < 0.4.3 + # https://github.com/commercialhaskell/stackage/issues/5956 + - pandoc < 2.13 + # end of packages # Package flags are applied to individual packages, and override the values of From 9d5a47ab15683ce0217bc027f72af0c2eaa2561d Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sun, 21 Mar 2021 14:29:39 +0100 Subject: [PATCH 14/14] MAINTAINERS.md: comma --- MAINTAINERS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index b1bb2c96..c559231c 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -28,7 +28,7 @@ it under your own name. If your package depends on a C library, please add it to the `debian-bootstrap.sh` script. -After doing that commit with a message like "add foo-bar" and send a pull request. +After doing that, commit with a message like "add foo-bar" and send a pull request. The continuous integration job will do some checks to see if your package's dependencies are up-to-date.