git.iko.soy/stackage
on master help sign in
Merged with fpco master
ee519d1joey
Stackage/Config.hs+24−15
compare with master
unifiedsplit
@@ -219,10 +219,13 @@ defaultExpectedFailures ghcVer requireHP = execWriter $ do
219 -- Requires locally running server
219 -- Requires locally running server
220 add "bloodhound"
220 add "bloodhound"
221
221
222− -- Requires PostgreSQL running
222+ -- Too lazy to keep the test dependencies up to date
223+ let names =
223− add "postgresql-binary"
224+ words "hasql hasql-postgres hasql-backend postgresql-binary" ++
224− add "hasql"
225+ words "stm-containers focus list-t slave-thread partial-handler" ++
225− add "hasql-postgres"
226+ words "neat-interpolation cases" ++
227+ words "base-prelude mtl-prelude"
228+ in mapM_ add names
226
229
227 -- https://github.com/gtk2hs/gtk2hs/issues/79
230 -- https://github.com/gtk2hs/gtk2hs/issues/79
228 add "gio"
231 add "gio"
@@ -248,6 +251,9 @@ defaultExpectedFailures ghcVer requireHP = execWriter $ do
248 add "tls"
251 add "tls"
249
252
250 add "x509"
253 add "x509"
254+
255+ -- Requires a correctly set up Postgres instance
256+ add "opaleye"
251 where
257 where
252 add = tell . singleton . PackageName
258 add = tell . singleton . PackageName
253
259
@@ -281,6 +287,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
281 | ghcVer <= GhcMajorVersion 7 6 -> "< 1.17"
287 | ghcVer <= GhcMajorVersion 7 6 -> "< 1.17"
282 | ghcVer <= GhcMajorVersion 7 8 -> "< 1.19"
288 | ghcVer <= GhcMajorVersion 7 8 -> "< 1.19"
283 | otherwise -> "-any"
289 | otherwise -> "-any"
290+ -- cabal-install is buggy still...
291+ addRange "Michael Snoyman" "network" "< 2.6"
292+ addRange "Michael Snoyman" "network-uri" "< 2.6"
284
293
285 mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
294 mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
286 [ "web-fpco th-expand-syns configurator smtLib"
295 [ "web-fpco th-expand-syns configurator smtLib"
@@ -314,6 +323,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
314 mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
323 mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
315 [ "criterion"
324 [ "criterion"
316 , "th-lift singletons th-desugar quickcheck-assertions"
325 , "th-lift singletons th-desugar quickcheck-assertions"
326+ , "distributed-process distributed-process-simplelocalnet" -- cloud-haskell"
317 ]
327 ]
318
328
319 addRange "FP Complete <michael@fpcomplete.com>" "kure" "<= 2.4.10"
329 addRange "FP Complete <michael@fpcomplete.com>" "kure" "<= 2.4.10"
@@ -330,14 +340,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
330 mapM_ (add "Alan Zimmerman") $ words
340 mapM_ (add "Alan Zimmerman") $ words
331 "hjsmin language-javascript"
341 "hjsmin language-javascript"
332
342
333− {-
334−
335− https://github.com/fpco/stackage/issues/320
336−
337 when (ghcVer >= GhcMajorVersion 7 8 && not requireHP) $
343 when (ghcVer >= GhcMajorVersion 7 8 && not requireHP) $
338 mapM_ (add "Alfredo Di Napoli <alfredo.dinapoli@gmail.com>") $ words
344 mapM_ (add "Alfredo Di Napoli <alfredo.dinapoli@gmail.com>") $ words
339 "mandrill"
345 "mandrill"
340− -}
341
346
342 mapM_ (add "Jasper Van der Jeugt") $ words
347 mapM_ (add "Jasper Van der Jeugt") $ words
343 "blaze-html blaze-markup stylish-haskell"
348 "blaze-html blaze-markup stylish-haskell"
@@ -465,9 +470,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
465 "base-unicode-symbols containers-unicode-symbols"
470 "base-unicode-symbols containers-unicode-symbols"
466
471
467 if ghcVer >= GhcMajorVersion 7 8
472 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"
469 else do
474 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"
471 addRange "Michael Snoyman" "linear-accelerate" "< 0.2"
476 addRange "Michael Snoyman" "linear-accelerate" "< 0.2"
472
477
473 mapM_ (add "Dan Burton <danburton.email@gmail.com>") $ words =<<
478 mapM_ (add "Dan Burton <danburton.email@gmail.com>") $ words =<<
@@ -651,12 +656,16 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
651
656
652 mapM_ (add "Alexander Thiemann <mail@athiemann.net>") $ words
657 mapM_ (add "Alexander Thiemann <mail@athiemann.net>") $ words
653 "graph-core reroute Spock"
658 "graph-core reroute Spock"
654−
659+
655 mapM_ (add "Joey Eremondi <joey@eremondi.com>") $ words =<<
660 mapM_ (add "Joey Eremondi <joey@eremondi.com>") $ words =<<
656 [ "prettyclass language-glsl union-find aeson-pretty QuasiText"
661 [ "prettyclass language-glsl union-find aeson-pretty QuasiText"
657 , "digest zip-archive elm-compiler elm-package elm-core-sources elm-build-lib"
662 , "digest zip-archive elm-compiler elm-package elm-core-sources elm-build-lib"
658 ]
663 ]
659
664
665+
666+ mapM_ (add "Arthur Fayzrakhmanov <heraldhoi@gmail.com>") $ words
667+ "sodium hdevtools"
668+
660 -- https://github.com/fpco/stackage/issues/217
669 -- https://github.com/fpco/stackage/issues/217
661 addRange "Michael Snoyman" "transformers" "< 0.4"
670 addRange "Michael Snoyman" "transformers" "< 0.4"
662 addRange "Michael Snoyman" "mtl" "< 2.2"
671 addRange "Michael Snoyman" "mtl" "< 2.2"
@@ -715,9 +724,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
715 -- https://github.com/fpco/stackage/issues/354
724 -- https://github.com/fpco/stackage/issues/354
716 addRange "Michael Snoyman" "JuicyPixels" "< 3.2"
725 addRange "Michael Snoyman" "JuicyPixels" "< 3.2"
717
726
718− -- https://github.com/fpco/stackage/issues/355
719− addRange "Michael Snoyman" "hashtables" "< 1.2"
720−
721 when (ghcVer == GhcMajorVersion 7 8 && requireHP) $ do
727 when (ghcVer == GhcMajorVersion 7 8 && requireHP) $ do
722 -- Yay workarounds for unnecessarily old versions
728 -- Yay workarounds for unnecessarily old versions
723 let peg x y = addRange "Haskell Platform" x y
729 let peg x y = addRange "Haskell Platform" x y
@@ -739,6 +745,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
739 peg "HandsomeSoup" "< 0.3.3"
745 peg "HandsomeSoup" "< 0.3.3"
740 peg "network-uri" "< 2.6"
746 peg "network-uri" "< 2.6"
741
747
748+ mapM_ (add "Tom Ellis <tom-stackage@jaguarpaw.co.uk>") $ words
749+ "opaleye product-profunctors"
750+
742add :: String -> String -> Writer PackageMap ()
751add :: String -> String -> Writer PackageMap ()
743add maintainer package = addRange maintainer package "-any"
752add maintainer package = addRange maintainer package "-any"
744
753
Stackage/Select.hs+6
@@ -43,10 +43,13 @@ defaultSelectSettings version requireHP = SelectSettings
43 -> Set.singleton "containers-old"
43 -> Set.singleton "containers-old"
44 _ -> Set.empty) `Set.union`
44 _ -> Set.empty) `Set.union`
45
45
46+ {-
46 -- Support for network 2.6
47 -- Support for network 2.6
47 (if version >= GhcMajorVersion 7 8 && not requireHP
48 (if version >= GhcMajorVersion 7 8 && not requireHP
48 then Set.singleton "network-uri"
49 then Set.singleton "network-uri"
49 else Set.empty)
50 else Set.empty)
51+ -}
52+ Set.empty
50 , disabledFlags = Set.fromList (words "bytestring-in-base test-hlint")
53 , disabledFlags = Set.fromList (words "bytestring-in-base test-hlint")
51 `Set.union`
54 `Set.union`
52 (if version <= GhcMajorVersion 7 4
55 (if version <= GhcMajorVersion 7 4
@@ -60,10 +63,13 @@ defaultSelectSettings version requireHP = SelectSettings
60 then Set.singleton "decoderinterface"
63 then Set.singleton "decoderinterface"
61 else Set.empty) `Set.union`
64 else Set.empty) `Set.union`
62
65
66+ {-
63 -- Support for network 2.6
67 -- Support for network 2.6
64 (if version >= GhcMajorVersion 7 8 && not requireHP
68 (if version >= GhcMajorVersion 7 8 && not requireHP
65 then Set.empty
69 then Set.empty
66 else Set.singleton "network-uri")
70 else Set.singleton "network-uri")
71+ -}
72+ Set.singleton "network-uri"
67 , allowedPackage = const $ Right ()
73 , allowedPackage = const $ Right ()
68 , useGlobalDatabase = False
74 , useGlobalDatabase = False
69 , skippedTests =
75 , skippedTests =
stackage.cabal+1−1
@@ -40,7 +40,7 @@ library
40 , transformers
40 , transformers
41 , process
41 , process
42 , old-locale
42 , old-locale
43− , time
43+ , time < 1.5
44 , utf8-string
44 , utf8-string
45
45
46executable stackage
46executable stackage