diff --git a/Stackage/Config.hs b/Stackage/Config.hs index b0a4a0db..cab3b082 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -284,6 +284,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do | ghcVer <= GhcMajorVersion 7 6 -> "< 1.17" | ghcVer <= GhcMajorVersion 7 8 -> "< 1.19" | otherwise -> "-any" + -- cabal-install is buggy still... + addRange "Michael Snoyman" "network" "< 2.6" + addRange "Michael Snoyman" "network-uri" "< 2.6" mapM_ (add "FP Complete ") $ words =<< [ "web-fpco th-expand-syns configurator smtLib" diff --git a/Stackage/Select.hs b/Stackage/Select.hs index 125f4af9..0fc9be31 100644 --- a/Stackage/Select.hs +++ b/Stackage/Select.hs @@ -43,10 +43,13 @@ defaultSelectSettings version requireHP = SelectSettings -> Set.singleton "containers-old" _ -> Set.empty) `Set.union` + {- -- Support for network 2.6 (if version >= GhcMajorVersion 7 8 && not requireHP then Set.singleton "network-uri" else Set.empty) + -} + Set.empty , disabledFlags = Set.fromList (words "bytestring-in-base test-hlint") `Set.union` (if version <= GhcMajorVersion 7 4 @@ -60,10 +63,13 @@ defaultSelectSettings version requireHP = SelectSettings then Set.singleton "decoderinterface" 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") + -} + Set.singleton "network-uri" , allowedPackage = const $ Right () , useGlobalDatabase = False , skippedTests =