@@ -3112,7 +3112,7 @@ packages:
31123112
31133113 "Mark Hopkins <markjohnhopkins@gmail.com> @mjhopkins":
31143114 - alerta
3115−
3115+
31163116 "Steven Vandevelde <icid.asset@gmail.com> @icidasset":
31173117 - shikensu
31183118
@@ -3175,31 +3175,20 @@ packages:
31753175 # https://github.com/fpco/stackage/issues/2400
31763176 - hslua < 0.5
31773177
3178− # https://github.com/fpco/stackage/issues/2440
3179− - discord-hs < 0.3.2
3180−
31813178 # https://github.com/fpco/stackage/issues/2449
31823179 - aeson < 1.2.0.0
31833180
31843181 # https://github.com/fpco/stackage/issues/2451
31853182 - websockets < 0.11.0.0
3186− - servant-subscriber < 0.6.0.1 # requires 0.11 on websockets
3183+ - servant-subscriber < 0.6.0.1
31873184
31883185 # https://github.com/fpco/stackage/issues/2464
31893186 - traverse-with-class < 1.0.0.0
31903187
3191− # https://github.com/fpco/stackage/issues/2477
3192− - intervals < 0.8
3193−
31943188 # https://github.com/fpco/stackage/issues/2487
31953189 - graphviz < 2999.19
31963190
3197− # https://github.com/fpco/stackage/issues/2489
3198− - haskell-src-meta < 0.8
3199− - interpolate < 0.1.1
3200−
3201− # https://github.com/fpco/stackage/issues/2494
3202− # Indirectly blocked on fpco/stackage/issues/245
3191+ # https://github.com/fpco/stackage/issues/2451
32033192 - websockets-simple < 0.0.2.1
32043193 - websockets-rpc < 0.4.1
32053194
@@ -3212,18 +3201,10 @@ packages:
32123201 # https://github.com/fpco/stackage/issues/2533
32133202 - mysql-haskell < 0.8.1.0
32143203
3215− # https://github.com/fpco/stackage/issues/2537
3216− - servant < 0.11
3217− - servant-client < 0.11
3218− - servant-server < 0.11
3219− - servant-docs < 0.10.0.1
3220− - servant-foreign < 0.10.0.1
3221−
3222− # https://github.com/fpco/stackage/issues/2538
32233204 # https://github.com/fpco/stackage/issues/2604
32243205 - criterion < 1.2
3225− - statistics < 0.14 # requires bigger criterion, criterion stopped on #2538
3226− - thread-local-storage < 0.1.2 # caused by #2604
3206+ - statistics < 0.14
3207+ - thread-local-storage < 0.1.2
32273208
32283209 # https://github.com/fpco/stackage/issues/2550
32293210 - foldl < 1.3.0
@@ -3238,11 +3219,6 @@ packages:
32383219 # https://github.com/fpco/stackage/issues/2559
32393220 - path-io < 1.3
32403221
3241− # https://github.com/fpco/stackage/issues/2560
3242− - quickcheck-instances < 0.3.13
3243− - text-show-instances < 3.6.1
3244− - aeson-compat < 0.3.7
3245−
32463222 # https://github.com/fpco/stackage/issues/2562
32473223 - trifecta < 1.7
32483224
@@ -3252,12 +3228,6 @@ packages:
32523228 # https://github.com/fpco/stackage/issues/2569
32533229 - optparse-applicative < 0.14
32543230
3255− # https://github.com/fpco/stackage/issues/2570
3256− - pandoc-citeproc < 0.10.5
3257−
3258− # https://github.com/jaspervdj/hakyll/issues/544
3259− - hakyll < 4.9.6.0
3260−
32613231 # https://github.com/fpco/stackage/issues/2577
32623232 - hint < 0.7
32633233
@@ -3269,17 +3239,15 @@ packages:
32693239
32703240 # https://github.com/fpco/stackage/issues/2586
32713241 - QuickCheck < 2.10
3242+ - aeson-compat < 0.3.7
3243+ - quickcheck-instances < 0.3.13
3244+ - text-show < 3.6.2
3245+ - text-show-instances < 3.6.1
32723246 - these < 0.7.4
32733247
32743248 # https://github.com/fpco/stackage/issues/2587
32753249 - extra < 1.6
32763250
3277− # https://github.com/michalkonecny/mixed-types-num/issues/1
3278− - mixed-types-num < 0.2
3279−
3280− # https://github.com/fpco/stackage/issues/2590
3281− - text-show < 3.6.2
3282−
32833251 # https://github.com/fpco/stackage/issues/2594
32843252 - req < 0.3.0 # also remove from expected-test-failure
32853253 - req-conduit < 0.2.0 # because of above