Makefile now builds using cabal, taking advantage of cabal's automatic detection of appropriate build flags.

The only thing lost is ./ghci

Speed: make fast used to take 20 seconds here, when rebuilding from
touching Command/Unused.hs. With cabal, it's 29 seconds.

Assistant/Pairing.hs

@@ -75,7 +75,7 @@ data PairingInProgress = PairingInProgress
 data SomeAddr = IPv4Addr HostAddress
 {- My Android build of the Network library does not currently have IPV6
  - support. -}
-#ifndef WITH_ANDROID
+#ifndef __ANDROID__
 	| IPv6Addr HostAddress6
 #endif
 	deriving (Ord, Eq, Read, Show)

Assistant/Ssh.hs

@@ -15,9 +15,6 @@ import Git.Remote
 
 import Data.Text (Text)
 import qualified Data.Text as T
-import qualified Control.Exception as E
-import System.Process (CreateProcess(..))
-import Control.Concurrent
 import Data.Char
 
 data SshData = SshData

Assistant/WebApp/Configurators/Local.hs

@@ -7,6 +7,12 @@
 
 {-# LANGUAGE CPP, TypeFamilies, QuasiQuotes, MultiParamTypeClasses, TemplateHaskell, OverloadedStrings, RankNTypes #-}
 
+#if defined VERSION_yesod_form
+#if ! MIN_VERSION_yesod_form(1,2,0)
+#define WITH_OLD_YESOD
+#endif
+#endif
+
 module Assistant.WebApp.Configurators.Local where
 
 import Assistant.WebApp.Common

Assistant/WebApp/Notifications.hs

@@ -7,6 +7,12 @@
 
 {-# LANGUAGE CPP, TypeFamilies, QuasiQuotes, MultiParamTypeClasses, TemplateHaskell, OverloadedStrings, RankNTypes #-}
 
+#if defined VERSION_yesod_default
+#if ! MIN_VERSION_yesod_default(1,1,0)
+#define WITH_OLD_YESOD
+#endif
+#endif
+
 module Assistant.WebApp.Notifications where
 
 import Assistant.Common