From 4e6ae471667beaa308607b3b03522ebabaf3014a Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Thu, 28 Apr 2016 13:18:44 -0400
Subject: 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.
---
 Build/Configure.hs         | 2 +-
 Build/DesktopFile.hs       | 2 +-
 Build/EvilLinker.hs        | 2 +-
 Build/EvilSplicer.hs       | 2 +-
 Build/LinuxMkLibs.hs       | 2 +-
 Build/NullSoftInstaller.hs | 2 +-
 Build/OSXMkLibs.hs         | 2 +-
 Build/Standalone.hs        | 2 +-
 Build/TestConfig.hs        | 2 +-
 Build/Version.hs           | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'Build')

diff --git a/Build/Configure.hs b/Build/Configure.hs
index 55f2493a1..f0c3f7c33 100644
--- a/Build/Configure.hs
+++ b/Build/Configure.hs
@@ -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
diff --git a/Build/DesktopFile.hs b/Build/DesktopFile.hs
index cac520d77..f832f310c 100644
--- a/Build/DesktopFile.hs
+++ b/Build/DesktopFile.hs
@@ -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
diff --git a/Build/EvilLinker.hs b/Build/EvilLinker.hs
index 97f218fd5..37885296f 100644
--- a/Build/EvilLinker.hs
+++ b/Build/EvilLinker.hs
@@ -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
 
diff --git a/Build/EvilSplicer.hs b/Build/EvilSplicer.hs
index 9734b7411..dc71a992c 100644
--- a/Build/EvilSplicer.hs
+++ b/Build/EvilSplicer.hs
@@ -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)
diff --git a/Build/LinuxMkLibs.hs b/Build/LinuxMkLibs.hs
index 5c33d4956..81cf834ef 100644
--- a/Build/LinuxMkLibs.hs
+++ b/Build/LinuxMkLibs.hs
@@ -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
diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs
index 7af6babef..b8c988062 100644
--- a/Build/NullSoftInstaller.hs
+++ b/Build/NullSoftInstaller.hs
@@ -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
diff --git a/Build/OSXMkLibs.hs b/Build/OSXMkLibs.hs
index c23f4a321..8be73babe 100644
--- a/Build/OSXMkLibs.hs
+++ b/Build/OSXMkLibs.hs
@@ -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
diff --git a/Build/Standalone.hs b/Build/Standalone.hs
index a3a4bac48..48e96f952 100644
--- a/Build/Standalone.hs
+++ b/Build/Standalone.hs
@@ -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
 
diff --git a/Build/TestConfig.hs b/Build/TestConfig.hs
index 35daf1945..b7766d6c4 100644
--- a/Build/TestConfig.hs
+++ b/Build/TestConfig.hs
@@ -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 =
diff --git a/Build/Version.hs b/Build/Version.hs
index 5954de169..fb6366688 100644
--- a/Build/Version.hs
+++ b/Build/Version.hs
@@ -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
-- 
cgit v1.2.3