aboutsummaryrefslogtreecommitdiff
path: root/Assistant/Upgrade.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-12-31 16:08:31 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-12-31 16:36:39 -0400
commit8f3134e5408ea1ea6207028ae17f2b5fb84e0c65 (patch)
tree99739954cd6b8a3c229a230f005d69f6ed74fb8c /Assistant/Upgrade.hs
parent6f83a6c8f45d7aa325d315654c4fd28de9feb4a6 (diff)
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.
Diffstat (limited to 'Assistant/Upgrade.hs')
-rw-r--r--Assistant/Upgrade.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Assistant/Upgrade.hs b/Assistant/Upgrade.hs
index 3b7b48833..a100e23b5 100644
--- a/Assistant/Upgrade.hs
+++ b/Assistant/Upgrade.hs
@@ -15,6 +15,7 @@ import qualified Annex
import Assistant.Alert
import Assistant.DaemonStatus
import Utility.Env
+import Utility.Env.Set
import Types.Distribution
import Types.Transfer
import Logs.Web
@@ -31,7 +32,7 @@ import Remote (remoteFromUUID)
import Annex.Path
import Config.Files
import Utility.ThreadScheduler
-import Utility.Tmp
+import Utility.Tmp.Dir
import Utility.UserInfo
import Utility.Gpg
import Utility.FileMode