Added gtk-based plot capabilities for criterion.

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

pkgs/development/libraries/haskell/Chart/default.nix

@@ -0,0 +1,15 @@
+{cabal, cairo, colour, dataAccessor, dataAccessorTemplate, gtk, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "Chart";
+  version = "0.13.1";
+  sha256 = "1gh8qw8xil543wssflhpjrgnig4v79vi7xizrm93a93i4n84npd5";
+  propagatedBuildInputs =
+    [cairo colour dataAccessor dataAccessorTemplate gtk mtl];
+  meta = {
+    description = "A library for generating 2D Charts and Plots";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+

pkgs/development/libraries/haskell/criterion/default.nix

@@ -1,13 +1,17 @@
 {cabal, deepseq, mtl, parallel, parsec, vector, vectorAlgorithms,
- mwcRandom, statistics}:
+ mwcRandom, statistics, Chart, dataAccessor}:
 
 cabal.mkDerivation (self : {
   pname = "criterion";
   version = "0.5.0.5";
   sha256 = "1b1g7a2ip07j0554cj4d0413859fbdkaxpcgq2znjz7wh8z5aabn";
 
-  propagatedBuildInputs =
+  propagatedBuildInputs = [
-    [deepseq mtl parallel parsec vector vectorAlgorithms mwcRandom statistics];
+    deepseq mtl parallel parsec vector vectorAlgorithms mwcRandom statistics
+    Chart dataAccessor
+  ];
+
+  configureFlags = "-fchart";
 
   meta = {
     homepage = "http://bitbucket.org/bos/criterion";

pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix

@@ -0,0 +1,14 @@
+{cabal, dataAccessor, utilityHt}:
+
+cabal.mkDerivation (self : {
+  pname = "data-accessor-template";
+  version = "0.2.1.5";
+  sha256 = "0fvf1cacvqzyl9x88h7fa0d6p94qhkvf177a84g036qjxn0khyja";
+  propagatedBuildInputs = [dataAccessor utilityHt];
+  meta = {
+    description = "Utilities for accessing and manipulating the fields of records";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+

pkgs/development/libraries/haskell/data-accessor/data-accessor.nix

@@ -0,0 +1,14 @@
+{cabal, transformers}:
+
+cabal.mkDerivation (self : {
+  pname = "data-accessor";
+  version = "0.2.1.4";
+  sha256 = "1fnfbcw1fzas2sbk9yhwd05ncvgqfy47hi9xh0ygsqilx7nwkdxv";
+  propagatedBuildInputs = [transformers];
+  meta = {
+    description = "Utilities for accessing and manipulating the fields of records";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+

pkgs/top-level/haskell-packages.nix

@@ -82,6 +82,8 @@ rec {
 
   cgi = callPackage ../development/libraries/haskell/cgi {};
 
+  Chart = callPackage ../development/libraries/haskell/Chart {};
+
   cmdargs = callPackage ../development/libraries/haskell/cmdargs {};
 
   colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {};
@@ -108,6 +110,10 @@ rec {
 
   csv = callPackage ../development/libraries/haskell/csv {};
 
+  dataAccessor = callPackage ../development/libraries/haskell/data-accessor/data-accessor.nix {};
+
+  dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {};
+
   dataenc = callPackage ../development/libraries/haskell/dataenc {};
 
   dataReify = callPackage ../development/libraries/haskell/data-reify {};