From 22645881c110e35bb68acc538385c0620bdbf6a3 Mon Sep 17 00:00:00 2001 From: Samuel May Date: Thu, 11 Oct 2018 19:03:39 -0700 Subject: [PATCH] Add upper bound on 'statistics'; broaden .gitignore .gitignore: products of manual cabal builds, and vim temp files hledger.cabal: *.RootFinding removed from statistics >=0.15 in favor of that in math-functions >=0.2 --- .gitignore | 3 +++ hledger/hledger.cabal | 8 ++++---- hledger/package.yaml | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e0dfd5fbd..3f9f7e948 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ TAGS /[0-9]* # *.j +*.sw[op] # haskell stuff *.dyn_hi @@ -43,11 +44,13 @@ TAGS *.hi *.p_o *.hp +.cabal-sandbox/ cabal-dev* cabal.project.local cabal.sandbox.config dist/ dist-newstyle/ +.ghc.environment.* /Shake /.shake.html .stack-work/ diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 17762c334..a49ab996b 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -143,7 +143,7 @@ library , safe >=0.2 , shakespeare >=2.0.2.2 , split >=0.1 - , statistics + , statistics <0.15 , tabular >=0.2 , temporary , text >=0.11 @@ -194,7 +194,7 @@ executable hledger , safe >=0.2 , shakespeare >=2.0.2.2 , split >=0.1 - , statistics + , statistics <0.15 , tabular >=0.2 , temporary , text >=0.11 @@ -248,7 +248,7 @@ test-suite test , safe >=0.2 , shakespeare >=2.0.2.2 , split >=0.1 - , statistics + , statistics <0.15 , tabular >=0.2 , temporary , test-framework @@ -303,7 +303,7 @@ benchmark bench , safe >=0.2 , shakespeare >=2.0.2.2 , split >=0.1 - , statistics + , statistics <0.15 , tabular >=0.2 , temporary , text >=0.11 diff --git a/hledger/package.yaml b/hledger/package.yaml index 692f15132..4264bcfb5 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -104,7 +104,7 @@ dependencies: - safe >=0.2 - shakespeare >=2.0.2.2 - split >=0.1 -- statistics +- statistics <=0.15 - tabular >=0.2 - temporary - text >=0.11