summaryrefslogtreecommitdiff
path: root/src/server/Cache.hs
diff options
context:
space:
mode:
authorThomas Hallgren <th-github@altocumulus.org>2019-05-15 12:05:38 +0200
committerThomas Hallgren <th-github@altocumulus.org>2019-05-15 12:05:38 +0200
commit86066d4b12d61e999740bf6a3a09b6547697ee13 (patch)
tree9f1571087789c47ae18c4da05a0d7eb380bf22be /src/server/Cache.hs
parentaf62a99bf535dc45d44d8546faab938485e49c84 (diff)
Eliminate the dependency on time-compat
It was only needed for compatibility with directory<1.2, but directory>=1.2 has been shipped with ghc since ghc-7.6. Note: time-compat-1.9.* (the current version) is a completely different package, that does not provide the needed function toUTCTime, which was provided in time-compat-0.1.*.
Diffstat (limited to 'src/server/Cache.hs')
-rw-r--r--src/server/Cache.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/Cache.hs b/src/server/Cache.hs
index d05ee2557..dc1eebdba 100644
--- a/src/server/Cache.hs
+++ b/src/server/Cache.hs
@@ -9,7 +9,7 @@ import Data.Maybe(mapMaybe)
import System.Directory (getModificationTime)
import System.Mem(performGC)
import Data.Time (UTCTime,getCurrentTime,diffUTCTime)
-import Data.Time.Compat (toUTCTime)
+--import Data.Time.Compat (toUTCTime)
data Cache a = Cache {
cacheLoad :: FilePath -> IO a,
@@ -63,7 +63,7 @@ readCache' c file =
Nothing -> do v <- newMVar Nothing
return (Map.insert file v objs, v)
-- Check time stamp, and reload if different than the cache entry
- readObject m = do t' <- toUTCTime `fmap` getModificationTime file
+ readObject m = do t' <- {-toUTCTime `fmap`-} getModificationTime file
now <- getCurrentTime
x' <- case m of
Just (t,_,x) | t' == t -> return x