diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-12-31 16:08:31 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-12-31 16:36:39 -0400 |
| commit | 8f3134e5408ea1ea6207028ae17f2b5fb84e0c65 (patch) | |
| tree | 99739954cd6b8a3c229a230f005d69f6ed74fb8c /Assistant | |
| parent | 6f83a6c8f45d7aa325d315654c4fd28de9feb4a6 (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')
| -rw-r--r-- | Assistant/Ssh.hs | 2 | ||||
| -rw-r--r-- | Assistant/Upgrade.hs | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs index fb4a39a17..852844616 100644 --- a/Assistant/Ssh.hs +++ b/Assistant/Ssh.hs @@ -9,12 +9,14 @@ module Assistant.Ssh where import Annex.Common import Utility.Tmp +import Utility.Tmp.Dir import Utility.Shell import Utility.Rsync import Utility.FileMode import Utility.SshConfig import Git.Remote import Utility.SshHost +import Utility.Process.Transcript import Data.Text (Text) import qualified Data.Text as T 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 |