summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-haskell/network/files/network-2.3.0.14-ghc-7.5.patch')
-rw-r--r--dev-haskell/network/files/network-2.3.0.14-ghc-7.5.patch69
1 files changed, 69 insertions, 0 deletions
diff --git a/dev-haskell/network/files/network-2.3.0.14-ghc-7.5.patch b/dev-haskell/network/files/network-2.3.0.14-ghc-7.5.patch
new file mode 100644
index 000000000000..e6a01539728a
--- /dev/null
+++ b/dev-haskell/network/files/network-2.3.0.14-ghc-7.5.patch
@@ -0,0 +1,69 @@
+--- network-2.3.0.14-orig/network.cabal 2012-06-04 10:25:39.000000000 +1000
++++ network-2.3.0.14/network.cabal 2012-06-27 20:21:38.271566190 +1000
+@@ -39,7 +39,7 @@
+ 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 @@
+ 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 @@
+ 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
+--- network-2.3.0.14-orig/Network/BSD.hsc 2012-06-04 10:25:39.000000000 +1000
++++ network-2.3.0.14/Network/BSD.hsc 2012-06-28 18:07:39.287001755 +1000
+@@ -112,7 +112,9 @@
+ 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-2.3.0.14-orig/tests/Simple.hs 2012-06-04 10:25:39.000000000 +1000
++++ network-2.3.0.14/tests/Simple.hs 2012-06-28 18:18:31.176027682 +1000
+@@ -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.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, (@=?))