@@ -4,7 +4,7 @@ module Stackage.Config where
44import Control.Monad (when)
55import Control.Monad.Trans.Writer (execWriter, tell)
66import qualified Data.Map as Map
7−import Data.Set (fromList)
7+import Data.Set (fromList, singleton)
88import Distribution.Text (simpleParse)
99import Stackage.Types
1010
@@ -19,94 +19,95 @@ defaultExtraCore _ = fromList $ map PackageName $ words
1919-- error in our package combination.
2020defaultExpectedFailures :: GhcMajorVersion
2121 -> Set PackageName
22−defaultExpectedFailures _ = fromList $ map PackageName
23− [ -- Requires an old version of WAI and Warp for tests
24− "HTTP"
22+defaultExpectedFailures _ = execWriter $ do
23+ -- Requires an old version of WAI and Warp for tests
24+ add "HTTP"
2525
2626 -- text and setenv have recursive dependencies in their tests, which
2727 -- cabal can't (yet) handle
28− , "text"
29− , "setenv"
28+ add "text"
29+ add "setenv"
3030
3131 -- The version of GLUT included with the HP does not generate
3232 -- documentation correctly.
33− , "GLUT"
33+ add "GLUT"
3434
3535 -- https://github.com/bos/statistics/issues/42
36− , "statistics"
36+ add "statistics"
3737
3838 -- https://github.com/kazu-yamamoto/simple-sendfile/pull/10
39− , "simple-sendfile"
39+ add "simple-sendfile"
4040
4141 -- http://hackage.haskell.org/trac/hackage/ticket/954
42− , "diagrams"
42+ add "diagrams"
4343
4444 -- https://github.com/fpco/stackage/issues/24
45− , "unix-time"
45+ add "unix-time"
4646
4747 -- With transformers 0.3, it doesn't provide any modules
48− , "transformers-compat"
48+ add "transformers-compat"
4949
5050 -- Tests require shell script and are incompatible with sandboxed package
5151 -- databases
52− , "HTF"
52+ add "HTF"
5353
5454 -- https://github.com/simonmar/monad-par/issues/28
55− , "monad-par"
55+ add "monad-par"
5656
5757 -- Unfortunately network failures seem to happen haphazardly
58− , "network"
58+ add "network"
5959
6060 -- https://github.com/ekmett/hyphenation/issues/1
61− , "hyphenation"
61+ add "hyphenation"
6262
6363 -- Test suite takes too long to run on some systems
64− , "punycode"
64+ add "punycode"
6565
6666 -- http://hub.darcs.net/stepcut/happstack/issue/1
67− , "happstack-server"
67+ add "happstack-server"
6868
6969 -- Requires a Facebook app.
70− , "fb"
70+ add "fb"
7171
7272 -- https://github.com/tibbe/hashable/issues/64
73− , "hashable"
73+ add "hashable"
7474
7575 -- https://github.com/vincenthz/language-java/issues/10
76− , "language-java"
76+ add "language-java"
7777
78− , "threads"
79− , "crypto-conduit"
80− , "pandoc"
81− , "language-ecmascript"
82− , "hspec"
83− , "alex"
78+ add "threads"
79+ add "crypto-conduit"
80+ add "pandoc"
81+ add "language-ecmascript"
82+ add "hspec"
83+ add "alex"
8484
8585 -- https://github.com/basvandijk/concurrent-extra/issues/
86− , "concurrent-extra"
86+ add "concurrent-extra"
8787
8888 -- https://github.com/rrnewton/haskell-lockfree-queue/issues/7
89− , "abstract-deque"
89+ add "abstract-deque"
9090
9191 -- https://github.com/skogsbaer/xmlgen/issues/2
92− , "xmlgen"
92+ add "xmlgen"
9393
9494 -- Something very strange going on with the test suite, I can't figure
9595 -- out how to fix it
96− , "bson"
96+ add "bson"
9797
9898 -- Requires a locally running PostgreSQL server with appropriate users
99− , "postgresql-simple"
99+ add "postgresql-simple"
100100
101101 -- https://github.com/IreneKnapp/direct-sqlite/issues/32
102− , "direct-sqlite"
102+ add "direct-sqlite"
103103
104104 -- Missing files
105− , "websockets"
105+ add "websockets"
106106
107107 -- Some kind of Cabal bug when trying to run tests
108− , "thyme"
109− ]
108+ add "thyme"
109+ where
110+ add = tell . singleton . PackageName
110111
111112-- | List of packages for our stable Hackage. All dependencies will be
112113-- included as well. Please indicate who will be maintaining the package