From 9669ae336a586184b50c73bd240476f20300f162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 28 Sep 2009 11:29:19 +0000
Subject: [PATCH] Added parsimony and polyparse, updated parsec.

svn path=/nixpkgs/trunk/; revision=17464
---
 pkgs/development/libraries/haskell/parsec/3.nix      |  4 ++--
 .../libraries/haskell/parsimony/default.nix          | 12 ++++++++++++
 .../libraries/haskell/polyparse/default.nix          | 11 +++++++++++
 pkgs/top-level/haskell-packages.nix                  |  8 ++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/parsimony/default.nix
 create mode 100644 pkgs/development/libraries/haskell/polyparse/default.nix

diff --git a/pkgs/development/libraries/haskell/parsec/3.nix b/pkgs/development/libraries/haskell/parsec/3.nix
index 23413700ad4f..883f1adabd61 100644
--- a/pkgs/development/libraries/haskell/parsec/3.nix
+++ b/pkgs/development/libraries/haskell/parsec/3.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "parsec";
-  version = "3.0.0"; # Haskell Platform 2009.0.0
-  sha256 = "0fqryy09y8h7z0hlayg5gpavghgwa0g3bldynwl17ks8l87ykj7a";
+  version = "3.0.1";
+  sha256 = "619d0c2eb093cfe6d6caab2ff94f31a6208720b4bcc85b9f98600253bb505542";
   propagatedBuildInputs = [mtl];
   meta = {
     description = "Monadic parser combinators";
diff --git a/pkgs/development/libraries/haskell/parsimony/default.nix b/pkgs/development/libraries/haskell/parsimony/default.nix
new file mode 100644
index 000000000000..26f4d09ae90c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/parsimony/default.nix
@@ -0,0 +1,12 @@
+{cabal, utf8String}:
+
+cabal.mkDerivation (self : {
+  pname = "parsimony";
+  version = "1";
+  sha256 = "8196029dc346470301f4535f678724412060a0aafd81b017211b57635a25a378";
+  propagatedBuildInputs = [utf8String];
+  meta = {
+    description = "Monadic parser combinators derived from Parsec";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/polyparse/default.nix b/pkgs/development/libraries/haskell/polyparse/default.nix
new file mode 100644
index 000000000000..f5664152c65d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/polyparse/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "polyparse";
+  version = "1.3";
+  sha256 = "6d82f08634f0856c7919c9413199f4d5f91e753a6d796a0b61e46d7cd1ce4a24";
+  meta = {
+    description = "A variety of alternative parser combinator libraries";
+  };
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7e7fd0686d65..5dfcda6e3704 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -328,11 +328,19 @@ rec {
     inherit cabal mtl;
   };
 
+  parsimony = import ../development/libraries/haskell/parsimony {
+    inherit cabal utf8String;
+  };
+
   pcreLight = import ../development/libraries/haskell/pcre-light {
     inherit cabal;
     inherit (pkgs) pcre;
   };
 
+  polyparse = import ../development/libraries/haskell/polyparse {
+    inherit cabal;
+  };
+
   QuickCheck  = QuickCheck1;
   QuickCheck1 = QuickCheck1200;
   QuickCheck2 = QuickCheck2101;