From 8f3134e5408ea1ea6207028ae17f2b5fb84e0c65 Mon Sep 17 00:00:00 2001 From: Joey Hess 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. --- git-annex.cabal | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'git-annex.cabal') diff --git a/git-annex.cabal b/git-annex.cabal index 6b2fec439..987894c01 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -302,6 +302,11 @@ source-repository head type: git location: git://git-annex.branchable.com/ +custom-setup + Setup-Depends: base (>= 4.6), hslogger, split, unix-compat, process, + filepath, exceptions, bytestring, directory, IfElse, data-default, + utf8-string, Cabal + Executable git-annex Main-Is: git-annex.hs Build-Depends: @@ -987,10 +992,13 @@ Executable git-annex Utility.DirWatcher Utility.DirWatcher.Types Utility.Directory + Utility.Directory.Stream Utility.DiskFree Utility.Dot Utility.DottedVersion Utility.Env + Utility.Env.Basic + Utility.Env.Set Utility.Exception Utility.ExternalSHA Utility.FileMode @@ -1029,9 +1037,11 @@ Executable git-annex Utility.Parallel Utility.PartialPrelude Utility.Path + Utility.Path.Max Utility.Percentage Utility.Process Utility.Process.Shim + Utility.Process.Transcript Utility.QuickCheck Utility.Rsync Utility.SRV @@ -1050,6 +1060,7 @@ Executable git-annex Utility.ThreadLock Utility.ThreadScheduler Utility.Tmp + Utility.Tmp.Dir Utility.Tor Utility.Touch Utility.Tuple -- cgit v1.2.3