summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES5
-rw-r--r--hledger-api.12
-rw-r--r--hledger-api.cabal18
-rw-r--r--hledger-api.hs7
-rw-r--r--hledger-api.info8
-rw-r--r--hledger-api.txt2
6 files changed, 24 insertions, 18 deletions
diff --git a/CHANGES b/CHANGES
index df54779..cb73fa5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
User-visible changes in hledger-api. See also hledger, hledger-lib.
+# 1.9.1 (2018/4/30)
+
+* use hledger-lib 1.9.1
+
+
# 1.9 (2018/3/31)
* support ghc 8.4, latest deps
diff --git a/hledger-api.1 b/hledger-api.1
index cd408b6..331b95c 100644
--- a/hledger-api.1
+++ b/hledger-api.1
@@ -1,5 +1,5 @@
-.TH "hledger\-api" "1" "March 2018" "hledger\-api 1.9" "hledger User Manuals"
+.TH "hledger\-api" "1" "April 2018" "hledger\-api 1.9.1" "hledger User Manuals"
diff --git a/hledger-api.cabal b/hledger-api.cabal
index 01a3d83..99661f5 100644
--- a/hledger-api.cabal
+++ b/hledger-api.cabal
@@ -1,11 +1,11 @@
--- This file has been generated from package.yaml by hpack version 0.20.0.
+-- This file has been generated from package.yaml by hpack version 0.28.2.
--
-- see: https://github.com/sol/hpack
--
--- hash: f3634e33165cee47d5e654d9261a1c38195c0466a0c52c659e5833033a73416a
+-- hash: ddd609623effac971ca9071b9698def791a428506794509717a218c0a5b2bde1
name: hledger-api
-version: 1.9
+version: 1.9.1
synopsis: Web API server for the hledger accounting tool
description: This is a simple web API server for hledger data.
It comes with a series of simple client-side web app examples.
@@ -27,7 +27,6 @@ license-file: LICENSE
tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.1
build-type: Simple
cabal-version: >= 1.10
-
extra-source-files:
CHANGES
examples/01.html
@@ -43,18 +42,21 @@ source-repository head
executable hledger-api
main-is: hledger-api.hs
+ other-modules:
+ Paths_hledger_api
ghc-options: -threaded
- cpp-options: -DVERSION="1.9"
+ cpp-options: -DVERSION="1.9.1"
build-depends:
Decimal
, aeson
, base >=4.8 && <4.12
, bytestring
, containers
+ , data-default >=0.5
, docopt
, either
- , hledger >=1.9 && <2.0
- , hledger-lib >=1.9 && <2.0
+ , hledger >=1.9.1 && <2.0
+ , hledger-lib >=1.9.1 && <2.0
, microlens >=0.4
, microlens-platform >=0.2.3.1
, safe
@@ -66,6 +68,4 @@ executable hledger-api
, wai
, wai-extra
, warp
- other-modules:
- Paths_hledger_api
default-language: Haskell2010
diff --git a/hledger-api.hs b/hledger-api.hs
index 50d31c8..a578ff4 100644
--- a/hledger-api.hs
+++ b/hledger-api.hs
@@ -17,6 +17,7 @@ import Control.Monad
import Data.Aeson
import qualified Data.ByteString.Lazy.Char8 as BL8
import Data.Decimal
+import Data.Default
import qualified Data.Map as M
import Data.Proxy
import Data.String (fromString)
@@ -36,12 +37,12 @@ import Text.Printf
import Hledger.Query
import Hledger.Cli hiding (Reader, version)
-hledgerApiVersion="1.9"
+hledgerApiVersion="1.9.1"
-- https://github.com/docopt/docopt.hs#readme
doc :: Docopt
doc = [docopt|
-hledger-api 1.9
+hledger-api 1.9.1
Serves hledger data and reports as a JSON web API.
@@ -90,7 +91,7 @@ main = do
let
defd = "."
d = getArgWithDefault args defd (longOption "static-dir")
- readJournalFile Nothing Nothing True f >>= either error' (serveApi h p d f)
+ readJournalFile def f >>= either error' (serveApi h p d f)
serveApi :: String -> Int -> FilePath -> FilePath -> Journal -> IO ()
serveApi h p d f j = do
diff --git a/hledger-api.info b/hledger-api.info
index aaa1cee..f606b0f 100644
--- a/hledger-api.info
+++ b/hledger-api.info
@@ -3,8 +3,8 @@ This is hledger-api.info, produced by makeinfo version 6.5 from stdin.

File: hledger-api.info, Node: Top, Next: OPTIONS, Up: (dir)
-hledger-api(1) hledger-api 1.9
-******************************
+hledger-api(1) hledger-api 1.9.1
+********************************
hledger-api is a simple web API server, intended to support client-side
web apps operating on hledger data. It comes with a series of simple
@@ -80,7 +80,7 @@ options as shown above.

Tag Table:
Node: Top72
-Node: OPTIONS1658
-Ref: #options1743
+Node: OPTIONS1662
+Ref: #options1747

End Tag Table
diff --git a/hledger-api.txt b/hledger-api.txt
index eaec24f..fdbcddb 100644
--- a/hledger-api.txt
+++ b/hledger-api.txt
@@ -117,4 +117,4 @@ SEE ALSO
-hledger-api 1.9 March 2018 hledger-api(1)
+hledger-api 1.9.1 April 2018 hledger-api(1)