slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ghc 7.10 Applicative import warnings (#239)

Browse Source 
Still needed CPP, despite using base-compat.
This commit is contained in:
Simon Michael 2015-03-29 15:39:37 -07:00
parent 592d997438
commit f75849cdd6
10 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extra/hledger-rewrite.hs
View File

@ -1,4 +1,5 @@
#!/usr/bin/env runhaskell
{-# LANGUAGE CPP #-}
{-|
hledger-rewrite [PATTERNS] --add-posting "ACCT AMTEXPR" ...
@ -22,7 +23,9 @@ Tested-with: hledger HEAD ~ 2014/2/4
-- hledger lib, cli and cmdargs utils
import Hledger.Cli
-- more utils for parsing
import Control.Applicative ((<*)) hiding (many)
#if !MIN_VERSION_base(4,8,0)
import Control.Applicative.Compat ((<*))
#endif
import Text.Parsec

4
hledger-lib/Hledger/Data/Dates.hs
View File

@ -64,7 +64,9 @@ module Hledger.Data.Dates (
)
where
import Control.Applicative ((<*))
#if !MIN_VERSION_base(4,8,0)
import Control.Applicative.Compat ((<*))
#endif
import Control.Monad
import Data.List
import Data.Maybe

5
hledger-lib/Hledger/Data/OutputFormat.hs
View File

@ -1,4 +1,5 @@
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE CPP #-}
module Hledger.Data.OutputFormat (
parseStringFormat
, formatsp
@ -8,8 +9,10 @@ module Hledger.Data.OutputFormat (
, tests
) where
import Control.Applicative ((<*))
import Numeric
#if !MIN_VERSION_base(4,8,0)
import Control.Applicative.Compat ((<*))
#endif
import Data.Char (isPrint)
import Data.Maybe
import Test.HUnit

4
hledger-lib/Hledger/Read/CsvReader.hs
View File

@ -20,7 +20,9 @@ module Hledger.Read.CsvReader (
tests_Hledger_Read_CsvReader
)
where
import Control.Applicative ((<$>), (<*))
#if !MIN_VERSION_base(4,8,0)
import Control.Applicative.Compat ((<$>), (<*))
#endif
import Control.Exception hiding (try)
import Control.Monad
import Control.Monad.Except

4
hledger-lib/Hledger/Read/JournalReader.hs
View File

@ -45,7 +45,9 @@ module Hledger.Read.JournalReader (
#endif
)
where
import Control.Applicative ((<*))
#if !MIN_VERSION_base(4,8,0)
import Control.Applicative.Compat ((<*))
#endif
import qualified Control.Exception as C
import Control.Monad
import Control.Monad.Except

2
hledger-lib/hledger-lib.cabal
View File

@ -89,6 +89,7 @@ library
Hledger.Utils.UTF8IOCompat
build-depends:
base >= 4.3 && < 5
,base-compat >= 0.5.0
,array
,blaze-markup >= 0.5.1
,bytestring
@ -127,6 +128,7 @@ test-suite tests
default-language: Haskell2010
build-depends: hledger-lib
, base >= 4.3 && < 5
, base-compat >= 0.5.0
, array
, blaze-markup >= 0.5.1
, cmdargs

3
hledger-web/hledger-web.cabal
View File

@ -162,6 +162,7 @@ library
hledger == 0.24.98
, hledger-lib == 0.24.98
, base >= 4 && < 5
, base-compat >= 0.5.0
, blaze-html
, blaze-markup
, bytestring
@ -236,6 +237,7 @@ executable hledger-web
, hledger == 0.24.98
, hledger-web == 0.24.98
, base >= 4 && < 5
, base-compat >= 0.5.0
, blaze-html
, blaze-markup
, bytestring
@ -285,6 +287,7 @@ test-suite test
build-depends:
hledger-web == 0.24.98
, base
, base-compat >= 0.5.0
, hspec
, yesod
, yesod-test

6
hledger/Hledger/Cli/Add.hs
View File

@ -3,12 +3,14 @@ A history-aware add command to help with data entry.
|-}
{-# OPTIONS_GHC -fno-warn-missing-signatures -fno-warn-unused-do-bind #-}
{-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable, RecordWildCards, TypeOperators, FlexibleContexts #-}
{-# LANGUAGE CPP, ScopedTypeVariables, DeriveDataTypeable, RecordWildCards, TypeOperators, FlexibleContexts #-}
module Hledger.Cli.Add
where
import Control.Applicative ((<*))
#if !MIN_VERSION_base(4,8,0)
import Control.Applicative.Compat ((<*))
#endif
import Control.Exception as E
import Control.Monad
import Control.Monad.Trans (liftIO)

4
hledger/Hledger/Cli/Options.hs
View File

@ -59,7 +59,9 @@ module Hledger.Cli.Options (
)
where
import Control.Applicative ((<$>), (<*))
#if !MIN_VERSION_base(4,8,0)
import Control.Applicative.Compat ((<$>), (<*))
#endif
import qualified Control.Exception as C
import Control.Monad (when)
import Data.List

4
hledger/hledger.cabal
View File

@ -77,6 +77,7 @@ library
build-depends:
hledger-lib == 0.24.98
,base >= 4.3 && < 5
,base-compat >= 0.5.0
-- ,cabal-file-th
,containers
,cmdargs >= 0.10 && < 0.11
@ -132,6 +133,7 @@ executable hledger
hledger-lib == 0.24.98
,hledger == 0.24.98
,base >= 4.3 && < 5
,base-compat >= 0.5.0
,containers
,cmdargs >= 0.10 && < 0.11
,csv
@ -174,6 +176,7 @@ test-suite tests
build-depends: hledger-lib
, hledger
, base >= 4.3 && < 5
, base-compat >= 0.5.0
, cmdargs
, containers
, csv
@ -218,6 +221,7 @@ benchmark bench
build-depends: hledger-lib,
hledger,
base >= 4.3 && < 5,
base-compat >= 0.5.0,
html,
tabular >= 0.2 && < 0.3,
process,