Fix build with directory-1.2.6.2.
It started exporting a isSymbolicLink which supports windows. But, git-annex does no use symlinks on windows yet and this conflicts with the function by the same name from unix-compat, so hide it.
This commit is contained in:
parent
6566795e4f
commit
5fe450514b
21 changed files with 26 additions and 20 deletions
|
@ -11,7 +11,7 @@
|
|||
module Utility.Directory where
|
||||
|
||||
import System.IO.Error
|
||||
import System.Directory
|
||||
import System.Directory hiding (isSymbolicLink)
|
||||
import Control.Monad
|
||||
import System.FilePath
|
||||
import Control.Applicative
|
||||
|
|
|
@ -35,7 +35,7 @@ import Utility.Process
|
|||
import Utility.PartialPrelude
|
||||
|
||||
import System.Environment
|
||||
import System.Directory
|
||||
import System.Directory hiding (isSymbolicLink)
|
||||
import System.FilePath
|
||||
import Data.List
|
||||
import Data.String.Utils
|
||||
|
|
|
@ -14,7 +14,7 @@ import Utility.Monad
|
|||
import Utility.Path
|
||||
|
||||
import Data.Maybe
|
||||
import System.Directory
|
||||
import System.Directory hiding (isSymbolicLink)
|
||||
import System.FilePath
|
||||
import Data.List.Utils
|
||||
import System.Posix.Files
|
||||
|
|
|
@ -34,7 +34,7 @@ import Data.List
|
|||
import Network.BSD
|
||||
import System.FilePath
|
||||
import Data.Hash.MD5
|
||||
import System.Directory
|
||||
import System.Directory hiding (isSymbolicLink)
|
||||
import Control.Applicative
|
||||
import Prelude
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ module Utility.Path where
|
|||
|
||||
import Data.String.Utils
|
||||
import System.FilePath
|
||||
import System.Directory
|
||||
import System.Directory hiding (isSymbolicLink)
|
||||
import Data.List
|
||||
import Data.Maybe
|
||||
import Data.Char
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
module Utility.Tmp where
|
||||
|
||||
import System.IO
|
||||
import System.Directory
|
||||
import System.Directory hiding (isSymbolicLink)
|
||||
import Control.Monad.IfElse
|
||||
import System.FilePath
|
||||
import Control.Monad.IO.Class
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue