Commit Graph

355 Commits

Author SHA1 Message Date
Simon Michael
0302be1b15 tools: fix tested-with in package.yamls 2016-08-09 07:57:30 -07:00
Simon Michael
d165600155 lib, cli, web, api: use hpack (package.yaml) for all packages at last #371
Generated package.yaml files from the old cabal files with hpack-convert,
removed some problematic blank lines manually,
regenerated the cabal files from the package.yaml files with hpack.
Tests pass, looks like all the info is still there.

This means that from now on, we don't edit cabal files directly.
We edit the less verbose package.yaml files. stack will update
the cabal files automatically (or non-stack users can use hpack).
The changes to both are committed, as we still want to provide
the cabal files to downloaders.
2016-08-09 07:24:57 -07:00
Simon Michael
b7071dee84 lib: use Data.Default directly, not via cmdargs 2016-07-29 10:15:48 -07:00
Moritz Kiefer
4141067428 Replace Parsec with Megaparsec (see #289) (#366)
* Replace Parsec with Megaparsec (see #289)

This builds upon PR #289 by @rasendubi

* Revert renaming of parseWithState to parseWithCtx

* Fix doctests

* Update for Megaparsec 5

* Specialize parser to improve performance

* Pretty print errors

* Swap StateT and ParsecT

This is necessary to get the correct backtracking behavior, i.e. discard
state changes if the parsing fails.
2016-07-29 08:57:10 -07:00
Simon Michael
a961988a88 bump cabal versions to 0.28 2016-05-29 00:00:59 -07:00
Simon Michael
59c2d73d14 doc: symlink other package docs into hledger (#343)
The hledger package tarball now contains a copy of the generated docs
from all the other packages, so that it can build without being in a
source tree.
2016-05-17 10:04:54 -07:00
Simon Michael
f0c219adaa add missing benchmark file to cabal tarball (#342) 2016-05-17 09:04:53 -07:00
Simon Michael
7ec3ebb66b update tested-with
Note we seem to have lost GHC 7.4 compatibility. It should be fixable if
anyone cares.
2016-04-28 17:32:17 -07:00
Simon Michael
a3e975bdb8 doc: use new file-embed to fix ghci cwd dependence
See https://github.com/snoyberg/file-embed/issues/18
2016-04-21 08:45:22 -07:00
Simon Michael
91847fc6fd data-files does not support wildcards after all 2016-04-20 13:23:05 -07:00
Simon Michael
33b5c5dc94 declare generated docs as data-files, sync hpack yamls 2016-04-20 12:47:17 -07:00
Simon Michael
42c12fe631 cli, ui, web, api: --info, --man, info & man cmds 2016-04-19 19:21:29 -07:00
Simon Michael
b7d2d612a8 hledger: embed main man pages; new help command 2016-04-14 18:38:12 -07:00
Simon Michael
b73bcda52a include txt man pages in cabal tarballs 2016-04-13 22:38:53 -07:00
Simon Michael
48f89314d5 hledger: long --help flag shows man page
hledger now embeds its man page, and will display it on --help (like
Ledger and git). -h and --help are now different, like git.
2016-04-13 22:32:04 -07:00
Simon Michael
b4d491791c doc: include nroff man pages in cabal tarballs 2016-04-12 11:25:46 -07:00
Simon Michael
a5fd56223c bump version to 0.27 2015-10-30 13:21:51 -07:00
Simon Michael
36d97a2e50 update cabal docs and other fields 2015-10-30 13:08:03 -07:00
Simon Michael
aee8d2144b add file to package, really fix build error (#286) 2015-10-01 08:46:55 -10:00
Simon Michael
74512814ec cli/ui/web: rename X.Options modules to X.XOptions
Make these modules' names more like the heavily-used types they
define (CliOpts, UIOpts, WebOpts). This is consistent with
RawOptions and ReportOptions, and helps with code navigation.
2015-08-28 12:43:51 -07:00
Simon Michael
6fd1e965ed fix cabal file regression breaking GHC<7.10 (#280) 2015-08-21 12:19:43 -07:00
Simon Michael
e485962a70 cli, web: obey the threaded flag again
[ci skip]
2015-08-13 11:55:58 -07:00
Simon Michael
48e31d4f8c bump version to 0.26.98 2015-08-12 22:49:04 -07:00
Simon Michael
a9b2e5409c switch to hpack-generated cabal files
The hledger-lib, hledger and hledger-web cabal files are now generated
from the package.yaml files with hpack, plus some manual fixups.
2015-08-12 22:45:08 -07:00
Simon Michael
9da0ab6af9 doc: give hledger a README on hackage (via symlink) 2015-07-21 12:23:31 -07:00
Simon Michael
087f3a49bc note older tested-with versions based on hackage builder 2015-07-13 20:23:59 -07:00
Simon Michael
3d3c374cc6 update tested-with 2015-07-12 17:36:19 -07:00
Simon Michael
e5c0d75117 bump version to 0.26 2015-07-12 15:29:10 -07:00
Simon Michael
2b3bdca6b1 cli: drop shakespeare-text dependency in more places
Drop deprecated shakespeare-text dependency for ghc 7.10+ consistently,
not just in one place. Hopefully this will clear the warning
at packdeps.haskellers.com.
2015-07-12 14:58:06 -07:00
Simon Michael
01db48fcfc cli: a more robust and featureful bench test
The bench script invoked by cabal bench or stack bench now links the
benchmarked code directly, avoiding any dependence on the shell and
$PATH. Also, it reports the journal parse time and the various reports
on the parsed data separately, and runs quicker.

You can get more accurate benchmark times by running with --criterion.
This will usually give much the same numbers and takes much longer.

Benchmarking via simplebench is still available, by running with
--simplebench. In this mode it benchmarks whatever commands are
configured in bench/default.bench. A disadvantage is that it uses the
first "hledger" executable in $PATH, so check which one it reports.
2015-06-25 16:08:27 -07:00
Simon Michael
e516aa6c3c stats: fix O(n^2) performance, now much faster on large journals 2015-06-19 11:07:35 -07:00
Simon Michael
745f2dd788 cli: a cabal bench test that works 2015-06-18 09:49:51 -07:00
Simon Michael
335deec496 cli: cabal test suite cleanup 2015-06-18 09:48:18 -07:00
Simon Michael
9e2111106b drop regexpr dependency 2015-05-17 08:32:45 -07:00
Simon Michael
61423bdad4 consistently require latest base-compat for sanity 2015-04-29 07:16:08 -07:00
Simon Michael
dac8a784f4 bump version to 0.26 alpha 2015-04-28 13:48:23 -07:00
Simon Michael
1bc9b71f28 bump version to 0.25 2015-04-28 13:42:41 -07:00
Simon Michael
f75849cdd6 fix ghc 7.10 Applicative import warnings (#239)
Still needed CPP, despite using base-compat.
2015-03-29 16:09:41 -07:00
Simon Michael
b52f08603b avoid a shakespeare/ghc-7.10 build failure (#239) 2015-03-29 14:20:33 -07:00
Simon Michael
8e50395b7c ErrorT -> ExceptT, handle mtl <2.2.1 && >=2.2.1 (#239) 2015-03-29 14:16:42 -07:00
Simon Michael
b8b730226f hledger/hledger-lib: update tested-with
Add 7.10 and drop 7.2-7.6 which haven't been tested recently (but should
still work)
2015-03-27 15:44:39 -07:00
Simon Michael
e60eb71467 adapt to GHC-7.10's time-1.5 (#239) 2015-03-27 15:42:32 -07:00
Simon Michael
c47463332a allow utf8-string-1 (fix fpco/stackage/#426) 2015-03-15 11:06:53 -07:00
Simon Michael
8278c13268 cli: on POSIX systems, use terminfo (and curses)
When building hledger on a non-windows system, and the new "curses"
cabal flag is true (as it is by default), include the terminfo package.
This will be useful for detecting terminal width and perhaps other
things.

Installation on posix is slightly harder now, since it will need the C
curses dev libraries. The curses flag lets posix users skip that
requirement by adding -f-curses (or cabal might even do that
automatically).
2015-01-19 13:47:43 -08:00
Simon Michael
a719cb8f6e bump version to 0.25-unreleased 2014-12-26 11:08:20 -08:00
Simon Michael
e77225038f bump version to 0.24 2014-12-25 11:42:39 -08:00
Julien Moutinho
cf28985cf2 lib: move from Text.ParserCombinators.Parsec to Text.Parsec
NOTE: required to use liftIO in includedirective
SEE: http://www.vex.net/~trebla/haskell/parsec-generally.xhtml#IO
2014-11-20 10:08:30 +01:00
Simon Michael
b542da133c cli: add csv dependency 2014-10-20 13:09:41 -07:00
Simon Michael
0620ec9840 fix redundant compilation in the hledger packages, at last
This seems to work well now with my haddock and GHC 7.8.
Not tested with GHC 7.6 though.
2014-10-19 09:37:18 -07:00
Simon Michael
84a90374b4 make build warnings consistent 2014-10-18 10:16:22 -07:00
Simon Michael
d7f1733243 remove text upper bound, allowing 1.2+ (fixes #207) 2014-09-12 18:36:23 -07:00
Simon Michael
3a16e6cfc7 mostly replace slow regexpr with regex-tdfa (fixes #189) 2014-07-06 14:03:28 -07:00
Simon Michael
6b059aeb5e Merge branch 'rdesfo-0.23'
Conflicts:
	.version
	hledger-lib/Hledger/Read/CsvReader.hs
	hledger-lib/hledger-lib.cabal
	hledger-web/hledger-web.cabal
	hledger/hledger.cabal
2014-05-22 16:15:35 -07:00
Ryan Desfosses
b60da51386 made the following changes to resolve deprecated warnings:
replaced hamletToRepHtml with giveUrlRenderer
  updated type RepHtml to Html
  replaced settingsPort with setPort
2014-05-21 07:30:54 -04:00
Simon Michael
3113e09a62 bump version to 0.23.2 2014-05-08 14:32:29 -07:00
Simon Michael
4b1714a9e0 bump version to 0.23.1 2014-05-07 16:44:44 -07:00
Simon Michael
41add3ffeb oh fine still cant do that, bump to 0.23.98 2014-05-03 17:18:12 -07:00
Simon Michael
87f1e83d78 bump version to 0.24dev 2014-05-03 15:51:57 -07:00
Simon Michael
07a82724ed lib, cli, web: change from "beta" to "stable"
Also add the hackage Console category to the first two.
2014-05-01 08:20:05 -07:00
Simon Michael
1eeedfe551 bump versions to 0.23 2014-05-01 08:17:17 -07:00
Simon Michael
d46b290287 update tested-withs 2014-04-19 12:16:14 -07:00
Simon Michael
499cf41b03 hledger, web: allow shakespeare 2.* 2014-04-19 12:15:20 -07:00
Simon Michael
ec42b8d9ee move towards per-package changelogs, clarify doc/RELNOTES.md status 2014-04-08 15:52:37 -07:00
Simon Michael
f9c1d94b5f accounts: make accounts a built-in command, listing posted account names 2014-04-07 08:27:50 -07:00
Simon Michael
ef1cc06cab avoid pretty-show with GHC < 7.4; update tested-with (fixes #155)
hledger builds with GHC 7.2 through 7.8. 7.0 is not supported
because we require shakespeare which requires the DeriveGeneric extension.
2014-03-27 12:29:34 -07:00
Peter Simons
9e7a7e3439 hledger.cabal: loosen restriction on 'text < 1.1' to fix build with GHC 7.8.x 2014-03-22 12:03:00 +01:00
Simon Michael
59cbc230d8 drop data-pprint for now, does not support ghc 7.8
The data-pprint and pretty-show packages used for debugging
tend to be poorly supported, drop one of them for now.
2014-03-19 16:11:46 -07:00
Simon Michael
97e3f852a1 bump version to 0.22.98 aka 0.23 alpha 2014-03-04 11:17:56 -08:00
Simon Michael
61d2c28bd9 hledger: sigh, more cabal file snafu 2014-03-04 11:16:38 -08:00
Simon Michael
fd04430ae4 also add wizards dependency to the test executable 2014-03-04 11:09:34 -08:00
Marko Kocić
b01166c760 Update hledger.cabal 2014-03-03 09:47:28 +01:00
Marko Kocić
3cdb293f33 Fix broken hledger.cabal 2014-03-03 09:18:18 +01:00
Simon Michael
dcdb032d96 add: rewrite using wizards and make it more robust
The code is now much more manageable, faciliating further
improvements. Completion now works at all prompts, and
will insert the default value if the input area is empty.
Account and amount defaults are more robust and useful
in various situations. There might be a slight regression
with default commodity handling.
2014-02-27 18:15:49 -08:00
Simon Michael
2ec6231a51 bump version to 0.22.1 2014-01-08 15:01:45 -08:00
Simon Michael
62b0461c0e require latest pretty-show to allow install with standard happy and fix hackage docs 2014-01-08 15:00:41 -08:00
Simon Michael
4c1b2c0f86 remove obsolete regex-compat-tdfa dependency from hledger 2014-01-08 14:48:28 -08:00
Simon Michael
8befcb8354 bump version to 0.22, update tested-with & doc building 2013-12-13 18:28:45 -08:00
Simon Michael
060c9c73d0 hledger: allow text 1.0 2013-12-13 17:43:52 -08:00
Simon Michael
b2c6a8e7d2 require data-pprint 0.2.3, works with ghc < 7.2 2013-12-06 13:58:06 -08:00
Simon Michael
3eac48871c require data-pprint 0.2.3, works with ghc < 7.2 2013-12-06 13:22:28 -08:00
Simon Michael
7e06a6a24c balance: basic multi-column balance (change) reports 2013-09-26 15:06:48 -07:00
Simon Michael
b44efdcb4e don't depend on an unreleased version of data-pprint (fixes #140) 2013-09-23 10:46:52 -07:00
Simon Michael
009c7e3f90 bump version to 0.22 alpha 2013-09-22 22:38:27 -07:00
Simon Michael
671bb6c4a2 require data-pprint as a debugging aid and make some types compatible with it 2013-09-21 13:36:43 -07:00
Max Bolingbroke
e96fff7887 Upgrade to regex-compat-tdfa to squelch unicode problems 2013-08-20 21:19:28 +01:00
Simon Michael
318d36d712 bump version 2013-06-23 16:50:35 -07:00
Simon Michael
4eda6119f8 bump version to 0.21.2 2013-06-04 19:07:22 -07:00
Simon Michael
557419de8c bump version to 0.21.1 2013-06-03 23:18:30 -07:00
Simon Michael
4041f5a553 bump version to 0.21 2013-06-01 15:58:06 -07:00
Clint Adams
180521996a Add cabal testsuite for hledger. 2013-05-15 15:56:05 -04:00
Simon Michael
4ff2635bf8 bump version to 0.20.98 (0.21 alpha) 2013-05-14 10:30:46 -07:00
Simon Michael
1db8920644 bump version to 0.20.0.1 2013-05-04 07:26:15 -07:00
Simon Michael
28a605ceb0 docs: update bug tracker and repository locations in cabal files 2013-05-03 06:46:23 -07:00
Simon Michael
b89168d1b0 bump version number 2013-05-01 12:46:37 -07:00
Simon Michael
a32b0513bd update tested-withs. hledger needs 7.2+, hledger-web needs 7.4+ for now 2013-04-19 12:26:05 -07:00
Simon Michael
fc39b4c25d the version bump was premature, revert so I can push
This reverts commit 1bc8b73159.
2013-04-19 11:54:26 -07:00
Simon Michael
1bc8b73159 bump version 2013-04-17 17:20:59 -07:00
Simon Michael
1adc583975 make hledger-web installable with GHC < 7.6 again
Revisiting the "directory 1.2 can be installed with older GHC, so we'd better pin it in the cabal file" change.
Requiring directory 1.2 made hledger-web uninstallable with GHC < 7.6 because current yesod depends on ghc
which depends on a particular directory version and can't be upgraded. This is a smarter fix, which should let
all hledger packages build with whatever directory version is installed.
2013-03-19 01:22:09 +00:00
Simon Michael
bbfd91e7ea directory 1.2 can be installed with older GHC, so we'd better pin it in the cabal file
hledger now requires directory >= 1.2. This might make installation
more complex on old GHC versions; if it turns out to be needed,
perhaps it can be conditionalised again, more accurately, in the cabal file.
2013-03-11 15:56:56 +00:00
Simon Michael
a33b42bbd9 update tested-with in cabal files 2013-02-25 19:50:49 +00:00
Simon Michael
c553103caf bump version 2012-11-27 23:53:16 +00:00
Simon Michael
1d8fe29c4c docs: point to new repo location on darcs hub 2012-11-17 04:31:21 +00:00
Simon Michael
7798744d60 should have released hledger-lib; bump all version numbers again 2012-11-24 16:01:19 +00:00
Simon Michael
d22be3ac30 bump hledger & hledger-web versions 2012-11-24 15:34:53 +00:00
Simon Michael
9786894bbb bump version, release notes 2012-11-17 03:32:48 +00:00
Simon Michael
c1ab41f0a9 hledger, hledger-lib: support GHC 7.6 2012-10-08 16:52:07 +00:00
Simon Michael
51a9f2a948 bump version 2012-10-21 20:20:35 +00:00
Simon Michael
f03b020e2f set version with CPP instead of cabal-file-th; make building more robust
hledger and hledger-web were reading their version number (and program
name) from their cabal files at compile time using cabal-file-th,
which allowed the version number be maintained in one place (per
package).

This meant you had to be in same directory as the cabal file when
building, which made life more complicated, eg emacs compilation mode
could not jump to errors. Also, it slowed down building slightly, and
is a factor in hledger Debian packages being unavailable on a number
of platforms (we also use TH for report templates).

Now, the build version is set with a CPP VERSION flag, which seems
simpler overall. For cabal builds, this needs to be configured
manually in a few more places in each cabal file. For makefile builds,
it is set it to the name of the most recent darcs tag (which should be
more useful than the old behaviour). If not set, it defaults to the
blank string, useful eg for haddock. And, all makefile builds now run
from the top directory.
2012-10-13 19:21:17 +00:00
Simon Michael
7fec954cbf support latest cmdargs, haskeline, split 2012-10-08 16:50:35 +00:00
Simon Michael
f8a9cce43d bump base lower bound to 4.3 to enforce GHC 7 requirement 2012-07-08 00:22:20 +00:00
Simon Michael
63973c3728 bump version to 0.18.2 2012-07-08 00:24:40 +00:00
Simon Michael
6db9db0be1 bump version 2012-06-29 23:09:19 +00:00
Simon Michael
df6ee91e38 hledger-lib, hledger will require GHC >= 7.0 due to use of shakespeare-text QQ in reports 2012-05-06 20:41:40 +00:00
Simon Michael
6b280d8970 add missing text, shakespeare-text deps 2012-05-14 16:25:23 +00:00
Simon Michael
0616499b97 update cabal files 2012-05-29 02:52:16 +00:00
Simon Michael
722c3a489f update cabal dependencies after dropping convert 2012-03-26 00:36:41 +00:00
Simon Michael
d0bf2667c2 bump version 2012-05-28 21:08:05 +00:00
Simon Michael
1f1a1eb16f bump version 2012-03-30 00:27:23 +00:00
Simon Michael
c23d1793ae docs: clarify supported GHC versions 2012-03-29 22:09:54 +00:00
Simon Michael
a26ecdb3e3 true-by-default threaded flag for hledger, allowing non-threaded builds on some debian architectures (Clint Adams) 2012-01-02 17:42:43 +00:00
Simon Michael
26ad00a659 support and require latest cmdargs 2012-01-05 18:25:15 +00:00
Simon Michael
917a35d62b allow building with cmdargs 0.9 2012-01-02 17:43:26 +00:00
Simon Michael
3e3af47b96 bump cmdargs upper bound in other places 2012-01-03 11:00:35 +00:00
Simon Michael
6b784c0e65 bump version 2012-02-02 05:37:02 +00:00
Simon Michael
9329873cef bump version to "0.17 alpha" 2012-01-31 05:18:18 +00:00
Simon Michael
62454b45ff update tested-with fields 2012-01-30 04:21:03 +00:00
Simon Michael
db7f4d1b3d use cabal-file-th to get executable name and version from cabal files 2011-10-19 19:53:42 +00:00
Simon Michael
4fb325b92a bump version 2011-10-04 23:53:50 +00:00
Simon Michael
b0b1f7d733 bump version 2011-10-01 17:17:02 +00:00
Simon Michael
f37d7b5659 bump version 2011-09-12 22:52:24 +00:00
Simon Michael
c834f4a8af bump version for all but hledger-lib, due to hledger fix 2011-09-02 19:25:31 +00:00
Simon Michael
cd68f43be3 cli: rename hledger.hs (but not the executable) to avoid mac build issues 2011-07-17 23:21:48 +00:00
Simon Michael
cbb0fc5c59 move basic reports into hledger-lib 2011-08-15 22:59:06 +00:00
Clint Adams
5ead6d05b1 update to cmdargs 0.8 API
Between 0.7 and 0.8, modeArgs changed from

modeArgs :: Maybe (Arg a)

to

modeArgs :: ([Arg a], Maybe (Arg a))
2011-08-30 21:41:25 +00:00
Simon Michael
4104114d4e harmonise package descriptions, make them hackage-compliant 2011-09-02 00:28:27 +00:00
Simon Michael
059825a9b2 optionsgeddon.. port to cmdargs and a fully modal cli 2011-08-15 22:50:09 +00:00
Simon Michael
47b1142d49 move reports back to Hledger.Cli for now, forgot they still depend on cli options 2011-07-18 23:30:40 +00:00
Trygve Laugstol
28dbb8864f Adding basic ledger FORMAT parser. 2011-06-20 21:33:26 +00:00
Simon Michael
910e5c2bee bump version 2011-09-02 00:42:50 +00:00
Simon Michael
883bc240c9 cli: cabal dependency fixes 2011-07-18 23:24:54 +00:00
Simon Michael
cfb26463b7 hledger.cabal: note self-depending issues and revert to the old way of building 2011-06-01 18:23:46 +00:00
Simon Michael
997ab43c35 cli: cabal updates, try to depend on self, don't use deprecated test api 2011-05-29 04:51:53 +00:00
Simon Michael
ac5059ea53 bump version 2011-05-24 04:28:21 +00:00
Simon Michael
7554cc7f9b installing: don't require newer process after all, too many problems 2010-12-25 19:53:21 +00:00
Dmitry Astapov
a87c016615 Hledger.Cli.Commands renamed to Hledger.Cli, updating .cabal accordingly 2011-01-20 23:07:33 +00:00
Simon Michael
49b291d284 docs: tweak 2011-04-19 01:12:29 +00:00
Simon Michael
7ee69f5ed8 docs: harmonise/update package descriptions 2011-04-19 00:50:47 +00:00
Simon Michael
e973868995 bump version 2011-04-18 06:53:50 +00:00
Simon Michael
9f66549b5a bump version to alpha 2011-01-21 01:27:39 +00:00
Simon Michael
a85e9bf68b fix hledger cabal file, cleanup 2010-09-10 01:45:12 +00:00
Simon Michael
e93474e873 cli: require newer process version to assist cabal-install 2010-11-26 20:36:28 +00:00
Simon Michael
1127c3f52f flatten modules a little 2010-11-15 06:48:49 +00:00
Simon Michael
15518da4ac bump version 2010-12-06 18:37:10 +00:00
Judah Jacobson
18fd5fe482 Use haskeline in the "add" command, and tab-complete account names. 2010-10-30 18:52:44 +00:00
Simon Michael
9cb716d002 packagegeddon.. split off web/chart/vty, move hledger to a subdir 2010-09-09 22:54:34 +00:00