simonmichael/hledger
1
1
Fork 0
mirror of https://github.com/simonmichael/hledger.git synced 2024-11-08 07:09:28 +03:00
Code Issues Projects Releases Wiki Activity

lib, cli, ui, web: drop oldtime flag, require time 1.5+

Browse Source 
Should be safe to do now, I hope.
This commit is contained in:
Simon Michael 2017-08-25 16:56:41 -07:00
parent 3778db9ec7
commit b324d3de95
8 changed files with 15 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,11 +47,6 @@ source-repository head
type: git
location: https://github.com/simonmichael/hledger
flag oldtime
description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal.
manual: False
default: False
library
hs-source-dirs:
./.
@ -83,17 +78,11 @@ library
, semigroups
, split >=0.1 && <0.3
, text >=1.2 && <1.3
, time >=1.5
, transformers >=0.2 && <0.6
, uglymemo
, utf8-string >=0.3.5 && <1.1
, HUnit
if flag(oldtime)
build-depends:
time <1.5
, old-locale
else
build-depends:
time >=1.5
exposed-modules:
Hledger
Hledger.Data
@ -177,19 +166,13 @@ test-suite doctests
, semigroups
, split >=0.1 && <0.3
, text >=1.2 && <1.3
, time >=1.5
, transformers >=0.2 && <0.6
, uglymemo
, utf8-string >=0.3.5 && <1.1
, HUnit
, doctest >=0.8
, Glob >=0.7
if flag(oldtime)
build-depends:
time <1.5
, old-locale
else
build-depends:
time >=1.5
other-modules:
Hledger
Hledger.Data
@ -271,6 +254,7 @@ test-suite hunittests
, semigroups
, split >=0.1 && <0.3
, text >=1.2 && <1.3
, time >=1.5
, transformers >=0.2 && <0.6
, uglymemo
, utf8-string >=0.3.5 && <1.1
@ -278,13 +262,6 @@ test-suite hunittests
, hledger-lib
, test-framework
, test-framework-hunit
if flag(oldtime)
build-depends:
time <1.5
, old-locale
else
build-depends:
time >=1.5
other-modules:
Hledger
Hledger.Data

17
hledger-lib/package.yaml
View File

@ -38,12 +38,6 @@ data-files:
- doc/hledger_timeclock.5.txt
- doc/hledger_timeclock.5.info
flags:
oldtime:
description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal.
manual: false
default: false
dependencies:
- base >=4.8 && <5
- base-compat >=0.8.1
@ -71,6 +65,7 @@ dependencies:
- semigroups
- split >=0.1 && <0.3
- text >=1.2 && <1.3
- time >=1.5
- transformers >=0.2 && <0.6
- uglymemo
- utf8-string >=0.3.5 && <1.1
@ -80,16 +75,6 @@ dependencies:
#- system-filepath
#- trifecta >= 0.91
when:
- condition: flag(oldtime)
then:
dependencies:
- time <1.5
- old-locale
else:
dependencies:
- time >=1.5
ghc-options:
- -Wall
- -fno-warn-unused-do-bind

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

@ -40,11 +40,6 @@ source-repository head
type: git
location: https://github.com/simonmichael/hledger
flag oldtime
description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal.
manual: False
default: False
flag threaded
description: Build with support for multithreaded execution
manual: False
@ -79,6 +74,7 @@ executable hledger-ui
, split >= 0.1 && < 0.3
, text >= 1.2 && < 1.3
, text-zipper >= 0.4 && < 0.11
, time >= 1.5
, transformers
, vector
if os(windows)
@ -87,13 +83,6 @@ executable hledger-ui
build-depends:
brick >= 0.12 && < 0.25
, vty >= 5.5 && < 5.18
if flag(oldtime)
build-depends:
time < 1.5
, old-locale
else
build-depends:
time >= 1.5
if flag(threaded)
ghc-options: -threaded
other-modules:

13
hledger-ui/package.yaml
View File

@ -36,10 +36,6 @@ flags:
description: Build with support for multithreaded execution
manual: false
default: true
oldtime:
description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal.
manual: false
default: false
cpp-options: -DVERSION="1.3.99"
@ -66,6 +62,7 @@ dependencies:
- split >= 0.1 && < 0.3
- text >= 1.2 && < 1.3
- text-zipper >= 0.4 && < 0.11
- time >= 1.5
- transformers
- vector
@ -87,14 +84,6 @@ when:
dependencies:
- brick >= 0.12 && < 0.25
- vty >= 5.5 && < 5.18
- condition: flag(oldtime)
then:
dependencies:
- time < 1.5
- old-locale
else:
dependencies:
- time >= 1.5
executables:
hledger-ui:

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

