@@ -3112,7 +3112,7 @@ packages:
3113 "Mark Hopkins <markjohnhopkins@gmail.com> @mjhopkins":
3113 "Mark Hopkins <markjohnhopkins@gmail.com> @mjhopkins":
3114 - alerta
3114 - alerta
3116 "Steven Vandevelde <icid.asset@gmail.com> @icidasset":
3116 "Steven Vandevelde <icid.asset@gmail.com> @icidasset":
3117 - shikensu
3117 - shikensu
@@ -3175,31 +3175,20 @@ packages:
3175 # https://github.com/fpco/stackage/issues/2400
3175 # https://github.com/fpco/stackage/issues/2400
3176 - hslua < 0.5
3176 - hslua < 0.5
3178− # https://github.com/fpco/stackage/issues/2440
3179− - discord-hs < 0.3.2
3181 # https://github.com/fpco/stackage/issues/2449
3178 # https://github.com/fpco/stackage/issues/2449
3182 - aeson < 1.2.0.0
3179 - aeson < 1.2.0.0
3184 # https://github.com/fpco/stackage/issues/2451
3181 # https://github.com/fpco/stackage/issues/2451
3185 - websockets < 0.11.0.0
3182 - websockets < 0.11.0.0
3186− - servant-subscriber < 0.6.0.1 # requires 0.11 on websockets
3183+ - servant-subscriber < 0.6.0.1
3188 # https://github.com/fpco/stackage/issues/2464
3185 # https://github.com/fpco/stackage/issues/2464
3189 - traverse-with-class < 1.0.0.0
3186 - traverse-with-class < 1.0.0.0
3191− # https://github.com/fpco/stackage/issues/2477
3194 # https://github.com/fpco/stackage/issues/2487
3188 # https://github.com/fpco/stackage/issues/2487
3195 - graphviz < 2999.19
3189 - graphviz < 2999.19
3197− # https://github.com/fpco/stackage/issues/2489
3191+ # https://github.com/fpco/stackage/issues/2451
3198− - haskell-src-meta < 0.8
3199− - interpolate < 0.1.1
3201− # https://github.com/fpco/stackage/issues/2494
3202− # Indirectly blocked on fpco/stackage/issues/245
3203 - websockets-simple < 0.0.2.1
3192 - websockets-simple < 0.0.2.1
3204 - websockets-rpc < 0.4.1
3193 - websockets-rpc < 0.4.1
@@ -3212,18 +3201,10 @@ packages:
3212 # https://github.com/fpco/stackage/issues/2533
3201 # https://github.com/fpco/stackage/issues/2533
3213 - mysql-haskell < 0.8.1.0
3202 - mysql-haskell < 0.8.1.0
3215− # https://github.com/fpco/stackage/issues/2537
3217− - servant-client < 0.11
3218− - servant-server < 0.11
3219− - servant-docs < 0.10.0.1
3220− - servant-foreign < 0.10.0.1
3222− # https://github.com/fpco/stackage/issues/2538
3223 # https://github.com/fpco/stackage/issues/2604
3204 # https://github.com/fpco/stackage/issues/2604
3224 - criterion < 1.2
3205 - criterion < 1.2
3225− - statistics < 0.14 # requires bigger criterion, criterion stopped on #2538
3206+ - statistics < 0.14
3226− - thread-local-storage < 0.1.2 # caused by #2604
3207+ - thread-local-storage < 0.1.2
3228 # https://github.com/fpco/stackage/issues/2550
3209 # https://github.com/fpco/stackage/issues/2550
3229 - foldl < 1.3.0
3210 - foldl < 1.3.0
@@ -3238,11 +3219,6 @@ packages:
3238 # https://github.com/fpco/stackage/issues/2559
3219 # https://github.com/fpco/stackage/issues/2559
3239 - path-io < 1.3
3220 - path-io < 1.3
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
3246 # https://github.com/fpco/stackage/issues/2562
3222 # https://github.com/fpco/stackage/issues/2562
3247 - trifecta < 1.7
3223 - trifecta < 1.7
@@ -3252,12 +3228,6 @@ packages:
3252 # https://github.com/fpco/stackage/issues/2569
3228 # https://github.com/fpco/stackage/issues/2569
3253 - optparse-applicative < 0.14
3229 - optparse-applicative < 0.14
3255− # https://github.com/fpco/stackage/issues/2570
3256− - pandoc-citeproc < 0.10.5
3258− # https://github.com/jaspervdj/hakyll/issues/544
3261 # https://github.com/fpco/stackage/issues/2577
3231 # https://github.com/fpco/stackage/issues/2577
3262 - hint < 0.7
3232 - hint < 0.7
@@ -3269,17 +3239,15 @@ packages:
3270 # https://github.com/fpco/stackage/issues/2586
3240 # https://github.com/fpco/stackage/issues/2586
3271 - QuickCheck < 2.10
3241 - 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
3272 - these < 0.7.4
3246 - these < 0.7.4
3274 # https://github.com/fpco/stackage/issues/2587
3248 # https://github.com/fpco/stackage/issues/2587
3275 - extra < 1.6
3249 - extra < 1.6
3277− # https://github.com/michalkonecny/mixed-types-num/issues/1
3278− - mixed-types-num < 0.2
3280− # https://github.com/fpco/stackage/issues/2590
3281− - text-show < 3.6.2
3283 # https://github.com/fpco/stackage/issues/2594
3251 # https://github.com/fpco/stackage/issues/2594
3284 - req < 0.3.0 # also remove from expected-test-failure
3252 - req < 0.3.0 # also remove from expected-test-failure
3285 - req-conduit < 0.2.0 # because of above
3253 - req-conduit < 0.2.0 # because of above