Some Haskell library updates.

svn path=/nixpkgs/trunk/; revision=15621

1 files changed, 15 insertions, 5 deletions

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;
+  };
+
 }