diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-12-14 12:46:57 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-12-14 12:46:57 -0400 |
| commit | 3a0bd261d9cfd395ed23ff43515523e6c6658c33 (patch) | |
| tree | 9186c5daf386ba8e76c47ec869a737344a5a74d1 /Command | |
| parent | ac4b4a812da85b46e7d656b12d9ff5568ef706fd (diff) | |
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.
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Assistant.hs | 4 | ||||
| -rw-r--r-- | Command/Version.hs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Command/Assistant.hs b/Command/Assistant.hs index af63778e6..70088674d 100644 --- a/Command/Assistant.hs +++ b/Command/Assistant.hs @@ -12,7 +12,7 @@ import qualified Command.Watch import Annex.Init import Annex.Path import Config.Files -import qualified Build.SysConfig +import qualified BuildInfo import Utility.HumanTime import Assistant.Install @@ -78,7 +78,7 @@ autoStart o = do f <- autoStartFile giveup $ "Nothing listed in " ++ f program <- programPath - haveionice <- pure Build.SysConfig.ionice <&&> inPath "ionice" + haveionice <- pure BuildInfo.ionice <&&> inPath "ionice" pids <- forM dirs $ \d -> do putStrLn $ "git-annex autostart in " ++ d mpid <- catchMaybeIO $ go haveionice program d diff --git a/Command/Version.hs b/Command/Version.hs index 7af928750..5f9fcce67 100644 --- a/Command/Version.hs +++ b/Command/Version.hs @@ -8,7 +8,7 @@ module Command.Version where import Command -import qualified Build.SysConfig as SysConfig +import qualified BuildInfo import Annex.Version import BuildInfo import Types.Key @@ -61,7 +61,7 @@ showVersion = do showPackageVersion :: IO () showPackageVersion = do - vinfo "git-annex version" SysConfig.packageversion + vinfo "git-annex version" BuildInfo.packageversion vinfo "build flags" $ unwords buildFlags vinfo "dependency versions" $ unwords dependencyVersions vinfo "key/value backends" $ unwords $ @@ -70,7 +70,7 @@ showPackageVersion = do showRawVersion :: IO () showRawVersion = do - putStr SysConfig.packageversion + putStr BuildInfo.packageversion hFlush stdout -- no newline, so flush vinfo :: String -> String -> IO () |