public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell-graphviz: fix for GHC 7.10

Browse Source
This commit is contained in:
Nikolay Amiantov 2015-05-18 16:59:44 +03:00
parent 19b4eb8208
commit f79effa2eb
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -241,8 +241,6 @@ self: super: {
hbb = dontDistribute super.hbb; hbb = dontDistribute super.hbb;
hsdev = dontDistribute super.hsdev; hsdev = dontDistribute super.hsdev;
# http://hub.darcs.net/ivanm/graphviz/issue/5
graphviz = markBroken super.graphviz;
Graphalyze = dontDistribute super.Graphalyze; Graphalyze = dontDistribute super.Graphalyze;
HLearn-approximation = dontDistribute super.HLearn-approximation; HLearn-approximation = dontDistribute super.HLearn-approximation;
HLearn-classification = dontDistribute super.HLearn-classification; HLearn-classification = dontDistribute super.HLearn-classification;
@ -288,6 +286,9 @@ self: super: {
# https://github.com/ocharles/tasty-rerun/issues/5 # https://github.com/ocharles/tasty-rerun/issues/5
tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts"); tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts");
# http://hub.darcs.net/ivanm/graphviz/issue/5
graphviz = appendPatch super.graphviz ./graphviz-fix-ghc710.patch;
# Broken with GHC 7.10.x. # Broken with GHC 7.10.x.
aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6; aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6;
annotated-wl-pprint_0_5_3 = markBroken super.annotated-wl-pprint_0_5_3; annotated-wl-pprint_0_5_3 = markBroken super.annotated-wl-pprint_0_5_3;

11
pkgs/development/haskell-modules/graphviz-fix-ghc710.patch Normal file
View File

@ -0,0 +1,11 @@
diff -ru3 graphviz.old/Data/GraphViz/Algorithms.hs graphviz/Data/GraphViz/Algorithms.hs
--- graphviz.old/Data/GraphViz/Algorithms.hs 2015-05-18 15:21:38.379771357 +0300
+++ graphviz/Data/GraphViz/Algorithms.hs 2015-05-18 15:01:01.940122684 +0300
@@ -38,6 +38,7 @@
import Data.GraphViz.Types.Canonical
import Data.GraphViz.Types.Internal.Common
+import Prelude hiding (traverse)
import Control.Arrow (first, second, (***))
import Control.Monad (unless)
import Control.Monad.Trans.State