Update network dependency

network-3.1.2.2 package exposes `StructLinger`, see haskell/network#491
IntersectMBO · Aug 28, 2022 · 2d4cee8 · 2d4cee8
1 parent ba3a1fd
commit 2d4cee8
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 38 deletions.
diff --git a/network-mux/network-mux.cabal b/network-mux/network-mux.cabal
@@ -56,7 +56,7 @@ library
                        -- The Windows version of network-3.1.2 is missing
                        -- functions, see
                        -- https://github.com/haskell/network/issues/484
-                       network         >=3.1.2 && <3.2,
+                       network         >=3.1.2.2 && <3.2,
                        process         >=1.6 && <1.7,
                        statistics-linreg
                                        >=0.3 && <0.4,

diff --git a/ouroboros-network-framework/ouroboros-network-framework.cabal b/ouroboros-network-framework/ouroboros-network-framework.cabal
@@ -50,7 +50,6 @@ library
                        Ouroboros.Network.InboundGovernor.Event
                        Ouroboros.Network.InboundGovernor.State
                        Ouroboros.Network.InboundGovernor.ControlChannel
-                       Ouroboros.Network.Linger
                        Ouroboros.Network.RethrowPolicy
                        Ouroboros.Network.Server.ConnectionTable
                        Ouroboros.Network.Server.Socket
@@ -92,7 +91,7 @@ library
                      , io-classes      >=0.1   && < 0.3
                      , monoidal-synchronisation
                                        >=0.1   && < 0.2
-                     , network         >=3.1.2 && < 3.2
+                     , network         >=3.1.2.2 && < 3.2
                      , network-mux     >=0.1   && < 0.2
                      , ouroboros-network-testing
                      , strict-stm      >=0.1   && < 0.2

diff --git a/ouroboros-network-framework/src/Ouroboros/Network/Linger.hsc b/ouroboros-network-framework/src/Ouroboros/Network/Linger.hsc
diff --git a/ouroboros-network/src/Ouroboros/Network/Diffusion/Socket.hs b/ouroboros-network/src/Ouroboros/Network/Diffusion/Socket.hs
@@ -11,11 +11,9 @@ module Ouroboros.Network.Diffusion.Socket
 import           Control.Monad (unless, when)
 import           Control.Tracer (Tracer (..), traceWith)
 
-import           Network.Socket (SockAddr, Socket)
+import           Network.Socket (SockAddr, Socket, StructLinger (..))
 import qualified Network.Socket as Socket
 
-import           Ouroboros.Network.Linger (StructLinger (..))
-
 -- | Configure a socket.  Either 'Socket.AF_UNIX', 'Socket.AF_INET' or
 -- 'Socket.AF_INET6' socket is expected.
 --