From c4ba7542d7792bddbba9ea8f4f9213b5ec55df87 Mon Sep 17 00:00:00 2001 From: Alex Chen Date: Sun, 20 May 2018 18:01:07 -0600 Subject: [PATCH] lib: use megaparsec 6 for all supported ghc versions --- hledger-lib/hledger-lib.cabal | 18 +++++++++--------- hledger-lib/package.yaml | 4 ++-- 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 +- stack-ghc7.10.yaml | 4 ++-- stack-ghc8.0.yaml | 2 ++ 10 files changed, 29 insertions(+), 27 deletions(-) diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index f98dc19a2..614ded6a2 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -2,7 +2,7 @@ -- -- see: https://github.com/sol/hpack -- --- hash: d8654e78331f08df80e8a353565c3d3856dd7f46e00fb3f28eaddf3d95167293 +-- hash: 5fde68eeaac8c1e790c207a8db26776e8659d7058fb3215c3c9678641d406a97 name: hledger-lib version: 1.9.99 @@ -118,12 +118,12 @@ library , extra , filepath , hashtables >=1.2 - , megaparsec >=5.0 + , megaparsec >=6.4.1 , mtl , mtl-compat , old-time , parsec >=3 - , parser-combinators + , parser-combinators >=0.4.0 , pretty-show >=1.6.4 , regex-tdfa , safe >=0.2 @@ -215,12 +215,12 @@ test-suite doctests , extra , filepath , hashtables >=1.2 - , megaparsec >=5.0 + , megaparsec >=6.4.1 , mtl , mtl-compat , old-time , parsec >=3 - , parser-combinators + , parser-combinators >=0.4.0 , pretty-show >=1.6.4 , regex-tdfa , safe >=0.2 @@ -314,12 +314,12 @@ test-suite easytests , filepath , hashtables >=1.2 , hledger-lib - , megaparsec >=5.0 + , megaparsec >=6.4.1 , mtl , mtl-compat , old-time , parsec >=3 - , parser-combinators + , parser-combinators >=0.4.0 , pretty-show >=1.6.4 , regex-tdfa , safe >=0.2 @@ -410,12 +410,12 @@ test-suite hunittests , filepath , hashtables >=1.2 , hledger-lib - , megaparsec >=5.0 + , megaparsec >=6.4.1 , mtl , mtl-compat , old-time , parsec >=3 - , parser-combinators + , parser-combinators >=0.4.0 , pretty-show >=1.6.4 , regex-tdfa , safe >=0.2 diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index 0ea4d08b5..c0b4ed4f3 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -54,12 +54,12 @@ dependencies: - directory - filepath - hashtables >=1.2 -- megaparsec >=5.0 +- megaparsec >=6.4.1 - mtl - mtl-compat - old-time - parsec >=3 -- parser-combinators +- parser-combinators >=0.4.0 - pretty-show >=1.6.4 - regex-tdfa - safe >=0.2 diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index 3af3c1087..b071a0cf5 100644 --- a/hledger-ui/hledger-ui.cabal +++ b/hledger-ui/hledger-ui.cabal @@ -2,7 +2,7 @@ -- -- see: https://github.com/sol/hpack -- --- hash: b550ebb38d8cb6318ceaade71bf1f9eeb9c85a5a84b4da7d9b63f6f8ccd91124 +-- hash: 0c78f681a99e0d6cc3ae1ff87b9397afc508292a6c412d00c85b5cdb5607b933 name: hledger-ui version: 1.9.99 @@ -78,7 +78,7 @@ executable hledger-ui , fsnotify >=0.2 , hledger >=1.9.99 && <2.0 , hledger-lib >=1.9.99 && <2.0 - , megaparsec >=5.0 + , megaparsec >=6.4.1 , 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 6e3bff4ab..cee94c886 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -55,7 +55,7 @@ dependencies: - HUnit - microlens >=0.4 - microlens-platform >=0.2.3.1 - - megaparsec >=5.0 + - megaparsec >=6.4.1 - 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 5541a6a3b..73e1045a8 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -2,7 +2,7 @@ -- -- see: https://github.com/sol/hpack -- --- hash: 0f07bd3900d1a00fa95eb4cc28f4e539eddce9d0b6a6123a37a809c6f71f6b6d +-- hash: c000d351c61aeef057878385c2fbb01b696d20af9137ac2210902ba8de60bfaa name: hledger-web version: 1.9.99 @@ -160,7 +160,7 @@ library , http-client , http-conduit , json - , megaparsec >=5.0 + , megaparsec >=6.4.1 , mtl , parsec >=3 , safe >=0.2 @@ -212,7 +212,7 @@ executable hledger-web , http-client , http-conduit , json - , megaparsec >=5.0 + , megaparsec >=6.4.1 , mtl , parsec >=3 , safe >=0.2 @@ -272,7 +272,7 @@ test-suite test , http-client , http-conduit , json - , megaparsec >=5.0 + , megaparsec >=6.4.1 , mtl , parsec >=3 , safe >=0.2 diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 85edc4f72..7486e4633 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -95,7 +95,7 @@ dependencies: - yesod-form >=1.4 && < 1.7 - yesod-static >=1.4 && < 1.7 - json -- megaparsec >=5.0 +- megaparsec >=6.4.1 - mtl - parsec >=3 diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 01e4b8e7c..838db2d65 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -2,7 +2,7 @@ -- -- see: https://github.com/sol/hpack -- --- hash: d2e059ba76c4adc8bd3486849c68143d38dc3fb25e92eb6a19327a6de3e852db +-- hash: 0f0ae8e75569c28e8c5987ba06696f6dbbbfc9334de43851eb1d1420ffc89d5a name: hledger version: 1.9.99 @@ -130,7 +130,7 @@ library , here , hledger-lib >=1.9.99 && <2.0 , lucid - , megaparsec >=5.0 + , megaparsec >=6.4.1 , mtl , mtl-compat , old-time @@ -181,7 +181,7 @@ executable hledger , here , hledger , hledger-lib >=1.9.99 && <2.0 - , megaparsec >=5.0 + , megaparsec >=6.4.1 , mtl , mtl-compat , old-time @@ -235,7 +235,7 @@ test-suite test , here , hledger , hledger-lib >=1.9.99 && <2.0 - , megaparsec >=5.0 + , megaparsec >=6.4.1 , mtl , mtl-compat , old-time @@ -290,7 +290,7 @@ benchmark bench , hledger , hledger-lib >=1.9.99 && <2.0 , html - , megaparsec >=5.0 + , megaparsec >=6.4.1 , mtl , mtl-compat , old-time diff --git a/hledger/package.yaml b/hledger/package.yaml index a93f19420..c2cb56235 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -94,7 +94,7 @@ dependencies: - haskeline >=0.6 - here - HUnit -- megaparsec >=5.0 +- megaparsec >=6.4.1 - mtl - mtl-compat - old-time diff --git a/stack-ghc7.10.yaml b/stack-ghc7.10.yaml index b883408a9..e1aaca9e4 100644 --- a/stack-ghc7.10.yaml +++ b/stack-ghc7.10.yaml @@ -17,9 +17,9 @@ extra-deps: - data-clist-0.1.2.0 - easytest-0.2 - http-api-data-0.3.7.1 -- megaparsec-5.3.1 +- megaparsec-6.4.1 - natural-transformation-0.4 -- parser-combinators-0.2.0 +- parser-combinators-0.4.0 - persistent-2.7.0 - persistent-template-2.5.2 - servant-0.11 diff --git a/stack-ghc8.0.yaml b/stack-ghc8.0.yaml index 598006f46..cfff0b8ec 100644 --- a/stack-ghc8.0.yaml +++ b/stack-ghc8.0.yaml @@ -11,3 +11,5 @@ packages: extra-deps: - easytest-0.2 +- megaparsec-6.4.1 +- parser-combinators-0.4.0