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.

4 files changed, 4 insertions, 1 deletions

diff --git a/Git/CurrentRepo.hs b/Git/CurrentRepo.hs
index 69a679ee3..df074cf8b 100644
--- a/Git/CurrentRepo.hs
+++ b/Git/CurrentRepo.hs
@@ -12,6 +12,7 @@ import Git.Types
 import Git.Construct
 import qualified Git.Config
 import Utility.Env
+import Utility.Env.Set
 
 {- Gets the current git repository.
  -
diff --git a/Git/Index.hs b/Git/Index.hs
index 85ea480b5..0898569b4 100644
--- a/Git/Index.hs
+++ b/Git/Index.hs
@@ -10,6 +10,7 @@ module Git.Index where
 import Common
 import Git
 import Utility.Env
+import Utility.Env.Set
 
 indexEnv :: String
 indexEnv = "GIT_INDEX_FILE"
diff --git a/Git/LockFile.hs b/Git/LockFile.hs
index a7a144114..e3d59009e 100644
--- a/Git/LockFile.hs
+++ b/Git/LockFile.hs
@@ -13,6 +13,7 @@ import Common
 
 #ifndef mingw32_HOST_OS
 import System.Posix.Types
+import System.Posix.IO
 #else
 import System.Win32.Types
 import System.Win32.File
diff --git a/Git/Repair.hs b/Git/Repair.hs
index 8e4324858..d4f8e0bf9 100644
--- a/Git/Repair.hs
+++ b/Git/Repair.hs
@@ -36,7 +36,7 @@ import qualified Git.Ref as Ref
 import qualified Git.RefLog as RefLog
 import qualified Git.UpdateIndex as UpdateIndex
 import qualified Git.Branch as Branch
-import Utility.Tmp
+import Utility.Tmp.Dir
 import Utility.Rsync
 import Utility.FileMode
 import Utility.Tuple