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/Property/Chroot/Util.hs | 1 - 1 file changed, 1 deletion(-) (limited to 'src/Propellor/Property/Chroot') diff --git a/src/Propellor/Property/Chroot/Util.hs b/src/Propellor/Property/Chroot/Util.hs index ff227f52..ac703136 100644 --- a/src/Propellor/Property/Chroot/Util.hs +++ b/src/Propellor/Property/Chroot/Util.hs @@ -6,7 +6,6 @@ import Utility.Exception import Utility.Env import Utility.Directory -import System.Directory import Control.Applicative import Prelude -- cgit v1.2.3