@@ -219,10 +219,13 @@ defaultExpectedFailures ghcVer requireHP = execWriter $ do
219219 -- Requires locally running server
220220 add "bloodhound"
221221
222− -- Requires PostgreSQL running
223− add "postgresql-binary"
224− add "hasql"
225− add "hasql-postgres"
222+ -- Too lazy to keep the test dependencies up to date
223+ let names =
224+ words "hasql hasql-postgres hasql-backend postgresql-binary" ++
225+ words "stm-containers focus list-t slave-thread partial-handler" ++
226+ words "neat-interpolation cases" ++
227+ words "base-prelude mtl-prelude"
228+ in mapM_ add names
226229
227230 -- https://github.com/gtk2hs/gtk2hs/issues/79
228231 add "gio"
@@ -248,6 +251,9 @@ defaultExpectedFailures ghcVer requireHP = execWriter $ do
248251 add "tls"
249252
250253 add "x509"
254+
255+ -- Requires a correctly set up Postgres instance
256+ add "opaleye"
251257 where
252258 add = tell . singleton . PackageName
253259
@@ -281,6 +287,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
281287 | ghcVer <= GhcMajorVersion 7 6 -> "< 1.17"
282288 | ghcVer <= GhcMajorVersion 7 8 -> "< 1.19"
283289 | otherwise -> "-any"
290+ -- cabal-install is buggy still...
291+ addRange "Michael Snoyman" "network" "< 2.6"
292+ addRange "Michael Snoyman" "network-uri" "< 2.6"
284293
285294 mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
286295 [ "web-fpco th-expand-syns configurator smtLib"
@@ -314,6 +323,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
314323 mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
315324 [ "criterion"
316325 , "th-lift singletons th-desugar quickcheck-assertions"
326+ , "distributed-process distributed-process-simplelocalnet" -- cloud-haskell"
317327 ]
318328
319329 addRange "FP Complete <michael@fpcomplete.com>" "kure" "<= 2.4.10"
@@ -330,14 +340,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
330340 mapM_ (add "Alan Zimmerman") $ words
331341 "hjsmin language-javascript"
332342
333− {-
334−
335− https://github.com/fpco/stackage/issues/320
336−
337343 when (ghcVer >= GhcMajorVersion 7 8 && not requireHP) $
338344 mapM_ (add "Alfredo Di Napoli <alfredo.dinapoli@gmail.com>") $ words
339345 "mandrill"
340− -}
341346
342347 mapM_ (add "Jasper Van der Jeugt") $ words
343348 "blaze-html blaze-markup stylish-haskell"
@@ -465,9 +470,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
465470 "base-unicode-symbols containers-unicode-symbols"
466471
467472 if ghcVer >= GhcMajorVersion 7 8
468− then add "Ryan Newton <ryan.newton@alum.mit.edu>" "accelerate"
473+ then add "Trevor L. McDonell <tmcdonell@cse.unsw.edu.au>" "accelerate"
469474 else do
470− addRange "Ryan Newton <ryan.newton@alum.mit.edu>" "accelerate" "< 0.15"
475+ addRange "Trevor L. McDonell <tmcdonell@cse.unsw.edu.au>" "accelerate" "< 0.15"
471476 addRange "Michael Snoyman" "linear-accelerate" "< 0.2"
472477
473478 mapM_ (add "Dan Burton <danburton.email@gmail.com>") $ words =<<
@@ -651,12 +656,16 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
651656
652657 mapM_ (add "Alexander Thiemann <mail@athiemann.net>") $ words
653658 "graph-core reroute Spock"
654−
659+
655660 mapM_ (add "Joey Eremondi <joey@eremondi.com>") $ words =<<
656661 [ "prettyclass language-glsl union-find aeson-pretty QuasiText"
657662 , "digest zip-archive elm-compiler elm-package elm-core-sources elm-build-lib"
658663 ]
659664
665+
666+ mapM_ (add "Arthur Fayzrakhmanov <heraldhoi@gmail.com>") $ words
667+ "sodium hdevtools"
668+
660669 -- https://github.com/fpco/stackage/issues/217
661670 addRange "Michael Snoyman" "transformers" "< 0.4"
662671 addRange "Michael Snoyman" "mtl" "< 2.2"
@@ -715,9 +724,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
715724 -- https://github.com/fpco/stackage/issues/354
716725 addRange "Michael Snoyman" "JuicyPixels" "< 3.2"
717726
718− -- https://github.com/fpco/stackage/issues/355
719− addRange "Michael Snoyman" "hashtables" "< 1.2"
720−
721727 when (ghcVer == GhcMajorVersion 7 8 && requireHP) $ do
722728 -- Yay workarounds for unnecessarily old versions
723729 let peg x y = addRange "Haskell Platform" x y
@@ -739,6 +745,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
739745 peg "HandsomeSoup" "< 0.3.3"
740746 peg "network-uri" "< 2.6"
741747
748+ mapM_ (add "Tom Ellis <tom-stackage@jaguarpaw.co.uk>") $ words
749+ "opaleye product-profunctors"
750+
742751add :: String -> String -> Writer PackageMap ()
743752add maintainer package = addRange maintainer package "-any"
744753