Skip to content
This repository has been archived by the owner on Sep 20, 2023. It is now read-only.

Network and Network.BSD #37

Closed
wants to merge 2 commits into from
Closed

Network and Network.BSD #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
092f0ff
Using network-bsd for Network.BSD.
kazu-yamamoto Jan 23, 2019
ed0ff77
Using PortID from Socks5 for network 3.0.
kazu-yamamoto Jan 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Network/Connection.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{-# LANGUAGE BangPatterns #-}
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE CPP #-}
-- |
-- Module : Network.Connection
-- License : BSD-style
Expand Down Expand Up @@ -60,8 +61,12 @@ import qualified Network.TLS.Extra as TLS

import System.X509 (getSystemCertificateStore)

#if MIN_VERSION_network (3,0,0)
import Network.Socks5 as N
#else
import Network.Socks5
import qualified Network as N
#endif
import Network.Socket
import Network.BSD (getProtocolNumber)
import qualified Network.Socket as N (close)
Expand Down
3 changes: 2 additions & 1 deletion connection.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ Library
, byteable
, containers
, data-default-class
, network >= 2.3
, network >= 2.7 && < 3.1
, network-bsd >= 2.7 && < 2.9
, tls >= 1.3
, socks >= 0.5.5
, x509 >= 1.5
Expand Down