From 68d700fa49f3e4f63d69a85db01ba49f2fbc5aef Mon Sep 17 00:00:00 2001 From: James Crayne Date: Sat, 28 Sep 2019 15:49:38 -0400 Subject: allow newer network package --- torrent-types/src/Data/.Torrent.hs.swp | Bin 57344 -> 0 bytes torrent-types/src/Data/Torrent.hs | 4 ++++ torrent-types/torrent-types.cabal | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) delete mode 100644 torrent-types/src/Data/.Torrent.hs.swp (limited to 'torrent-types') diff --git a/torrent-types/src/Data/.Torrent.hs.swp b/torrent-types/src/Data/.Torrent.hs.swp deleted file mode 100644 index 0aecaad6..00000000 Binary files a/torrent-types/src/Data/.Torrent.hs.swp and /dev/null differ diff --git a/torrent-types/src/Data/Torrent.hs b/torrent-types/src/Data/Torrent.hs index a1eb286c..4cad301e 100644 --- a/torrent-types/src/Data/Torrent.hs +++ b/torrent-types/src/Data/Torrent.hs @@ -196,7 +196,11 @@ import Data.Text.Encoding as T import Data.Text.Read import Data.Time.Clock.POSIX import Data.Typeable +#if MIN_VERSION_network(2,7,0) +import Network.Socket (HostName) +#else import Network (HostName) +#endif import Network.HTTP.Types.QueryLike import Network.HTTP.Types.URI import Network.URI diff --git a/torrent-types/torrent-types.cabal b/torrent-types/torrent-types.cabal index c5939983..f06d75ef 100644 --- a/torrent-types/torrent-types.cabal +++ b/torrent-types/torrent-types.cabal @@ -31,7 +31,7 @@ library , containers , text , time - , network < 2.7 + , network , network-addr , data-default , network-uri -- cgit v1.2.3