summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.md4
-rw-r--r--Hledger/Read/CsvReader.hs6
-rw-r--r--hledger-lib.cabal10
3 files changed, 12 insertions, 8 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 59d0072..0704473 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,10 @@
Internal/api/developer-ish changes in the hledger-lib (and hledger) packages.
For user-visible changes, see the hledger package changelog.
+# 1.14.1 2019-03-20
+
+- require easytest <0.3 to fix build issue
+
# 1.14 2019-03-01
- added:
diff --git a/Hledger/Read/CsvReader.hs b/Hledger/Read/CsvReader.hs
index 426d51c..4416d57 100644
--- a/Hledger/Read/CsvReader.hs
+++ b/Hledger/Read/CsvReader.hs
@@ -690,7 +690,7 @@ transactionFromCsvRecord sourcepos rules record = t
where
statuserror err = error' $ unlines
["error: could not parse \""++str++"\" as a cleared status (should be *, ! or empty)"
- ,"the parse error is: "++show err
+ ,"the parse error is: "++customErrorBundlePretty err
]
code = maybe "" render $ mfieldtemplate "code"
description = maybe "" render $ mfieldtemplate "description"
@@ -705,7 +705,7 @@ transactionFromCsvRecord sourcepos rules record = t
,"the amount rule is: "++(fromMaybe "" $ mfieldtemplate "amount")
,"the currency rule is: "++(fromMaybe "unspecified" $ mfieldtemplate "currency")
,"the default-currency is: "++fromMaybe "unspecified" mdefaultcurrency
- ,"the parse error is: "++show err
+ ,"the parse error is: "++customErrorBundlePretty err
,"you may need to "
++"change your amount or currency rules, "
++"or "++maybe "add a" (const "change your") mskip++" skip rule"
@@ -734,7 +734,7 @@ transactionFromCsvRecord sourcepos rules record = t
,"the balance rule is: "++(fromMaybe "" $ mfieldtemplate "balance")
,"the currency rule is: "++(fromMaybe "unspecified" $ mfieldtemplate "currency")
,"the default-currency is: "++fromMaybe "unspecified" mdefaultcurrency
- ,"the parse error is: "++show err
+ ,"the parse error is: "++customErrorBundlePretty err
]
-- build the transaction
diff --git a/hledger-lib.cabal b/hledger-lib.cabal
index 67fd077..4e90fd7 100644
--- a/hledger-lib.cabal
+++ b/hledger-lib.cabal
@@ -4,10 +4,10 @@ cabal-version: 1.12
--
-- see: https://github.com/sol/hpack
--
--- hash: e2c444e055dd9ef61f9cbddeeddf69ce3274e6c2eef4b64301b7107144d7d84b
+-- hash: 4d6b36fe7c3d7cbcff001ad72b5f9030c0fdf2caf573b30e46dddbc0045a7066
name: hledger-lib
-version: 1.14
+version: 1.14.1
synopsis: Core data types, parsers and functionality for the hledger accounting tools
description: This is a reusable library containing hledger's core functionality.
.
@@ -119,7 +119,7 @@ library
, data-default >=0.5
, deepseq
, directory
- , easytest
+ , easytest >=0.2.1 && <0.3
, extra
, file-embed >=0.0.10
, filepath
@@ -221,7 +221,7 @@ test-suite doctests
, deepseq
, directory
, doctest >=0.16
- , easytest
+ , easytest >=0.2.1 && <0.3
, extra
, file-embed >=0.0.10
, filepath
@@ -322,7 +322,7 @@ test-suite easytests
, data-default >=0.5
, deepseq
, directory
- , easytest
+ , easytest >=0.2.1 && <0.3
, extra
, file-embed >=0.0.10
, filepath