add --version-full and compiler info

This may count as "significant" since it's a new command line
option, but it's deliberately out of the way.

Author: geekosaur

cabal-install/cabal-install.cabal

@@ -130,6 +130,7 @@ library
         Distribution.Client.Compat.Orphans
         Distribution.Client.Compat.Prelude
         Distribution.Client.Compat.Semaphore
+        Distribution.Client.Compat.SysInfo
         Distribution.Client.Compat.Tar
         Distribution.Client.Config
         Distribution.Client.Configure

cabal-install/src/Distribution/Client/Compat/SysInfo.hs

@@ -0,0 +1,15 @@
+{-# LANGUAGE CPP #-}
+
+module Distribution.Client.Compat.SysInfo
+  ( fullCompilerVersion
+  ) where
+
+import Data.Version (Version)
+import qualified System.Info as SI
+
+fullCompilerVersion :: Version
+#if MIN_VERSION_base(4,15,0)
+fullCompilerVersion = SI.fullCompilerVersion
+#else
+fullCompilerVersion = SI.compilerVersion
+#endif

cabal-install/src/Distribution/Client/Config.hs

@@ -358,6 +358,7 @@ instance Semigroup SavedConfig where
       combinedSavedGlobalFlags =
         GlobalFlags
           { globalVersion = combine globalVersion
+          , globalFullVersion = combine globalFullVersion
           , globalNumericVersion = combine globalNumericVersion
           , globalConfigFile = combine globalConfigFile
           , globalConstraintsFile = combine globalConstraintsFile

cabal-install/src/Distribution/Client/GlobalFlags.hs

@@ -81,6 +81,7 @@ import qualified Hackage.Security.Util.Pretty as Sec
 -- | Flags that apply at the top level, not to any sub-command.
 data GlobalFlags = GlobalFlags
   { globalVersion :: Flag Bool
+  , globalFullVersion :: Flag Bool
   , globalNumericVersion :: Flag Bool
   , globalConfigFile :: Flag FilePath
   , globalConstraintsFile :: Flag FilePath
@@ -103,6 +104,7 @@ defaultGlobalFlags :: GlobalFlags
 defaultGlobalFlags =
   GlobalFlags
     { globalVersion = Flag False
+    , globalFullVersion = Flag False
     , globalNumericVersion = Flag False
     , globalConfigFile = mempty
     , globalConstraintsFile = mempty

cabal-install/src/Distribution/Client/Main.hs

@@ -170,7 +170,8 @@ import Distribution.Client.Utils
   , relaxEncodingErrors
   )
 import Distribution.Client.Version
-  ( cabalInstallGitInfo
+  ( cabalInstallCompilerInfo
+  , cabalInstallGitInfo
   , cabalInstallVersion
   )
 
@@ -346,6 +347,8 @@ mainWorker args = do
           _
             | fromFlagOrDefault False (globalVersion globalFlags) ->
                 printVersion
+            | fromFlagOrDefault False (globalFullVersion globalFlags) ->
+                printFullVersion
             | fromFlagOrDefault False (globalNumericVersion globalFlags) ->
                 printNumericVersion
           CommandHelp help -> printCommandHelp help
@@ -415,6 +418,13 @@ mainWorker args = do
     printErrors errs = dieNoVerbosity $ intercalate "\n" errs
     printNumericVersion = putStrLn $ display cabalInstallVersion
     printVersion =
+      putStrLn $
+        "cabal-install version "
+          ++ display cabalInstallVersion
+          ++ "\ncompiled using version "
+          ++ display cabalVersion
+          ++ " of the Cabal library "
+    printFullVersion =
       putStrLn $
         "cabal-install version "
           ++ display cabalInstallVersion
@@ -423,6 +433,8 @@ mainWorker args = do
           ++ display cabalVersion
           ++ " of the Cabal library "
           ++ cabalGitInfo'
+          ++ "\nwith "
+          ++ cabalInstallCompilerInfo
       where
         cabalInstallGitInfo'
           | null cabalInstallGitInfo = ""

cabal-install/src/Distribution/Client/ProjectConfig/Legacy.hs

@@ -984,6 +984,7 @@ convertToLegacySharedConfig
       globalFlags =
         GlobalFlags
           { globalVersion = mempty
+          , globalFullVersion = mempty
           , globalNumericVersion = mempty
           , globalConfigFile = projectConfigConfigFile
           , globalConstraintsFile = mempty

cabal-install/src/Distribution/Client/Setup.hs

@@ -487,6 +487,13 @@ globalCommand commands =
           globalVersion
           (\v flags -> flags{globalVersion = v})
           trueArg
+      , option
+          []
+          ["version-full"]
+          "Print full version information with git revision (if available) and compiler"
+          globalFullVersion
+          (\v flags -> flags{globalFullVersion = v})
+          trueArg
       , option
           []
           ["numeric-version"]

cabal-install/src/Distribution/Client/Version.hs

@@ -7,9 +7,14 @@
 module Distribution.Client.Version
   ( cabalInstallVersion
   , cabalInstallGitInfo
+  , cabalInstallCompilerInfo
   ) where
 
+import Data.List (intercalate)
+import qualified Data.Version as DV
+import qualified Distribution.Client.Compat.SysInfo as SIC
 import Distribution.Version
+import qualified System.Info as SI
 
 import qualified Paths_cabal_install as PackageInfo
 
@@ -28,6 +33,20 @@ import GitHash
 cabalInstallVersion :: Version
 cabalInstallVersion = mkVersion' PackageInfo.version
 
+-- |
+-- `cabal-install` compiler information.
+cabalInstallCompilerInfo :: String
+cabalInstallCompilerInfo =
+  concat
+    [ SI.compilerName
+    , " "
+    , intercalate "." (map show (DV.versionBranch SIC.fullCompilerVersion))
+    , " on "
+    , SI.os
+    , " "
+    , SI.arch
+    ]
+
 -- |
 -- `cabal-install` Git information. Only filled in if built in a Git tree in
 -- development mode and Template Haskell is available.