From cd7dba4f0b40e57dcbfc7481b3553b86984e3522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Fri, 15 May 2009 18:52:55 +0000
Subject: [PATCH] Some Haskell library updates.

svn path=/nixpkgs/trunk/; revision=15621
---
 .../haskell/uu-parsinglib/default.nix         | 11 ++++++++++
 pkgs/games/MazesOfMonad/default.nix           | 13 ++++++++++++
 pkgs/top-level/haskell-packages.nix           | 20 ++++++++++++++-----
 3 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/uu-parsinglib/default.nix
 create mode 100644 pkgs/games/MazesOfMonad/default.nix

diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
new file mode 100644
index 00000000000..d7507be3d45
--- /dev/null
+++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "uu-parsinglib";
+  version = "2.0.0";
+  sha256 = "b92246d7019fcdf8a6448686eb619b176b1744217f64e31f14e906b4991198ca";
+  meta = {
+    description = "New version of the Utrecht University parser combinator library";
+  };
+})  
+
diff --git a/pkgs/games/MazesOfMonad/default.nix b/pkgs/games/MazesOfMonad/default.nix
new file mode 100644
index 00000000000..763bc337f70
--- /dev/null
+++ b/pkgs/games/MazesOfMonad/default.nix
@@ -0,0 +1,13 @@
+{cabal, HUnit, mtl, regexPosix, time}:
+
+cabal.mkDerivation (self : {
+  pname = "MazesOfMonad";
+  version = "1.0.2";
+  name = self.fname;
+  sha256 = "cb5833d509a96fe7411b5eba981bd939da2942b47595d99b861028b9328a4748";
+  propagatedBuildInputs = [HUnit mtl regexPosix time];
+  meta = {
+    description = "Console-based Role Playing Game";
+  };
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3b635455d64..ac7ab5d2edd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -153,11 +153,6 @@ rec {
     inherit cabal;
   };
 
-  idris = import ../development/compilers/idris {
-    inherit cabal mtl parsec readline ivor happy;
-    inherit (pkgs) fetchdarcs;
-  };
-
   ivor = import ../development/libraries/haskell/ivor {
     inherit cabal mtl parsec;
   };
@@ -287,6 +282,10 @@ rec {
     inherit cabal;
   };
 
+  uuParsingLib = import ../development/libraries/haskell/uu-parsinglib {
+    inherit cabal;
+  };
+
   vacuum = import ../development/libraries/haskell/vacuum {
     inherit cabal ghcPaths haskellSrcMeta;
   };
@@ -342,6 +341,11 @@ rec {
     inherit (pkgs) fetchurl stdenv;
   };
 
+  idris = import ../development/compilers/idris {
+    inherit cabal mtl parsec readline ivor happy;
+    inherit (pkgs) fetchdarcs;
+  };
+
 
   # Development tools.
 
@@ -433,4 +437,10 @@ rec {
     inherit (pkgs) tetex polytable;
   };
 
+  # Games.
+
+  MazesOfMonad = import ../games/MazesOfMonad {
+    inherit cabal HUnit mtl regexPosix time;
+  };
+
 }