Added vacuum and vacuum-cairo packages.

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

1 files changed, 15 insertions, 7 deletions

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 22d8d3ade306d..13264ee819cd9 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 {