From 9013694d895cda52501c2e0f222e01cfd342c75b Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Thu, 7 Dec 2017 11:46:33 -0800 Subject: [PATCH] cabal: regenerate with stack 1.6/hpack 0.20 --- hledger-api/hledger-api.cabal | 18 ++-- hledger-lib/hledger-lib.cabal | 70 ++++++++------- hledger-ui/hledger-ui.cabal | 43 +++++----- hledger-web/hledger-web.cabal | 73 ++++++++-------- hledger/hledger.cabal | 156 ++++++++++++++++++---------------- 5 files changed, 192 insertions(+), 168 deletions(-) diff --git a/hledger-api/hledger-api.cabal b/hledger-api/hledger-api.cabal index 2a79b25e2..f9d366191 100644 --- a/hledger-api/hledger-api.cabal +++ b/hledger-api/hledger-api.cabal @@ -1,6 +1,8 @@ --- This file has been generated from package.yaml by hpack version 0.17.1. +-- This file has been generated from package.yaml by hpack version 0.20.0. -- -- see: https://github.com/sol/hpack +-- +-- hash: fd127179a6a5d684a9d0c26c79a1e960e8d5a8c5ae933bfe74f4243f141cbdbe name: hledger-api version: 1.4 @@ -46,24 +48,26 @@ executable hledger-api ghc-options: -threaded cpp-options: -DVERSION="1.4" build-depends: - hledger-lib >= 1.4 && < 1.5 - , hledger >= 1.4 && < 1.5 - , base >=4.8 && <5 + Decimal , aeson + , base >=4.8 && <5 , bytestring , containers - , Decimal , docopt , either + , hledger >=1.4 && <1.5 + , hledger-lib >=1.4 && <1.5 , microlens >=0.4 && <0.5 , microlens-platform >=0.2.3.1 && <0.4 , safe - , servant-server >= 0.10 + , servant-server >=0.10 , servant-swagger - , swagger2 >= 2.0 && < 2.3 + , swagger2 >=2.0 && <2.3 , text , transformers , wai , wai-extra , warp + other-modules: + Paths_hledger_api default-language: Haskell2010 diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 31d7e3fcd..260c38f28 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -1,6 +1,8 @@ --- This file has been generated from package.yaml by hpack version 0.17.1. +-- This file has been generated from package.yaml by hpack version 0.20.0. -- -- see: https://github.com/sol/hpack +-- +-- hash: bd2f0b8fb0ccd42bde368ee17beef1e09b0031891300059efb70f88f7e1c1e04 name: hledger-lib version: 1.4 @@ -52,26 +54,28 @@ library ./. 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 - , base-compat >=0.8.1 - , ansi-terminal >= 0.6.2.3 && < 0.8 + Decimal + , HUnit + , ansi-terminal >=0.6.2.3 && <0.8 , array + , base >=4.8 && <5 + , base-compat >=0.8.1 , blaze-markup >=0.5.1 , bytestring , cmdargs >=0.10 && <0.11 , containers , csv , data-default >=0.5 - , Decimal , deepseq , directory + , extra , filepath - , hashtables >= 1.2 - , megaparsec >=5.0 && < 6.3 + , hashtables >=1.2 + , megaparsec >=5.0 && <6.3 , mtl , mtl-compat , old-time - , parsec >= 3 + , parsec >=3 , pretty-show >=1.6.4 , regex-tdfa , safe >=0.2 @@ -82,8 +86,6 @@ library , transformers >=0.2 && <0.6 , uglymemo , utf8-string >=0.3.5 && <1.1 - , HUnit - , extra exposed-modules: Hledger Hledger.Data @@ -141,26 +143,30 @@ test-suite doctests 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 - , base-compat >=0.8.1 - , ansi-terminal >= 0.6.2.3 && < 0.8 + Decimal + , Glob >=0.7 + , HUnit + , ansi-terminal >=0.6.2.3 && <0.8 , array + , base >=4.8 && <5 + , base-compat >=0.8.1 , blaze-markup >=0.5.1 , bytestring , cmdargs >=0.10 && <0.11 , containers , csv , data-default >=0.5 - , Decimal , deepseq , directory + , doctest >=0.8 + , extra , filepath - , hashtables >= 1.2 - , megaparsec >=5.0 && < 6.3 + , hashtables >=1.2 + , megaparsec >=5.0 && <6.3 , mtl , mtl-compat , old-time - , parsec >= 3 + , parsec >=3 , pretty-show >=1.6.4 , regex-tdfa , safe >=0.2 @@ -171,10 +177,6 @@ test-suite doctests , transformers >=0.2 && <0.6 , uglymemo , utf8-string >=0.3.5 && <1.1 - , HUnit - , extra - , doctest >=0.8 - , Glob >=0.7 other-modules: Hledger Hledger.Data @@ -220,6 +222,7 @@ test-suite doctests Hledger.Utils.Tree Hledger.Utils.UTF8IOCompat Text.Megaparsec.Compat + Paths_hledger_lib default-language: Haskell2010 test-suite hunittests @@ -230,41 +233,41 @@ test-suite hunittests 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 - , base-compat >=0.8.1 - , ansi-terminal >= 0.6.2.3 && < 0.8 + Decimal + , HUnit + , ansi-terminal >=0.6.2.3 && <0.8 , array + , base >=4.8 && <5 + , base-compat >=0.8.1 , blaze-markup >=0.5.1 , bytestring , cmdargs >=0.10 && <0.11 , containers , csv , data-default >=0.5 - , Decimal , deepseq , directory + , extra , filepath - , hashtables >= 1.2 - , megaparsec >=5.0 && < 6.3 + , hashtables >=1.2 + , hledger-lib + , megaparsec >=5.0 && <6.3 , mtl , mtl-compat , old-time - , parsec >= 3 + , parsec >=3 , pretty-show >=1.6.4 , regex-tdfa , safe >=0.2 , semigroups , split >=0.1 && <0.3 + , test-framework + , test-framework-hunit , text >=1.2 && <1.3 , time >=1.5 , transformers >=0.2 && <0.6 , uglymemo , utf8-string >=0.3.5 && <1.1 - , HUnit - , extra - , hledger-lib - , test-framework - , test-framework-hunit other-modules: Hledger Hledger.Data @@ -310,4 +313,5 @@ test-suite hunittests Hledger.Utils.Tree Hledger.Utils.UTF8IOCompat Text.Megaparsec.Compat + Paths_hledger_lib default-language: Haskell2010 diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index 151d8bea1..eb4f4cfd3 100644 --- a/hledger-ui/hledger-ui.cabal +++ b/hledger-ui/hledger-ui.cabal @@ -1,6 +1,8 @@ --- This file has been generated from package.yaml by hpack version 0.17.1. +-- This file has been generated from package.yaml by hpack version 0.20.0. -- -- see: https://github.com/sol/hpack +-- +-- hash: c00bcfd6f775d332d459686ee8b8058420f77d46d34fe308eaee51fe84a7619f name: hledger-ui version: 1.4 @@ -52,37 +54,37 @@ executable hledger-ui 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.4" build-depends: - hledger >= 1.4 && < 1.5 - , hledger-lib >= 1.4 && < 1.5 - , ansi-terminal >= 0.6.2.3 && < 0.8 + HUnit + , ansi-terminal >=0.6.2.3 && <0.8 , async - , base >= 4.8 && < 5 - , base-compat >= 0.8.1 - , cmdargs >= 0.8 + , base >=4.8 && <5 + , base-compat >=0.8.1 + , cmdargs >=0.8 , containers , data-default , directory , filepath - , fsnotify >= 0.2 && < 0.3 - , HUnit - , microlens >= 0.4 && < 0.5 - , microlens-platform >= 0.2.3.1 && < 0.4 - , megaparsec >=5.0 && < 6.3 + , fsnotify >=0.2 && <0.3 + , hledger >=1.4 && <1.5 + , hledger-lib >=1.4 && <1.5 + , megaparsec >=5.0 && <6.3 + , microlens >=0.4 && <0.5 + , microlens-platform >=0.2.3.1 && <0.4 , pretty-show >=1.6.4 - , process >= 1.2 - , safe >= 0.2 - , split >= 0.1 && < 0.3 - , text >= 1.2 && < 1.3 - , text-zipper >= 0.4 && < 0.11 - , time >= 1.5 + , process >=1.2 + , safe >=0.2 + , split >=0.1 && <0.3 + , text >=1.2 && <1.3 + , text-zipper >=0.4 && <0.11 + , time >=1.5 , transformers , vector if os(windows) buildable: False else build-depends: - brick >= 0.12 && < 0.30 - , vty >= 5.5 && < 5.20 + brick >=0.12 && <0.30 + , vty >=5.5 && <5.20 if flag(threaded) ghc-options: -threaded other-modules: @@ -98,4 +100,5 @@ executable hledger-ui Hledger.UI.UIState Hledger.UI.UITypes Hledger.UI.UIUtils + Paths_hledger_ui default-language: Haskell2010 diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 6cf94801d..475df16af 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -1,6 +1,8 @@ --- This file has been generated from package.yaml by hpack version 0.17.1. +-- This file has been generated from package.yaml by hpack version 0.20.0. -- -- see: https://github.com/sol/hpack +-- +-- hash: a055e6e87e8d6345efe67e94f9a716eedbcfb2d65daf650a2d5a6c75a8c466f7 name: hledger-web version: 1.4 @@ -122,8 +124,7 @@ 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.4" build-depends: - hledger-lib >= 1.4 && < 1.5 - , hledger >= 1.4 && < 1.5 + HUnit , base >=4.8 && <5 , base-compat >=0.8.1 , blaze-html @@ -131,16 +132,21 @@ library , bytestring , clientsession , cmdargs >=0.10 && <0.11 + , conduit-extra >=1.1 , data-default , directory , filepath , hjsmin - , http-conduit + , hledger >=1.4 && <1.5 + , hledger-lib >=1.4 && <1.5 , http-client - , HUnit - , conduit-extra >=1.1 + , http-conduit + , json + , megaparsec >=5.0 && <6.3 + , mtl + , parsec >=3 , safe >=0.2 - , shakespeare >=2.0.2.2 && < 2.1 + , shakespeare >=2.0.2.2 && <2.1 , template-haskell , text >=1.2 && <1.3 , time >=1.5 @@ -154,10 +160,6 @@ library , yesod-core , yesod-form , yesod-static - , json - , megaparsec >=5.0 && < 6.3 - , mtl - , parsec >=3 if (flag(dev)) || (flag(library-only)) cpp-options: -DDEVELOPMENT if flag(dev) @@ -190,8 +192,7 @@ executable hledger-web 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.4" build-depends: - hledger-lib >= 1.4 && < 1.5 - , hledger >= 1.4 && < 1.5 + HUnit , base >=4.8 && <5 , base-compat >=0.8.1 , blaze-html @@ -199,16 +200,22 @@ executable hledger-web , bytestring , clientsession , cmdargs >=0.10 && <0.11 + , conduit-extra >=1.1 , data-default , directory , filepath , hjsmin - , http-conduit + , hledger >=1.4 && <1.5 + , hledger-lib >=1.4 && <1.5 + , hledger-web , http-client - , HUnit - , conduit-extra >=1.1 + , http-conduit + , json + , megaparsec >=5.0 && <6.3 + , mtl + , parsec >=3 , safe >=0.2 - , shakespeare >=2.0.2.2 && < 2.1 + , shakespeare >=2.0.2.2 && <2.1 , template-haskell , text >=1.2 && <1.3 , time >=1.5 @@ -222,11 +229,6 @@ executable hledger-web , yesod-core , yesod-form , yesod-static - , json - , megaparsec >=5.0 && < 6.3 - , mtl - , parsec >=3 - , hledger-web if (flag(dev)) || (flag(library-only)) cpp-options: -DDEVELOPMENT if flag(dev) @@ -235,6 +237,8 @@ executable hledger-web buildable: False if flag(threaded) ghc-options: -threaded + other-modules: + Paths_hledger_web default-language: Haskell2010 test-suite test @@ -245,8 +249,7 @@ test-suite 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.4" build-depends: - hledger-lib >= 1.4 && < 1.5 - , hledger >= 1.4 && < 1.5 + HUnit , base >=4.8 && <5 , base-compat >=0.8.1 , blaze-html @@ -254,16 +257,23 @@ test-suite test , bytestring , clientsession , cmdargs >=0.10 && <0.11 + , conduit-extra >=1.1 , data-default , directory , filepath , hjsmin - , http-conduit + , hledger >=1.4 && <1.5 + , hledger-lib >=1.4 && <1.5 + , hledger-web + , hspec , http-client - , HUnit - , conduit-extra >=1.1 + , http-conduit + , json + , megaparsec >=5.0 && <6.3 + , mtl + , parsec >=3 , safe >=0.2 - , shakespeare >=2.0.2.2 && < 2.1 + , shakespeare >=2.0.2.2 && <2.1 , template-haskell , text >=1.2 && <1.3 , time >=1.5 @@ -277,12 +287,6 @@ test-suite test , yesod-core , yesod-form , yesod-static - , json - , megaparsec >=5.0 && < 6.3 - , mtl - , parsec >=3 - , hledger-web - , hspec , yesod-test if (flag(dev)) || (flag(library-only)) cpp-options: -DDEVELOPMENT @@ -291,4 +295,5 @@ test-suite test other-modules: HomeTest TestImport + Paths_hledger_web default-language: Haskell2010 diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 06308a10d..5e8952ea0 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -1,6 +1,8 @@ --- This file has been generated from package.yaml by hpack version 0.17.1. +-- This file has been generated from package.yaml by hpack version 0.20.0. -- -- see: https://github.com/sol/hpack +-- +-- hash: 02f720160e681e526ef52ed8f954737f447d5b0a654db2efb9f3474584db8618 name: hledger version: 1.4 @@ -77,43 +79,43 @@ 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.4" build-depends: - base >=4.8 && <5 + Decimal + , Diff + , HUnit + , ansi-terminal >=0.6.2.3 && <0.8 + , base >=4.8 && <5 , base-compat >=0.8.1 - , ansi-terminal >= 0.6.2.3 && < 0.8 + , bytestring + , cmdargs >=0.10 && <0.11 + , containers + , csv + , data-default >=0.5 , directory , file-embed >=0.0.10 && <0.1 , filepath - , here - , pretty-show >=1.6.4 - , process - , shakespeare >=2.0.2.2 && <2.1 - , temporary - , tabular >=0.2 && <0.3 - , time >=1.5 - , utility-ht >= 0.0.13 - , hledger-lib >= 1.4 && < 1.5 - , bytestring - , containers - , unordered-containers - , cmdargs >=0.10 && <0.11 - , csv - , data-default >=0.5 - , Diff , hashable >=1.2.4 , haskeline >=0.6 && <=0.8 - , HUnit + , here + , hledger-lib >=1.4 && <1.5 + , megaparsec >=5.0 && <6.3 , mtl , mtl-compat , old-time - , megaparsec >=5.0 && < 6.3 + , pretty-show >=1.6.4 + , process , regex-tdfa , safe >=0.2 + , shakespeare >=2.0.2.2 && <2.1 , split >=0.1 && <0.3 - , transformers + , tabular >=0.2 && <0.3 + , temporary , text >=0.11 + , time >=1.5 + , transformers + , unordered-containers , utf8-string >=0.3.5 && <1.1 + , utility-ht >=0.0.13 , wizards ==1.0.* - , Decimal if (!(os(windows))) && (flag(terminfo)) build-depends: terminfo @@ -159,46 +161,48 @@ executable hledger 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.4" build-depends: - base >=4.8 && <5 + Decimal + , HUnit + , ansi-terminal >=0.6.2.3 && <0.8 + , base >=4.8 && <5 , base-compat >=0.8.1 - , ansi-terminal >= 0.6.2.3 && < 0.8 + , bytestring + , cmdargs >=0.10 && <0.11 + , containers + , csv + , data-default >=0.5 , directory , file-embed >=0.0.10 && <0.1 , filepath - , here - , pretty-show >=1.6.4 - , process - , shakespeare >=2.0.2.2 && <2.1 - , temporary - , tabular >=0.2 && <0.3 - , time >=1.5 - , utility-ht >= 0.0.13 - , hledger-lib >= 1.4 && < 1.5 - , hledger - , bytestring - , containers - , unordered-containers - , cmdargs >=0.10 && <0.11 - , csv - , data-default >=0.5 , haskeline >=0.6 && <=0.8 - , HUnit + , here + , hledger + , hledger-lib >=1.4 && <1.5 , mtl , mtl-compat , old-time , parsec >=3 + , pretty-show >=1.6.4 + , process , regex-tdfa , safe >=0.2 + , shakespeare >=2.0.2.2 && <2.1 , split >=0.1 && <0.3 + , tabular >=0.2 && <0.3 + , temporary , text >=0.11 + , time >=1.5 + , unordered-containers , utf8-string >=0.3.5 && <1.1 + , utility-ht >=0.0.13 , wizards ==1.0.* - , Decimal if (!(os(windows))) && (flag(terminfo)) build-depends: terminfo if flag(threaded) ghc-options: -threaded + other-modules: + Paths_hledger default-language: Haskell2010 test-suite test @@ -209,46 +213,48 @@ test-suite 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.4" build-depends: - base >=4.8 && <5 + Decimal + , HUnit + , ansi-terminal >=0.6.2.3 && <0.8 + , base >=4.8 && <5 , base-compat >=0.8.1 - , ansi-terminal >= 0.6.2.3 && < 0.8 + , bytestring + , cmdargs >=0.10 && <0.11 + , containers + , csv + , data-default >=0.5 , directory , file-embed >=0.0.10 && <0.1 , filepath - , here - , pretty-show >=1.6.4 - , process - , shakespeare >=2.0.2.2 && <2.1 - , temporary - , tabular >=0.2 && <0.3 - , time >=1.5 - , utility-ht >= 0.0.13 - , hledger-lib >= 1.4 && < 1.5 - , hledger - , bytestring - , containers - , unordered-containers - , cmdargs >=0.10 && <0.11 - , csv - , data-default >=0.5 , haskeline >=0.6 && <=0.8 - , HUnit + , here + , hledger + , hledger-lib >=1.4 && <1.5 , mtl , mtl-compat , old-time , parsec >=3 + , pretty-show >=1.6.4 + , process , regex-tdfa , safe >=0.2 + , shakespeare >=2.0.2.2 && <2.1 , split >=0.1 && <0.3 - , text >=0.11 - , utf8-string >=0.3.5 && <1.1 - , wizards ==1.0.* - , Decimal + , tabular >=0.2 && <0.3 + , temporary , test-framework , test-framework-hunit + , text >=0.11 + , time >=1.5 + , unordered-containers + , utf8-string >=0.3.5 && <1.1 + , utility-ht >=0.0.13 + , wizards ==1.0.* if (!(os(windows))) && (flag(terminfo)) build-depends: terminfo + other-modules: + Paths_hledger default-language: Haskell2010 benchmark bench @@ -258,26 +264,28 @@ benchmark bench bench 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 + ansi-terminal >=0.6.2.3 && <0.8 + , base >=4.8 && <5 , base-compat >=0.8.1 - , ansi-terminal >= 0.6.2.3 && < 0.8 + , criterion , directory , file-embed >=0.0.10 && <0.1 , filepath , here + , hledger + , hledger-lib >=1.4 && <1.5 + , html , pretty-show >=1.6.4 , process , shakespeare >=2.0.2.2 && <2.1 - , temporary , tabular >=0.2 && <0.3 + , temporary , time >=1.5 - , utility-ht >= 0.0.13 - , hledger-lib >= 1.4 && < 1.5 - , hledger - , criterion - , html , timeit + , utility-ht >=0.0.13 if (!(os(windows))) && (flag(terminfo)) build-depends: terminfo + other-modules: + Paths_hledger default-language: Haskell2010