From d9e72d389ec02a5a2e0e7063a30c9e55186d5b86 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 25 Aug 2017 14:39:35 -0700 Subject: [PATCH] lib: fix a deps problem in package.yaml breaking test suite with ghc 8.2 --- hledger-lib/hledger-lib.cabal | 9 ++++++--- hledger-lib/package.yaml | 6 ++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index a066fe4c6..a836a3f67 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -76,17 +76,17 @@ library , mtl , mtl-compat , old-time + , parsec , pretty-show >=1.6.4 , regex-tdfa , safe >=0.2 + , semigroups , split >=0.1 && <0.3 , text >=1.2 && <1.3 , transformers >=0.2 && <0.6 , uglymemo , utf8-string >=0.3.5 && <1.1 , HUnit - , parsec - , semigroups if impl(ghc <7.6) build-depends: ghc-prim @@ -173,9 +173,11 @@ test-suite doctests , mtl , mtl-compat , old-time + , parsec , pretty-show >=1.6.4 , regex-tdfa , safe >=0.2 + , semigroups , split >=0.1 && <0.3 , text >=1.2 && <1.3 , transformers >=0.2 && <0.6 @@ -268,9 +270,11 @@ test-suite hunittests , mtl , mtl-compat , old-time + , parsec , pretty-show >=1.6.4 , regex-tdfa , safe >=0.2 + , semigroups , split >=0.1 && <0.3 , text >=1.2 && <1.3 , transformers >=0.2 && <0.6 @@ -278,7 +282,6 @@ test-suite hunittests , utf8-string >=0.3.5 && <1.1 , HUnit , hledger-lib - , parsec , test-framework , test-framework-hunit if impl(ghc <7.6) diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index 933eb809c..32a0ca25c 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -58,9 +58,11 @@ dependencies: - mtl - mtl-compat - old-time +- parsec - pretty-show >=1.6.4 - regex-tdfa - safe >=0.2 +- semigroups - split >=0.1 && <0.3 - text >=1.2 && <1.3 - transformers >=0.2 && <0.6 @@ -142,9 +144,6 @@ library: - Text.Megaparsec.Compat # other-modules: # - Ledger.Parser.Text - dependencies: - - parsec - - semigroups tests: doctests: main: doctests.hs @@ -157,7 +156,6 @@ tests: source-dirs: tests dependencies: - hledger-lib - - parsec - test-framework - test-framework-hunit stability: stable