Skip to content

Unbreak the build with directory < 1.2.3.0. #4962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 19, 2017
Merged

Unbreak the build with directory < 1.2.3.0. #4962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a6559a
Unbreak the build with directory < 1.2.3.0.
23Skidoo Dec 19, 2017
9858c69
Bump the dependency on pretty-show.
23Skidoo Dec 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions cabal-install/Distribution/Client/Compat/Directory.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{-# LANGUAGE CPP #-}
module Distribution.Client.Compat.Directory (setModificationTime) where

#if MIN_VERSION_directory(1,2,3)
import System.Directory (setModificationTime)
#else

import Data.Time.Clock (UTCTime)

setModificationTime :: FilePath -> UTCTime -> IO ()
setModificationTime _fp _t = return ()

#endif
3 changes: 2 additions & 1 deletion cabal-install/Distribution/Client/Update.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ module Distribution.Client.Update

import Distribution.Simple.Setup
( fromFlag )
import Distribution.Client.Compat.Directory
( setModificationTime )
import Distribution.Client.Types
( Repo(..), RemoteRepo(..), maybeRepoRemote )
import Distribution.Client.HttpUtils
Expand All @@ -40,7 +42,6 @@ import Distribution.Simple.Utils

import qualified Data.ByteString.Lazy as BS
import Distribution.Client.GZipUtils (maybeDecompress)
import System.Directory (setModificationTime)
import System.FilePath ((<.>), dropExtension)
import Data.Maybe (mapMaybe)
import Data.Time (getCurrentTime)
Expand Down
6 changes: 4 additions & 2 deletions cabal-install/cabal-install.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ library
Distribution.Client.CmdRepl
Distribution.Client.CmdRun
Distribution.Client.CmdTest
Distribution.Client.Compat.Directory
Distribution.Client.Compat.ExecutablePath
Distribution.Client.Compat.FileLock
Distribution.Client.Compat.FilePerms
Expand Down Expand Up @@ -437,6 +438,7 @@ executable cabal
Distribution.Client.CmdRepl
Distribution.Client.CmdRun
Distribution.Client.CmdTest
Distribution.Client.Compat.Directory
Distribution.Client.Compat.ExecutablePath
Distribution.Client.Compat.FileLock
Distribution.Client.Compat.FilePerms
Expand Down Expand Up @@ -657,7 +659,7 @@ executable cabal
mtl,
network,
network-uri,
pretty-show,
pretty-show >= 1.6.15,
random,
tagged,
tar,
Expand Down Expand Up @@ -786,7 +788,7 @@ Test-Suite solver-quickcheck
tasty >= 0.12,
tasty-quickcheck,
QuickCheck >= 2.8.2,
pretty-show
pretty-show >= 1.6.15

if !(arch(arm) && impl(ghc < 7.6))
ghc-options: -threaded
Expand Down