From 7ebecb1ab80601d253b1842bed611fced08b36ff Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 4 Jun 2018 17:02:57 -0700 Subject: [PATCH] use newer hashtables to fix an instance warning with doctests/ghc 7 (#794) --- hledger-lib/hledger-lib.cabal | 10 +++++----- hledger-lib/package.yaml | 2 +- stack-ghc7.10.yaml | 2 ++ stack-ghc8.0.yaml | 2 ++ stack-ghc8.2.yaml | 2 ++ 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 516d130c4..6ccd34c9c 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -2,7 +2,7 @@ -- -- see: https://github.com/sol/hpack -- --- hash: 0e72f3eaeca291a51788326f145fe2e50f9febc84f8fb6d2e039f0bdd5b3f667 +-- hash: 4e9f93f0ca43f594b381f1e1e03e67ce3379bd4830b260e6f7dc1596b946993f name: hledger-lib version: 1.9.99 @@ -116,7 +116,7 @@ library , directory , extra , filepath - , hashtables >=1.2 + , hashtables >=1.2.3.1 , megaparsec >=6.4.1 , mtl , mtl-compat @@ -212,7 +212,7 @@ test-suite doctests , doctest >=0.8 , extra , filepath - , hashtables >=1.2 + , hashtables >=1.2.3.1 , megaparsec >=6.4.1 , mtl , mtl-compat @@ -307,7 +307,7 @@ test-suite easytests , easytest , extra , filepath - , hashtables >=1.2 + , hashtables >=1.2.3.1 , hledger-lib , megaparsec >=6.4.1 , mtl @@ -402,7 +402,7 @@ test-suite hunittests , directory , extra , filepath - , hashtables >=1.2 + , hashtables >=1.2.3.1 , hledger-lib , megaparsec >=6.4.1 , mtl diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index 896b46a83..b4425fcc8 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -53,7 +53,7 @@ dependencies: - deepseq - directory - filepath -- hashtables >=1.2 +- hashtables >=1.2.3.1 - megaparsec >=6.4.1 - mtl - mtl-compat diff --git a/stack-ghc7.10.yaml b/stack-ghc7.10.yaml index c580d28aa..7521a9e1a 100644 --- a/stack-ghc7.10.yaml +++ b/stack-ghc7.10.yaml @@ -12,6 +12,8 @@ packages: extra-deps: - easytest-0.2 +# avoid no hashable instance for AccountName from doctests +- hashtables-1.2.3.1 # Many newer versions to allow using the latest base-compat with all ghc versions. # This is just the first workable install plan I found. - adjunctions-4.4 diff --git a/stack-ghc8.0.yaml b/stack-ghc8.0.yaml index 36ea4c1d9..231023e20 100644 --- a/stack-ghc8.0.yaml +++ b/stack-ghc8.0.yaml @@ -42,5 +42,7 @@ extra-deps: - swagger2-2.2.2 - text-1.2.3.0 - unordered-containers-0.2.9.0 +# avoid no hashable instance for AccountName from doctests +- hashtables-1.2.3.1 # avoid hanging with windows symlinks https://github.com/simonmichael/hledger/issues/791 - directory-1.3.2.2 diff --git a/stack-ghc8.2.yaml b/stack-ghc8.2.yaml index 15800cd86..886d736c6 100644 --- a/stack-ghc8.2.yaml +++ b/stack-ghc8.2.yaml @@ -17,6 +17,8 @@ extra-deps: - base-compat-batteries-0.10.1 - criterion-1.4.1.0 - swagger2-2.2.2 +# avoid no hashable instance for AccountName from doctests +- hashtables-1.2.3.1 # avoid https://github.com/simonmichael/hledger/issues/791 - directory-1.3.2.2