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

pkg: rename terminfo flag, drop pretty-show conditionals

Browse Source
This commit is contained in:
Simon Michael 2016-08-09 12:16:24 -07:00
parent 9ad7f2f7e4
commit c3b76221d4
6 changed files with 28 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,10 +68,11 @@ library
, deepseq
, directory
, filepath
, megaparsec >=5
, mtl
, mtl-compat
, old-time
, megaparsec >=5
, pretty-show >=1.6.4
, regex-tdfa
, safe >=0.2
, split >=0.1 && <0.3
@ -82,9 +83,6 @@ library
, HUnit
, parsec
, semigroups
if impl(ghc >=7.4)
build-depends:
pretty-show >=1.6.4
if flag(oldtime)
build-depends:
time <1.5
@ -157,10 +155,11 @@ test-suite doctests
, deepseq
, directory
, filepath
, megaparsec >=5
, mtl
, mtl-compat
, old-time
, megaparsec >=5
, pretty-show >=1.6.4
, regex-tdfa
, safe >=0.2
, split >=0.1 && <0.3
@ -193,10 +192,11 @@ test-suite hunittests
, deepseq
, directory
, filepath
, megaparsec >=5
, mtl
, mtl-compat
, old-time
, megaparsec >=5
, pretty-show >=1.6.4
, regex-tdfa
, safe >=0.2
, split >=0.1 && <0.3
@ -208,9 +208,6 @@ test-suite hunittests
, hledger-lib
, test-framework
, test-framework-hunit
if impl(ghc >=7.4)
build-depends:
pretty-show >=1.6.4
if flag(oldtime)
build-depends:
time <1.5

9
hledger-lib/package.yaml
View File

@ -52,10 +52,11 @@ dependencies:
- deepseq
- directory
- filepath
- megaparsec >=5
- mtl
- mtl-compat
- old-time
- megaparsec >=5
- pretty-show >=1.6.4
- regex-tdfa
- safe >=0.2
- split >=0.1 && <0.3
@ -117,9 +118,6 @@ library:
- parsec
- semigroups
when:
- condition: impl(ghc >=7.4)
dependencies:
- pretty-show >=1.6.4
- condition: flag(oldtime)
then:
dependencies:
@ -143,9 +141,6 @@ tests:
- test-framework
- test-framework-hunit
when:
- condition: impl(ghc >=7.4)
dependencies:
- pretty-show >=1.6.4
- condition: flag(oldtime)
then:
dependencies:

4
hledger-ui/hledger-ui.cabal
View File

@ -70,6 +70,7 @@ executable hledger-ui
, microlens >= 0.4 && < 0.5
, microlens-platform >= 0.2.3.1 && < 0.4
, megaparsec >= 5
, pretty-show >=1.6.4
, process >= 1.2
, safe >= 0.2
, split >= 0.1 && < 0.3
@ -92,9 +93,6 @@ executable hledger-ui
else
build-depends:
time >= 1.5
if impl(ghc >= 7.4)
build-depends:
pretty-show >= 1.6.4
other-modules:
Hledger.UI
Hledger.UI.AccountsScreen

4
hledger-ui/package.yaml
View File

@ -71,6 +71,7 @@ executables:
- microlens >= 0.4 && < 0.5
- microlens-platform >= 0.2.3.1 && < 0.4
- megaparsec >= 5
- pretty-show >=1.6.4
- process >= 1.2
- safe >= 0.2
- split >= 0.1 && < 0.3
@ -96,8 +97,5 @@ executables:
else:
dependencies:
- time >= 1.5
- condition: impl(ghc >= 7.4)
dependencies:
- pretty-show >= 1.6.4
stability : beta
tested-with : GHC==7.8.4, GHC==7.10.3, GHC==8.0

29
hledger/hledger.cabal
View File

