78c3f14 · stackage · git.iko.soy

git.iko.soy/stackage

REVERT ME Temporarily block network 2.6 again (cabal-install is still broken)

commit78c3f149fd4587df8a1390988895421178a23a8b authorMichael Snoyman <michael@snoyman.com> dateTue 9 Dec 2014, 18:31 (12 years ago) parentaac7bc3

2 files changed+9

unifiedsplit

Stackage/Config.hs+3

@@ -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"

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 =