From 93369900f8dd5e9cbb718c79bb82b4489e425913 Mon Sep 17 00:00:00 2001
From: Julian Ospald <j.ospald@travelaudience.com>
Date: Wed, 13 Dec 2017 23:33:34 +0100
Subject: [PATCH] Update for GHC-8.2.2

---
 hsfm.cabal                  |  6 ++++++
 src/HSFM/GUI/Gtk/Dialogs.hs | 18 +++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/hsfm.cabal b/hsfm.cabal
index 04c312f..ee5e37e 100644
--- a/hsfm.cabal
+++ b/hsfm.cabal
@@ -54,6 +54,9 @@ library
 executable hsfm-gtk
   main-is:             HSFM/GUI/Gtk.hs
   other-modules:
+                       Paths_hsfm
+                       HSFM.FileSystem.FileType
+                       HSFM.FileSystem.UtilTypes
                        HSFM.GUI.Glib.GlibString
                        HSFM.GUI.Gtk.Callbacks
                        HSFM.GUI.Gtk.Callbacks.Utils
@@ -66,6 +69,9 @@ executable hsfm-gtk
                        HSFM.GUI.Gtk.Plugins
                        HSFM.GUI.Gtk.Settings
                        HSFM.GUI.Gtk.Utils
+                       HSFM.History
+                       HSFM.Settings
+                       HSFM.Utils.IO
                        HSFM.Utils.MyPrelude
 
   build-depends:
diff --git a/src/HSFM/GUI/Gtk/Dialogs.hs b/src/HSFM/GUI/Gtk/Dialogs.hs
index f07706b..29eb13c 100644
--- a/src/HSFM/GUI/Gtk/Dialogs.hs
+++ b/src/HSFM/GUI/Gtk/Dialogs.hs
@@ -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