From fa79bbbc9adae15de7aadad1aa1429bd09ef84ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Wed, 17 Nov 2010 15:38:16 +0000
Subject: [PATCH] Added the Haskell criterion package.

svn path=/nixpkgs/trunk/; revision=24741
---
 .../libraries/haskell/criterion/default.nix    | 18 ++++++++++++++++++
 .../libraries/haskell/erf/default.nix          | 13 +++++++++++++
 .../libraries/haskell/mwc-random/default.nix   | 14 ++++++++++++++
 .../libraries/haskell/primitive/default.nix    |  4 ++--
 .../libraries/haskell/statistics/default.nix   | 15 +++++++++++++++
 .../haskell/vector-algorithms/default.nix      | 14 ++++++++++++++
 .../libraries/haskell/vector/default.nix       |  4 ++--
 pkgs/top-level/haskell-packages.nix            | 13 +++++++++++++
 8 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/criterion/default.nix
 create mode 100644 pkgs/development/libraries/haskell/erf/default.nix
 create mode 100644 pkgs/development/libraries/haskell/mwc-random/default.nix
 create mode 100644 pkgs/development/libraries/haskell/statistics/default.nix
 create mode 100644 pkgs/development/libraries/haskell/vector-algorithms/default.nix

diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix
new file mode 100644
index 00000000000..0b1cac4076f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/criterion/default.nix
@@ -0,0 +1,18 @@
+{cabal, deepseq, mtl, parallel, parsec, vector, vectorAlgorithms,
+ mwcRandom, statistics}:
+
+cabal.mkDerivation (self : {
+  pname = "criterion";
+  version = "0.5.0.5";
+  sha256 = "1b1g7a2ip07j0554cj4d0413859fbdkaxpcgq2znjz7wh8z5aabn";
+
+  propagatedBuildInputs =
+    [deepseq mtl parallel parsec vector vectorAlgorithms mwcRandom statistics];
+
+  meta = {
+    homepage = "http://bitbucket.org/bos/criterion";
+    description = "Robust, reliable performance measurement and analysis";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/erf/default.nix b/pkgs/development/libraries/haskell/erf/default.nix
new file mode 100644
index 00000000000..57691777564
--- /dev/null
+++ b/pkgs/development/libraries/haskell/erf/default.nix
@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "erf";
+  version = "1.0.0.0";
+  sha256 = "0zkb9csnfqcrzdkqqn0xihfx1k17fw9ki7y3d1di67lnlmjpkqnn";
+  meta = {
+    description = "The error function, erf, and friends";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix
new file mode 100644
index 00000000000..1ac66ca67f2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mwc-random/default.nix
@@ -0,0 +1,14 @@
+{cabal, primitive, vector}:
+
+cabal.mkDerivation (self : {
+  pname = "mwc-random";
+  version = "0.8.0.2";
+  sha256 = "1lry31abyz6wh3x8ipclgkfc889azs7mw2ppp9kpdlx41wbzhdj6";
+  propagatedBuildInputs = [primitive vector];
+  meta = {
+    description = "Fast, high quality pseudo random number generation";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/primitive/default.nix b/pkgs/development/libraries/haskell/primitive/default.nix
index ea2de19592f..f4d29695118 100644
--- a/pkgs/development/libraries/haskell/primitive/default.nix
+++ b/pkgs/development/libraries/haskell/primitive/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "primitive";
-  version = "0.3";
-  sha256 = "b63cb5dd3417433429b3ad5489791bddd0973b96b7c3314a4ecc9e6a68b2a35d";
+  version = "0.3.1";
+  sha256 = "1903hx88ax4dgyyx00a0k86jy4mkqrprpn7arfy19dqqyfpb2ikj";
   meta = {
     description = "Wrappers for primitive operations";
     license = "BSD";
diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix
new file mode 100644
index 00000000000..8ebacb5933b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/statistics/default.nix
@@ -0,0 +1,15 @@
+{cabal, primitive, vector, vectorAlgorithms, mwcRandom, erf}:
+
+cabal.mkDerivation (self : {
+  pname = "statistics";
+  version = "0.8.0.3";
+  sha256 = "11b7ai661sm7j4n8wymipzjldshackwgv6kkp6yqrkxzg40xhal9";
+  propagatedBuildInputs =
+    [primitive vector vectorAlgorithms mwcRandom erf];
+  meta = {
+    description = "A library of statistical types, data and functions";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
new file mode 100644
index 00000000000..49b95384299
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
@@ -0,0 +1,14 @@
+{cabal, primitive, vector}:
+
+cabal.mkDerivation (self : {
+  pname = "vector-algorithms";
+  version = "0.3.4";
+  sha256 = "19b25myz0lhf010lgajlkz72g3w119x89i097rmbc2y4z1bjgpiv";
+  propagatedBuildInputs = [primitive vector];
+  meta = {
+    description = "Efficient algorithms for vector arrays";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/vector/default.nix b/pkgs/development/libraries/haskell/vector/default.nix
index bf9dbd818ed..797d9e703e4 100644
--- a/pkgs/development/libraries/haskell/vector/default.nix
+++ b/pkgs/development/libraries/haskell/vector/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "vector";
-  version = "0.6.0.1";
-  sha256 = "b0cba9b3aa94688321a2ec7b4fb4b41781073b2605584ad41957ba1c6892acce";
+  version = "0.7.0.1";
+  sha256 = "147kwm3p6w1qg1sg3ls7i8zj3mcnyxf80il4r5kz5fd3n1ibvyxj";
   propagatedBuildInputs = [primitive];
   meta = {
     description = "Efficient arrays";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 924bf4a3982..9cfb3718c9d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -94,6 +94,11 @@ rec {
     time = time_1_1_3;
   };
 
+  criterion = callPackage ../development/libraries/haskell/criterion {
+    parallel = parallel_2_2_0_1;
+    parsec = parsec_3;
+  };
+
   Crypto = callPackage ../development/libraries/haskell/Crypto {};
 
   CS173Tourney = callPackage ../development/libraries/haskell/CS173Tourney {
@@ -125,6 +130,8 @@ rec {
     inherit (pkgs) libedit;
   };
 
+  erf = callPackage ../development/libraries/haskell/erf {};
+
   filepath = callPackage ../development/libraries/haskell/filepath {};
 
   emgm = callPackage ../development/libraries/haskell/emgm {};
@@ -436,6 +443,8 @@ rec {
 
   multiset = callPackage ../development/libraries/haskell/multiset {};
 
+  mwcRandom = callPackage ../development/libraries/haskell/mwc-random {};
+
   neither = callPackage ../development/libraries/haskell/neither {};
 
   network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {};
@@ -575,6 +584,8 @@ rec {
     network = network_2_2_1_7;
   };
 
+  statistics = callPackage ../development/libraries/haskell/statistics {};
+
   syb = callPackage ../development/libraries/haskell/syb {};
 
   sybWithClass = callPackage ../development/libraries/haskell/syb/syb-with-class.nix {};
@@ -671,6 +682,8 @@ rec {
 
   vector = callPackage ../development/libraries/haskell/vector {};
 
+  vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {};
+
   vectorSpace = callPackage ../development/libraries/haskell/vector-space {};
 
   vty = callPackage ../development/libraries/haskell/vty {