revert reversion

This reverts commit 05c37ced983e89505c2c3cdcbe1db67e3a86560b.

Android build is going to have consistent versions again.

3 files changed, 8 insertions, 4 deletions

diff --git a/Command/Map.hs b/Command/Map.hs
index 702cde6e9..940a0796f 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -194,11 +194,11 @@ tryScan r
 	| Git.repoIsUrl r = return Nothing
 	| otherwise = liftIO $ safely $ Git.Config.read r
   where
-	pipedconfig c params = liftIO $ safely $
+	pipedconfig cmd params = liftIO $ safely $
 		withHandle StdoutHandle createProcessSuccess p $
 			Git.Config.hRead r
 	  where
-		p = proc c $ toCommand params
+		p = proc cmd $ toCommand params
 
 	configlist = Ssh.onRemote r (pipedconfig, return Nothing) "configlist" [] []
 	manualconfiglist = do
diff --git a/Command/Trust.hs b/Command/Trust.hs
index 5c66c4e98..638fc50e4 100644
--- a/Command/Trust.hs
+++ b/Command/Trust.hs
@@ -24,11 +24,11 @@ seek :: CommandSeek
 seek = trustCommand "trust" Trusted
 
 trustCommand :: String -> TrustLevel -> CommandSeek
-trustCommand cmdname level = withWords start
+trustCommand cmd level = withWords start
   where
 	start ws = do
 		let name = unwords ws
-		showStart cmdname name
+		showStart cmd name
 		u <- Remote.nameToUUID name
 		next $ perform u
 	perform uuid = do
diff --git a/Utility/Yesod.hs b/Utility/Yesod.hs
index 6d38ba4ed..afe10a111 100644
--- a/Utility/Yesod.hs
+++ b/Utility/Yesod.hs
@@ -28,7 +28,11 @@ import Yesod as Y
 #else
 import Yesod as Y hiding (Html)
 #endif
+#if MIN_VERSION_yesod_form(1,3,8)
+import Yesod.Form.Bootstrap3 as Y hiding (bfs)
+#else
 import Assistant.WebApp.Bootstrap3 as Y hiding (bfs)
+#endif
 #ifndef __NO_TH__
 import Yesod.Default.Util
 import Language.Haskell.TH.Syntax (Q, Exp)