@ -63,16 +63,16 @@ source-repository head
type: git
location: https://github.com/simonmichael/hledger
flag curses
default: True
description: On POSIX systems, enable curses support for auto-detecting terminal width.
manual: False
flag oldtime
description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal.
manual: False
default: False
flag terminfo
description: On POSIX systems, build with the terminfo lib for detecting terminal width.
manual: False
default: True
flag threaded
default: True
description: Build with support for multithreaded execution
@ -87,6 +87,7 @@ library
, directory
, file-embed >=0.0.10 && <0.1
, filepath
, pretty-show >=1.6.4
, process
, temporary
, tabular >=0.2 && <0.3
@ -124,10 +125,7 @@ library
else
build-depends:
time >=1.5
if impl(ghc >=7.4)
build-depends:
pretty-show >=1.6.4
if (!(os(windows))) && (flag(curses))
if (!(os(windows))) && (flag(terminfo))
build-depends:
terminfo
exposed-modules:
@ -168,6 +166,7 @@ executable hledger
, directory
, file-embed >=0.0.10 && <0.1
, filepath
, pretty-show >=1.6.4
, process
, temporary
, tabular >=0.2 && <0.3
@ -207,10 +206,7 @@ executable hledger
else
build-depends:
time >=1.5
if impl(ghc >=7.4)
build-depends:
pretty-show >=1.6.4
if (!(os(windows))) && (flag(curses))
if (!(os(windows))) && (flag(terminfo))
build-depends:
terminfo
default-language: Haskell2010
@ -228,6 +224,7 @@ test-suite test
, directory
, file-embed >=0.0.10 && <0.1
, filepath
, pretty-show >=1.6.4
, process
, temporary
, tabular >=0.2 && <0.3
@ -260,9 +257,6 @@ test-suite test
build-depends:
shakespeare >=1.0 && <2.1
, shakespeare-text >=1.0 && <1.2
if impl(ghc >=7.4)
build-depends:
pretty-show >=1.6.4
if flag(oldtime)
build-depends:
time <1.5
@ -270,7 +264,7 @@ test-suite test
else
build-depends:
time >=1.5
if (!(os(windows))) && (flag(curses))
if (!(os(windows))) && (flag(terminfo))
build-depends:
terminfo
default-language: Haskell2010
@ -290,6 +284,7 @@ benchmark bench
, directory
, file-embed >=0.0.10 && <0.1
, filepath
, pretty-show >=1.6.4
, process
, temporary
, tabular >=0.2 && <0.3

21
hledger/package.yaml
View File

@ -50,9 +50,8 @@ data-files:
- doc/other/hledger_timedot.5.txt
- doc/other/hledger_timedot.5.info
flags:
curses:
description: On POSIX systems, enable curses support for auto-detecting terminal
width.
terminfo:
description: On POSIX systems, build with the terminfo lib for detecting terminal width.
manual: false
default: true
threaded:
@ -69,6 +68,7 @@ dependencies:
- directory
- file-embed >=0.0.10 && <0.1
- filepath
- pretty-show >=1.6.4
- process
- temporary
- tabular >=0.2 && <0.3
@ -141,10 +141,7 @@ library:
else:
dependencies:
- time >=1.5
- condition: impl(ghc >=7.4)
dependencies:
- pretty-show >=1.6.4
- condition: (!(os(windows))) && (flag(curses))
- condition: (!(os(windows))) && (flag(terminfo))
dependencies:
- terminfo
executables:
@ -192,10 +189,7 @@ executables:
else:
dependencies:
- time >=1.5
- condition: impl(ghc >=7.4)
dependencies:
- pretty-show >=1.6.4
- condition: (!(os(windows))) && (flag(curses))
- condition: (!(os(windows))) && (flag(terminfo))
dependencies:
- terminfo
tests:
@ -235,9 +229,6 @@ tests:
dependencies:
- shakespeare >=1.0 && <2.1
- shakespeare-text >=1.0 && <1.2
- condition: impl(ghc >=7.4)
dependencies:
- pretty-show >=1.6.4
- condition: flag(oldtime)
then:
dependencies:
@ -246,7 +237,7 @@ tests:
else:
dependencies:
- time >=1.5
- condition: (!(os(windows))) && (flag(curses))
- condition: (!(os(windows))) && (flag(terminfo))
dependencies:
- terminfo
benchmarks: