diff --git a/example-client/example-client.cabal b/example-client/example-client.cabal index 6980105e..e67ffb35 100644 --- a/example-client/example-client.cabal +++ b/example-client/example-client.cabal @@ -43,7 +43,7 @@ executable example-client directory >= 1.2, filepath >= 1.2, optparse-applicative >= 0.11, - time >= 1.2, + time >= 1.5, hackage-security >= 0.5, hackage-security-HTTP, hackage-security-curl, diff --git a/hackage-repo-tool/hackage-repo-tool.cabal b/hackage-repo-tool/hackage-repo-tool.cabal index c8ffbc12..6168ff59 100644 --- a/hackage-repo-tool/hackage-repo-tool.cabal +++ b/hackage-repo-tool/hackage-repo-tool.cabal @@ -68,7 +68,7 @@ executable hackage-repo-tool bytestring >= 0.9 && < 0.13, directory >= 1.2 && < 1.4, filepath >= 1.3 && < 1.5, - time >= 1.4 && < 1.13 + time >= 1.5 && < 1.13 if !os(windows) build-depends: unix >= 2.5 && < 2.9 diff --git a/hackage-security/hackage-security.cabal b/hackage-security/hackage-security.cabal index b76fe1cf..e642a1ed 100644 --- a/hackage-security/hackage-security.cabal +++ b/hackage-security/hackage-security.cabal @@ -128,7 +128,7 @@ library -- functionality, 0.5.0 changes type of serialise tar >= 0.5 && < 0.7, template-haskell >= 2.7 && < 2.22, - time >= 1.2 && < 1.13, + time >= 1.5 && < 1.13, transformers >= 0.3 && < 0.7, zlib >= 0.5 && < 0.7, -- whatever versions are bundled with ghc: diff --git a/hackage-security/src/Hackage/Security/Util/JSON.hs b/hackage-security/src/Hackage/Security/Util/JSON.hs index f35e93ca..6dbd3d02 100644 --- a/hackage-security/src/Hackage/Security/Util/JSON.hs +++ b/hackage-security/src/Hackage/Security/Util/JSON.hs @@ -30,10 +30,6 @@ import Text.JSON.Canonical import Network.URI import qualified Data.Map as Map -#if !MIN_VERSION_time(1,5,0) -import System.Locale (defaultTimeLocale) -#endif - import Hackage.Security.Util.Path {------------------------------------------------------------------------------- @@ -137,10 +133,6 @@ instance ReportSchemaErrors m => FromJSON m UTCTime where case parseTimeM False defaultTimeLocale "%FT%TZ" str of Just time -> return time Nothing -> expected "valid date-time string" (Just str) -#if !MIN_VERSION_time(1,5,0) - where - parseTimeM _trim = parseTime -#endif instance ( Monad m , ToObjectKey m k