aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--debian/changelog1
-rw-r--r--doc/bugs/conflicting_haskell_packages.mdwn9
3 files changed, 11 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 565edfb0e..c888fc215 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
PREFIX=/usr
-GHCFLAGS=-O2 -Wall
+GHCFLAGS=-O2 -Wall -ignore-package monads-fd
GHCMAKE=ghc $(GHCFLAGS) --make
bins=git-annex git-annex-shell
diff --git a/debian/changelog b/debian/changelog
index 42d45c3a3..3a5f60fef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ git-annex (0.20) UNRELEASED; urgency=low
an unannex as checking in of an unlocked file.
* map: New subcommand that uses graphviz to display a nice map of
the git repository network.
+ * Deal with the mtl/monads-fd conflict.
-- Joey Hess <joeyh@debian.org> Mon, 31 Jan 2011 20:06:02 -0400
diff --git a/doc/bugs/conflicting_haskell_packages.mdwn b/doc/bugs/conflicting_haskell_packages.mdwn
index 6a619de90..5528fad82 100644
--- a/doc/bugs/conflicting_haskell_packages.mdwn
+++ b/doc/bugs/conflicting_haskell_packages.mdwn
@@ -6,3 +6,12 @@ This can be done by the flags -hide-packages and then -package foo
>
> Could you just show the build problem that you are suggesting I work
> around? --[[Joey]]
+
+
+> Thanks npouillard, I see the problem now.
+> <http://stackoverflow.com/questions/2048953/control-monad-state-found-in-multiple-packages-haskell>
+>
+> I've added "-ignore-package monads-fd" to GHCFLAGS. I hope I don't
+> really have to hide all packages and individually turn them back on;
+> surely this monads-fd/mtl conflict is an exception, and Haskell's module
+> system is not a mess of conflicting modules? --[[Joey]] [[done]]