Skip to content

Commit 3f0d771

Browse files
committed
Unbreak the build with directory < 1.2.3.0.
See #4950 (comment) for context.
1 parent fcabd87 commit 3f0d771

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{-# LANGUAGE CPP #-}
2+
module Distribution.Client.Compat.Directory (setModificationTime) where
3+
4+
#if MIN_VERSION_directory(1,2,3)
5+
import System.Directory (setModificationTime)
6+
#else
7+
8+
import Data.Time.Clock (UTCTime)
9+
import System.IO (FilePath)
10+
11+
setModificationTime :: FilePath -> UTCTime -> IO ()
12+
setModificationTime _fp _t = return ()
13+
14+
#endif

cabal-install/Distribution/Client/Update.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ module Distribution.Client.Update
1717

1818
import Distribution.Simple.Setup
1919
( fromFlag )
20+
import Distribution.Client.Compat.Directory
21+
( setModificationTime )
2022
import Distribution.Client.Types
2123
( Repo(..), RemoteRepo(..), maybeRepoRemote )
2224
import Distribution.Client.HttpUtils
@@ -40,7 +42,6 @@ import Distribution.Simple.Utils
4042

4143
import qualified Data.ByteString.Lazy as BS
4244
import Distribution.Client.GZipUtils (maybeDecompress)
43-
import System.Directory (setModificationTime)
4445
import System.FilePath ((<.>), dropExtension)
4546
import Data.Maybe (mapMaybe)
4647
import Data.Time (getCurrentTime)

cabal-install/cabal-install.cabal

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ library
168168
Distribution.Client.CmdRepl
169169
Distribution.Client.CmdRun
170170
Distribution.Client.CmdTest
171+
Distribution.Client.Compat.Directory
171172
Distribution.Client.Compat.ExecutablePath
172173
Distribution.Client.Compat.FileLock
173174
Distribution.Client.Compat.FilePerms
@@ -437,6 +438,7 @@ executable cabal
437438
Distribution.Client.CmdRepl
438439
Distribution.Client.CmdRun
439440
Distribution.Client.CmdTest
441+
Distribution.Client.Compat.Directory
440442
Distribution.Client.Compat.ExecutablePath
441443
Distribution.Client.Compat.FileLock
442444
Distribution.Client.Compat.FilePerms

0 commit comments

Comments
 (0)