1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
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, (@=?))
|
GitWeb
