git.iko.soy/stackage
on master help sign in
Remove upper bounds and close #276
commitece1d69fc0fdd4528607ff4118ba4d65a254ba56 authorMichael Snoyman <michael@snoyman.com> dateFri 28 Nov 2014, 07:51 (12 years ago) parent7c3ff90
2 files changed+16−7
compare with master
unifiedsplit
Stackage/Config.hs+3−4 Stackage/Select.hs+13−3
Stackage/Config.hs+3−4
@@ -591,6 +591,8 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
591591 addRange "Michael Snoyman" "aeson-utils" "< 0.2.2"
592592 addRange "Michael Snoyman" "formatting" "< 5"
593593 addRange "Michael Snoyman" "aws" "< 0.10"
594+ addRange "Michael Snoyman" "network" "< 2.6"
595+ addRange "Michael Snoyman" "network-uri" "< 2.6"
594596
595597 -- 0.16.2 fixes dependency issues with different version of GHC
596598 -- and Haskell Platform. Now builds on GHC 7.4-7.8. Version 1.0 is
@@ -603,10 +605,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
603605 when (ghcVer < GhcMajorVersion 7 8) $
604606 addRange "Michael Snoyman" "aeson" "< 0.8"
605607
606− -- https://github.com/fpco/stackage/issues/276
607− addRange "Michael Snoyman" "network" "< 2.6"
608− addRange "Michael Snoyman" "network-uri" "< 2.6"
609−
610608 -- https://github.com/fpco/stackage/issues/279
611609 addRange "Michael Snoyman" "MonadRandom" "< 0.2"
612610
@@ -653,6 +651,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
653651 peg "texmath" "<= 0.6.6.3"
654652 peg "checkers" "== 0.3.2"
655653 peg "HandsomeSoup" "< 0.3.3"
654+ peg "network-uri" "< 2.6"
656655
657656add :: String -> String -> Writer PackageMap ()
658657add maintainer package = addRange maintainer package "-any"
Stackage/Select.hs+13−3
@@ -41,8 +41,13 @@ defaultSelectSettings version requireHP = SelectSettings
4141 (case Map.lookup (PackageName "containers") coreMap of
4242 Just v | Just range <- simpleParse "< 0.5", v `withinRange` range
4343 -> Set.singleton "containers-old"
44− _ -> Set.empty)
45− , disabledFlags = Set.fromList (words "bytestring-in-base test-hlint network-uri")
44+ _ -> Set.empty) `Set.union`
45+
46+ -- Support for network 2.6
47+ (if version >= GhcMajorVersion 7 8 && not requireHP
48+ then Set.singleton "network-uri"
49+ else Set.empty)
50+ , disabledFlags = Set.fromList (words "bytestring-in-base test-hlint")
4651 `Set.union`
4752 (if version <= GhcMajorVersion 7 4
4853 then Set.singleton "bytestring-builder"
@@ -53,7 +58,12 @@ defaultSelectSettings version requireHP = SelectSettings
5358 `Set.union`
5459 (if version <= GhcMajorVersion 7 6
5560 then Set.singleton "decoderinterface"
56− else Set.empty)
61+ else Set.empty) `Set.union`
62+
63+ -- Support for network 2.6
64+ (if version >= GhcMajorVersion 7 8 && not requireHP
65+ then Set.empty
66+ else Set.singleton "network-uri")
5767 , allowedPackage = const $ Right ()
5868 , useGlobalDatabase = False
5969 , skippedTests =