Merge branch 'master' into patch-1

.github/workflows/check.yml

@@ -9,7 +9,6 @@ jobs:
       - uses: haskell/actions/setup@v1
         with:
           ghc-version: '8.10'
-          cabal-version: '3.4'
           stack-version: '2.5'
       - uses: actions/cache@v2
         with:

README.md

@@ -25,7 +25,7 @@ We welcome all packages, provided:
 Full details on how to add and test a package can be found in the [maintainers agreement](https://github.com/commercialhaskell/stackage/blob/master/MAINTAINERS.md#adding-a-package).
 
 __NOTE__: There is an approximate 30 minute delay between a package uploading
-to Hackage and being available to the Travis build script to check upper
+to Hackage and being available to the Github workflow action to check upper
 bounds. If a pull request is marked as failed due to using an older version,
 please close and reopen the PR to retrigger a Travis build.
 

build-constraints.yaml

@@ -3756,7 +3756,7 @@ packages:
     "János Tapolczai <janos.tapolczai@gmail.com> @jtapolczai":
         - listsafe
 
-    "Serokell <hi@serokell.io> @serokell":
+    "Serokell <libraries@serokell.io> @serokell":
         # - importify
         - log-warper < 0 # GHC 8.4 via lifted-async-0.10.0.1
         - o-clock
@@ -3765,30 +3765,6 @@ packages:
         - with-utf8
         - uncaught-exception
 
-    "Kowainik <xrom.xkov@gmail.com> @chshersh @vrom911":
-        - co-log-core
-        - co-log < 0 # ansi-terminal 0.11
-        - co-log-polysemy < 0
-        - colourista < 0 # ansi-terminal 0.11
-        - first-class-patterns
-        - ilist
-        - life-sync < 0 # optparse-applicative 0.16.1
-        - membrain
-        - relude < 1  # cabal version/parsing issue: https://github.com/commercialhaskell/stackage/issues/5921
-        - shellmet
-        - shortcut-links
-        - summoner < 0 # neat-interpolation-0.4
-        - summoner-tui < 0 # neat-interpolation-0.4 via summoner
-        - tomland
-        - typerep-map
-        - validation-selective
-
-    "Dmitrii Kovanikov <kovanikov@gmail.com> @chshersh":
-        - type-errors-pretty
-
-    "Veronika Romashkina <vrom911@gmail.com> @vrom911":
-        - slist
-
     "Holmusk <tech@holmusk.com> @arbus":
         - elm-street < 0 # via base-4.13.0.0 & warp-3.3.2
 
@@ -4048,6 +4024,7 @@ packages:
         - composite-aeson
         - composite-aeson-path
         - composite-aeson-refined
+        - composite-aeson-throw
         - composite-base
         - composite-binary
         - composite-ekg
@@ -4058,6 +4035,8 @@ packages:
         - ixset-typed-conversions
         - ixset-typed-hashable-instance
         - lucid-cdn
+        - pandoc-dhall-decoder
+        - pandoc-throw
         - path-binary-instance
         - path-extensions
         - path-like
@@ -4317,7 +4296,7 @@ packages:
         # - msgpack-rpc # https://github.com/commercialhaskell/stackage/pull/4471
         # - msgpack-idl # https://github.com/commercialhaskell/stackage/pull/4471
         - msgpack-aeson < 0 # via msgpack
-        - int-cast < 0 # ghc 8.10
+        - int-cast
 
     "Akihito Kirisaki <kirisaki@klaraworks.net> @kirisaki":
         - caster < 0 # via fast-builder
@@ -4461,7 +4440,7 @@ packages:
         - slack-api
 
     "Dobromir Nikolov <dnikolovv@hotmail.com> @dnikolovv":
-        - it-has
+        - it-has < 0 # generic-lens 2.1
 
     "Gabriele Sales <gbrsales@gmail.com> @gbrsales":
         - cabal-appimage
@@ -4559,6 +4538,12 @@ packages:
     "Tomasz Maciosowski <t4ccer@gmail.com> @t4ccer":
         - wai-session-redis
 
+    "Rory Tyler Hayford <rory.hayford@protonmail.com> @ngua":
+        - ipa
+
+    "Andreas Herrmann <andreas.herrmann@tweag.io> @aherrmann":
+        - capability
+
     "Grandfathered dependencies":
         - Boolean
         - Decimal
@@ -4633,6 +4618,8 @@ packages:
         - classy-prelude-conduit
         - clientsession
         - cmark-gfm
+        - co-log-core
+        - co-log-polysemy < 0
         - colour
         - concurrent-extra
         - conduit
@@ -4709,6 +4696,7 @@ packages:
         - filemanip
         - fin
         - fingertree
+        - first-class-patterns
         - fmlist
         - friendly-time
         - functor-classes-compat
@@ -4762,6 +4750,7 @@ packages:
         - hxt-unicode
         - iconv
         - ieee754
+        - ilist
         - indexed
         - infer-license
         - insert-ordered-containers
@@ -4788,6 +4777,7 @@ packages:
         - lzma
         - managed
         - math-functions
+        - membrain
         - mersenne-random-pure64
         - mfsolve
         - microstache
@@ -4864,6 +4854,7 @@ packages:
         - regex-tdfa-text < 0 # via regex-base-0.94.0.0
         - relapse
         - relational-schemas
+        - relude < 1  # cabal version/parsing issue: https://github.com/commercialhaskell/stackage/issues/5921
         - rerebase
         - resolv
         - resource-pool
@@ -4887,12 +4878,15 @@ packages:
         - setenv
         - shakespeare
         - shell-escape
+        - shellmet
+        - shortcut-links
         - silently
         - simple-reflect
         - simple-sendfile
         - singleton-bool
         - size-based < 0 # ghc 8.10
         - skein
+        - slist
         - snap-core
         - some
         - special-values
@@ -4952,14 +4946,17 @@ packages:
         - timeit
         - tls-session-manager
         - token-bucket < 0 # via base-4.13.0.0
+        - tomland
         - tonatona < 0 # via tonaparser
         - transformers-base
         - tree-diff
         - trivial-constraint < 0 # ghc 8.10.1 #5447/closed
         - true-name < 0 # MonadFail
         - tuple-th
+        - type-errors-pretty
         - type-fun < 0 # ghc 8.10.1 #5448/closed
         - type-hint
+        - typerep-map
         - uglymemo
         - unbounded-delays
         - universe
@@ -4975,6 +4972,7 @@ packages:
         - utf8-light
         - utf8-string
         - uuid-types
+        - validation-selective
         - vault
         - vec
         - vector
@@ -6845,11 +6843,6 @@ packages:
       # https://github.com/commercialhaskell/stackage/issues/5836
       - clock < 0.8.2
 
-      # https://github.com/commercialhaskell/stackage/issues/5842
-      - generic-lens < 2.1.0.0
-      - generic-lens-core < 2.1.0.0
-      - generic-optics < 2.1.0.0
-
       # https://github.com/commercialhaskell/stackage/issues/5864
       - parser-combinators       < 1.3.0
       - parser-combinators-tests < 1.3.0
@@ -6938,6 +6931,8 @@ packages:
       # https://github.com/commercialhaskell/stackage/issues/5975
       - singleton-bool < 0.1.6
 
+      # https://github.com/commercialhaskell/stackage/issues/5982
+      - versions < 5.0
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of
@@ -7777,7 +7772,6 @@ expected-test-failures:
     - base16 # https://github.com/commercialhaskell/stackage/issues/5948
     - prometheus-client # https://github.com/commercialhaskell/stackage/issues/5948
 
-
     # Recursive deps https://github.com/fpco/stackage/issues/1818
     - options
     - text # 1.2.2.1
@@ -7894,6 +7888,8 @@ expected-test-failures:
     - mmark
     - mmark-ext
 
+    # https://github.com/kcsongor/generic-lens/issues/133
+    - generic-optics
 # end of expected-test-failures
 
 # Benchmarks which are known not to build. Note that, currently we do not run