git.iko.soy/stackage
on master help sign in
Remove upper bounds and close #276
ece1d69Michael Snoyman
Stackage/Config.hs+3−4
compare with master
unifiedsplit
@@ -591,6 +591,8 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
591 addRange "Michael Snoyman" "aeson-utils" "< 0.2.2"
591 addRange "Michael Snoyman" "aeson-utils" "< 0.2.2"
592 addRange "Michael Snoyman" "formatting" "< 5"
592 addRange "Michael Snoyman" "formatting" "< 5"
593 addRange "Michael Snoyman" "aws" "< 0.10"
593 addRange "Michael Snoyman" "aws" "< 0.10"
594+ addRange "Michael Snoyman" "network" "< 2.6"
595+ addRange "Michael Snoyman" "network-uri" "< 2.6"
594
596
595 -- 0.16.2 fixes dependency issues with different version of GHC
597 -- 0.16.2 fixes dependency issues with different version of GHC
596 -- and Haskell Platform. Now builds on GHC 7.4-7.8. Version 1.0 is
598 -- 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
603 when (ghcVer < GhcMajorVersion 7 8) $
605 when (ghcVer < GhcMajorVersion 7 8) $
604 addRange "Michael Snoyman" "aeson" "< 0.8"
606 addRange "Michael Snoyman" "aeson" "< 0.8"
605
607
606− -- https://github.com/fpco/stackage/issues/276
607− addRange "Michael Snoyman" "network" "< 2.6"
608− addRange "Michael Snoyman" "network-uri" "< 2.6"
609−
610 -- https://github.com/fpco/stackage/issues/279
608 -- https://github.com/fpco/stackage/issues/279
611 addRange "Michael Snoyman" "MonadRandom" "< 0.2"
609 addRange "Michael Snoyman" "MonadRandom" "< 0.2"
612
610
@@ -653,6 +651,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
653 peg "texmath" "<= 0.6.6.3"
651 peg "texmath" "<= 0.6.6.3"
654 peg "checkers" "== 0.3.2"
652 peg "checkers" "== 0.3.2"
655 peg "HandsomeSoup" "< 0.3.3"
653 peg "HandsomeSoup" "< 0.3.3"
654+ peg "network-uri" "< 2.6"
656
655
657add :: String -> String -> Writer PackageMap ()
656add :: String -> String -> Writer PackageMap ()
658add maintainer package = addRange maintainer package "-any"
657add maintainer package = addRange maintainer package "-any"
Stackage/Select.hs+13−3
@@ -41,8 +41,13 @@ defaultSelectSettings version requireHP = SelectSettings
41 (case Map.lookup (PackageName "containers") coreMap of
41 (case Map.lookup (PackageName "containers") coreMap of
42 Just v | Just range <- simpleParse "< 0.5", v `withinRange` range
42 Just v | Just range <- simpleParse "< 0.5", v `withinRange` range
43 -> Set.singleton "containers-old"
43 -> Set.singleton "containers-old"
44− _ -> Set.empty)
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)
45− , disabledFlags = Set.fromList (words "bytestring-in-base test-hlint network-uri")
50+ , disabledFlags = Set.fromList (words "bytestring-in-base test-hlint")
46 `Set.union`
51 `Set.union`
47 (if version <= GhcMajorVersion 7 4
52 (if version <= GhcMajorVersion 7 4
48 then Set.singleton "bytestring-builder"
53 then Set.singleton "bytestring-builder"
@@ -53,7 +58,12 @@ defaultSelectSettings version requireHP = SelectSettings
53 `Set.union`
58 `Set.union`
54 (if version <= GhcMajorVersion 7 6
59 (if version <= GhcMajorVersion 7 6
55 then Set.singleton "decoderinterface"
60 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")
57 , allowedPackage = const $ Right ()
67 , allowedPackage = const $ Right ()
58 , useGlobalDatabase = False
68 , useGlobalDatabase = False
59 , skippedTests =
69 , skippedTests =