directory 1.2 can be installed with older GHC, so we'd better pin it in the cabal file

hledger now requires directory >= 1.2. This might make installation
more complex on old GHC versions; if it turns out to be needed,
perhaps it can be conditionalised again, more accurately, in the cabal file.
This commit is contained in:
Simon Michael 2013-03-11 15:56:56 +00:00
parent ae8d4882b4
commit bbfd91e7ea
2 changed files with 3 additions and 10 deletions

View File

@ -1,4 +1,4 @@
{-# LANGUAGE ScopedTypeVariables, CPP #-} {-# LANGUAGE ScopedTypeVariables #-}
{-| {-|
Utilities for top-level modules and ghci. See also Hledger.Read and Utilities for top-level modules and ghci. See also Hledger.Read and
@ -34,10 +34,8 @@ import System.Process (readProcessWithExitCode)
import System.Time (ClockTime, getClockTime, diffClockTimes, TimeDiff(TimeDiff)) import System.Time (ClockTime, getClockTime, diffClockTimes, TimeDiff(TimeDiff))
import Test.HUnit import Test.HUnit
import Text.Printf import Text.Printf
#if __GLASGOW_HASKELL__ >= 706
import System.Time (ClockTime(TOD)) import System.Time (ClockTime(TOD))
import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds) import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds)
#endif
import Hledger.Cli.Options import Hledger.Cli.Options
import Hledger.Data import Hledger.Data
@ -103,14 +101,9 @@ fileModificationTime :: FilePath -> IO ClockTime
fileModificationTime f fileModificationTime f
| null f = getClockTime | null f = getClockTime
| otherwise = (do | otherwise = (do
-- getModificationTime returned a ClockTime till GHC 7.6 (directory 1.2), now it's UTCTime
#if __GLASGOW_HASKELL__ < 706
clo <- getModificationTime f
#else
utc <- getModificationTime f utc <- getModificationTime f
let nom = utcTimeToPOSIXSeconds utc let nom = utcTimeToPOSIXSeconds utc
let clo = TOD (read $ takeWhile (`elem` "0123456789") $ show nom) 0 -- XXX read let clo = TOD (read $ takeWhile (`elem` "0123456789") $ show nom) 0 -- XXX read
#endif
return clo return clo
) )
`C.catch` \(_::C.IOException) -> getClockTime `C.catch` \(_::C.IOException) -> getClockTime

View File

@ -67,7 +67,7 @@ library
-- ,cabal-file-th -- ,cabal-file-th
,containers ,containers
,cmdargs >= 0.10 && < 0.11 ,cmdargs >= 0.10 && < 0.11
,directory ,directory >= 1.2
,filepath ,filepath
,haskeline >= 0.6 && <= 0.8 ,haskeline >= 0.6 && <= 0.8
,HUnit ,HUnit
@ -120,7 +120,7 @@ executable hledger
,base >= 4.3 && < 5 ,base >= 4.3 && < 5
,containers ,containers
,cmdargs >= 0.10 && < 0.11 ,cmdargs >= 0.10 && < 0.11
,directory ,directory >= 1.2
,filepath ,filepath
,haskeline >= 0.6 && <= 0.8 ,haskeline >= 0.6 && <= 0.8
,HUnit ,HUnit