git.iko.soy/stackage
on master help sign in
Merge branch 'master' into stackage2
commit00c546faee6a54ab0cbfa642eb4fdf62532923a0 authorMichael Snoyman <michael@snoyman.com> dateWed 10 Dec 2014, 10:08 (12 years ago) parent558481495f07e1
2 files changed+15−3
compare with master
unifiedsplit
Stackage/Config.hs+9−3 Stackage/Select.hs+6
Stackage/Config.hs+9−3
@@ -220,7 +220,7 @@ defaultExpectedFailures ghcVer requireHP = execWriter $ do
220220 add "bloodhound"
221221
222222 -- Too lazy to keep the test dependencies up to date
223− let names =
223+ let names =
224224 words "hasql hasql-postgres hasql-backend postgresql-binary" ++
225225 words "stm-containers focus list-t slave-thread partial-handler" ++
226226 words "neat-interpolation cases" ++
@@ -284,6 +284,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
284284 | ghcVer <= GhcMajorVersion 7 6 -> "< 1.17"
285285 | ghcVer <= GhcMajorVersion 7 8 -> "< 1.19"
286286 | otherwise -> "-any"
287+ -- cabal-install is buggy still...
288+ addRange "Michael Snoyman" "network" "< 2.6"
289+ addRange "Michael Snoyman" "network-uri" "< 2.6"
287290
288291 mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
289292 [ "web-fpco th-expand-syns configurator smtLib"
@@ -655,9 +658,12 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
655658
656659 mapM_ (add "Alexander Thiemann <mail@athiemann.net>") $ words
657660 "graph-core reroute Spock"
658−
661+
659662 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"
661667
662668 -- https://github.com/fpco/stackage/issues/217
663669 addRange "Michael Snoyman" "transformers" "< 0.4"
Stackage/Select.hs+6
@@ -43,10 +43,13 @@ defaultSelectSettings version requireHP = SelectSettings
4343 -> Set.singleton "containers-old"
4444 _ -> Set.empty) `Set.union`
4545
46+ {-
4647 -- Support for network 2.6
4748 (if version >= GhcMajorVersion 7 8 && not requireHP
4849 then Set.singleton "network-uri"
4950 else Set.empty)
51+ -}
52+ Set.empty
5053 , disabledFlags = Set.fromList (words "bytestring-in-base test-hlint")
5154 `Set.union`
5255 (if version <= GhcMajorVersion 7 4
@@ -60,10 +63,13 @@ defaultSelectSettings version requireHP = SelectSettings
6063 then Set.singleton "decoderinterface"
6164 else Set.empty) `Set.union`
6265
66+ {-
6367 -- Support for network 2.6
6468 (if version >= GhcMajorVersion 7 8 && not requireHP
6569 then Set.empty
6670 else Set.singleton "network-uri")
71+ -}
72+ Set.singleton "network-uri"
6773 , allowedPackage = const $ Right ()
6874 , useGlobalDatabase = False
6975 , skippedTests =