From e45070aab597210e901e339c0c7a50b73b2670f9 Mon Sep 17 00:00:00 2001 From: Alex Chen Date: Tue, 9 Oct 2018 11:15:33 -0600 Subject: [PATCH] Update dependency bounds for megaparsec --- hledger-lib/hledger-lib.cabal | 8 ++++---- hledger-lib/package.yaml | 2 +- hledger-ui/hledger-ui.cabal | 4 ++-- hledger-ui/package.yaml | 2 +- hledger-web/hledger-web.cabal | 8 ++++---- hledger-web/package.yaml | 2 +- hledger/hledger.cabal | 10 +++++----- hledger/package.yaml | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 645e6b869..59f934a10 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -2,7 +2,7 @@ -- -- see: https://github.com/sol/hpack -- --- hash: f3cc307bb564ecec4c16143a1d254c4cbbbee1483eb7860c711e3c4c5ed46431 +-- hash: ec4f3b835e224318ad3608ab36126e3e07d3c54075f648eba27476bb51db15f4 name: hledger-lib version: 1.11 @@ -122,7 +122,7 @@ library , extra , filepath , hashtables >=1.2.3.1 - , megaparsec >=6.4.1 + , megaparsec >=7.0.0 && <8 , mtl , mtl-compat , old-time @@ -222,7 +222,7 @@ test-suite doctests , extra , filepath , hashtables >=1.2.3.1 - , megaparsec >=6.4.1 + , megaparsec >=7.0.0 && <8 , mtl , mtl-compat , old-time @@ -322,7 +322,7 @@ test-suite easytests , filepath , hashtables >=1.2.3.1 , hledger-lib - , megaparsec >=6.4.1 + , megaparsec >=7.0.0 && <8 , mtl , mtl-compat , old-time diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index c248fe95c..f097fa3a4 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -57,7 +57,7 @@ dependencies: - easytest - filepath - hashtables >=1.2.3.1 -- megaparsec >=6.4.1 +- megaparsec >=7.0.0 && <8 - mtl - mtl-compat - old-time diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index 6886fb391..f8da776cc 100644 --- a/hledger-ui/hledger-ui.cabal +++ b/hledger-ui/hledger-ui.cabal @@ -2,7 +2,7 @@ -- -- see: https://github.com/sol/hpack -- --- hash: d2925ba85674c61c233d118134f8b3cd090ca0900953652b4253755bb8840c9c +-- hash: 61b73ed221f9d6964b622e7b8ea40259e9c82efd8b28dadc89d6a643ea947b94 name: hledger-ui version: 1.11 @@ -77,7 +77,7 @@ executable hledger-ui , fsnotify >=0.2.1.2 && <0.4 , hledger >=1.11 && <1.12 , hledger-lib >=1.11 && <1.12 - , megaparsec >=6.4.1 + , megaparsec >=7.0.0 && <8 , microlens >=0.4 , microlens-platform >=0.2.3.1 , pretty-show >=1.6.4 diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index 5fabaa2be..fb8177576 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -54,7 +54,7 @@ dependencies: - fsnotify >=0.2.1.2 && <0.4 - microlens >=0.4 - microlens-platform >=0.2.3.1 -- megaparsec >=6.4.1 +- megaparsec >=7.0.0 && <8 - pretty-show >=1.6.4 - process >=1.2 - safe >=0.2 diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index b9be2e317..e92fdb6f1 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -2,7 +2,7 @@ -- -- see: https://github.com/sol/hpack -- --- hash: a990f6fed36d14942e007240e0b37a9ff1147902b74cadc426403828ce3950a6 +-- hash: 60eb9cb226968eed42b507637364f5960aa6b6fb91dff8a46fcbd40295780df6 name: hledger-web version: 1.11 @@ -127,8 +127,6 @@ flag threaded default: True library - hs-source-dirs: - ./. exposed-modules: Hledger.Web Hledger.Web.Application @@ -148,6 +146,8 @@ library Hledger.Web.Widget.Common other-modules: Paths_hledger_web + hs-source-dirs: + ./. ghc-options: -Wall -fwarn-tabs cpp-options: -DVERSION="1.11" build-depends: @@ -169,7 +169,7 @@ library , http-client , http-conduit , json - , megaparsec >=6.4.1 + , megaparsec >=7.0.0 && <8 , mtl , semigroups , shakespeare >=2.0.2.2 diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index bf3191e76..8a4939eb6 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -114,7 +114,7 @@ library: - http-conduit - http-client - json - - megaparsec >=6.4.1 + - megaparsec >=7.0.0 && <8 - mtl - semigroups - shakespeare >=2.0.2.2 diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 56c522943..1234a42bc 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -2,7 +2,7 @@ -- -- see: https://github.com/sol/hpack -- --- hash: a53ed723ef2c43c6425e4bf2d40ae7a37b9816dcdbd49795a7a7972b4b4ca203 +-- hash: e89846e17f78017f83d440cb2fcfe10caba2b0c4c6a61195b4faffcdd2b7a100 name: hledger version: 1.11 @@ -131,7 +131,7 @@ library , here , hledger-lib >=1.11 && <1.12 , lucid - , megaparsec >=6.4.1 + , megaparsec >=7.0.0 && <8 , mtl , mtl-compat , old-time @@ -182,7 +182,7 @@ executable hledger , here , hledger , hledger-lib >=1.11 && <1.12 - , megaparsec >=6.4.1 + , megaparsec >=7.0.0 && <8 , mtl , mtl-compat , old-time @@ -236,7 +236,7 @@ test-suite test , here , hledger , hledger-lib >=1.11 && <1.12 - , megaparsec >=6.4.1 + , megaparsec >=7.0.0 && <8 , mtl , mtl-compat , old-time @@ -291,7 +291,7 @@ benchmark bench , hledger , hledger-lib >=1.11 && <1.12 , html - , megaparsec >=6.4.1 + , megaparsec >=7.0.0 && <8 , mtl , mtl-compat , old-time diff --git a/hledger/package.yaml b/hledger/package.yaml index 186f8a600..c3f2441da 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -93,7 +93,7 @@ dependencies: - filepath - haskeline >=0.6 - here -- megaparsec >=6.4.1 +- megaparsec >=7.0.0 && <8 - mtl - mtl-compat - old-time