git.iko.soy/distributed-process
on master help sign in
Base 4.6 compatibility
867f51bEdsko de Vries
distributed-process-simplelocalnet/ChangeLog+4
compare with master
unifiedsplit
@@ -1,3 +1,7 @@
1+2012-07-16 Edsko de Vries <edsko@well-typed.com> 0.2.0.2
2+
3+* Relax contraints on bytestring and containers
4+
12012-07-09 Edsko de Vries <edsko@well-typed.com> 0.2.0.1
52012-07-09 Edsko de Vries <edsko@well-typed.com> 0.2.0.1
2
6
3* Bugfix: Documentation referred to old module name
7* Bugfix: Documentation referred to old module name
distributed-process-simplelocalnet/distributed-process-simplelocalnet.cabal+5−5
@@ -1,5 +1,5 @@
1Name: distributed-process-simplelocalnet
1Name: distributed-process-simplelocalnet
2−Version: 0.2.0.1
2+Version: 0.2.0.2
3Cabal-Version: >=1.8
3Cabal-Version: >=1.8
4Build-Type: Simple
4Build-Type: Simple
5License: BSD3
5License: BSD3
@@ -25,12 +25,12 @@ Source-Repository head
25
25
26Library
26Library
27 Build-Depends: base >= 4.4 && < 5,
27 Build-Depends: base >= 4.4 && < 5,
28− bytestring >= 0.9 && < 0.10,
28+ bytestring >= 0.9 && < 0.11,
29 network >= 2.3 && < 2.4,
29 network >= 2.3 && < 2.4,
30 network-multicast >= 0.0 && < 0.1,
30 network-multicast >= 0.0 && < 0.1,
31 data-accessor >= 0.2 && < 0.3,
31 data-accessor >= 0.2 && < 0.3,
32 binary >= 0.5 && < 0.6,
32 binary >= 0.5 && < 0.6,
33− containers >= 0.4 && < 0.5,
33+ containers >= 0.4 && < 0.6,
34 transformers >= 0.2 && < 0.4,
34 transformers >= 0.2 && < 0.4,
35 network-transport >= 0.2 && < 0.3,
35 network-transport >= 0.2 && < 0.3,
36 network-transport-tcp >= 0.2 && < 0.3,
36 network-transport-tcp >= 0.2 && < 0.3,
@@ -47,12 +47,12 @@ Test-Suite TestSimpleLocalnet
47 Type: exitcode-stdio-1.0
47 Type: exitcode-stdio-1.0
48 Main-Is: TestSimpleLocalnet.hs
48 Main-Is: TestSimpleLocalnet.hs
49 Build-Depends: base >= 4.4 && < 5,
49 Build-Depends: base >= 4.4 && < 5,
50− bytestring >= 0.9 && < 0.10,
50+ bytestring >= 0.9 && < 0.11,
51 network >= 2.3 && < 2.4,
51 network >= 2.3 && < 2.4,
52 network-multicast >= 0.0 && < 0.1,
52 network-multicast >= 0.0 && < 0.1,
53 data-accessor >= 0.2 && < 0.3,
53 data-accessor >= 0.2 && < 0.3,
54 binary >= 0.5 && < 0.6,
54 binary >= 0.5 && < 0.6,
55− containers >= 0.4 && < 0.5,
55+ containers >= 0.4 && < 0.6,
56 transformers >= 0.2 && < 0.4,
56 transformers >= 0.2 && < 0.4,
57 network-transport >= 0.2 && < 0.3,
57 network-transport >= 0.2 && < 0.3,
58 network-transport-tcp >= 0.2 && < 0.3,
58 network-transport-tcp >= 0.2 && < 0.3,
distributed-process/ChangeLog+5
@@ -1,3 +1,8 @@
1+2012-07-16 Edsko de Vries <edsko@well-typed.com> 0.2.1.2
2+
3+* Base 4.6 compatibility
4+* Relax constraints on bytestring and containers
5+
12012-07-16 Edsko de Vries <edsko@well-typed.com> 0.2.1.1
62012-07-16 Edsko de Vries <edsko@well-typed.com> 0.2.1.1
2
7
3* Relax upper bound on 'time' dependency
8* Relax upper bound on 'time' dependency
distributed-process/distributed-process.cabal+13−10
@@ -1,5 +1,5 @@
1Name: distributed-process
1Name: distributed-process
2−Version: 0.2.1.1
2+Version: 0.2.1.2
3Cabal-Version: >=1.8
3Cabal-Version: >=1.8
4Build-Type: Simple
4Build-Type: Simple
5License: BSD3
5License: BSD3
@@ -37,8 +37,8 @@ Library
37 transformers >= 0.2 && < 0.4,
37 transformers >= 0.2 && < 0.4,
38 mtl >= 2.0 && < 2.2,
38 mtl >= 2.0 && < 2.2,
39 data-accessor >= 0.2 && < 0.3,
39 data-accessor >= 0.2 && < 0.3,
40− bytestring >= 0.9 && < 0.10,
40+ bytestring >= 0.9 && < 0.11,
41− containers >= 0.4 && < 0.5,
41+ containers >= 0.4 && < 0.6,
42 old-locale >= 1.0 && < 1.1,
42 old-locale >= 1.0 && < 1.1,
43 time >= 1.2 && < 1.5,
43 time >= 1.2 && < 1.5,
44 template-haskell >= 2.6 && < 2.8,
44 template-haskell >= 2.6 && < 2.8,
@@ -68,7 +68,8 @@ Library
68 GADTs,
68 GADTs,
69 GeneralizedNewtypeDeriving,
69 GeneralizedNewtypeDeriving,
70 DeriveDataTypeable,
70 DeriveDataTypeable,
71− TemplateHaskell
71+ TemplateHaskell,
72+ CPP
72 ghc-options: -Wall
73 ghc-options: -Wall
73 HS-Source-Dirs: src
74 HS-Source-Dirs: src
74
75
@@ -83,8 +84,8 @@ Test-Suite TestCH
83 transformers >= 0.2 && < 0.4,
84 transformers >= 0.2 && < 0.4,
84 mtl >= 2.0 && < 2.2,
85 mtl >= 2.0 && < 2.2,
85 data-accessor >= 0.2 && < 0.3,
86 data-accessor >= 0.2 && < 0.3,
86− bytestring >= 0.9 && < 0.10,
87+ bytestring >= 0.9 && < 0.11,
87− containers >= 0.4 && < 0.5,
88+ containers >= 0.4 && < 0.6,
88 old-locale >= 1.0 && < 1.1,
89 old-locale >= 1.0 && < 1.1,
89 time >= 1.2 && < 1.5,
90 time >= 1.2 && < 1.5,
90 template-haskell >= 2.6 && < 2.8,
91 template-haskell >= 2.6 && < 2.8,
@@ -99,7 +100,8 @@ Test-Suite TestCH
99 GADTs,
100 GADTs,
100 GeneralizedNewtypeDeriving,
101 GeneralizedNewtypeDeriving,
101 DeriveDataTypeable,
102 DeriveDataTypeable,
102− TemplateHaskell
103+ TemplateHaskell,
104+ CPP
103 ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
105 ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
104 HS-Source-Dirs: tests src
106 HS-Source-Dirs: tests src
105
107
@@ -114,8 +116,8 @@ Test-Suite TestClosure
114 transformers >= 0.2 && < 0.4,
116 transformers >= 0.2 && < 0.4,
115 mtl >= 2.0 && < 2.2,
117 mtl >= 2.0 && < 2.2,
116 data-accessor >= 0.2 && < 0.3,
118 data-accessor >= 0.2 && < 0.3,
117− bytestring >= 0.9 && < 0.10,
119+ bytestring >= 0.9 && < 0.11,
118− containers >= 0.4 && < 0.5,
120+ containers >= 0.4 && < 0.6,
119 old-locale >= 1.0 && < 1.1,
121 old-locale >= 1.0 && < 1.1,
120 time >= 1.2 && < 1.5,
122 time >= 1.2 && < 1.5,
121 template-haskell >= 2.6 && < 2.8,
123 template-haskell >= 2.6 && < 2.8,
@@ -130,6 +132,7 @@ Test-Suite TestClosure
130 GADTs,
132 GADTs,
131 GeneralizedNewtypeDeriving,
133 GeneralizedNewtypeDeriving,
132 DeriveDataTypeable,
134 DeriveDataTypeable,
133− TemplateHaskell
135+ TemplateHaskell,
136+ CPP
134 ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
137 ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
135 HS-Source-Dirs: tests src
138 HS-Source-Dirs: tests src
distributed-process/src/Control/Distributed/Process.hs+4
@@ -91,7 +91,11 @@ module Control.Distributed.Process
91 , DidSpawn(..)
91 , DidSpawn(..)
92 ) where
92 ) where
93
93
94+
95+#if ! MIN_VERSION_base(4,6,0)
94import Prelude hiding (catch)
96import Prelude hiding (catch)
97+#endif
98+
95import Data.Typeable (Typeable)
99import Data.Typeable (Typeable)
96import Control.Monad.IO.Class (liftIO)
100import Control.Monad.IO.Class (liftIO)
97import Control.Distributed.Process.Internal.Types
101import Control.Distributed.Process.Internal.Types
distributed-process/src/Control/Distributed/Process/Internal/Primitives.hs+3
@@ -55,7 +55,10 @@ module Control.Distributed.Process.Internal.Primitives
55 , monitorPort
55 , monitorPort
56 ) where
56 ) where
57
57
58+#if ! MIN_VERSION_base(4,6,0)
58import Prelude hiding (catch)
59import Prelude hiding (catch)
60+#endif
61+
59import Data.Binary (decode)
62import Data.Binary (decode)
60import Data.Typeable (Typeable, typeOf)
63import Data.Typeable (Typeable, typeOf)
61import Data.Time.Clock (getCurrentTime)
64import Data.Time.Clock (getCurrentTime)
distributed-process/src/Control/Distributed/Process/Node.hs+4
@@ -9,7 +9,11 @@ module Control.Distributed.Process.Node
9 , localNodeId
9 , localNodeId
10 ) where
10 ) where
11
11
12+
13+#if ! MIN_VERSION_base(4,6,0)
12import Prelude hiding (catch)
14import Prelude hiding (catch)
15+#endif
16+
13import System.IO (fixIO, hPutStrLn, stderr)
17import System.IO (fixIO, hPutStrLn, stderr)
14import qualified Data.ByteString.Lazy as BSL (fromChunks)
18import qualified Data.ByteString.Lazy as BSL (fromChunks)
15import Data.Binary (decode)
19import Data.Binary (decode)
distributed-process/tests/TestAuxiliary.hs+4
@@ -8,7 +8,11 @@ module TestAuxiliary ( -- Running tests
8 , randomThreadDelay
8 , randomThreadDelay
9 ) where
9 ) where
10
10
11+
12+#if ! MIN_VERSION_base(4,6,0)
11import Prelude hiding (catch)
13import Prelude hiding (catch)
14+#endif
15+
12import Control.Concurrent (myThreadId, forkIO, ThreadId, throwTo, threadDelay)
16import Control.Concurrent (myThreadId, forkIO, ThreadId, throwTo, threadDelay)
13import Control.Monad (liftM2, unless)
17import Control.Monad (liftM2, unless)
14import Control.Exception (SomeException, try, catch)
18import Control.Exception (SomeException, try, catch)
distributed-process/tests/TestCH.hs+3
@@ -1,6 +1,9 @@
1module Main where
1module Main where
2
2
3+#if ! MIN_VERSION_base(4,6,0)
3import Prelude hiding (catch)
4import Prelude hiding (catch)
5+#endif
6+
4import Data.Binary (Binary(..))
7import Data.Binary (Binary(..))
5import Data.Typeable (Typeable)
8import Data.Typeable (Typeable)
6import Data.Foldable (forM_)
9import Data.Foldable (forM_)
network-transport-tcp/ChangeLog+5
@@ -1,3 +1,8 @@
1+2012-07-16 Edsko de Vries <edsko@well-typed.com> 0.2.0.2
2+
3+* Base 4.6 compatibility
4+* Relax package contraints on bytestring and containers
5+
12012-07-12 Edsko de Vries <edsko@well-typed.com> 0.2.0.1
62012-07-12 Edsko de Vries <edsko@well-typed.com> 0.2.0.1
2
7
3* Fix bug in recvExact
8* Fix bug in recvExact
network-transport-tcp/network-transport-tcp.cabal+8−6
@@ -1,5 +1,5 @@
1Name: network-transport-tcp
1Name: network-transport-tcp
2−Version: 0.2.0.1
2+Version: 0.2.0.2
3Cabal-Version: >=1.8
3Cabal-Version: >=1.8
4Build-Type: Simple
4Build-Type: Simple
5License: BSD3
5License: BSD3
@@ -24,11 +24,12 @@ Library
24 Build-Depends: base >= 4.3 && < 5,
24 Build-Depends: base >= 4.3 && < 5,
25 network-transport >= 0.2 && < 0.3,
25 network-transport >= 0.2 && < 0.3,
26 data-accessor >= 0.2 && < 0.3,
26 data-accessor >= 0.2 && < 0.3,
27− containers >= 0.4 && < 0.5,
27+ containers >= 0.4 && < 0.6,
28− bytestring >= 0.9 && < 0.10,
28+ bytestring >= 0.9 && < 0.11,
29 network >= 2.3 && < 2.4
29 network >= 2.3 && < 2.4
30 Exposed-modules: Network.Transport.TCP,
30 Exposed-modules: Network.Transport.TCP,
31 Network.Transport.TCP.Internal
31 Network.Transport.TCP.Internal
32+ Extensions: CPP
32 ghc-options: -Wall -fno-warn-unused-do-bind
33 ghc-options: -Wall -fno-warn-unused-do-bind
33 HS-Source-Dirs: src
34 HS-Source-Dirs: src
34
35
@@ -38,8 +39,8 @@ Test-Suite TestTCP
38 Build-Depends: base >= 4.3 && < 5,
39 Build-Depends: base >= 4.3 && < 5,
39 network-transport >= 0.2 && < 0.3,
40 network-transport >= 0.2 && < 0.3,
40 data-accessor >= 0.2 && < 0.3,
41 data-accessor >= 0.2 && < 0.3,
41− containers >= 0.4 && < 0.5,
42+ containers >= 0.4 && < 0.6,
42− bytestring >= 0.9 && < 0.10,
43+ bytestring >= 0.9 && < 0.11,
43 network >= 2.3 && < 2.4,
44 network >= 2.3 && < 2.4,
44 random >= 1.0 && < 1.1,
45 random >= 1.0 && < 1.1,
45 ansi-terminal >= 0.5 && < 0.6,
46 ansi-terminal >= 0.5 && < 0.6,
@@ -50,5 +51,6 @@ Test-Suite TestTCP
50 DeriveDataTypeable,
51 DeriveDataTypeable,
51 RankNTypes,
52 RankNTypes,
52 OverlappingInstances,
53 OverlappingInstances,
53− OverloadedStrings
54+ OverloadedStrings,
55+ CPP
54 HS-Source-Dirs: tests src
56 HS-Source-Dirs: tests src
network-transport-tcp/src/Network/Transport/TCP.hs+7−1
@@ -28,7 +28,13 @@ module Network.Transport.TCP ( -- * Main API
28 -- $design
28 -- $design
29 ) where
29 ) where
30
30
31−import Prelude hiding (catch, mapM_)
31+import Prelude hiding
32+ ( mapM_
33+#if ! MIN_VERSION_base(4,6,0)
34+ , catch
35+#endif
36+ )
37+
32import Network.Transport
38import Network.Transport
33import Network.Transport.TCP.Internal ( forkServer
39import Network.Transport.TCP.Internal ( forkServer
34 , recvWithLength
40 , recvWithLength
network-transport-tcp/src/Network/Transport/TCP/Internal.hs+3
@@ -6,7 +6,10 @@ module Network.Transport.TCP.Internal ( forkServer
6 , tryCloseSocket
6 , tryCloseSocket
7 ) where
7 ) where
8
8
9+#if ! MIN_VERSION_base(4,6,0)
9import Prelude hiding (catch)
10import Prelude hiding (catch)
11+#endif
12+
10import Network.Transport.Internal (decodeInt32, void, tryIO, forkIOWithUnmask)
13import Network.Transport.Internal (decodeInt32, void, tryIO, forkIOWithUnmask)
11import qualified Network.Socket as N ( HostName
14import qualified Network.Socket as N ( HostName
12 , ServiceName
15 , ServiceName
network-transport-tcp/tests/TestAuxiliary.hs+3
@@ -8,7 +8,10 @@ module TestAuxiliary ( -- Running tests
8 , randomThreadDelay
8 , randomThreadDelay
9 ) where
9 ) where
10
10
11+#if ! MIN_VERSION_base(4,6,0)
11import Prelude hiding (catch)
12import Prelude hiding (catch)
13+#endif
14+
12import Control.Concurrent (myThreadId, forkIO, ThreadId, throwTo, threadDelay)
15import Control.Concurrent (myThreadId, forkIO, ThreadId, throwTo, threadDelay)
13import Control.Concurrent.Chan (Chan)
16import Control.Concurrent.Chan (Chan)
14import Control.Monad (liftM2, unless)
17import Control.Monad (liftM2, unless)
network-transport-tcp/tests/TestTCP.hs+9−1
@@ -2,7 +2,15 @@
2{-# OPTIONS_GHC -fno-warn-orphans #-}
2{-# OPTIONS_GHC -fno-warn-orphans #-}
3module Main where
3module Main where
4
4
5−import Prelude hiding (catch, (>>=), (>>), return, fail)
5+import Prelude hiding
6+ ( (>>=)
7+ , return
8+ , fail
9+ , (>>)
10+#if ! MIN_VERSION_base(4,6,0)
11+ , catch
12+#endif
13+ )
6import TestTransport (testTransport)
14import TestTransport (testTransport)
7import TestAuxiliary (forkTry, runTests)
15import TestAuxiliary (forkTry, runTests)
8import Network.Transport
16import Network.Transport
network-transport-tcp/tests/TestTransport.hs+9−1
@@ -1,7 +1,15 @@
1{-# LANGUAGE RebindableSyntax #-}
1{-# LANGUAGE RebindableSyntax #-}
2module TestTransport where
2module TestTransport where
3
3
4−import Prelude hiding (catch, (>>=), (>>), return, fail)
4+import Prelude hiding
5+ ( (>>=)
6+ , return
7+ , fail
8+ , (>>)
9+#if ! MIN_VERSION_base(4,6,0)
10+ , catch
11+#endif
12+ )
5import TestAuxiliary (forkTry, runTests, trySome, randomThreadDelay)
13import TestAuxiliary (forkTry, runTests, trySome, randomThreadDelay)
6import Control.Concurrent (forkIO, killThread, yield)
14import Control.Concurrent (forkIO, killThread, yield)
7import Control.Concurrent.MVar (newEmptyMVar, takeMVar, putMVar, readMVar, tryTakeMVar, modifyMVar_, newMVar)
15import Control.Concurrent.MVar (newEmptyMVar, takeMVar, putMVar, readMVar, tryTakeMVar, modifyMVar_, newMVar)
network-transport-tcp/tests/Traced.hs+9−1
@@ -50,7 +50,15 @@ module Traced ( MonadS(..)
50 , traceShow
50 , traceShow
51 ) where
51 ) where
52
52
53−import Prelude hiding ((>>=), return, fail, catch, (>>))
53+import Prelude hiding
54+ ( (>>=)
55+ , return
56+ , fail
57+ , (>>)
58+#if ! MIN_VERSION_base(4,6,0)
59+ , catch
60+#endif
61+ )
54import qualified Prelude
62import qualified Prelude
55import Control.Exception (catches, Handler(..), SomeException, throwIO, Exception(..), IOException)
63import Control.Exception (catches, Handler(..), SomeException, throwIO, Exception(..), IOException)
56import Control.Applicative ((<$>))
64import Control.Applicative ((<$>))
network-transport/ChangeLog+5
@@ -1,3 +1,8 @@
1+2012-07-16 Edsko de Vries <edsko@well-typed.com> 0.2.0.2
2+
3+* Base 4.6 compatible test suites
4+* Relax package constraints for bytestring
5+
12012-07-16 Edsko de Vries <edsko@well-typed.com> 0.2.0.1
62012-07-16 Edsko de Vries <edsko@well-typed.com> 0.2.0.1
2
7
3* Hide catch only for base < 4.6
8* Hide catch only for base < 4.6
network-transport/network-transport.cabal+2−2
@@ -1,5 +1,5 @@
1Name: network-transport
1Name: network-transport
2−Version: 0.2.0.1
2+Version: 0.2.0.2
3Cabal-Version: >=1.6
3Cabal-Version: >=1.6
4Build-Type: Simple
4Build-Type: Simple
5License: BSD3
5License: BSD3
@@ -66,7 +66,7 @@ Source-Repository head
66Library
66Library
67 Build-Depends: base >= 4.3 && < 5,
67 Build-Depends: base >= 4.3 && < 5,
68 binary >= 0.5 && < 0.6,
68 binary >= 0.5 && < 0.6,
69− bytestring >= 0.9 && < 0.10,
69+ bytestring >= 0.9 && < 0.11,
70 transformers >= 0.2 && < 0.4
70 transformers >= 0.2 && < 0.4
71 Exposed-Modules: Network.Transport,
71 Exposed-Modules: Network.Transport,
72 Network.Transport.Util
72 Network.Transport.Util