[package-plan] 10/29: refresh hledger patches & cabals
Sean Whitton
spwhitton at spwhitton.name
Sun Sep 3 01:46:11 UTC 2017
This is an automated email from the git hooks/post-receive script.
spwhitton pushed a commit to branch lts-9.2
in repository package-plan.
commit 71d01b044b16b4cdea33ad0fbb950bac959321d2
Author: Sean Whitton <spwhitton at spwhitton.name>
Date: Sat Sep 2 17:19:09 2017 -0700
refresh hledger patches & cabals
This fixes hledger with newer megaparsec -- upstream has revised their
.cabal on Hackage.
---
.../{hledger-1.1.cabal => hledger-1.2.cabal} | 53 +++++++++---------
...hledger-lib-1.1.cabal => hledger-lib-1.2.cabal} | 62 +++++++++-------------
packages.txt | 10 ++--
patches/hledger-lib/{1.1 => 1.2}/newer-megaparsec | 18 +++----
.../hledger-lib/{1.1 => 1.2}/no-mtl-compat.patch | 16 +++---
patches/hledger-lib/{1.1 => 1.2}/series | 0
patches/hledger/{1.1 => 1.2}/newer-megaparsec | 6 +--
patches/hledger/{1.1 => 1.2}/no-mtl-compat.patch | 12 ++---
patches/hledger/{1.1 => 1.2}/series | 0
9 files changed, 85 insertions(+), 92 deletions(-)
diff --git a/additional-cabals/hledger-1.1.cabal b/additional-cabals/hledger-1.2.cabal
similarity index 94%
rename from additional-cabals/hledger-1.1.cabal
rename to additional-cabals/hledger-1.2.cabal
index 00cc24d..378aee1 100644
--- a/additional-cabals/hledger-1.1.cabal
+++ b/additional-cabals/hledger-1.2.cabal
@@ -1,11 +1,9 @@
--- This file has been generated from package.yaml by hpack version 0.15.0.
+-- This file has been generated from package.yaml by hpack version 0.17.0.
--
-- see: https://github.com/sol/hpack
name: hledger
-version: 1.1
-stability: stable
-category: Finance, Console
+version: 1.2
synopsis: Command-line interface for the hledger accounting tool
description: This is hledger's command-line interface.
Its basic function is to read a plain text file describing
@@ -17,15 +15,17 @@ description: This is hledger's command-line interface.
with ledger(1). hledger provides command-line, curses and web
interfaces, and aims to be a reliable, practical tool for daily
use.
-license: GPL
-license-file: LICENSE
-author: Simon Michael <simon at joyful.com>
-maintainer: Simon Michael <simon at joyful.com>
+category: Finance, Console
+stability: stable
homepage: http://hledger.org
bug-reports: http://bugs.hledger.org
-cabal-version: >= 1.10
-build-type: Simple
+author: Simon Michael <simon at joyful.com>
+maintainer: Simon Michael <simon at joyful.com>
+license: GPL-3
+license-file: LICENSE
tested-with: GHC==7.10.3, GHC==8.0
+build-type: Simple
+cabal-version: >= 1.10
extra-source-files:
bench/10000x1000x10.journal
@@ -74,24 +74,25 @@ flag terminfo
default: True
flag threaded
- default: True
description: Build with support for multithreaded execution
manual: False
+ default: True
library
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
- cpp-options: -DVERSION="1.1"
+ cpp-options: -DVERSION="1.2"
build-depends:
base >=4.8 && <5
, base-compat >=0.8.1
, directory
, file-embed >=0.0.10 && <0.1
, filepath
+ , here
, pretty-show >=1.6.4
, process
, temporary
, tabular >=0.2 && <0.3
- , hledger-lib >= 1.1 && < 1.2
+ , hledger-lib >= 1.2 && < 1.3
, bytestring
, containers
, unordered-containers
@@ -104,7 +105,7 @@ library
, mtl
, mtl-compat
, old-time
- , megaparsec >=5.0 && < 5.2
+ , megaparsec >=5.0 && < 5.3
, regex-tdfa
, safe >=0.2
, split >=0.1 && <0.3
@@ -144,6 +145,7 @@ library
Hledger.Cli.Accounts
Hledger.Cli.Balance
Hledger.Cli.Balancesheet
+ Hledger.Cli.BalanceView
Hledger.Cli.Cashflow
Hledger.Cli.Help
Hledger.Cli.Histogram
@@ -163,19 +165,20 @@ executable hledger
hs-source-dirs:
app
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
- cpp-options: -DVERSION="1.1"
+ cpp-options: -DVERSION="1.2"
build-depends:
base >=4.8 && <5
, base-compat >=0.8.1
, directory
, file-embed >=0.0.10 && <0.1
, filepath
+ , here
, pretty-show >=1.6.4
, process
, temporary
, tabular >=0.2 && <0.3
- , hledger-lib >= 1.1 && < 1.2
- , hledger == 1.1
+ , hledger-lib >= 1.2 && < 1.3
+ , hledger == 1.2
, bytestring
, containers
, unordered-containers
@@ -224,19 +227,20 @@ test-suite test
hs-source-dirs:
test
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
- cpp-options: -DVERSION="1.1"
+ cpp-options: -DVERSION="1.2"
build-depends:
base >=4.8 && <5
, base-compat >=0.8.1
, directory
, file-embed >=0.0.10 && <0.1
, filepath
+ , here
, pretty-show >=1.6.4
, process
, temporary
, tabular >=0.2 && <0.3
- , hledger-lib >= 1.1 && < 1.2
- , hledger == 1.1
+ , hledger-lib >= 1.2 && < 1.3
+ , hledger == 1.2
, bytestring
, containers
, unordered-containers
@@ -281,23 +285,23 @@ test-suite test
benchmark bench
type: exitcode-stdio-1.0
+ main-is: bench.hs
hs-source-dirs:
bench
- main-is: bench.hs
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
- default-language: Haskell2010
build-depends:
base >=4.8 && <5
, base-compat >=0.8.1
, directory
, file-embed >=0.0.10 && <0.1
, filepath
+ , here
, pretty-show >=1.6.4
, process
, temporary
, tabular >=0.2 && <0.3
- , hledger-lib >= 1.1 && < 1.2
- , hledger == 1.1
+ , hledger-lib >= 1.2 && < 1.3
+ , hledger == 1.2
, criterion
, html
, timeit
@@ -308,3 +312,4 @@ benchmark bench
else
build-depends:
time >=1.5
+ default-language: Haskell2010
diff --git a/additional-cabals/hledger-lib-1.1.cabal b/additional-cabals/hledger-lib-1.2.cabal
similarity index 92%
rename from additional-cabals/hledger-lib-1.1.cabal
rename to additional-cabals/hledger-lib-1.2.cabal
index b0f192f..e5ed38f 100644
--- a/additional-cabals/hledger-lib-1.1.cabal
+++ b/additional-cabals/hledger-lib-1.2.cabal
@@ -1,11 +1,9 @@
--- This file has been generated from package.yaml by hpack version 0.15.0.
+-- This file has been generated from package.yaml by hpack version 0.17.0.
--
-- see: https://github.com/sol/hpack
name: hledger-lib
-version: 1.1
-stability: stable
-category: Finance
+version: 1.2
synopsis: Core data types, parsers and functionality for the hledger accounting tools
description: This is a reusable library containing hledger's core functionality.
.
@@ -15,15 +13,17 @@ description: This is a reusable library containing hledger's core functionali
with ledger(1). hledger provides command-line, curses and web
interfaces, and aims to be a reliable, practical tool for daily
use.
-license: GPL
-license-file: LICENSE
-author: Simon Michael <simon at joyful.com>
-maintainer: Simon Michael <simon at joyful.com>
+category: Finance
+stability: stable
homepage: http://hledger.org
bug-reports: http://bugs.hledger.org
-cabal-version: >= 1.10
-build-type: Simple
+author: Simon Michael <simon at joyful.com>
+maintainer: Simon Michael <simon at joyful.com>
+license: GPL-3
+license-file: LICENSE
tested-with: GHC==7.10.3, GHC==8.0
+build-type: Simple
+cabal-version: >= 1.10
extra-source-files:
CHANGES
@@ -54,8 +54,7 @@ flag oldtime
library
hs-source-dirs:
- other/ledger-parse
- , .
+ ./.
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
build-depends:
base >=4.8 && <5
@@ -72,7 +71,7 @@ library
, directory
, filepath
, hashtables >= 1.2
- , megaparsec >=5.0 && < 5.2
+ , megaparsec >=5.0 && < 5.3
, mtl
, mtl-compat
, old-time
@@ -85,9 +84,6 @@ library
, uglymemo
, utf8-string >=0.3.5 && <1.1
, HUnit
- , parsers >= 0.5
- , system-filepath
- , trifecta >= 0.91
, parsec
, semigroups
if impl(ghc <7.6)
@@ -110,19 +106,20 @@ library
Hledger.Data.Dates
Hledger.Data.Journal
Hledger.Data.Ledger
+ Hledger.Data.MarketPrice
Hledger.Data.Period
Hledger.Data.StringFormat
Hledger.Data.Posting
Hledger.Data.RawOptions
Hledger.Data.Timeclock
Hledger.Data.Transaction
+ Hledger.Data.AutoTransaction
Hledger.Data.Types
Hledger.Query
Hledger.Read
Hledger.Read.Common
Hledger.Read.CsvReader
Hledger.Read.JournalReader
- Hledger.Read.LedgerReader
Hledger.Read.TimedotReader
Hledger.Read.TimeclockReader
Hledger.Reports
@@ -143,18 +140,16 @@ library
Hledger.Utils.Tree
Hledger.Utils.UTF8IOCompat
other-modules:
- Ledger.Parser.Text
Paths_hledger_lib
default-language: Haskell2010
test-suite doctests
type: exitcode-stdio-1.0
+ main-is: doctests.hs
hs-source-dirs:
- other/ledger-parse
- , .
- , tests
+ ./.
+ tests
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
- main-is: doctests.hs
build-depends:
base >=4.8 && <5
, base-compat >=0.8.1
@@ -170,7 +165,7 @@ test-suite doctests
, directory
, filepath
, hashtables >= 1.2
- , megaparsec >=5.0 && < 5.2
+ , megaparsec >=5.0 && < 5.3
, mtl
, mtl-compat
, old-time
@@ -183,25 +178,23 @@ test-suite doctests
, uglymemo
, utf8-string >=0.3.5 && <1.1
, HUnit
- , parsers >= 0.5
- , system-filepath
- , trifecta >= 0.91
, doctest >=0.8
, Glob >=0.7
if impl(ghc <7.6)
build-depends:
ghc-prim
other-modules:
- Ledger.Parser.Text
Hledger
Hledger.Data
Hledger.Data.Account
Hledger.Data.AccountName
Hledger.Data.Amount
+ Hledger.Data.AutoTransaction
Hledger.Data.Commodity
Hledger.Data.Dates
Hledger.Data.Journal
Hledger.Data.Ledger
+ Hledger.Data.MarketPrice
Hledger.Data.Period
Hledger.Data.Posting
Hledger.Data.RawOptions
@@ -214,7 +207,6 @@ test-suite doctests
Hledger.Read.Common
Hledger.Read.CsvReader
Hledger.Read.JournalReader
- Hledger.Read.LedgerReader
Hledger.Read.TimeclockReader
Hledger.Read.TimedotReader
Hledger.Reports
@@ -240,9 +232,8 @@ test-suite hunittests
type: exitcode-stdio-1.0
main-is: hunittests.hs
hs-source-dirs:
- other/ledger-parse
- , .
- , tests
+ ./.
+ tests
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
build-depends:
base >=4.8 && <5
@@ -259,7 +250,7 @@ test-suite hunittests
, directory
, filepath
, hashtables >= 1.2
- , megaparsec >=5.0 && < 5.2
+ , megaparsec >=5.0 && < 5.3
, mtl
, mtl-compat
, old-time
@@ -272,9 +263,6 @@ test-suite hunittests
, uglymemo
, utf8-string >=0.3.5 && <1.1
, HUnit
- , parsers >= 0.5
- , system-filepath
- , trifecta >= 0.91
, hledger-lib
, parsec
, test-framework
@@ -290,16 +278,17 @@ test-suite hunittests
build-depends:
time >=1.5
other-modules:
- Ledger.Parser.Text
Hledger
Hledger.Data
Hledger.Data.Account
Hledger.Data.AccountName
Hledger.Data.Amount
+ Hledger.Data.AutoTransaction
Hledger.Data.Commodity
Hledger.Data.Dates
Hledger.Data.Journal
Hledger.Data.Ledger
+ Hledger.Data.MarketPrice
Hledger.Data.Period
Hledger.Data.Posting
Hledger.Data.RawOptions
@@ -312,7 +301,6 @@ test-suite hunittests
Hledger.Read.Common
Hledger.Read.CsvReader
Hledger.Read.JournalReader
- Hledger.Read.LedgerReader
Hledger.Read.TimeclockReader
Hledger.Read.TimedotReader
Hledger.Reports
diff --git a/packages.txt b/packages.txt
index 33496ce..0d0448c 100644
--- a/packages.txt
+++ b/packages.txt
@@ -353,11 +353,11 @@ hinotify 0.3.9
hint 0.7.0 notest
hit 0.6.3
hjsmin 0.2.0.2
-hledger 1.2 key # BROKEN - LTS 8 - needs patching for newer megaparsec
-hledger-interest 1.5.1 binary key # BROKEN - LTS 8 - needs patching for newer megaparsec
-hledger-lib 1.2 # BROKEN - LTS 8 - needs patching for newer megaparsec
-hledger-ui 1.2 binary # BROKEN - LTS 8 - needs patching for newer megaparsec
-hledger-web 1.2 binary # BROKEN - LTS 8 - needs patching for newer megaparsec
+hledger 1.2 key
+hledger-interest 1.5.1 binary key
+hledger-lib 1.2
+hledger-ui 1.2 binary
+hledger-web 1.2 binary
hlint 2.0.9
hmatrix 0.18.0.0
hmatrix-gsl 0.18.0.1
diff --git a/patches/hledger-lib/1.1/newer-megaparsec b/patches/hledger-lib/1.2/newer-megaparsec
similarity index 55%
rename from patches/hledger-lib/1.1/newer-megaparsec
rename to patches/hledger-lib/1.2/newer-megaparsec
index bc59650..2010453 100644
--- a/patches/hledger-lib/1.1/newer-megaparsec
+++ b/patches/hledger-lib/1.2/newer-megaparsec
@@ -1,29 +1,29 @@
--- a/hledger-lib.cabal
+++ b/hledger-lib.cabal
-@@ -72,7 +72,7 @@
+@@ -71,7 +71,7 @@ library
, directory
, filepath
, hashtables >= 1.2
-- , megaparsec >=5.0 && < 5.2
-+ , megaparsec >=5.0 && < 5.3
+- , megaparsec >=5.0 && < 5.3
++ , megaparsec >=5.0 && < 5.4
, mtl
, old-time
, pretty-show >=1.6.4
-@@ -169,7 +169,7 @@
+@@ -164,7 +164,7 @@ test-suite doctests
, directory
, filepath
, hashtables >= 1.2
-- , megaparsec >=5.0 && < 5.2
-+ , megaparsec >=5.0 && < 5.3
+- , megaparsec >=5.0 && < 5.3
++ , megaparsec >=5.0 && < 5.4
, mtl
, old-time
, pretty-show >=1.6.4
-@@ -257,7 +257,7 @@
+@@ -248,7 +248,7 @@ test-suite hunittests
, directory
, filepath
, hashtables >= 1.2
-- , megaparsec >=5.0 && < 5.2
-+ , megaparsec >=5.0 && < 5.3
+- , megaparsec >=5.0 && < 5.3
++ , megaparsec >=5.0 && < 5.4
, mtl
, old-time
, pretty-show >=1.6.4
diff --git a/patches/hledger-lib/1.1/no-mtl-compat.patch b/patches/hledger-lib/1.2/no-mtl-compat.patch
similarity index 57%
rename from patches/hledger-lib/1.1/no-mtl-compat.patch
rename to patches/hledger-lib/1.2/no-mtl-compat.patch
index 87e1524..44d07a1 100644
--- a/patches/hledger-lib/1.1/no-mtl-compat.patch
+++ b/patches/hledger-lib/1.2/no-mtl-compat.patch
@@ -1,24 +1,24 @@
---- hledger-lib-1.1.orig/hledger-lib.cabal
-+++ hledger-lib-1.1/hledger-lib.cabal
-@@ -74,7 +74,6 @@
+--- a/hledger-lib.cabal
++++ b/hledger-lib.cabal
+@@ -73,7 +73,6 @@ library
, hashtables >= 1.2
- , megaparsec >=5.0 && < 5.2
+ , megaparsec >=5.0 && < 5.3
, mtl
- , mtl-compat
, old-time
, pretty-show >=1.6.4
, regex-tdfa
-@@ -172,7 +171,6 @@
+@@ -167,7 +166,6 @@ test-suite doctests
, hashtables >= 1.2
- , megaparsec >=5.0 && < 5.2
+ , megaparsec >=5.0 && < 5.3
, mtl
- , mtl-compat
, old-time
, pretty-show >=1.6.4
, regex-tdfa
-@@ -261,7 +259,6 @@
+@@ -252,7 +250,6 @@ test-suite hunittests
, hashtables >= 1.2
- , megaparsec >=5.0 && < 5.2
+ , megaparsec >=5.0 && < 5.3
, mtl
- , mtl-compat
, old-time
diff --git a/patches/hledger-lib/1.1/series b/patches/hledger-lib/1.2/series
similarity index 100%
rename from patches/hledger-lib/1.1/series
rename to patches/hledger-lib/1.2/series
diff --git a/patches/hledger/1.1/newer-megaparsec b/patches/hledger/1.2/newer-megaparsec
similarity index 60%
rename from patches/hledger/1.1/newer-megaparsec
rename to patches/hledger/1.2/newer-megaparsec
index 4846278..250ca9e 100644
--- a/patches/hledger/1.1/newer-megaparsec
+++ b/patches/hledger/1.2/newer-megaparsec
@@ -1,11 +1,11 @@
--- a/hledger.cabal
+++ b/hledger.cabal
-@@ -103,7 +103,7 @@
+@@ -104,7 +104,7 @@ library
, HUnit
, mtl
, old-time
-- , megaparsec >=5.0 && < 5.2
-+ , megaparsec >=5.0 && < 5.3
+- , megaparsec >=5.0 && < 5.3
++ , megaparsec >=5.0 && < 5.4
, regex-tdfa
, safe >=0.2
, split >=0.1 && <0.3
diff --git a/patches/hledger/1.1/no-mtl-compat.patch b/patches/hledger/1.2/no-mtl-compat.patch
similarity index 67%
rename from patches/hledger/1.1/no-mtl-compat.patch
rename to patches/hledger/1.2/no-mtl-compat.patch
index dcd06eb..370580c 100644
--- a/patches/hledger/1.1/no-mtl-compat.patch
+++ b/patches/hledger/1.2/no-mtl-compat.patch
@@ -1,14 +1,14 @@
---- hledger-1.1.orig/hledger.cabal
-+++ hledger-1.1/hledger.cabal
-@@ -102,7 +102,6 @@
+--- a/hledger.cabal
++++ b/hledger.cabal
+@@ -103,7 +103,6 @@ library
, haskeline >=0.6 && <=0.8
, HUnit
, mtl
- , mtl-compat
, old-time
- , megaparsec >=5.0 && < 5.2
+ , megaparsec >=5.0 && < 5.3
, regex-tdfa
-@@ -185,7 +184,6 @@
+@@ -188,7 +187,6 @@ executable hledger
, haskeline >=0.6 && <=0.8
, HUnit
, mtl
@@ -16,7 +16,7 @@
, old-time
, parsec >=3
, regex-tdfa
-@@ -246,7 +244,6 @@
+@@ -250,7 +248,6 @@ test-suite test
, haskeline >=0.6 && <=0.8
, HUnit
, mtl
diff --git a/patches/hledger/1.1/series b/patches/hledger/1.2/series
similarity index 100%
rename from patches/hledger/1.1/series
rename to patches/hledger/1.2/series
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git
More information about the Pkg-haskell-commits
mailing list