Added vacuum and vacuum-cairo packages.

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

4 files changed, 40 insertions, 8 deletions

diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strictConcurrency/default.nix
new file mode 100644
index 000000000000..6e43e157c37b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/strictConcurrency/default.nix
@@ -0,0 +1,12 @@
+{cabal, parallel}:
+
+cabal.mkDerivation (self : {
+  pname = "strict-concurrency";
+  version = "0.2.1";
+  sha256 = "8838600033bde2ce7ca6bd95a3815412da67244b57dfc0e2246a8f2469f5fd9c";
+  propagatedBuildInputs = [parallel];
+  meta = {
+    description = "Strict concurrency abstractions";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix
index 75ac4778ed0e..05e1448ddb1f 100644
--- a/pkgs/development/libraries/haskell/vacuum/default.nix
+++ b/pkgs/development/libraries/haskell/vacuum/default.nix
@@ -6,7 +6,7 @@ cabal.mkDerivation (self : {
   sha256 = "9240ec35b39d60928a73469893adf1d2aa742b9a781dbc6dcdaa54e96d9bf1af";
   propagatedBuildInputs = [ghcPaths haskellSrcMeta];
   meta = {
-    description = "Generic programming with systems of recursive datatypes";
+    description = "Extract graph representations of ghc heap values";
   };
 })  
 
diff --git a/pkgs/development/libraries/haskell/vacuumCairo/default.nix b/pkgs/development/libraries/haskell/vacuumCairo/default.nix
new file mode 100644
index 000000000000..cd30b77d5b7b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vacuumCairo/default.nix
@@ -0,0 +1,12 @@
+{cabal, vacuum, gtk2hs, parallel, strictConcurrency}:
+
+cabal.mkDerivation (self : {
+  pname = "vacuum-cairo";
+  version = "0.4.1";
+  sha256 = "4d506fec246d40e5c983eea1dbd72735e276f882539aa3682cda9d9a33f8ddb2";
+  propagatedBuildInputs = [vacuum gtk2hs parallel strictConcurrency];
+  meta = {
+    description = "Visualize live Haskell data structures using vacuum, graphviz and cairo";
+  };
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 22d8d3ade306..13264ee819cd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -183,6 +183,10 @@ rec {
     inherit cabal;
   };
 
+  strictConcurrency = import ../development/libraries/haskell/strictConcurrency {
+    inherit cabal parallel;
+  };
+
   time = import ../development/libraries/haskell/time {
     inherit cabal;
   };
@@ -195,15 +199,23 @@ rec {
     inherit cabal;
   };
 
-  wxHaskell = import ../development/libraries/haskell/wxHaskell {
-    inherit ghc;
-    inherit (pkgs) stdenv fetchurl unzip wxGTK;
+  vacuum = import ../development/libraries/haskell/vacuum {
+    inherit cabal ghcPaths haskellSrcMeta;
+  };
+
+  vacuumCairo = import ../development/libraries/haskell/vacuumCairo {
+    inherit cabal vacuum gtk2hs parallel strictConcurrency;
   };
 
   vty = import ../development/libraries/haskell/vty {
     inherit cabal;
   };
 
+  wxHaskell = import ../development/libraries/haskell/wxHaskell {
+    inherit ghc;
+    inherit (pkgs) stdenv fetchurl unzip wxGTK;
+  };
+
   X11 = import ../development/libraries/haskell/X11 {
     inherit cabal;
     inherit (pkgs.xlibs) libX11 libXinerama libXext;
@@ -282,10 +294,6 @@ rec {
     inherit cabal uulib;
   };
 
-  vacuum = import ../development/libraries/haskell/vacuum {
-    inherit cabal ghcPaths haskellSrcMeta;
-  };
-  
   # Applications.
 
   darcs = import ../applications/version-management/darcs/darcs-2.nix {