haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-12 07:18:31 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove upper bounds and close #276

Browse Source
This commit is contained in:
Michael Snoyman 2014-11-28 07:51:20 +02:00
parent 7c3ff9072d
commit ece1d69fc0
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Stackage/Config.hs
View File

@ -591,6 +591,8 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
addRange "Michael Snoyman" "aeson-utils" "< 0.2.2"
addRange "Michael Snoyman" "formatting" "< 5"
addRange "Michael Snoyman" "aws" "< 0.10"
addRange "Michael Snoyman" "network" "< 2.6"
addRange "Michael Snoyman" "network-uri" "< 2.6"
-- 0.16.2 fixes dependency issues with different version of GHC
-- 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
when (ghcVer < GhcMajorVersion 7 8) $
addRange "Michael Snoyman" "aeson" "< 0.8"
-- https://github.com/fpco/stackage/issues/276
addRange "Michael Snoyman" "network" "< 2.6"
addRange "Michael Snoyman" "network-uri" "< 2.6"
-- https://github.com/fpco/stackage/issues/279
addRange "Michael Snoyman" "MonadRandom" "< 0.2"
@ -653,6 +651,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
peg "texmath" "<= 0.6.6.3"
peg "checkers" "== 0.3.2"
peg "HandsomeSoup" "< 0.3.3"
peg "network-uri" "< 2.6"
add :: String -> String -> Writer PackageMap ()
add maintainer package = addRange maintainer package "-any"

16
Stackage/Select.hs
View File

@ -41,8 +41,13 @@ defaultSelectSettings version requireHP = SelectSettings
(case Map.lookup (PackageName "containers") coreMap of
Just v | Just range <- simpleParse "< 0.5", v `withinRange` range
-> Set.singleton "containers-old"
_ -> Set.empty)
, disabledFlags = Set.fromList (words "bytestring-in-base test-hlint network-uri")
_ -> Set.empty) `Set.union`
-- Support for network 2.6
(if version >= GhcMajorVersion 7 8 && not requireHP
then Set.singleton "network-uri"
else Set.empty)
, disabledFlags = Set.fromList (words "bytestring-in-base test-hlint")
`Set.union`
(if version <= GhcMajorVersion 7 4
then Set.singleton "bytestring-builder"
@ -53,7 +58,12 @@ defaultSelectSettings version requireHP = SelectSettings
`Set.union`
(if version <= GhcMajorVersion 7 6
then Set.singleton "decoderinterface"
else Set.empty)
else Set.empty) `Set.union`
-- Support for network 2.6
(if version >= GhcMajorVersion 7 8 && not requireHP
then Set.empty
else Set.singleton "network-uri")
, allowedPackage = const $ Right ()
, useGlobalDatabase = False
, skippedTests =