Remove upper bounds and close #276

Stackage/Config.hs

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

Stackage/Select.hs

@@ -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)
+            _ -> Set.empty) `Set.union`
-    , disabledFlags = Set.fromList (words "bytestring-in-base test-hlint network-uri")
+
+        -- 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 =