From 6cf40a76d19a8dcd1a1293329ad173a266969d06 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 23 Apr 2025 11:00:49 -1000 Subject: [PATCH] lib: parseHledgerVersion: also save the package version as text --- hledger/Hledger/Cli/Version.hs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/hledger/Hledger/Cli/Version.hs b/hledger/Hledger/Cli/Version.hs index 63dc077a5..86b0391eb 100644 --- a/hledger/Hledger/Cli/Version.hs +++ b/hledger/Hledger/Cli/Version.hs @@ -89,13 +89,14 @@ type GitHash = String -- intended operating machine and machine architecture, if we can detect these. -- Also, a copy of the --version output from which it was parsed. data HledgerBinaryVersion = HledgerBinaryVersion { - hbinVersionOutput :: String - , hbinProgramName :: ProgramName - , hbinPackageVersion :: Version - , hbinGitHash :: Maybe GitHash - , hbinReleaseDate :: Maybe Day - , hbinOs :: Maybe OsName - , hbinArch :: Maybe ArchName + hbinVersionOutput :: String + , hbinProgramName :: ProgramName + , hbinPackageVersion :: Version + , hbinPackageVersionStr :: String + , hbinGitHash :: Maybe GitHash + , hbinReleaseDate :: Maybe Day + , hbinOs :: Maybe OsName + , hbinArch :: Maybe ArchName } deriving (Show, Eq) type Parser = Parsec Void String @@ -147,6 +148,7 @@ hledgerversionp = do { hbinVersionOutput = "" , hbinProgramName = progName , hbinPackageVersion = pkgversion + , hbinPackageVersionStr = showVersion pkgversion , hbinGitHash = mgithash , hbinReleaseDate = mreldate , hbinOs = mos