From 4d67efc948ee9317a65c22268e31757a849c9193 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 2 Feb 2020 00:36:10 -0500 Subject: [PATCH] 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. --- mailbox-count.cabal | 6 +++--- src/OptionalConfiguration.hs | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mailbox-count.cabal b/mailbox-count.cabal index 0b7fa29..0d995c1 100644 --- 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 4faff20..16fad06 100644 --- 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 -- 2.43.2