Author: andres
Date: Wed Nov 17 15:38:16 2010
New Revision: 24741
URL: https://svn.nixos.org/websvn/nix/?rev=24741&sc=1
Log:
Added the Haskell criterion package.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/criterion/
nixpkgs/trunk/pkgs/development/libraries/haskell/criterion/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/erf/
nixpkgs/trunk/pkgs/development/libraries/haskell/erf/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/mwc-random/
nixpkgs/trunk/pkgs/development/libraries/haskell/mwc-random/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/statistics/
nixpkgs/trunk/pkgs/development/libraries/haskell/statistics/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/
nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/primitive/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/vector/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/criterion/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/criterion/default.nix
Wed Nov 17 15:38:16 2010 (r24741)
@@ -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];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/erf/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/erf/default.nix Wed Nov
17 15:38:16 2010 (r24741)
@@ -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];
+ };
+})
+
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/mwc-random/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/mwc-random/default.nix
Wed Nov 17 15:38:16 2010 (r24741)
@@ -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];
+ };
+})
+
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/primitive/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/primitive/default.nix
Wed Nov 17 15:30:07 2010 (r24740)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/primitive/default.nix
Wed Nov 17 15:38:16 2010 (r24741)
@@ -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";
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/statistics/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/statistics/default.nix
Wed Nov 17 15:38:16 2010 (r24741)
@@ -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];
+ };
+})
+
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/vector-algorithms/default.nix
Wed Nov 17 15:38:16 2010 (r24741)
@@ -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];
+ };
+})
+
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/vector/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/vector/default.nix Wed Nov
17 15:30:07 2010 (r24740)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/vector/default.nix Wed Nov
17 15:38:16 2010 (r24741)
@@ -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";
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Nov 17 15:30:07
2010 (r24740)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Nov 17 15:38:16
2010 (r24741)
@@ -94,6 +94,11 @@
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 @@
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 @@
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 @@
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 @@
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 {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
