Preparation for support of new network package:

    * The network-bsd flag is split into two flags:
        - old-network-bsd (for network >2.6 && < 2.9)
        - new-network-bsd (for network >=3.0)
    * Unused methods in SocketLike class have been removed

1 files changed, 17 insertions, 5 deletions

diff --git a/dht/dht-client.cabal b/dht/dht-client.cabal
index 3a513280..3569c6dd 100644
--- a/dht/dht-client.cabal
+++ b/dht/dht-client.cabal
@@ -32,10 +32,17 @@ flag network-uri
   description:         Use network-uri package.
   default:             True
 
-flag network-bsd
+-- supports network-2.7, 2.8, with deprecation warnings
+flag old-network-bsd
   description:         Use network-bsd package.
   default:             True
 
+-- TODO: Due to removed functions, this flag doesn't actually build.
+-- In the future, this flag should support network >3.0
+flag new-network-bsd
+  description:         Use newer network-bsd package.
+  default:             False
+
 flag builder
   description: Use older bytestring package and bytestring-builder.
   default: False
@@ -223,11 +230,16 @@ library
   if impl(ghc < 8)
       Build-depends:  transformers
 
-  if flag(network-bsd)
-      Build-depends:  network      >= 3.0
-                    , network-uri  >= 2.6
-                    , network-bsd
+  if flag(old-network-bsd)
+    Build-depends:  network < 3.0
+                  , network-uri  >= 2.6
+                  , network-bsd < 2.8.1.0
   else
+   if flag(new-network-bsd)
+    Build-depends:  network >= 3.0
+                  , network-uri  >= 2.6
+                  , network-bsd >= 2.8.1.0
+   else
     if flag(network-uri)
       Build-depends:  network      >= 2.6 && < 3.0
                     , network-uri  >= 2.6