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
This commit is contained in:
Samuel May 2018-10-11 19:03:39 -07:00 committed by Simon Michael
parent 0d531bb24f
commit 22645881c1
3 changed files with 8 additions and 5 deletions

3
.gitignore vendored
View File

@ -36,6 +36,7 @@ TAGS
/[0-9]* /[0-9]*
# #
*.j *.j
*.sw[op]
# haskell stuff # haskell stuff
*.dyn_hi *.dyn_hi
@ -43,11 +44,13 @@ TAGS
*.hi *.hi
*.p_o *.p_o
*.hp *.hp
.cabal-sandbox/
cabal-dev* cabal-dev*
cabal.project.local cabal.project.local
cabal.sandbox.config cabal.sandbox.config
dist/ dist/
dist-newstyle/ dist-newstyle/
.ghc.environment.*
/Shake /Shake
/.shake.html /.shake.html
.stack-work/ .stack-work/

View File

@ -143,7 +143,7 @@ library
, safe >=0.2 , safe >=0.2
, shakespeare >=2.0.2.2 , shakespeare >=2.0.2.2
, split >=0.1 , split >=0.1
, statistics , statistics <0.15
, tabular >=0.2 , tabular >=0.2
, temporary , temporary
, text >=0.11 , text >=0.11
@ -194,7 +194,7 @@ executable hledger
, safe >=0.2 , safe >=0.2
, shakespeare >=2.0.2.2 , shakespeare >=2.0.2.2
, split >=0.1 , split >=0.1
, statistics , statistics <0.15
, tabular >=0.2 , tabular >=0.2
, temporary , temporary
, text >=0.11 , text >=0.11
@ -248,7 +248,7 @@ test-suite test
, safe >=0.2 , safe >=0.2
, shakespeare >=2.0.2.2 , shakespeare >=2.0.2.2
, split >=0.1 , split >=0.1
, statistics , statistics <0.15
, tabular >=0.2 , tabular >=0.2
, temporary , temporary
, test-framework , test-framework
@ -303,7 +303,7 @@ benchmark bench
, safe >=0.2 , safe >=0.2
, shakespeare >=2.0.2.2 , shakespeare >=2.0.2.2
, split >=0.1 , split >=0.1
, statistics , statistics <0.15
, tabular >=0.2 , tabular >=0.2
, temporary , temporary
, text >=0.11 , text >=0.11

View File

@ -104,7 +104,7 @@ dependencies:
- safe >=0.2 - safe >=0.2
- shakespeare >=2.0.2.2 - shakespeare >=2.0.2.2
- split >=0.1 - split >=0.1
- statistics - statistics <=0.15
- tabular >=0.2 - tabular >=0.2
- temporary - temporary
- text >=0.11 - text >=0.11