stackage-install 0.1.1.1 → 0.1.2

raw patch · 3 files changed

+28/−5 lines, 3 filesdep ~http-client

Dependency ranges changed: http-client

Files

• ChangeLog.md +4/−0
• Stackage/Install.hs +23/−4
• stackage-install.cabal +1/−1

@@ -1,3 +1,7 @@+# 0.1.2++* http-client 0.5+ # 0.1.1.1  * Only print warning on missing files if index has JSON files

@@ -1,3 +1,4 @@+{-# LANGUAGE CPP                #-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE OverloadedStrings  #-} {-# LANGUAGE ViewPatterns       #-}@@ -43,10 +44,18 @@ import           Data.Text.Encoding       (encodeUtf8) import           Data.Typeable            (Typeable) import           Data.Word                (Word64)-import           Network.HTTP.Client      (Manager, brRead, checkStatus,+import           Network.HTTP.Client      (Manager, brRead,                                            managerResponseTimeout, newManager,-                                           parseUrl, responseBody,-                                           responseStatus, withResponse)+                                           responseBody,+                                           responseStatus, withResponse+#if MIN_VERSION_http_client(0,5,0)+                                           , parseRequest+                                           , responseTimeoutMicro+#else+                                           , parseUrl+                                           , checkStatus+#endif+                                           ) import           Network.HTTP.Client.TLS  (tlsManagerSettings) import           Network.HTTP.Types       (statusCode) import           System.Directory         (createDirectoryIfMissing,@@ -101,7 +110,13 @@ defaultSettings :: Settings defaultSettings = Settings     { _getManager = newManager tlsManagerSettings-        { managerResponseTimeout = Just 90000000+        { managerResponseTimeout =+#if MIN_VERSION_http_client(0,5,0)+            responseTimeoutMicro+#else+            Just+#endif+            90000000         }     , _cabalCommand = "cabal"     , _downloadPrefix = "https://s3.amazonaws.com/hackage.fpcomplete.com/package/"@@ -253,6 +268,9 @@                             , packageSize p                             )             createDirectoryIfMissing True $ takeDirectory fp+#if MIN_VERSION_http_client(0,5,0)+            req' <- parseRequest url+#else             req <- parseUrl url             let req' = req                     { checkStatus = \s x y ->@@ -261,6 +279,7 @@                             then Nothing                             else checkStatus req s x y                     }+#endif             withResponse req' man $ \res -> if statusCode (responseStatus res) == 200                 then do                     let tmp = fp <.> "tmp"

@@ -1,5 +1,5 @@ name:                stackage-install-version:             0.1.1.1+version:             0.1.2 synopsis:            Secure download of packages for cabal-install description:         For more information, see <https://www.stackage.org/package/stackage-install> homepage:            https://github.com/fpco/stackage-install