Use Paths_cabal_install for cabal-install version number (backport #9421

) (#9433) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Hécate Moonlight <[email protected]>
haskell · Nov 22, 2023 · 5d97fcf · 5d97fcf
1 parent b17d6f2
commit 5d97fcf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
@@ -63,6 +63,8 @@ library
     default-extensions: TypeOperators
 
     hs-source-dirs:   src
+    other-modules:
+        Paths_cabal_install
     exposed-modules:
         -- this modules are moved from Cabal
         -- they are needed for as long until cabal-install moves to parsec parser

diff --git a/cabal-install/src/Distribution/Client/Version.hs b/cabal-install/src/Distribution/Client/Version.hs
@@ -6,11 +6,9 @@ module Distribution.Client.Version
 
 import Distribution.Version
 
--- This value determines the `cabal-install --version` output.
---
--- It is used in several places throughout the project, including anonymous build reports, client configuration,
--- and project planning output. Historically, this was a @Paths_*@ module, however, this conflicted with
--- program coverage information generated by HPC, and hence was moved to be a standalone value.
---
+import qualified Paths_cabal_install as PackageInfo
+
+-- |
+-- This value determines the output of `cabal-install --version`.
 cabalInstallVersion :: Version
-cabalInstallVersion = mkVersion [3,10,2,1]
+cabalInstallVersion = mkVersion' PackageInfo.version