@ -113,11 +113,6 @@ flag library-only
manual: False
default: False
flag oldtime
description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal.
manual: False
default: False
flag threaded
description: Build with support for multithreaded execution.
manual: False
@ -148,6 +143,7 @@ library
, shakespeare >=2.0.2.2 && < 2.1
, template-haskell
, text >=1.2 && <1.3
, time >=1.5
, transformers
, wai
, wai-extra
@ -166,13 +162,6 @@ library
cpp-options: -DDEVELOPMENT
if flag(dev)
ghc-options: -O0
if flag(oldtime)
build-depends:
time <1.5
, old-locale
else
build-depends:
time >=1.5
exposed-modules:
Application
Foundation
@ -222,6 +211,7 @@ executable hledger-web
, shakespeare >=2.0.2.2 && < 2.1
, template-haskell
, text >=1.2 && <1.3
, time >=1.5
, transformers
, wai
, wai-extra
@ -241,13 +231,6 @@ executable hledger-web
cpp-options: -DDEVELOPMENT
if flag(dev)
ghc-options: -O0
if flag(oldtime)
build-depends:
time <1.5
, old-locale
else
build-depends:
time >=1.5
if flag(library-only)
buildable: False
if flag(threaded)
@ -283,6 +266,7 @@ test-suite test
, shakespeare >=2.0.2.2 && < 2.1
, template-haskell
, text >=1.2 && <1.3
, time >=1.5
, transformers
, wai
, wai-extra
@ -304,13 +288,6 @@ test-suite test
cpp-options: -DDEVELOPMENT
if flag(dev)
ghc-options: -O0
if flag(oldtime)
build-depends:
time <1.5
, old-locale
else
build-depends:
time >=1.5
other-modules:
HomeTest
TestImport

13
hledger-web/package.yaml
View File

@ -60,10 +60,6 @@ flags:
description: Build with support for multithreaded execution.
manual: false
default: true
oldtime:
description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal.
manual: false
default: false
dependencies:
- hledger-lib >= 1.3.99 && < 1.4
@ -87,6 +83,7 @@ dependencies:
- shakespeare >=2.0.2.2 && < 2.1
- template-haskell
- text >=1.2 && <1.3
- time >=1.5
- transformers
- wai
- wai-extra
@ -107,14 +104,6 @@ when:
cpp-options: -DDEVELOPMENT
- condition: flag(dev)
ghc-options: -O0
- condition: flag(oldtime)
then:
dependencies:
- time <1.5
- old-locale
else:
dependencies:
- time >=1.5
ghc-options:
- -Wall

37
hledger/hledger.cabal
View File

@ -63,11 +63,6 @@ source-repository head
type: git
location: https://github.com/simonmichael/hledger
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
@ -94,6 +89,7 @@ library
, shakespeare >=2.0.2.2 && <2.1
, temporary
, tabular >=0.2 && <0.3
, time >=1.5
, hledger-lib >= 1.3.99 && < 1.4
, bytestring
, containers
@ -115,13 +111,6 @@ library
, text >=0.11
, utf8-string >=0.3.5 && <1.1
, wizards ==1.0.*
if flag(oldtime)
build-depends:
time <1.5
, old-locale
else
build-depends:
time >=1.5
if (!(os(windows))) && (flag(terminfo))
build-depends:
terminfo
@ -171,6 +160,7 @@ executable hledger
, shakespeare >=2.0.2.2 && <2.1
, temporary
, tabular >=0.2 && <0.3
, time >=1.5
, hledger-lib >= 1.3.99 && < 1.4
, hledger
, bytestring
@ -191,13 +181,6 @@ executable hledger
, text >=0.11
, utf8-string >=0.3.5 && <1.1
, wizards ==1.0.*
if flag(oldtime)
build-depends:
time <1.5
, old-locale
else
build-depends:
time >=1.5
if (!(os(windows))) && (flag(terminfo))
build-depends:
terminfo
@ -225,6 +208,7 @@ test-suite test
, shakespeare >=2.0.2.2 && <2.1
, temporary
, tabular >=0.2 && <0.3
, time >=1.5
, hledger-lib >= 1.3.99 && < 1.4
, hledger
, bytestring
@ -247,13 +231,6 @@ test-suite test
, wizards ==1.0.*
, test-framework
, test-framework-hunit
if flag(oldtime)
build-depends:
time <1.5
, old-locale
else
build-depends:
time >=1.5
if (!(os(windows))) && (flag(terminfo))
build-depends:
terminfo
@ -278,18 +255,12 @@ benchmark bench
, shakespeare >=2.0.2.2 && <2.1
, temporary
, tabular >=0.2 && <0.3
, time >=1.5
, hledger-lib >= 1.3.99 && < 1.4
, hledger
, criterion
, html
, timeit
if flag(oldtime)
build-depends:
time <1.5
, old-locale
else
build-depends:
time >=1.5
if (!(os(windows))) && (flag(terminfo))
build-depends:
terminfo

13
hledger/package.yaml
View File

@ -63,10 +63,6 @@ flags:
description: Build with support for multithreaded execution
manual: false
default: true
oldtime:
description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal.
manual: false
default: false
ghc-options:
- -Wall
@ -89,17 +85,10 @@ dependencies:
- shakespeare >=2.0.2.2 && <2.1
- temporary
- tabular >=0.2 && <0.3
- time >=1.5
- hledger-lib >= 1.3.99 && < 1.4
when:
- condition: flag(oldtime)
then:
dependencies:
- time <1.5
- old-locale
else:
dependencies:
- time >=1.5
- condition: (!(os(windows))) && (flag(terminfo))
dependencies:
- terminfo