From 92f36a1d31418e747eeaaaad03aeb85cec939d21 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Nov 2017 14:59:51 -0400 Subject: still can't express custom-setup deps They need unix on non-windows, for Utility.Env, which Build.Configure uses, but cabal can't express that in a custom-setup stanza. To avoid this problem, Utility.Env would need to be moved into unix-compat.. --- Build/Configure.hs | 2 +- Build/TestConfig.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Build') diff --git a/Build/Configure.hs b/Build/Configure.hs index 5df6857b1..f51ceef79 100644 --- a/Build/Configure.hs +++ b/Build/Configure.hs @@ -7,7 +7,6 @@ module Build.Configure where import Control.Applicative import Control.Monad.IfElse import Control.Monad -import System.Directory import Build.TestConfig import Build.Version @@ -19,6 +18,7 @@ import Utility.Env import Utility.Exception import qualified Git.Version import Utility.DottedVersion +import Utility.Directory tests :: [TestCase] tests = diff --git a/Build/TestConfig.hs b/Build/TestConfig.hs index 6c7139595..f6ad2df6f 100644 --- a/Build/TestConfig.hs +++ b/Build/TestConfig.hs @@ -7,10 +7,10 @@ module Build.TestConfig where import Utility.Path import Utility.Monad import Utility.SafeCommand +import Utility.Directory import System.IO import System.FilePath -import System.Directory type ConfigKey = String data ConfigValue = -- cgit v1.2.3