From 6e402e1ed635752cbbb9078a94dcad819a631fa8 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 25 Aug 2017 15:52:08 -0700 Subject: [PATCH] cli: package.yaml: simplify dep lists, whitespace --- hledger/hledger.cabal | 23 +++++-- hledger/package.yaml | 139 ++++++++++++++---------------------------- 2 files changed, 64 insertions(+), 98 deletions(-) diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 1ba45910b..8d177d916 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -179,7 +179,7 @@ executable hledger , process , temporary , tabular >=0.2 && <0.3 - , hledger-lib >= 1.3.99 + , hledger-lib >= 1.3.99 && < 1.4 , hledger , bytestring , containers @@ -199,8 +199,6 @@ executable hledger , text >=0.11 , utf8-string >=0.3.5 && <1.1 , wizards ==1.0.* - if flag(threaded) - ghc-options: -threaded if impl(ghc <7.6) build-depends: ghc-prim @@ -221,6 +219,8 @@ executable hledger if (!(os(windows))) && (flag(terminfo)) build-depends: terminfo + if flag(threaded) + ghc-options: -threaded default-language: Haskell2010 test-suite test @@ -242,7 +242,7 @@ test-suite test , process , temporary , tabular >=0.2 && <0.3 - , hledger-lib >= 1.3.99 + , hledger-lib >= 1.3.99 && < 1.4 , hledger , bytestring , containers @@ -304,11 +304,21 @@ benchmark bench , process , temporary , tabular >=0.2 && <0.3 - , hledger-lib >= 1.3.99 + , hledger-lib >= 1.3.99 && < 1.4 , hledger , criterion , html , timeit + if impl(ghc <7.6) + build-depends: + ghc-prim + if impl(ghc >=7.10) + build-depends: + shakespeare >=2.0.2.2 && <2.1 + else + build-depends: + shakespeare >=1.0 && <2.1 + , shakespeare-text >=1.0 && <1.2 if flag(oldtime) build-depends: time <1.5 @@ -316,4 +326,7 @@ benchmark bench else build-depends: time >=1.5 + if (!(os(windows))) && (flag(terminfo)) + build-depends: + terminfo default-language: Haskell2010 diff --git a/hledger/package.yaml b/hledger/package.yaml index 57ef9aed5..f070dc615 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -19,11 +19,15 @@ maintainer: Simon Michael github: simonmichael/hledger homepage: http://hledger.org bug-reports: http://bugs.hledger.org +stability: stable +tested-with: GHC==7.10.3, GHC==8.0 + extra-source-files: - CHANGES - README.md - test/test.hs - bench/10000x1000x10.journal + data-files: - doc/hledger.1 - doc/hledger.1.txt @@ -49,6 +53,7 @@ data-files: - doc/other/hledger_timedot.5 - doc/other/hledger_timedot.5.txt - doc/other/hledger_timedot.5.info + flags: terminfo: description: On POSIX systems, build with the terminfo lib for detecting terminal width. @@ -62,6 +67,15 @@ flags: description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal. manual: false default: false + +ghc-options: +- -Wall +- -fno-warn-unused-do-bind +- -fno-warn-name-shadowing +- -fno-warn-missing-signatures +- -fno-warn-type-defaults +- -fno-warn-orphans + dependencies: - base >=4.8 && <5 - base-compat >=0.8.1 @@ -74,13 +88,32 @@ dependencies: - process - temporary - tabular >=0.2 && <0.3 -ghc-options: -- -Wall -- -fno-warn-unused-do-bind -- -fno-warn-name-shadowing -- -fno-warn-missing-signatures -- -fno-warn-type-defaults -- -fno-warn-orphans +- hledger-lib >= 1.3.99 && < 1.4 + +when: +- condition: impl(ghc <7.6) + dependencies: + - ghc-prim +- condition: impl(ghc >=7.10) + then: + dependencies: + - shakespeare >=2.0.2.2 && <2.1 + else: + dependencies: + - shakespeare >=1.0 && <2.1 + - shakespeare-text >=1.0 && <1.2 +- condition: flag(oldtime) + then: + dependencies: + - time <1.5 + - old-locale + else: + dependencies: + - time >=1.5 +- condition: (!(os(windows))) && (flag(terminfo)) + dependencies: + - terminfo + library: cpp-options: -DVERSION="1.3.99" exposed-modules: @@ -107,7 +140,6 @@ library: - Hledger.Cli.Stats - Text.Tabular.AsciiWide dependencies: - - hledger-lib >= 1.3.99 && < 1.4 - bytestring - containers - unordered-containers @@ -128,36 +160,16 @@ library: - text >=0.11 - utf8-string >=0.3.5 && <1.1 - wizards ==1.0.* - when: - - condition: impl(ghc <7.6) - dependencies: - - ghc-prim - - condition: impl(ghc >=7.10) - then: - dependencies: - - shakespeare >=2.0.2.2 && <2.1 - else: - dependencies: - - shakespeare >=1.0 && <2.1 - - shakespeare-text >=1.0 && <1.2 - - condition: flag(oldtime) - then: - dependencies: - - time <1.5 - - old-locale - else: - dependencies: - - time >=1.5 - - condition: (!(os(windows))) && (flag(terminfo)) - dependencies: - - terminfo + executables: hledger: main: hledger-cli.hs source-dirs: app cpp-options: -DVERSION="1.3.99" + when: + - condition: flag(threaded) + ghc-options: -threaded dependencies: - - hledger-lib >= 1.3.99 - hledger - bytestring - containers @@ -177,38 +189,13 @@ executables: - text >=0.11 - utf8-string >=0.3.5 && <1.1 - wizards ==1.0.* - when: - - condition: flag(threaded) - ghc-options: -threaded - - condition: impl(ghc <7.6) - dependencies: - - ghc-prim - - condition: impl(ghc >=7.10) - then: - dependencies: - - shakespeare >=2.0.2.2 && <2.1 - else: - dependencies: - - shakespeare >=1.0 && <2.1 - - shakespeare-text >=1.0 && <1.2 - - condition: flag(oldtime) - then: - dependencies: - - time <1.5 - - old-locale - else: - dependencies: - - time >=1.5 - - condition: (!(os(windows))) && (flag(terminfo)) - dependencies: - - terminfo + tests: test: main: test.hs source-dirs: test cpp-options: -DVERSION="1.3.99" dependencies: - - hledger-lib >= 1.3.99 - hledger - bytestring - containers @@ -230,47 +217,13 @@ tests: - wizards ==1.0.* - test-framework - test-framework-hunit - when: - - condition: impl(ghc <7.6) - dependencies: - - ghc-prim - - condition: impl(ghc >=7.10) - then: - dependencies: - - shakespeare >=2.0.2.2 && <2.1 - else: - dependencies: - - shakespeare >=1.0 && <2.1 - - shakespeare-text >=1.0 && <1.2 - - condition: flag(oldtime) - then: - dependencies: - - time <1.5 - - old-locale - else: - dependencies: - - time >=1.5 - - condition: (!(os(windows))) && (flag(terminfo)) - dependencies: - - terminfo + benchmarks: bench: main: bench.hs source-dirs: bench dependencies: - - hledger-lib >= 1.3.99 - hledger - criterion - html - timeit - when: - - condition: flag(oldtime) - then: - dependencies: - - time <1.5 - - old-locale - else: - dependencies: - - time >=1.5 -stability: stable -tested-with: GHC==7.10.3, GHC==8.0