mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Deal with the mtl/monads-fd conflict.

Browse source
This commit is contained in:
Joey Hess 2011-02-08 15:11:49 -04:00
parent 82ff914492
commit 45387b3fcb
3 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,5 +1,5 @@
PREFIX=/usr PREFIX=/usr
GHCFLAGS=-O2 -Wall GHCFLAGS=-O2 -Wall -ignore-package monads-fd
GHCMAKE=ghc $(GHCFLAGS) --make GHCMAKE=ghc $(GHCFLAGS) --make
bins=git-annex git-annex-shell bins=git-annex git-annex-shell

1
debian/changelog vendored
View file

@ -8,6 +8,7 @@ git-annex (0.20) UNRELEASED; urgency=low
an unannex as checking in of an unlocked file. an unannex as checking in of an unlocked file.
* map: New subcommand that uses graphviz to display a nice map of * map: New subcommand that uses graphviz to display a nice map of
the git repository network. the git repository network.
* Deal with the mtl/monads-fd conflict.
-- Joey Hess <joeyh@debian.org> Mon, 31 Jan 2011 20:06:02 -0400 -- Joey Hess <joeyh@debian.org> Mon, 31 Jan 2011 20:06:02 -0400

9
doc/bugs/conflicting_haskell_packages.mdwn
View file

@ -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 > Could you just show the build problem that you are suggesting I work
> around? --[[Joey]] > 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]]