From fc5ea05cfd4f76a4b32833bfe6f3b9fe68cfd93d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Jul 2011 15:33:55 +0000
Subject: [PATCH] Keep polyparse 1.4 around because haskell-graphviz depends on
 the older version.

I've asked upstream to update their cabal file, but until then we'll
need both versions. :-(

svn path=/nixpkgs/trunk/; revision=28021
---
 pkgs/development/libraries/haskell/polyparse/1.4.nix  | 11 +++++++++++
 .../haskell/polyparse/{default.nix => 1.7.nix}        |  0
 pkgs/top-level/haskell-packages.nix                   |  8 ++++++--
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/polyparse/1.4.nix
 rename pkgs/development/libraries/haskell/polyparse/{default.nix => 1.7.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/polyparse/1.4.nix b/pkgs/development/libraries/haskell/polyparse/1.4.nix
new file mode 100644
index 00000000000..e05ba114938
--- /dev/null
+++ b/pkgs/development/libraries/haskell/polyparse/1.4.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "polyparse";
+  version = "1.4";
+  sha256 = "6e599fb0771e8ce2e1d3a3bbe5eddc2d77b2b4bbb54602f01005dc55dc039d44";
+  meta = {
+    description = "A variety of alternative parser combinator libraries";
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/polyparse/default.nix b/pkgs/development/libraries/haskell/polyparse/1.7.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/polyparse/default.nix
rename to pkgs/development/libraries/haskell/polyparse/1.7.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1615fb69576..a45bf7a111a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -541,7 +541,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {};
 
-  graphviz = callPackage ../development/libraries/haskell/graphviz {};
+  graphviz = callPackage ../development/libraries/haskell/graphviz {
+    polyparse = self.polyparse14;
+  };
 
   hakyll = callPackage ../development/libraries/haskell/hakyll {};
 
@@ -804,7 +806,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   persistentTemplate = callPackage ../development/libraries/haskell/persistent-template {};
 
-  polyparse = callPackage ../development/libraries/haskell/polyparse {};
+  polyparse14 = callPackage ../development/libraries/haskell/polyparse/1.4.nix {};
+  polyparse17 = callPackage ../development/libraries/haskell/polyparse/1.7.nix {};
+  polyparse = self.polyparse17;
 
   pool = callPackage ../development/libraries/haskell/pool {};