diff options
| -rw-r--r-- | Remote/S3.hs | 9 | ||||
| -rw-r--r-- | Utility/Url.hs | 5 | ||||
| -rwxr-xr-x | standalone/windows/build.sh | 4 |
3 files changed, 8 insertions, 10 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index 2d2819824..c05831b0b 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -23,7 +23,7 @@ import qualified Data.Map as M import Data.Char import Network.Socket (HostName) import Network.HTTP.Conduit (Manager, newManager) -import Network.HTTP.Client (managerResponseTimeout, responseStatus, responseBody, RequestBody(..)) +import Network.HTTP.Client (responseStatus, responseBody, RequestBody(..)) import Network.HTTP.Types import Control.Monad.Trans.Resource import Control.Monad.Catch @@ -50,13 +50,6 @@ import Annex.Content import Annex.Url (withUrlOptions) import Utility.Url (checkBoth, managerSettings, closeManager) -#if MIN_VERSION_http_client(0,5,0) -import Network.HTTP.Client (responseTimeoutNone) -#else -responseTimeoutNone :: Maybe Int -responseTimeoutNone = Nothing -#endif - type BucketName = String remote :: RemoteType diff --git a/Utility/Url.hs b/Utility/Url.hs index d49953c55..e1a21af5d 100644 --- a/Utility/Url.hs +++ b/Utility/Url.hs @@ -50,6 +50,11 @@ closeManager :: Manager -> IO () closeManager _ = return () #endif +#if ! MIN_VERSION_http_client(0,5,0) +responseTimeoutNone :: Maybe Int +responseTimeoutNone = Nothing +#endif + managerSettings :: ManagerSettings #if MIN_VERSION_http_conduit(2,1,7) managerSettings = tlsManagerSettings diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index a8469a675..48e78e7ed 100755 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -27,8 +27,8 @@ export UPGRADE_LOCATION #export FORCE_GIT_VERSION # Uncomment to get rid of cabal installed libraries. -#cabal list --installed -#rm -rf /c/Users/jenkins/AppData/Roaming/cabal /c/Users/jenkins/AppData/Roaming/ghc +cabal list --installed +rm -rf /c/Users/jenkins/AppData/Roaming/cabal /c/Users/jenkins/AppData/Roaming/ghc # Don't allow build artifact from a past successful build to be extracted # if we fail. |