Updated network dependency

network-3.1.2.2 package exposes `StructLinger`, see haskell/network#491
IntersectMBO · Oct 28, 2022 · a849413 · a849413
1 parent 8bba172
commit a849413
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 72 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,
@@ -182,7 +182,6 @@ executable cardano-ping
   import:              demo-deps
   hs-source-dirs:      tools
   main-is:             cardano-ping.hs
-  other-modules:       Linger
   build-depends:       base,
                        aeson,
                        network-mux,

diff --git a/network-mux/tools/Linger.hsc b/network-mux/tools/Linger.hsc
diff --git a/network-mux/tools/cardano-ping.hs b/network-mux/tools/cardano-ping.hs
@@ -28,7 +28,7 @@ import           Data.Maybe (fromMaybe, isNothing)
 import           Data.TDigest
 import           Data.Text (unpack)
 import           Data.Word
-import           Network.Socket (AddrInfo)
+import           Network.Socket (AddrInfo, StructLinger (..))
 import qualified Network.Socket as Socket
 import           System.Console.GetOpt
 import           System.Environment (getArgs, getProgName)
@@ -40,8 +40,6 @@ import           Network.Mux.Bearer.Socket
 import           Network.Mux.Timeout
 import           Network.Mux.Types
 
-import           Linger
-
 mainnetMagic :: Word32
 mainnetMagic = 764824073
 

diff --git a/ouroboros-network-framework/ouroboros-network-framework.cabal b/ouroboros-network-framework/ouroboros-network-framework.cabal
@@ -68,7 +68,6 @@ library
 
                        Simulation.Network.Snocket
 
-  other-modules:       Ouroboros.Network.Linger
   -- other-extensions:
   build-depends:       base            >=4.12  && <4.15
                      , async           >=2.1   && <2.3
@@ -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-framework/src/Ouroboros/Network/Snocket.hs b/ouroboros-network-framework/src/Ouroboros/Network/Snocket.hs
@@ -54,14 +54,14 @@ import qualified System.Win32.NamedPipes as Win32
 
 import           Network.Mux.Bearer.NamedPipe (namedPipeAsBearer)
 #endif
+import           Network.Socket (StructLinger (..))
 import qualified Network.Socket as Socket
 
 import qualified Network.Mux.Bearer.Socket as Mx
 import           Network.Mux.Trace (MuxTrace)
 import           Network.Mux.Types (MuxBearer)
 
 import           Ouroboros.Network.IOManager
-import           Ouroboros.Network.Linger (StructLinger (..))
 
 
 -- | Named pipes and Berkeley sockets have different API when accepting