From f3dd5eb83010096e9c37d167ce021646236eda8f Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 28 Aug 2015 11:17:49 -0700 Subject: [PATCH] fix options breakage with GHC < 7.10 --- hledger-lib/Hledger/Reports/ReportOptions.hs | 5 ++++- hledger-ui/Hledger/UI/Options.hs | 3 +++ hledger-web/Hledger/Web/Options.hs | 2 +- hledger/Hledger/Cli/Options.hs | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hledger-lib/Hledger/Reports/ReportOptions.hs b/hledger-lib/Hledger/Reports/ReportOptions.hs index 5c0efea2b..5b129489c 100644 --- a/hledger-lib/Hledger/Reports/ReportOptions.hs +++ b/hledger-lib/Hledger/Reports/ReportOptions.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE RecordWildCards, DeriveDataTypeable #-} +{-# LANGUAGE CPP, RecordWildCards, DeriveDataTypeable #-} {-| Options common to most hledger reports. @@ -31,6 +31,9 @@ module Hledger.Reports.ReportOptions ( where import Data.Data (Data) +#if !MIN_VERSION_base(4,8,0) +import Data.Functor.Compat ((<$>)) +#endif import Data.Typeable (Typeable) import Data.Time.Calendar import System.Console.CmdArgs.Default -- some additional default stuff diff --git a/hledger-ui/Hledger/UI/Options.hs b/hledger-ui/Hledger/UI/Options.hs index b2ec0e815..48dc4274e 100644 --- a/hledger-ui/Hledger/UI/Options.hs +++ b/hledger-ui/Hledger/UI/Options.hs @@ -5,6 +5,9 @@ module Hledger.UI.Options where +#if !MIN_VERSION_base(4,8,0) +import Data.Functor.Compat ((<$>)) +#endif import Data.List (intercalate) import System.Console.CmdArgs import System.Console.CmdArgs.Explicit diff --git a/hledger-web/Hledger/Web/Options.hs b/hledger-web/Hledger/Web/Options.hs index eaa3aca2c..70139851d 100644 --- a/hledger-web/Hledger/Web/Options.hs +++ b/hledger-web/Hledger/Web/Options.hs @@ -3,7 +3,7 @@ module Hledger.Web.Options where import Prelude #if !MIN_VERSION_base(4,8,0) -import Control.Applicative ((<$>)) +import Data.Functor.Compat ((<$>)) #endif import Data.Maybe import System.Console.CmdArgs diff --git a/hledger/Hledger/Cli/Options.hs b/hledger/Hledger/Cli/Options.hs index 770ca95ed..1af5778aa 100644 --- a/hledger/Hledger/Cli/Options.hs +++ b/hledger/Hledger/Cli/Options.hs @@ -64,6 +64,9 @@ import Prelude () import Prelude.Compat import qualified Control.Exception as C import Control.Monad (when) +#if !MIN_VERSION_base(4,8,0) +import Data.Functor.Compat ((<$>)) +#endif import Data.List.Compat import Data.List.Split (splitOneOf) import Data.Maybe