Upgrade to network-3.1.2.0

IntersectMBO · Nov 20, 2020 · 26513d0 · 26513d0
1 parent 20ec0a8
commit 26513d0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/Win32-network/Win32-network.cabal b/Win32-network/Win32-network.cabal
@@ -39,7 +39,7 @@ library
  include-dirs: include
  build-depends: base >= 4.5 && < 4.15,
  bytestring >= 0.10 && < 0.11,
- network >= 3.1 && < 3.2,
+ network >= 3.1.2 && < 3.2,
  Win32 >= 2.5.4.1
  extra-libraries: ws2_32
 

diff --git a/network-mux/network-mux.cabal b/network-mux/network-mux.cabal
@@ -48,7 +48,7 @@ library
  -- The Windows version of network-3.1.2 is missing
  -- functions, see
  -- https://github.com/haskell/network/issues/484
- network >=3.1 && <3.1.2,
+ network >=3.1.2 && <3.2,
  process >=1.6 && <1.7,
  statistics-linreg
  >=0.3 && <0.4,

diff --git a/network-mux/src/Network/Mux/Channel.hs b/network-mux/src/Network/Mux/Channel.hs
@@ -1,6 +1,7 @@
-{-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 -- | An extension of 'Network.TypedProtocol.Channel', with additional 'Channel'
 -- implementations.
@@ -9,7 +10,9 @@ module Network.Mux.Channel
  ( Channel (..)
  , createBufferConnectedChannels
  , createPipeConnectedChannels
+#if !defined(mingw32_HOST_OS)
  , createSocketConnectedChannels
+#endif
  , withFifosAsChannel
  , socketAsChannel
  , channelEffect
@@ -167,7 +170,7 @@ socketAsChannel socket =
  then return Nothing
  else return (Just (LBS.fromStrict chunk))
 
-
+#if !defined(mingw32_HOST_OS)
 --- | Create a local socket, with both ends in this process, and expose that as
 --- a pair of 'ByteChannel's, one for each end.
 ---
@@ -183,7 +186,7 @@ createSocketConnectedChannels family = do
 
  return (socketAsChannel socketA,
  socketAsChannel socketB)
-
+#endif
 
 channelEffect :: forall m.
  Monad m

diff --git a/ntp-client/ntp-client.cabal b/ntp-client/ntp-client.cabal
@@ -23,7 +23,7 @@ library
  , binary >=0.8 && <0.11
  , bytestring >=0.10 && <0.11
  , contra-tracer >=0.1 && <0.2
- , network >= 3.1 && <3.2
+ , network >= 3.1.2 && <3.2
  , stm >=2.4 && <2.6
  , time >=1.6 && <1.11
  , Win32-network >=0.1 && <0.2

diff --git a/ouroboros-network-framework/ouroboros-network-framework.cabal b/ouroboros-network-framework/ouroboros-network-framework.cabal
@@ -75,7 +75,7 @@ library
  , contra-tracer
 
  , io-sim-classes >=0.1 && < 0.3
- , network >=3.1 && < 3.2
+ , network >=3.1.2 && < 3.2
  , network-mux >=0.1 && < 0.2
  , typed-protocols >=0.1 && < 0.2
  , Win32-network >=0.1 && < 0.2

diff --git a/ouroboros-network/ouroboros-network.cabal b/ouroboros-network/ouroboros-network.cabal
@@ -146,7 +146,7 @@ library
  iproute,
  mtl,
  nothunks,
- network >=3.1 && <3.2,
+ network >=3.1.2 && <3.2,
  psqueues >=0.2.3 && <0.3,
  serialise >=0.2 && <0.3,
  random,