src/OptionalConfiguration.hs: don't derive Typeable.

As of ghc-7.10.1, it's not necessary to derive Typeable. So let's not
do it. The cabal file was updated to require >=7.10.1 as a result.

diff --git a/mailbox-count.cabal b/mailbox-count.cabal
index 0b7fa2939c12d44a816e660a433431cf01b551a3..0d995c1153c2a2326f68a9f6ebefd121b78a1889 100644 (file)
--- a/mailbox-count.cabal
+++ b/mailbox-count.cabal
@@ -153,7 +153,7 @@ description:
 
 executable mailbox-count
   build-depends:
-    base                        >= 4.6 && < 5,
+    base                        >= 4.8 && < 5,
     cmdargs                     >= 0.10,
     configurator                >= 0.2,
     containers                  >= 0.5,
@@ -189,7 +189,7 @@ test-suite testsuite
   hs-source-dirs: src test
   main-is: TestSuite.hs
   build-depends:
-    base                        >= 4.6 && < 5,
+    base                        >= 4.8 && < 5,
     cmdargs                     >= 0.10,
     configurator                >= 0.2,
     containers                  >= 0.5,
@@ -210,7 +210,7 @@ test-suite doctests
   hs-source-dirs: test
   main-is: Doctests.hs
   build-depends:
-    base      >= 4.6 && < 5,
+    base      >= 4.8 && < 5,
     -- Additional test dependencies.
     doctest   >= 0.9,
     filemanip >= 0.3.6

diff --git a/src/OptionalConfiguration.hs b/src/OptionalConfiguration.hs
index 4faff205cfd416318a2bbc0fb03fa833fbd34100..16fad069670a8c2d47fb96a5299352889d26dd6f 100644 (file)
--- a/src/OptionalConfiguration.hs
+++ b/src/OptionalConfiguration.hs
@@ -19,7 +19,6 @@ import qualified Data.Configurator as DC (
   load,
   lookup )
 import Data.Data ( Data )
-import Data.Typeable ( Typeable )
 import Data.Monoid ( Monoid() )
 import Data.Semigroup ( Semigroup() )
 import Paths_mailbox_count ( getSysconfDir )
@@ -43,7 +42,7 @@ data OptionalConfiguration =
     port     :: Maybe Int,
     summary_query :: Maybe String,
     username :: Maybe String }
-  deriving (Show, Data, Typeable)
+  deriving (Show, Data)
 
 
 -- | Combine two Maybes into one, essentially mashing them