fold Build/SysConfig.hs into BuildInfo via include

This avoids warnings from stack about the module not being listed in the
cabal file. So, the generated file is also renamed to Build/SysConfig.

Note that the setup program seems to be cached despite these changes; I
had to cabal clean to get cabal to update it so that Build/SysConfig was
written.

This commit was sponsored by Jochen Bartl on Patreon.

Assistant/Threads/UpgradeWatcher.hs

@@ -21,7 +21,7 @@ import Assistant.Alert
 import Assistant.DaemonStatus
 #ifdef WITH_WEBAPP
 import Assistant.WebApp.Types
-import qualified Build.SysConfig
+import qualified BuildInfo
 #endif
 
 import Control.Concurrent.MVar
@@ -103,7 +103,7 @@ showSuccessfulUpgrade urlrenderer = do
 			(T.pack "Enable Automatic Upgrades")
 			urlrenderer ConfigEnableAutomaticUpgradeR
 		)
-	void $ addAlert $ upgradeFinishedAlert button Build.SysConfig.packageversion
+	void $ addAlert $ upgradeFinishedAlert button BuildInfo.packageversion
 #else
 	noop
 #endif

Assistant/Threads/Upgrader.hs

@@ -19,7 +19,7 @@ import Assistant.DaemonStatus
 import Assistant.Alert
 import Utility.NotificationBroadcaster
 import qualified Annex
-import qualified Build.SysConfig
+import qualified BuildInfo
 import qualified Utility.DottedVersion as DottedVersion
 import Types.Distribution
 #ifdef WITH_WEBAPP
@@ -31,7 +31,7 @@ import qualified Data.Text as T
 
 upgraderThread :: UrlRenderer -> NamedThread
 upgraderThread urlrenderer = namedThread "Upgrader" $
-	when (isJust Build.SysConfig.upgradelocation) $ do
+	when (isJust BuildInfo.upgradelocation) $ do
 		{- Check for upgrade on startup, unless it was just
 		 - upgraded. -}
 		unlessM (liftIO checkSuccessfulUpgrade) $
@@ -63,7 +63,7 @@ checkUpgrade urlrenderer = do
   where
 	go Nothing = debug [ "Failed to check if upgrade is available." ]
 	go (Just d) = do
-		let installed = DottedVersion.normalize Build.SysConfig.packageversion
+		let installed = DottedVersion.normalize BuildInfo.packageversion
 		let avail = DottedVersion.normalize $ distributionVersion d
 		let old = DottedVersion.normalize <$> distributionUrgentUpgrade d
 		if Just installed <= old

Assistant/Upgrade.hs

@@ -36,7 +36,7 @@ import Utility.UserInfo
 import Utility.Gpg
 import Utility.FileMode
 import qualified Utility.Lsof as Lsof
-import qualified Build.SysConfig
+import qualified BuildInfo
 import qualified Utility.Url as Url
 import qualified Annex.Url as Url
 import Utility.Tuple
@@ -329,7 +329,7 @@ downloadDistributionInfo = do
 			)
 
 distributionInfoUrl :: String
-distributionInfoUrl = fromJust Build.SysConfig.upgradelocation ++ ".info"
+distributionInfoUrl = fromJust BuildInfo.upgradelocation ++ ".info"
 
 distributionInfoSigUrl :: String
 distributionInfoSigUrl = distributionInfoUrl ++ ".sig"

Assistant/WebApp/Configurators/Preferences.hs

@@ -21,7 +21,7 @@ import Annex.NumCopies
 import Utility.DataUnits
 import Git.Config
 import Types.Distribution
-import qualified Build.SysConfig
+import qualified BuildInfo
 
 import qualified Data.Text as T
 
@@ -58,7 +58,7 @@ prefsAForm d = PrefsForm
 		, ("disabled", NoAutoUpgrade)
 		]
 	autoUpgradeLabel
-		| isJust Build.SysConfig.upgradelocation = "Auto upgrade"
+		| isJust BuildInfo.upgradelocation = "Auto upgrade"
 		| otherwise = "Auto restart on upgrade"
 
 	positiveIntField = check isPositive intField

Assistant/WebApp/Documentation.hs

@@ -11,7 +11,7 @@ module Assistant.WebApp.Documentation where
 
 import Assistant.WebApp.Common
 import Assistant.Install (standaloneAppBase)
-import Build.SysConfig (packageversion)
+import BuildInfo (packageversion)
 import BuildInfo
 
 {- The full license info may be included in a file on disk that can

Assistant/WebApp/Types.hs

@@ -24,7 +24,7 @@ import Utility.WebApp
 import Utility.Yesod
 import Types.Transfer
 import Utility.Gpg (KeyId)
-import Build.SysConfig (packageversion)
+import BuildInfo (packageversion)
 import Types.ScheduledActivity
 import Assistant.WebApp.RepoId
 import Assistant.WebApp.Pairing