summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-05-24 16:06:27 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-05-24 16:06:27 -0400
commit77d6aa7957648f6d1ad238e6ca87c18af36b15e5 (patch)
treebe31ccf19ff853228b0f635e9380da5e808cfbdf
parent938dbba657060bb65fadd2fe3337e6d577443132 (diff)
temporarily add cabal.config to support ghc 8.0.1 build
This commit can be reverted once the library deps are worked out upstream.
-rw-r--r--.gitignore1
-rw-r--r--cabal.config3
-rw-r--r--git-annex.cabal1
3 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 7d550cb3c..eb4825b4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,6 @@ dist
cabal-dev
.cabal-sandbox
cabal.sandbox.config
-cabal.config
.stack-work
# Project-local emacs configuration
.dir-locals.el
diff --git a/cabal.config b/cabal.config
new file mode 100644
index 000000000..9bc18cbd9
--- /dev/null
+++ b/cabal.config
@@ -0,0 +1,3 @@
+-- Temporary to support building with ghc 8.0.1, until all the library
+-- dependencies get worked out upstream.
+allow-newer: base,time,transformers
diff --git a/git-annex.cabal b/git-annex.cabal
index e075d01ec..8e7750a70 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -35,6 +35,7 @@ Description:
-- make cabal install git-annex work.
Extra-Source-Files:
stack.yaml
+ cabal.config
README
CHANGELOG
NEWS