From 2e513dc98c51eca1cdfce3715b4a017be39734f7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 28 Apr 2016 15:31:35 -0400 Subject: Fix build with directory-1.2.6.2. It's now exporting a conflicting isSymbolicLink https://github.com/haskell/directory/issues/52 Only a few places in propellor use isSymbolicLink, but to prevent future problems, made as much of it as possible import Utility.Directory, which re-exports System.Directory without the conflicting symbol. (Utility.Tmp and System.Console.Concurrent.Internal cannot import Utility.Directory due to cycles, and don't use isSymbolicLink anyway.) --- src/Propellor/DotDir.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor/DotDir.hs') diff --git a/src/Propellor/DotDir.hs b/src/Propellor/DotDir.hs index 669ac303..f32b52a4 100644 --- a/src/Propellor/DotDir.hs +++ b/src/Propellor/DotDir.hs @@ -15,6 +15,7 @@ import Utility.Monad import Utility.Process import Utility.SafeCommand import Utility.Exception +import Utility.Directory import Utility.Path -- This module is autogenerated by the build system. import qualified Paths_propellor as Package @@ -24,7 +25,6 @@ import Data.List import Data.Version import Control.Monad import Control.Monad.IfElse -import System.Directory import System.FilePath import System.Posix.Directory import System.IO -- cgit v1.3-2-g0d8e