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. --- Annex/Fixup.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Annex') diff --git a/Annex/Fixup.hs b/Annex/Fixup.hs index 1cde86390..35634f14c 100644 --- a/Annex/Fixup.hs +++ b/Annex/Fixup.hs @@ -20,7 +20,7 @@ import Utility.Exception import System.IO import System.FilePath -import System.Directory +import System.Directory hiding (isSymbolicLink) import Data.List import Control.Monad import Control.Monad.IfElse -- cgit v1.2.3