Skip to content

Commit 51cdec3

Browse files
committed
Require time >= 1.5
1 parent e22d3e5 commit 51cdec3

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

example-client/example-client.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ executable example-client
4343
directory >= 1.2,
4444
filepath >= 1.2,
4545
optparse-applicative >= 0.11,
46-
time >= 1.2,
46+
time >= 1.5,
4747
hackage-security >= 0.5,
4848
hackage-security-HTTP,
4949
hackage-security-curl,

hackage-repo-tool/hackage-repo-tool.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ executable hackage-repo-tool
6868
bytestring >= 0.9 && < 0.13,
6969
directory >= 1.2 && < 1.4,
7070
filepath >= 1.3 && < 1.5,
71-
time >= 1.4 && < 1.13
71+
time >= 1.5 && < 1.13
7272
if !os(windows)
7373
build-depends: unix >= 2.5 && < 2.9
7474

hackage-security/hackage-security.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ library
128128
-- functionality, 0.5.0 changes type of serialise
129129
tar >= 0.5 && < 0.7,
130130
template-haskell >= 2.7 && < 2.22,
131-
time >= 1.2 && < 1.13,
131+
time >= 1.5 && < 1.13,
132132
transformers >= 0.3 && < 0.7,
133133
zlib >= 0.5 && < 0.7,
134134
-- whatever versions are bundled with ghc:

hackage-security/src/Hackage/Security/Util/JSON.hs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ import Text.JSON.Canonical
3030
import Network.URI
3131
import qualified Data.Map as Map
3232

33-
#if !MIN_VERSION_time(1,5,0)
34-
import System.Locale (defaultTimeLocale)
35-
#endif
36-
3733
import Hackage.Security.Util.Path
3834

3935
{-------------------------------------------------------------------------------
@@ -137,10 +133,6 @@ instance ReportSchemaErrors m => FromJSON m UTCTime where
137133
case parseTimeM False defaultTimeLocale "%FT%TZ" str of
138134
Just time -> return time
139135
Nothing -> expected "valid date-time string" (Just str)
140-
#if !MIN_VERSION_time(1,5,0)
141-
where
142-
parseTimeM _trim = parseTime
143-
#endif
144136

145137
instance ( Monad m
146138
, ToObjectKey m k

0 commit comments

Comments
 (0)