From 8f3134e5408ea1ea6207028ae17f2b5fb84e0c65 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Sun, 31 Dec 2017 16:08:31 -0400
Subject: finally really add back custom-setup stanza

Fourth or fifth try at this and finally found a way to make it work.

Absurd amount of busy-work forced on me by change in cabal's behavior.
Split up Utility modules that need posix stuff out of ones used by
Setup. Various other hacks around inability for Setup to use anything
that ifdefs a use of unix.

Probably lost a full day of my life to this.
This is how build systems make their users hate them. Just saying.
---
 Command/AddUrl.hs    | 1 +
 Command/Multicast.hs | 2 ++
 Command/P2P.hs       | 2 +-
 Command/Proxy.hs     | 2 +-
 Command/Sync.hs      | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'Command')

diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs
index 65d25859b..995848ed2 100644
--- a/Command/AddUrl.hs
+++ b/Command/AddUrl.hs
@@ -30,6 +30,7 @@ import Logs.Location
 import Utility.Metered
 import Utility.FileSystemEncoding
 import Utility.HtmlDetect
+import Utility.Path.Max
 import qualified Annex.Transfer as Transfer
 
 cmd :: Command
diff --git a/Command/Multicast.hs b/Command/Multicast.hs
index 9a518a18f..55792a2bc 100644
--- a/Command/Multicast.hs
+++ b/Command/Multicast.hs
@@ -25,6 +25,8 @@ import Types.FileMatcher
 import qualified Git.LsFiles as LsFiles
 import Utility.Hash
 import Utility.Tmp
+import Utility.Tmp.Dir
+import Utility.Process.Transcript
 import Config
 
 import Data.Char
diff --git a/Command/P2P.hs b/Command/P2P.hs
index 40a49b49f..1b5418499 100644
--- a/Command/P2P.hs
+++ b/Command/P2P.hs
@@ -19,7 +19,7 @@ import qualified Annex
 import Annex.UUID
 import Config
 import Utility.AuthToken
-import Utility.Tmp
+import Utility.Tmp.Dir
 import Utility.FileMode
 import Utility.ThreadScheduler
 import qualified Utility.MagicWormhole as Wormhole
diff --git a/Command/Proxy.hs b/Command/Proxy.hs
index dba0300b8..553d826f4 100644
--- a/Command/Proxy.hs
+++ b/Command/Proxy.hs
@@ -9,7 +9,7 @@ module Command.Proxy where
 
 import Command
 import Config
-import Utility.Tmp
+import Utility.Tmp.Dir
 import Utility.Env
 import Annex.Direct
 import qualified Git
diff --git a/Command/Sync.hs b/Command/Sync.hs
index f63260ed4..75752f4ff 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -63,6 +63,7 @@ import Annex.TaggedPush
 import qualified Database.Export as Export
 import Utility.Bloom
 import Utility.OptParse
+import Utility.Process.Transcript
 
 import Control.Concurrent.MVar
 import qualified Data.Map as M
-- 
cgit v1.2.3