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
|
@ -4,7 +4,7 @@
|
|||
|
||||
module Build.Configure where
|
||||
|
||||
import System.Directory
|
||||
import System.Directory hiding (isSymbolicLink)
|
||||
import Control.Applicative
|
||||
import System.Environment (getArgs)
|
||||
import Control.Monad.IfElse
|
||||
|
|
|
@ -20,7 +20,7 @@ import Utility.OSX
|
|||
import Assistant.Install.AutoStart
|
||||
import Assistant.Install.Menu
|
||||
|
||||
import System.Directory
|
||||
import System.Directory hiding (isSymbolicLink)
|
||||
import System.Environment
|
||||
#ifndef mingw32_HOST_OS
|
||||
import System.Posix.User
|
||||
|
|
|
@ -15,7 +15,7 @@ import Text.Parsec
|
|||
import Text.Parsec.String
|
||||
import Control.Applicative ((<$>))
|
||||
import Control.Monad
|
||||
import System.Directory
|
||||
import System.Directory hiding (isSymbolicLink)
|
||||
import Data.Maybe
|
||||
import Data.List
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ import Data.String.Utils
|
|||
import Data.Char
|
||||
import System.Environment
|
||||
import System.FilePath
|
||||
import System.Directory
|
||||
import System.Directory hiding (isSymbolicLink)
|
||||
import System.IO
|
||||
import Control.Monad
|
||||
import Prelude hiding (log)
|
||||
|
|
|
@ -12,7 +12,7 @@ module Main where
|
|||
import System.Environment
|
||||
import Data.Maybe
|
||||
import System.FilePath
|
||||
import System.Directory
|
||||
import System.Directory hiding (isSymbolicLink)
|
||||
import Control.Monad
|
||||
import Data.List
|
||||
import System.Posix.Files
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
{-# LANGUAGE OverloadedStrings, FlexibleContexts #-}
|
||||
|
||||
import Development.NSIS
|
||||
import System.Directory
|
||||
import System.Directory hiding (isSymbolicLink)
|
||||
import System.FilePath
|
||||
import Control.Monad
|
||||
import Control.Applicative
|
||||
|
|
|
@ -10,7 +10,7 @@ module Main where
|
|||
import System.Environment (getArgs)
|
||||
import Data.Maybe
|
||||
import System.FilePath
|
||||
import System.Directory
|
||||
import System.Directory hiding (isSymbolicLink)
|
||||
import Control.Monad
|
||||
import Control.Monad.IfElse
|
||||
import Data.List
|
||||
|
|
|
@ -12,7 +12,7 @@ module Main where
|
|||
import Control.Monad.IfElse
|
||||
import System.Environment
|
||||
import System.FilePath
|
||||
import System.Directory
|
||||
import System.Directory hiding (isSymbolicLink)
|
||||
import Control.Monad
|
||||
import Build.BundledPrograms
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ import Utility.SafeCommand
|
|||
|
||||
import System.IO
|
||||
import System.FilePath
|
||||
import System.Directory
|
||||
import System.Directory hiding (isSymbolicLink)
|
||||
|
||||
type ConfigKey = String
|
||||
data ConfigValue =
|
||||
|
|
|
@ -6,7 +6,7 @@ module Build.Version where
|
|||
|
||||
import Data.List
|
||||
import System.Environment
|
||||
import System.Directory
|
||||
import System.Directory hiding (isSymbolicLink)
|
||||
import Data.Char
|
||||
import System.Process
|
||||
import Control.Applicative
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue