Compatibility with ghc head

Network/BSD.hsc

@@ -112,7 +112,9 @@ import Foreign.Storable (Storable(..))
 import Foreign.Marshal.Array (allocaArray0, peekArray0)
 import Foreign.Marshal.Utils (with, fromBool)
 import Data.Typeable
+#if !MIN_VERSION_base(4,6,0)
 import Prelude hiding (catch)
+#endif
 import System.IO.Error (ioeSetErrorString, mkIOError)
 import System.IO.Unsafe (unsafePerformIO)
 

network.cabal

@@ -39,7 +39,7 @@ library
       Network.Socket.ByteString.MsgHdr
 
   build-depends:
-    base >= 3 && < 4.6,
+    base >= 3 && < 4.7,
     bytestring < 1.0,
     parsec >= 2.0 && < 3.2
 
@@ -62,11 +62,11 @@ test-suite simple
   type: exitcode-stdio-1.0
 
   build-depends:
-    base < 4.6,
-    bytestring < 0.10,
+    base < 4.7,
+    bytestring < 1.0,
     HUnit < 1.3,
     network,
-    test-framework < 0.6,
+    test-framework < 0.7,
     test-framework-hunit < 0.3
 
 test-suite uri
@@ -75,10 +75,10 @@ test-suite uri
   type: exitcode-stdio-1.0
 
   build-depends:
-    base < 4.6,
+    base < 4.7,
     HUnit < 1.3,
     network,
-    test-framework < 0.6,
+    test-framework < 0.7,
     test-framework-hunit < 0.3
 
 source-repository head

tests/Simple.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE CPP, ScopedTypeVariables #-}
 {-# OPTIONS_GHC -fno-warn-unused-do-bind #-}
 
 module Main where
@@ -10,7 +10,9 @@ import qualified Data.ByteString as S
 import qualified Data.ByteString.Char8 as C
 import Network.Socket hiding (recv, recvFrom, send, sendTo)
 import Network.Socket.ByteString
+#if !MIN_VERSION_base(4,6,0)
 import Prelude hiding (catch)
+#endif
 import Test.Framework (Test, defaultMain, testGroup)
 import Test.Framework.Providers.HUnit (testCase)
 import Test.HUnit (Assertion, (@=?))