git.iko.soy/stackage
on master help sign in
Merge branch 'master' into stackage2
00c546fMichael Snoyman
Stackage/Config.hs+9−3
compare with master
unifiedsplit
@@ -220,7 +220,7 @@ defaultExpectedFailures ghcVer requireHP = execWriter $ do
220 add "bloodhound"
220 add "bloodhound"
221
221
222 -- Too lazy to keep the test dependencies up to date
222 -- Too lazy to keep the test dependencies up to date
223− let names =
223+ let names =
224 words "hasql hasql-postgres hasql-backend postgresql-binary" ++
224 words "hasql hasql-postgres hasql-backend postgresql-binary" ++
225 words "stm-containers focus list-t slave-thread partial-handler" ++
225 words "stm-containers focus list-t slave-thread partial-handler" ++
226 words "neat-interpolation cases" ++
226 words "neat-interpolation cases" ++
@@ -284,6 +284,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
284 | ghcVer <= GhcMajorVersion 7 6 -> "< 1.17"
284 | ghcVer <= GhcMajorVersion 7 6 -> "< 1.17"
285 | ghcVer <= GhcMajorVersion 7 8 -> "< 1.19"
285 | ghcVer <= GhcMajorVersion 7 8 -> "< 1.19"
286 | otherwise -> "-any"
286 | otherwise -> "-any"
287+ -- cabal-install is buggy still...
288+ addRange "Michael Snoyman" "network" "< 2.6"
289+ addRange "Michael Snoyman" "network-uri" "< 2.6"
287
290
288 mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
291 mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
289 [ "web-fpco th-expand-syns configurator smtLib"
292 [ "web-fpco th-expand-syns configurator smtLib"
@@ -655,9 +658,12 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
655
658
656 mapM_ (add "Alexander Thiemann <mail@athiemann.net>") $ words
659 mapM_ (add "Alexander Thiemann <mail@athiemann.net>") $ words
657 "graph-core reroute Spock"
660 "graph-core reroute Spock"
658−
661+
659 mapM_ (add "Joey Eremondi <joey@eremondi.com>") $ words
662 mapM_ (add "Joey Eremondi <joey@eremondi.com>") $ words
660− "prettyclass"
663+ "prettyclass language-glsl union-find aeson-pretty QuasiText"
664+
665+ mapM_ (add "Arthur Fayzrakhmanov <heraldhoi@gmail.com>") $ words
666+ "sodium hdevtools"
661
667
662 -- https://github.com/fpco/stackage/issues/217
668 -- https://github.com/fpco/stackage/issues/217
663 addRange "Michael Snoyman" "transformers" "< 0.4"
669 addRange "Michael Snoyman" "transformers" "< 0.4"
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 =