Haskell package updates.

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

4 files changed, 24 insertions, 9 deletions

diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix
new file mode 100644
index 000000000000..6fbfe6d0fbd1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/multirec/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "multirec";
+  version = "0.2";
+  sha256 = "66f748245020437ad30dbc25e2decae7d49c6d968c014b316c0961539892083c";
+  meta = {
+    description = "Generic programming with systems of recursive datatypes";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix
index 0e5e517d7c54..b715b0ca7433 100644
--- a/pkgs/development/libraries/haskell/uulib/default.nix
+++ b/pkgs/development/libraries/haskell/uulib/default.nix
@@ -2,9 +2,9 @@
 
 cabal.mkDerivation (self : {
   pname = "uulib";
-  version = "0.9.5";
-  sha256 = "38415725133af464de582dadc7d7e60b1aeb96344b18b239d176bf2181f98563";
+  version = "0.9.10";
+  sha256 = "1df7336ed76c278323c2e25ab53ec1afc9eba6a7c918c826e9f783e84479e08f";
   meta = {
-    description = "Fast Parser Combinators and Pretty Printing Combinators";
+    description = "Haskell Utecht Tools Library";
   };
 })
diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix
index f9fe0d3a6870..d4c3de9026eb 100644
--- a/pkgs/development/tools/haskell/uuagc/default.nix
+++ b/pkgs/development/tools/haskell/uuagc/default.nix
@@ -2,9 +2,9 @@
 
 cabal.mkDerivation (self : {
   pname = "uuagc";
-  version = "0.9.7";
+  version = "0.9.10";
   name = self.fname;
-  sha256 = "7479ddbc8dc4b04cae278a942a50d7d76f06011aca06c56bcd26bdeba6eeb2d6";
+  sha256 = "cdbe78b6138a67bbc612f0f667f70ba483ebbdaa4d0c87c5508cfb5e68a49dcb";
   extraBuildInputs = [uulib];
   meta = {
     description = "Attribute Grammar System of Universiteit Utrecht";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 54767b4787da..e7386ffbbae9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -123,6 +123,10 @@ rec {
     inherit cabal;
   };
 
+  multirec = import ../development/libraries/haskell/multirec {
+    inherit cabal;
+  };
+
   network = import ../development/libraries/haskell/network {
     inherit cabal parsec;
   };
@@ -179,10 +183,6 @@ rec {
     inherit cabal;
   };
 
-  uuagc = import ../development/tools/haskell/uuagc {
-    inherit cabal uulib;
-  };
-
   uulib = import ../development/libraries/haskell/uulib {
     inherit cabal;
   };
@@ -266,6 +266,10 @@ rec {
     inherit (pkgs) perl;
   };
 
+  uuagc = import ../development/tools/haskell/uuagc {
+    inherit cabal uulib;
+  };
+
   
   # Applications.