From eb617e26de3834fc9a6de744e33830be66f145ed Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel <hvr@gnu.org> Date: Sun, 4 Mar 2018 14:00:19 +0100 Subject: [PATCH] Avoid using `CURRENT_PACKAGE_VERSION` macro As this would require us to declare `cabal-version: 2.0` in the cabal package description. This regression was introduced in 9c13b19 Fixes #6 --- Main.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Main.hs b/Main.hs index 7f4eade..60c7276 100644 --- a/Main.hs +++ b/Main.hs @@ -37,7 +37,8 @@ import System.IO #ifdef BUILD_NHC import System.Directory ( getCurrentDirectory ) #else -import Paths_hsc2hs as Main ( getDataFileName ) +import Paths_hsc2hs as Main ( getDataFileName, version ) +import Data.Version ( showVersion ) #endif #if defined(IN_GHC_TREE) import System.Environment ( getExecutablePath ) @@ -66,7 +67,7 @@ getDataFileName s = do here <- getCurrentDirectory #endif versionString :: String -versionString = "hsc2hs version " ++ CURRENT_PACKAGE_VERSION ++ "\n" +versionString = "hsc2hs version " ++ showVersion version ++ "\n" main :: IO () main = do -- GitLab