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
No known key found for this signature in database
GPG Key ID: B98A650A91ACD651
2 changed files with 15 additions and 9 deletions

View File

@ -54,6 +54,9 @@ library
executable hsfm-gtk executable hsfm-gtk
main-is: HSFM/GUI/Gtk.hs main-is: HSFM/GUI/Gtk.hs
other-modules: other-modules:
Paths_hsfm
HSFM.FileSystem.FileType
HSFM.FileSystem.UtilTypes
HSFM.GUI.Glib.GlibString HSFM.GUI.Glib.GlibString
HSFM.GUI.Gtk.Callbacks HSFM.GUI.Gtk.Callbacks
HSFM.GUI.Gtk.Callbacks.Utils HSFM.GUI.Gtk.Callbacks.Utils
@ -66,6 +69,9 @@ executable hsfm-gtk
HSFM.GUI.Gtk.Plugins HSFM.GUI.Gtk.Plugins
HSFM.GUI.Gtk.Settings HSFM.GUI.Gtk.Settings
HSFM.GUI.Gtk.Utils HSFM.GUI.Gtk.Utils
HSFM.History
HSFM.Settings
HSFM.Utils.IO
HSFM.Utils.MyPrelude HSFM.Utils.MyPrelude
build-depends: build-depends:

View File

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