From ca49a84ba50bb609dfa8f7db005f6449e1ae5ff2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 10 Mar 2017 15:49:14 -0400
Subject: [PATCH] Drop support for building with old versions of dns and
 http-conduit.

---
 CHANGELOG       | 1 +
 Utility/SRV.hs  | 9 +--------
 Utility/Url.hs  | 8 --------
 git-annex.cabal | 4 ++--
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c697d08690..3d7620922e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ git-annex (6.20170301.2) UNRELEASED; urgency=medium
   * Windows: Improve handling of shebang in external special remote
     program, searching for the program in the PATH.
   * Drop support for building without network-uri.
+  * Drop support for building with old versions of dns and http-conduit.
 
  -- Joey Hess <id@joeyh.name>  Thu, 02 Mar 2017 12:51:40 -0400
 
diff --git a/Utility/SRV.hs b/Utility/SRV.hs
index 033064a273..64cca60608 100644
--- a/Utility/SRV.hs
+++ b/Utility/SRV.hs
@@ -5,8 +5,6 @@
  - License: BSD-2-clause
  -}
 
-{-# LANGUAGE CPP #-}
-
 module Utility.SRV (
 	mkSRVTcp,
 	mkSRV,
@@ -42,12 +40,7 @@ lookupSRV :: SRV -> IO [HostPort]
 lookupSRV (SRV srv) = do
 	seed <- makeResolvSeed defaultResolvConf
 	r <- withResolver seed $ flip DNS.lookupSRV $ B8.fromString srv
-	return $
-#if MIN_VERSION_dns(1,0,0)
-		either (const []) use r
-#else
-		maybe [] use r
-#endif
+	return $ either (const []) use r
   where
 	use = orderHosts . map tohosts
 	tohosts (priority, weight, port, hostname) =
diff --git a/Utility/Url.hs b/Utility/Url.hs
index 1b68dce7fd..2b71b6be41 100644
--- a/Utility/Url.hs
+++ b/Utility/Url.hs
@@ -67,11 +67,7 @@ data UrlOptions = UrlOptions
 	{ userAgent :: Maybe UserAgent
 	, reqHeaders :: Headers
 	, reqParams :: [CommandParam]
-#if MIN_VERSION_http_conduit(2,0,0)
 	, applyRequest :: Request -> Request
-#else
-	, applyRequest :: forall m. Request m -> Request m
-#endif
 	}
 
 instance Default UrlOptions
@@ -232,11 +228,7 @@ contentDispositionFilename s
 			drop 1 $ dropWhile (/= '"') s
 	| otherwise = Nothing
 
-#if MIN_VERSION_http_conduit(2,0,0)
 headRequest :: Request -> Request
-#else
-headRequest :: Request m -> Request m
-#endif
 headRequest r = r
 	{ method = methodHead
 	-- remove defaut Accept-Encoding header, to get actual,
diff --git a/git-annex.cabal b/git-annex.cabal
index c79ca70341..d6428cadce 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -342,7 +342,7 @@ Executable git-annex
    resourcet,
    http-client,
    http-types,
-   http-conduit,
+   http-conduit (>= 2.0.0),
    time,
    old-locale,
    esqueleto,
@@ -395,7 +395,7 @@ Executable git-annex
     CPP-Options: -DWITH_WEBDAV
 
   if flag(Assistant) && ! os(solaris)
-    Build-Depends: dns, mountpoints
+    Build-Depends: dns (>= 1.0.0), mountpoints
     CPP-Options: -DWITH_ASSISTANT
 
   if flag(Assistant)