From f79effa2ebc65fd4ba468fffab4db3401d6eda09 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 18 May 2015 16:59:44 +0300 Subject: [PATCH] haskell-graphviz: fix for GHC 7.10 --- .../haskell-modules/configuration-ghc-7.10.x.nix | 5 +++-- .../haskell-modules/graphviz-fix-ghc710.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/haskell-modules/graphviz-fix-ghc710.patch diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 53512826a5b..e5717ba899f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -241,8 +241,6 @@ self: super: { hbb = dontDistribute super.hbb; hsdev = dontDistribute super.hsdev; - # http://hub.darcs.net/ivanm/graphviz/issue/5 - graphviz = markBroken super.graphviz; Graphalyze = dontDistribute super.Graphalyze; HLearn-approximation = dontDistribute super.HLearn-approximation; HLearn-classification = dontDistribute super.HLearn-classification; @@ -288,6 +286,9 @@ self: super: { # https://github.com/ocharles/tasty-rerun/issues/5 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. 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; diff --git a/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch b/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch new file mode 100644 index 00000000000..e72bb793da7 --- /dev/null +++ b/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch @@ -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