Updated Haskell packages.

 - cautious-file: updated to version 1.0.1
 - hmatrix: updated to version 0.14.0.1
 - random-fu: updated to version 0.2.2.0
 - resourcet: added version 0.3.0
 - sendfile: updated to version 0.7.6
 - test-framework: added version 0.6

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

8 files changed, 66 insertions, 13 deletions

diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix
index 1e967675b00a5..816ed6fadae5f 100644
--- a/pkgs/development/libraries/haskell/cautious-file/default.nix
+++ b/pkgs/development/libraries/haskell/cautious-file/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cautious-file";
-  version = "1.0";
-  sha256 = "1s2la91vk9c99bj0ipzc4r6w81rcs4jfmn0xr1cgjab00bzj880q";
+  version = "1.0.1";
+  sha256 = "0mlgchvdhw9lhml4pqmxxvx1zcqmkcyl3yx6w3zp0df200njzsws";
   buildDepends = [ filepath ];
   meta = {
     description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index 0248f3289b822..acda91808ad8f 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -1,13 +1,15 @@
-{ cabal, binary, blas, gsl, liblapack, storableComplex, vector }:
+{ cabal, binary, blas, gsl, liblapack, random, storableComplex
+, vector
+}:
 
 cabal.mkDerivation (self: {
   pname = "hmatrix";
-  version = "0.13.1.0";
-  sha256 = "0pl5z6zsxyvbdfdng77r2c4isq6d4wbyzx2qs9r8rbn6glaxwrmp";
-  buildDepends = [ binary storableComplex vector ];
+  version = "0.14.0.1";
+  sha256 = "057ii711qsh5307bp3jqpvlhwp2iacr83whhjm5053b5psinj4z5";
+  buildDepends = [ binary random storableComplex vector ];
   extraLibraries = [ blas gsl liblapack ];
   meta = {
-    homepage = "http://perception.inf.um.es/hmatrix";
+    homepage = "https://github.com/albertoruiz/hmatrix";
     description = "Linear algebra and numerical computation";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix
index 653a4c8534d0e..2f4893dba08e2 100644
--- a/pkgs/development/libraries/haskell/random-fu/default.nix
+++ b/pkgs/development/libraries/haskell/random-fu/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "random-fu";
-  version = "0.2.1.1";
-  sha256 = "034pnmagly3akmmcli018258fnyqlyz79av21dqqklfixvw3yja7";
+  version = "0.2.2.0";
+  sha256 = "1wv2c6ba3ad80zyj75xfds98q7psgjkmaqk2zm0srmipq06mx92r";
   buildDepends = [
     erf gamma monadLoops mtl randomShuffle randomSource rvar syb
     transformers vector
diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
new file mode 100644
index 0000000000000..16cf070eb1353
--- /dev/null
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -0,0 +1,17 @@
+{ cabal, liftedBase, monadControl, transformers, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "resourcet";
+  version = "0.3.0";
+  sha256 = "1r7yyw8jzh1wxy03mv22hg1c9ff9s4iv86kfgnmva8nwmcgnv0a1";
+  buildDepends = [
+    liftedBase monadControl transformers transformersBase
+  ];
+  meta = {
+    homepage = "http://github.com/snoyberg/conduit";
+    description = "Deterministic allocation and freeing of scarce resources";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix
index 74f49b56a9125..875bbf45eb375 100644
--- a/pkgs/development/libraries/haskell/sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/sendfile/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "sendfile";
-  version = "0.7.5";
-  sha256 = "0gkkxlbl3ci1b973jyksk03400pm8npmsqv81iqs0lwbzc7nxs28";
+  version = "0.7.6";
+  sha256 = "0wqbnr07s3g7f6p4x27ips9nzjjz1ii5hw1q54i31g40jzv8rs7z";
   buildDepends = [ network ];
   meta = {
     homepage = "http://patch-tag.com/r/mae/sendfile";
diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/0.5.nix
index 6ac60c1df2dd8..6ac60c1df2dd8 100644
--- a/pkgs/development/libraries/haskell/test-framework/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework/0.5.nix
diff --git a/pkgs/development/libraries/haskell/test-framework/0.6.nix b/pkgs/development/libraries/haskell/test-framework/0.6.nix
new file mode 100644
index 0000000000000..12238fc199e00
--- /dev/null
+++ b/pkgs/development/libraries/haskell/test-framework/0.6.nix
@@ -0,0 +1,25 @@
+{ cabal, ansiTerminal, ansiWlPprint, extensibleExceptions, hostname
+, random, regexPosix, time, xml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "test-framework";
+  version = "0.6";
+  sha256 = "1ah5q3fwd5dmh2zb4rphdpz7hs39m4g1khvxjjwfzwyd9pxiz723";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    ansiTerminal ansiWlPprint extensibleExceptions hostname random
+    regexPosix time xml
+  ];
+  meta = {
+    homepage = "http://batterseapower.github.com/test-framework/";
+    description = "Framework for running and organising tests, with HUnit and QuickCheck support";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 195730a1c40c8..75cf015e31ab1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1211,6 +1211,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   resourcePool = callPackage ../development/libraries/haskell/resource-pool {};
 
+  resourcet = callPackage ../development/libraries/haskell/resourcet {};
+
   RSA = callPackage ../development/libraries/haskell/RSA {};
 
   safe = callPackage ../development/libraries/haskell/safe {};
@@ -1324,7 +1326,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   terminfo = callPackage ../development/libraries/haskell/terminfo {};
 
-  testFramework = callPackage ../development/libraries/haskell/test-framework {};
+  testFramework_0_6 = callPackage ../development/libraries/haskell/test-framework/0.6.nix {};
+  testFramework_0_5 = callPackage ../development/libraries/haskell/test-framework/0.5.nix {};
+  testFramework = self.testFramework_0_6;
 
   testFrameworkHunit = callPackage ../development/libraries/haskell/test-framework-hunit {};
 
@@ -1608,7 +1612,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     QuickCheck = self.QuickCheck2;
   };
 
-  mathblog = callPackage ../applications/misc/mathblog {};
+  mathblog = callPackage ../applications/misc/mathblog {
+    testFramework = self.testFramework_0_5;
+    testFrameworkHunit = self.testFrameworkHunit.override {
+      testFramework = self.testFramework_0_5;
+    };
+  };
 
   xmobar = callPackage ../applications/misc/xmobar {
     parsec = self.parsec3;