hledger 0.12 → 0.12.1
raw patch · 5 files changed
+54/−54 lines, 5 filesdep ~hledger-libdep ~utf8-stringPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: hledger-lib, utf8-string
API changes (from Hackage documentation)
Files
- Hledger/Cli/Commands/Web.hs +4/−4
- Hledger/Cli/Version.hs +1/−1
- MANUAL.markdown +33/−43
- NEWS.markdown +11/−1
- hledger.cabal +5/−5
Hledger/Cli/Commands/Web.hs view
@@ -142,7 +142,7 @@ getReportParameters = do app <- getYesod t <- liftIO $ getCurrentLocalTime- a <- fromMaybe "" <$> lookupGetParam "x"+ a <- fromMaybe "" <$> lookupGetParam "a" p <- fromMaybe "" <$> lookupGetParam "p" let opts = appOpts app ++ [Period p] args = appArgs app ++ [a]@@ -277,7 +277,7 @@ (True, ((acct, _, _, _):_)) -> let a' = if isAccountRegex a then a else acct a'' = accountNameToAccountRegex $ parentAccountName $ accountRegexToAccountName a'- parenturl = (here, [("y",a''), ("p",p)])+ parenturl = (here, [("a",a''), ("p",p)]) in [$hamlet| \ | $ %a!href=@?parenturl@ show more ↑@@ -836,7 +836,7 @@ navlink :: TemplateData -> String -> HledgerWebAppRoute -> Hamlet HledgerWebAppRoute navlink TD{here=here,a=a,p=p} s dest = [$hamlet|%a#$s$link.$style$!href=@?u@ $s$|]- where u = (dest, concat [(if null a then [] else [("z", a)])+ where u = (dest, concat [(if null a then [] else [("a", a)]) ,(if null p then [] else [("p", p)])]) style | dest == here = "navlinkcurrent" | otherwise = "navlink"@@ -880,7 +880,7 @@ stopfiltering = if filtering then [$hamlet|%a#stopfilterlink!href=@?u@ stop filtering acct/desc|] else nulltemplate where u = (here, if filteringperiod then [("p", p)] else []) stopfilteringperiod = if filteringperiod then [$hamlet|%a#stopfilterlink!href=@?u@ stop filtering period|] else nulltemplate- where u = (here, if filtering then [("q", a)] else [])+ where u = (here, if filtering then [("a", a)] else []) helplink :: String -> String -> Hamlet HledgerWebAppRoute helplink topic label = [$hamlet|%a!href=$u$!target=hledgerhelp $label$|]
Hledger/Cli/Version.hs view
@@ -10,7 +10,7 @@ import Hledger.Data.Utils -- version and PATCHLEVEL are set by the makefile-version = "0.12.0"+version = "0.12.1" #ifdef PATCHLEVEL patchlevel = "." ++ show PATCHLEVEL -- must be numeric !
MANUAL.markdown view
@@ -4,7 +4,7 @@ # hledger manual -This is the official hledger manual, for version 0.12.0. You may also+This is the official hledger manual, for version 0.12.1. You may also want to visit the rest of [hledger.org](http://hledger.org), and for background, [c++ ledger's manual](http://joyful.com/repos/ledger/doc/ledger.html).@@ -72,9 +72,7 @@ working first, then try these one at a time: - `-fweb` builds the [web](#web) command, enabling a web-based user- interface. This requires GHC 6.12. If you are stuck with GHC 6.10,- you can use `-fweb610` instead, to build an older version of the web- interface.+ interface. This requires GHC 6.12 or greater. - `-fvty` builds the [vty](#vty) command, enabling a basic curses-style user interface. This does not work on microsoft@@ -122,7 +120,7 @@ $ hledger histogram # transactions per day, or other interval $ hledger add # add some new transactions to the journal file $ hledger vty # curses ui, if installed with -fvty- $ hledger web # web ui, if installed with -fweb or -fweb610+ $ hledger web # web ui, if installed with -fweb $ hledger chart # make a balance chart, if installed with -fchart You'll find more examples below.@@ -217,7 +215,7 @@ register - show transactions as a register with running balance stats - show various statistics for a journal vty - run a simple curses-style UI (if installed with -fvty)- web - run a simple web-based UI (if installed with -fweb or -fweb610)+ web - run a simple web-based UI (if installed with -fweb chart - generate balances pie charts (if installed with -fchart) test - run self-tests @@ -1002,24 +1000,10 @@ - **Do you have a new enough version of GHC ?** hledger supports GHC 6.10 and 6.12. Building with the `-fweb` flag requires 6.12 or greater. -- **Do you have a new enough version of cabal-install ?**- Recent versions tend to be better at resolving dependencies. The error- `setup: failed to parse output of 'ghc-pkg dump'` is another symptom of- this. To update, do:- - $ cabal update- $ cabal install cabal-install- $ cabal clean- - then try installing hledger again.--- **Could not run trhsx.**- You are installing with `-fweb610`, which needs to run the `trhsx` executable.- It is installed by the hsx package in `~/.cabal/bin`, which needs to be in- your path. Do something like:-- $ echo 'export PATH=$PATH:~/.cabal/bin' >> ~/.bash_profile; source ~/.bash_profile-+- **An error while building non-hledger packages.**+ Resolve these problem packages one at a time. Eg, cabal install pkg1.+ Look for the cause of the failure near the end of the output. If it's+ not apparent, try again with `-v2` or `-v3` for more verbose output. - **Could not run happy.** A package (eg haskell-src-exts) needs to run the `happy` executable.@@ -1051,6 +1035,21 @@ - **A ghc: panic! (the 'impossible' happened)** might be [this issue](http://hackage.haskell.org/trac/ghc/ticket/3862) +- **This package indirectly depends on multiple versions of the same package.**+ You may have previously installed some of hledger's dependencies+ depending on different versions of (eg) parsec. Then cabal install hledger gives+ an error like this:++ Warning: This package indirectly depends on multiple versions of the same+ package. This is highly likely to cause a compile failure.+ package yesod-0.5.0.3 requires parsec-2.1.0.1+ package csv-0.1.1 requires parsec-3.1.0+ ...++ The above example could be resolved by, eg:++ $ cabal install yesod --reinstall --constraint 'parsec == 3.1.0"+ - **Another error while building a hledger package.** The current hledger release might have a coding error, or dependency error. You could try installing the@@ -1067,25 +1066,16 @@ $ cd .. $ cabal install [-f...] -- **An error while building non-hledger packages.**- Resolve these problem packages one at a time. Eg, cabal install pkg1.- Look for the cause of the failure near the end of the output. If it's- not apparent, try again with `-v2` or `-v3` for more verbose output.--- **This package indirectly depends on multiple versions of the same package.**- You may have previously installed some of hledger's dependencies- depending on different versions of (eg) parsec. Then cabal install hledger gives- an error like this:-- Warning: This package indirectly depends on multiple versions of the same- package. This is highly likely to cause a compile failure.- package yesod-0.5.0.3 requires parsec-2.1.0.1- package csv-0.1.1 requires parsec-3.1.0- ...-- The above example could be resolved by, eg:-- $ cabal install yesod --reinstall --constraint 'parsec == 3.1.0"+- **Do you have a new enough version of cabal-install ?**+ Recent versions tend to be better at resolving dependencies. The error+ `setup: failed to parse output of 'ghc-pkg dump'` is another symptom of+ this. To update, do:+ + $ cabal update+ $ cabal install cabal-install+ $ cabal clean+ + then try installing hledger again. - **cabal fails to resolve dependencies.** It's possible for cabal to get confused, eg if you have
NEWS.markdown view
@@ -4,21 +4,31 @@ # hledger news +## 2010/9/6 hledger 0.12.1++ * web: fix account filtering breakage+ * installing: tighten up utf8-string dependency+ ## 2010/9/5 hledger 0.12 + * web: new, better web ui; accounts are now a permanent sidebar; add form uses auto-completing combo fields * installing: fix a build error with parsec 3 (#22) * installing: require exactly matching hledger-lib version for more robust builds * installing: explicit data-object dependency to ensure hledger and hledger-lib use the same time version+ * installing: explicit hamlet dependency for more robust building * installing: build threaded and with warnings * installing: drop -fweb610 flag * installing: add gtk2hs-buildtools dependency needed to build with -fchart+ * installing: require cabal 1.6 or greater * add -D/--daily flag * register: with --depth, clip account names or aggregate postings rather than excluding them- * web: new, better web ui; accounts are now a permanent sidebar; add form uses auto-completing combo fields * fix !include with deeply nested directories (#21) * fix obscured date parse errors with parsec 3 * handle unicode better in errors * fix a ghc 6.12.3 error when running interpreted++Stats: 50 days and 90 commits since last release, now at 5741+lines of code with 136 tests and 41% unit test coverage. ## 2010/07/17 hledger 0.11.1
hledger.cabal view
@@ -1,5 +1,5 @@ name: hledger-version: 0.12+version: 0.12.1 category: Finance synopsis: A command-line (or curses or web-based) double-entry accounting tool. description:@@ -73,7 +73,7 @@ Hledger.Cli.Commands.Register Hledger.Cli.Commands.Stats build-depends:- hledger-lib == 0.12+ hledger-lib == 0.12.1 ,HUnit ,base >= 3 && < 5 ,containers@@ -89,7 +89,7 @@ ,safe >= 0.2 ,split == 0.1.* ,time- ,utf8-string >= 0.3+ ,utf8-string >= 0.3.5 && < 0.4 if flag(chart) cpp-options: -DCHART@@ -137,7 +137,7 @@ Hledger.Cli.Commands.Register Hledger.Cli.Commands.Stats build-depends:- hledger-lib == 0.12+ hledger-lib == 0.12.1 ,HUnit ,base >= 3 && < 5 ,containers@@ -153,7 +153,7 @@ ,safe >= 0.2 ,split == 0.1.* ,time- ,utf8-string >= 0.3+ ,utf8-string >= 0.3.5 && < 0.4 source-repository head type: darcs