Update for GHC-8.2.2

This commit is contained in:
Julian Ospald
2017-12-13 23:33:34 +01:00
parent 7f5adf7962
commit 93369900f8
2 changed files with 15 additions and 9 deletions

View File

@@ -48,14 +48,15 @@ import Data.ByteString.UTF8
(
fromString
)
import Data.Version
(
showVersion
)
import Distribution.Package
(
PackageIdentifier(..)
, PackageName(..)
, packageVersion
, unPackageName
)
import Distribution.Version
(
showVersion
)
import Distribution.PackageDescription
(
@@ -64,7 +65,7 @@ import Distribution.PackageDescription
)
import Distribution.PackageDescription.Parse
(
readPackageDescription
readGenericPackageDescription,
)
import Distribution.Verbosity
(
@@ -97,7 +98,6 @@ import System.Posix.FilePath
---------------------
--[ Dialog popups ]--
---------------------
@@ -192,12 +192,12 @@ showAboutDialog = do
lstr <- Prelude.readFile =<< getDataFileName "LICENSE"
hsfmicon <- pixbufNewFromFile =<< getDataFileName "data/Gtk/icons/hsfm.png"
pdesc <- fmap packageDescription
(readPackageDescription silent
(readGenericPackageDescription silent
=<< getDataFileName "hsfm.cabal")
set ad
[ aboutDialogProgramName := (unPackageName . pkgName . package) pdesc
, aboutDialogName := (unPackageName . pkgName . package) pdesc
, aboutDialogVersion := (showVersion . pkgVersion . package) pdesc
, aboutDialogVersion := (showVersion . packageVersion . package) pdesc
, aboutDialogCopyright := copyright pdesc
, aboutDialogComments := description pdesc
, aboutDialogLicense := Just lstr