From 4e6ae471667beaa308607b3b03522ebabaf3014a Mon Sep 17 00:00:00 2001 From: Joey Hess 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. --- Utility/LockFile/PidLock.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Utility/LockFile') diff --git a/Utility/LockFile/PidLock.hs b/Utility/LockFile/PidLock.hs index a21014c0e..50c38d70c 100644 --- a/Utility/LockFile/PidLock.hs +++ b/Utility/LockFile/PidLock.hs @@ -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 -- cgit v1.2.3