summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2012-03-09 21:55:22 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2012-03-09 21:55:22 +0000
commit88353314068a0dfbbaa900aff2d2959bec942570 (patch)
treec3888c3b1d9488fb941ffd8322f5a0e775429550 /dev-haskell/haddock/files
parentold (diff)
downloadgentoo-2-88353314068a0dfbbaa900aff2d2959bec942570.tar.gz
gentoo-2-88353314068a0dfbbaa900aff2d2959bec942570.tar.bz2
gentoo-2-88353314068a0dfbbaa900aff2d2959bec942570.zip
Fix build failure against system's cabal-1.10 (use cabal bundled with ghc). Fixes bug #383707 by Niklas Johansson and others.
(Portage version: 2.2.0_alpha90_p1/cvs/Linux x86_64)
Diffstat (limited to 'dev-haskell/haddock/files')
-rw-r--r--dev-haskell/haddock/files/haddock-2.6.1-cabal-1.8.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/dev-haskell/haddock/files/haddock-2.6.1-cabal-1.8.patch b/dev-haskell/haddock/files/haddock-2.6.1-cabal-1.8.patch
new file mode 100644
index 000000000000..d23cd2508df5
--- /dev/null
+++ b/dev-haskell/haddock/files/haddock-2.6.1-cabal-1.8.patch
@@ -0,0 +1,13 @@
+diff --git a/haddock.cabal b/haddock.cabal
+index 4a00ce1..5323628 100644
+--- a/haddock.cabal
++++ b/haddock.cabal
+@@ -71,7 +71,7 @@ executable haddock
+ pretty,
+ containers,
+ array,
+- Cabal >= 1.5,
++ Cabal >= 1.5 && <1.10,
+ ghc >= 6.12 && < 6.14
+
+ if flag(in-ghc-tree)