Merge branch 'master' of https://github.com/NixOS/nixpkgs

5 files changed, 799 insertions, 157 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 471de6cab5df..20d64ff11e4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21,10 +21,12 @@
   # null, the default standard environment is used.
   bootStdenv ? null
 
-, # Darwin is an "impure" platform, with its libc outside of the store.
-  # Thus, GCC, GFortran, & co. must always look for files in standard system
-  # directories (/usr/include, etc.)
-  noSysDirs ? (system != "x86_64-darwin" && system != "i686-darwin")
+, # Non-GNU/Linux OSes are currently "impure" platforms, with their libc
+  # outside of the store.  Thus, GCC, GFortran, & co. must always look for
+  # files in standard system directories (/usr/include, etc.)
+  noSysDirs ? (system != "x86_64-darwin" && system != "i686-darwin"
+               && system != "x86_64-freebsd" && system != "i686-freebsd"
+               && system != "x86_64-kfreebsd-gnu")
 
   # More flags for the bootstrapping of stdenv.
 , gccWithCC ? true
@@ -449,6 +451,8 @@ let
 
   eggdrop = callPackage ../tools/networking/eggdrop { };
 
+  enca = callPackage ../tools/text/enca { };
+
   mcrl = callPackage ../tools/misc/mcrl { };
 
   mcrl2 = callPackage ../tools/misc/mcrl2 { };
@@ -1301,6 +1305,8 @@ let
 
   plotutils = callPackage ../tools/graphics/plotutils { };
 
+  plowshare = callPackage ../tools/misc/plowshare { };
+
   pngcrush = callPackage ../tools/graphics/pngcrush { };
 
   pngnq = callPackage ../tools/graphics/pngnq { };
@@ -1493,6 +1499,8 @@ let
 
   su = shadow;
 
+  surfraw = callPackage ../tools/networking/surfraw { };
+
   swec = callPackage ../tools/networking/swec {
     inherit (perlPackages) LWP URI HTMLParser HTTPServerSimple Parent;
   };
@@ -2366,6 +2374,10 @@ let
     then openjre
     else jdkdistro false false;
 
+  oraclejdk = jdkdistro true false;
+
+  oraclejre = jdkdistro false false;
+
   jrePlugin = lowPrio (jdkdistro false true);
 
   supportsJDK =
@@ -3327,6 +3339,7 @@ let
 
   celt = callPackage ../development/libraries/celt {};
   celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {};
+  celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix {};
 
   cgal = callPackage ../development/libraries/CGAL {};
 
@@ -3363,6 +3376,8 @@ let
 
   clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) { };
 
+  clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { };
+
   clucene_core = callPackage ../development/libraries/clucene-core { };
 
   cluceneCore = clucene_core; # !!! remove this
@@ -3985,6 +4000,8 @@ let
 
   libcdio = callPackage ../development/libraries/libcdio { };
 
+  libcdr = callPackage ../development/libraries/libcdr { };
+
   libchamplain = callPackage ../development/libraries/libchamplain {
     inherit (gnome) libsoup;
   };
@@ -4088,6 +4105,8 @@ let
     libmpeg2 = mpeg2dec;
   };
 
+  libexttextcat = callPackage ../development/libraries/libexttextcat {};
+
   libf2c = callPackage ../development/libraries/libf2c {};
 
   libfixposix = callPackage ../development/libraries/libfixposix {};
@@ -4330,6 +4349,8 @@ let
 
   libvirt = callPackage ../development/libraries/libvirt { };
 
+  libvisio = callPackage ../development/libraries/libvisio { };
+
   libvncserver = builderDefsPackage (import ../development/libraries/libvncserver) {
     inherit libtool libjpeg openssl zlib;
     inherit (xlibs) xproto libX11 damageproto libXdamage
@@ -4416,6 +4437,8 @@ let
 
   lzo = callPackage ../development/libraries/lzo { };
 
+  mdds = callPackage ../development/libraries/mdds { };
+
   # failed to build
   mediastreamer = callPackage ../development/libraries/mediastreamer { };
 
@@ -4472,6 +4495,8 @@ let
 
   mysocketw = callPackage ../development/libraries/mysocketw { };
 
+  mythes = callPackage ../development/libraries/mythes { };
+
   ncurses = makeOverridable (import ../development/libraries/ncurses) {
     inherit fetchurl;
     unicode = system != "i686-cygwin";
@@ -4790,6 +4815,13 @@ let
 
   sphinxbase = callPackage ../development/libraries/sphinxbase { };
 
+  spice = callPackage ../development/libraries/spice {
+    celt = celt_0_5_1;
+    inherit (xlibs) libXrandr libXfixes libXext libXrender libXinerama;
+  };
+
+  spiceProtocol = callPackage ../development/libraries/spice-protocol { };
+
   sratom = callPackage ../development/libraries/audio/sratom { };
 
   srtp = callPackage ../development/libraries/srtp {};
@@ -6789,6 +6821,8 @@ let
 
   espeak = callPackage ../applications/audio/espeak { };
 
+  espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
+
   esniper = callPackage ../applications/networking/esniper { };
 
   etherape = callPackage ../applications/networking/sniffers/etherape {
@@ -6879,6 +6913,13 @@ let
 
   firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; });
 
+  firefox15Pkgs = callPackage ../applications/networking/browsers/firefox/15.0.nix {
+    inherit (gnome) libIDL;
+    inherit (pythonPackages) pysqlite;
+  };
+
+  firefox15Wrapper = lowPrio (wrapFirefox { browser = firefox15Pkgs.firefox; });
+
   flac = callPackage ../applications/audio/flac { };
 
   flashplayer = flashplayer11;
@@ -6956,6 +6997,8 @@ let
 
   libquvi = callPackage ../applications/video/quvi/library.nix { };
 
+  praat = callPackage ../applications/audio/praat { };
+
   quvi = callPackage ../applications/video/quvi/tool.nix { };
 
   quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { };
@@ -7924,7 +7967,13 @@ let
     fltk = fltk13;
   };
 
-  zathura = callPackage ../applications/misc/zathura { };
+  zathuraCollection = recurseIntoAttrs
+    (let callPackage = newScope pkgs.zathuraCollection; in
+      import ../applications/misc/zathura { inherit callPackage pkgs; });
+
+  zathura = zathuraCollection.zathuraWrapper;
+
+  girara = callPackage ../applications/misc/girara { };
 
   zgrviewer = callPackage ../applications/graphics/zgrviewer {};
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c2e457bfe456..f90e16abe02d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -125,12 +125,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     GLUT         = self.GLUT_2_1_2_1;           # 7.5 fail
     haskellSrc   = self.haskellSrc_1_0_1_5;     # 7.5 ok
     html         = self.html_1_0_1_2;           # 7.5 ok
-    HTTP         = self.HTTP_4000_2_3;          # 7.5 ok
+    HTTP         = self.HTTP_4000_2_4;          # 7.5 ok
     HUnit        = self.HUnit_1_2_5_1;          # 7.5 ok
     mtl          = self.mtl_2_1_2;              # 7.5 ok
     network      = self.network_2_3_1_0;        # 7.5 ok
     OpenGL       = self.OpenGL_2_2_3_1;         # 7.5 fail
-    parallel     = self.parallel_3_2_0_2;       # 7.5 fail
+    parallel     = self.parallel_3_2_0_3;       # 7.5 ok
     parsec       = self.parsec_3_1_3;           # 7.5 ok
     QuickCheck   = self.QuickCheck_2_5;         # 7.5 fail
     random       = self.random_1_0_1_1;         # 7.5 ok
@@ -386,6 +386,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Agda = callPackage ../development/libraries/haskell/Agda {
     haskellSrcExts = self.haskellSrcExts_1_11_1;
+    haskeline = self.haskeline_0_6_4_7;
   };
 
   accelerate = callPackage ../development/libraries/haskell/accelerate {};
@@ -522,6 +523,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {};
 
+  cipherAes = callPackage ../development/libraries/haskell/cipher-aes {};
+
   clientsession = callPackage ../development/libraries/haskell/clientsession {};
 
   cmdargs = callPackage ../development/libraries/haskell/cmdargs {};
@@ -532,16 +535,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   colour = callPackage ../development/libraries/haskell/colour {};
 
-  comonad_1_1_1_6 = callPackage ../development/libraries/haskell/comonad/1.1.1.6.nix {};
-  comonad_3_0_0_2 = callPackage ../development/libraries/haskell/comonad/3.0.0.2.nix {};
-  comonad = self.comonad_3_0_0_2;
+  comonad = callPackage ../development/libraries/haskell/comonad {};
 
-  comonadTransformers_2_1_2 = callPackage ../development/libraries/haskell/comonad-transformers/2.1.2.nix {
-    comonad = self.comonad_1_1_1_6;
-    semigroupoids = self.semigroupoids_1_3_4;
-  };
-  comonadTransformers_3_0 = callPackage ../development/libraries/haskell/comonad-transformers/3.0.nix {};
-  comonadTransformers = self.comonadTransformers_3_0;
+  comonadTransformers = callPackage ../development/libraries/haskell/comonad-transformers {};
 
   compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {};
 
@@ -603,10 +599,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {};
 
-  dataLens = callPackage ../development/libraries/haskell/data-lens {
-    comonadTransformers = self.comonadTransformers_2_1_2;
-    semigroupoids = self.semigroupoids_1_3_4;
-  };
+  dataLens = callPackage ../development/libraries/haskell/data-lens {};
 
   dataLensTemplate = callPackage ../development/libraries/haskell/data-lens-template {};
 
@@ -614,6 +607,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   dataReify = callPackage ../development/libraries/haskell/data-reify {};
 
+  dateCache = callPackage ../development/libraries/haskell/date-cache {};
+
   datetime = callPackage ../development/libraries/haskell/datetime {};
 
   deepseq_1_1_0_0 = callPackage ../development/libraries/haskell/deepseq/1.1.0.0.nix {};
@@ -819,7 +814,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hashtables = callPackage ../development/libraries/haskell/hashtables {};
 
-  haskeline = callPackage ../development/libraries/haskell/haskeline {};
+  haskeline_0_6_4_7 = callPackage ../development/libraries/haskell/haskeline/0.6.4.7.nix {};
+  haskeline_0_7_0_2 = callPackage ../development/libraries/haskell/haskeline/0.7.0.2.nix {};
+  haskeline = self.haskeline_0_7_0_2;
 
   haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {};
 
@@ -849,7 +846,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {};
   HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {};
   HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {};
-  HTTP = self.HTTP_4000_2_3;
+  HTTP_4000_2_4 = callPackage ../development/libraries/haskell/HTTP/4000.2.4.nix {};
+  HTTP = self.HTTP_4000_2_4;
 
   hackageDb = callPackage ../development/libraries/haskell/hackage-db {};
 
@@ -887,7 +885,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hjsmin = callPackage ../development/libraries/haskell/hjsmin {};
 
-  hledger = callPackage ../development/libraries/haskell/hledger {};
+  hledger = callPackage ../development/libraries/haskell/hledger {
+    haskeline = self.haskeline_0_6_4_7;
+  };
   hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {};
   hledgerInterest = callPackage ../applications/office/hledger-interest {};
   hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {};
@@ -1327,11 +1327,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   semigroups = callPackage ../development/libraries/haskell/semigroups {};
 
-  semigroupoids_1_3_4 = callPackage ../development/libraries/haskell/semigroupoids/1.3.4.nix {
-    comonad = self.comonad_1_1_1_6;
-  };
-  semigroupoids_3_0 = callPackage ../development/libraries/haskell/semigroupoids/3.0.nix {};
-  semigroupoids = self.semigroupoids_3_0;
+  semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {};
 
   shelly = callPackage ../development/libraries/haskell/shelly {};
 
@@ -1369,6 +1365,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   stringsearch = callPackage ../development/libraries/haskell/stringsearch {};
 
+  stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {};
+
   syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {};
   syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {};
   syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {};
@@ -1410,7 +1408,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {};
 
-  split_0_1 = callPackage ../development/libraries/haskell/split/0.1.nix {};
   split = callPackage ../development/libraries/haskell/split {};
 
   stbImage = callPackage ../development/libraries/haskell/stb-image {};
@@ -1448,8 +1445,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   tagsoup = callPackage ../development/libraries/haskell/tagsoup {};
 
-  tagsoup_0_10_1 = callPackage ../development/libraries/haskell/tagsoup/0.10.1nix {};
-
   temporary = callPackage ../development/libraries/haskell/temporary {};
 
   Tensor = callPackage ../development/libraries/haskell/Tensor {};
@@ -1752,6 +1747,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   darcs = callPackage ../applications/version-management/darcs {
     tar = self.tar_0_3_2_0;
+    haskeline = self.haskeline_0_6_4_7;
   };
 
   leksah = callPackage ../applications/editors/leksah {
@@ -1773,7 +1769,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   xmonadExtras = callPackage ../applications/window-managers/xmonad/xmonad-extras.nix {
     X11 = self.X11_1_5_0_1;
-    split = self.split_0_1;
   };
 
   # Tools.
diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index 0ab4306cca07..82d6b65ee48d 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -5,7 +5,135 @@ let self = {
     inherit stdenv nodejs;
   };
 
+  patchLatest = srcAttrs:
+                  let src = fetchurl srcAttrs; in
+                  pkgs.runCommand src.name {} ''
+                    tar xf ${src}
+                    sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json
+                    tar cf $out package
+                  '';
+
+  "abbrev" = self."abbrev-1";
+
+  "abbrev-1" = self.buildNodePackage rec {
+    name = "abbrev-1.0.3";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/abbrev/-/${name}.tgz";
+      sha256 = "d444c07f411418828a5e81ac85569afe638e6441a562086faa0209ec7bdf55f2";
+    };
+    deps = [
+
+    ];
+  };
+
+  "active-x-obfuscator" = self."active-x-obfuscator-0.0.1";
+
+  "active-x-obfuscator-0.0.1" = self.buildNodePackage rec {
+    name = "active-x-obfuscator-0.0.1";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/active-x-obfuscator/-/${name}.tgz";
+      sha256 = "069cc18a0e7790ec106b267d28b47c691220f119a8daec925dd47f06866ce1c6";
+    };
+    deps = [
+      self."zeparser-0.0.5"
+    ];
+  };
+
+  "ansi" = self."ansi-~0.1.2";
+
+  "ansi-~0.1.2" = self.buildNodePackage rec {
+    name = "ansi-0.1.2";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi/-/${name}.tgz";
+      sha256 = "6f2288b1db642eb822578f4ee70bf26bf97173cc7d3f10f496070fb96250006b";
+    };
+    deps = [
+
+    ];
+  };
+
+  "backbone" = self."backbone-0.9.2";
+
+  "backbone-0.9.2" = self.buildNodePackage rec {
+    name = "backbone-0.9.2";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/backbone/-/${name}.tgz";
+      sha256 = "0a5ebc8d32949ea2870a684e8430a8b4dec75a163ecf2740eb5fb4865393bb32";
+    };
+    deps = [
+      self."underscore->=1.3.1"
+    ];
+  };
+
+  "block-stream" = self."block-stream-*";
+
+  "block-stream-*" = self.buildNodePackage rec {
+    name = "block-stream-0.0.6";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/block-stream/-/${name}.tgz";
+      sha256 = "2fc365b42b8601c8ee150d453f6cc762a01054b7fb28bdfcfcbce7c97e93601b";
+    };
+    deps = [
+      self."inherits-~1.0.0"
+    ];
+  };
+
+  "browserchannel" = self."browserchannel-0.4.1";
+
+  "browserchannel-0.4.1" = self.buildNodePackage rec {
+    name = "browserchannel-0.4.1";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browserchannel/-/${name}.tgz";
+      sha256 = "f5d038347cee6802bb6f30f53bcf2adf196d241505b77ffca3d5f8a76a109c5f";
+    };
+    deps = [
+      self."coffee-script-~1"
+      self."hat"
+      self."connect-~1.7"
+      self."timerstub"
+      self."request-~2"
+    ];
+  };
+
+  "bson" = self."bson-0.1.0";
+
+  "bson-0.1.0" = self.buildNodePackage rec {
+    name = "bson-0.1.0";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bson/-/${name}.tgz";
+      sha256 = "32618266420f4d2688e957a6a145aab6a1402c950b7b7c7c1d0520cbd08251c9";
+    };
+    deps = [
+
+    ];
+  };
+
+  "bytes" = self."bytes-0.1.0";
+
+  "bytes-0.1.0" = self.buildNodePackage rec {
+    name = "bytes-0.1.0";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bytes/-/${name}.tgz";
+      sha256 = "32954618600f6566ecd95aec0ea0ae3318a1b4a29bf6a7970462c29a843bf701";
+    };
+    deps = [
+
+    ];
+  };
+
   "coffee-script" = self."coffee-script-1.3.3";
+  "coffee-script-~1" = self."coffee-script-1.3.3";
+
+  "coffee-script-~1.1.2" = self.buildNodePackage rec {
+    name = "coffee-script-1.1.3";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz";
+      sha256 = "3b431da901f753bde0ab26245c7111e1e4b8be1bba0086cf4a7470d739acae87";
+    };
+    deps = [
+
+    ];
+  };
 
   "coffee-script-1.3.3" = self.buildNodePackage rec {
     name = "coffee-script-1.3.3";
@@ -18,75 +146,174 @@ let self = {
     ];
   };
 
-  "semver" = self."semver-1";
+  "commander" = self."commander-~0.6.1";
 
-  "semver-1" = self.buildNodePackage rec {
-    name = "semver-1.0.14";
+  "commander-~0.6.1" = self.buildNodePackage rec {
+    name = "commander-0.6.1";
     src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/${name}.tgz";
-      sha256 = "560df522ae0e8834d8b07f6ca9c60bd8836e844642361abde108018cbe9ca82f";
+      url = "http://registry.npmjs.org/commander/-/${name}.tgz";
+      sha256 = "7b7fdd1bc4d16f6776169a64f133d629efe2e3a7cd338b1d0884ee909abbd729";
     };
     deps = [
 
     ];
   };
 
-  "npm2nix" = self."npm2nix-0.1.2";
+  "connect" = self."connect-2.4.4";
 
-  "npm2nix-0.1.2" = self.buildNodePackage rec {
-    name = "npm2nix-0.1.2";
+  "connect-~1.7" = self.buildNodePackage rec {
+    name = "connect-1.7.3";
     src = fetchurl {
-      url = https://bitbucket.org/shlevy/npm2nix/get/0.1.2.tar.gz;
-      sha256 = "0wmgdbjvvwqv47113xdipzkmdafsca9av1s0fq605jf97wrpvbw3";
-      name = "${name}.tgz";
+      url = "http://registry.npmjs.org/connect/-/${name}.tgz";
+      sha256 = "773fd6ca8c90e33cc28d012fb3d72d66eb99114b20d88228330458628f030d12";
     };
     deps = [
-      self."semver-1"
+      self."qs->= 0.3.1"
+      self."mime->= 0.0.1"
     ];
   };
 
-  "mkdirp" = self."mkdirp-0.3";
+  "connect-2.4.4" = self.buildNodePackage rec {
+    name = "connect-2.4.4";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect/-/${name}.tgz";
+      sha256 = "1f474ca9db05b9d58f3469ad4932722e49bec1f6ec35665ddea09155382914e9";
+    };
+    deps = [
+      self."qs-0.4.2"
+      self."formidable-1.0.11"
+      self."crc-0.2.0"
+      self."cookie-0.0.4"
+      self."bytes-0.1.0"
+      self."send-0.0.4"
+      self."fresh-0.1.0"
+      self."pause-0.0.1"
+      self."debug"
+    ];
+  };
 
-  "mkdirp-0.3" = self.buildNodePackage rec {
-    name = "mkdirp-0.3.4";
+  "cookie" = self."cookie-0.0.4";
+
+  "cookie-0.0.4" = self.buildNodePackage rec {
+    name = "cookie-0.0.4";
     src = fetchurl {
-      url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz";
-      sha256 = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425";
+      url = "http://registry.npmjs.org/cookie/-/${name}.tgz";
+      sha256 = "a917477c448a6a91ef73d550d8d8a6d4864e8fbd247b6f73baaca66c9bfc3b0b";
     };
     deps = [
 
     ];
   };
 
-  "nopt" = self."nopt-2";
+  "crc" = self."crc-0.2.0";
 
-  "nopt-2" = self.buildNodePackage rec {
-    name = "nopt-2.0.0";
+  "crc-0.2.0" = self.buildNodePackage rec {
+    name = "crc-0.2.0";
     src = fetchurl {
-      url = "http://registry.npmjs.org/nopt/-/${name}.tgz";
-      sha256 = "112e9bea8b745a2e5a59d239e6f6f02e720e080ab8cdca89b6b8f0143ae718b5";
+      url = "http://registry.npmjs.org/crc/-/${name}.tgz";
+      sha256 = "027c180bbbddd0960e6000f7ef60623997dfa61b3c2ef141acf00c29a1763b5d";
     };
     deps = [
-      self."abbrev-1"
+
     ];
   };
 
-  "graceful-fs" = self."graceful-fs-1";
+  "cssmin" = self."cssmin-0.3.1";
 
-  "graceful-fs-1" = self.buildNodePackage rec {
-    name = "graceful-fs-1.1.10";
+  "cssmin-0.3.1" = self.buildNodePackage rec {
+    name = "cssmin-0.3.1";
     src = fetchurl {
-      url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz";
-      sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24";
+      url = "http://registry.npmjs.org/cssmin/-/${name}.tgz";
+      sha256 = "56f1854fd0c6cb4cf78cea861e7b617ccf1daf91b47fba5bc80abdf2529b3102";
+    };
+    deps = [
+
+    ];
+  };
+
+  "datetime" = self."datetime-0.0.3";
+
+  "datetime-0.0.3" = self.buildNodePackage rec {
+    name = "datetime-0.0.3";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/datetime/-/${name}.tgz";
+      sha256 = "d584a5b140ced7bd44199fc5e1b6cd55ec2d3c946dc990ced42f6ab2687747f0";
+    };
+    deps = [
+      self."vows->=0.5.4"
+    ];
+  };
+
+  "debug" = self."debug-*";
+
+  "debug-*" = self.buildNodePackage rec {
+    name = "debug-0.7.0";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/${name}.tgz";
+      sha256 = "113c041fb01fd8db2a1b83320529849ccbb23794a4c3799a0154312de2a5d618";
     };
     deps = [
 
     ];
   };
 
-  "fstream" = self."fstream-~0.1.13";
+  "diff" = self."diff-~1.0.3";
 
-  "fstream-~0.1.13" = self.buildNodePackage rec {
+  "diff-~1.0.3" = self.buildNodePackage rec {
+    name = "diff-1.0.3";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/diff/-/${name}.tgz";
+      sha256 = "88e1bb04e3707c5601ec0841e170f8892a3b929bf8c4030f826cd32c1fa21472";
+    };
+    deps = [
+
+    ];
+  };
+
+  "eyes" = self."eyes->=0.1.6";
+
+  "eyes->=0.1.6" = self.buildNodePackage rec {
+    name = "eyes-0.1.8";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/eyes/-/${name}.tgz";
+      sha256 = "4fa6db8f2c9926fb39a211c622d7eb3a76efbc4878559f9bd155d647a6963735";
+    };
+    deps = [
+
+    ];
+  };
+
+  "formidable" = self."formidable-1.0.11";
+
+  "formidable-1.0.11" = self.buildNodePackage rec {
+    name = "formidable-1.0.11";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/formidable/-/${name}.tgz";
+      sha256 = "39b345d14d69c27fe262e12f16900cef6be220510788866e0a12c9fedd03766e";
+    };
+    deps = [
+
+    ];
+  };
+
+  "fresh" = self."fresh-0.1.0";
+
+  "fresh-0.1.0" = self.buildNodePackage rec {
+    name = "fresh-0.1.0";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fresh/-/${name}.tgz";
+      sha256 = "c402fbd25e26c0167bf288e1ba791716808bfaa5de32b76ae68e8e8a3d7e2b33";
+    };
+    deps = [
+
+    ];
+  };
+
+  "fstream" = self."fstream-0.1.18";
+  "fstream-~0.1.8" = self."fstream-0.1.18";
+  "fstream-~0.1.13" = self."fstream-0.1.18";
+
+  "fstream-0.1.18" = self.buildNodePackage rec {
     name = "fstream-0.1.18";
     src = fetchurl {
       url = "http://registry.npmjs.org/fstream/-/${name}.tgz";
@@ -100,26 +327,175 @@ let self = {
     ];
   };
 
-  "npmlog" = self."npmlog-0";
+  "glob" = self."glob-3";
 
-  "npmlog-0" = self.buildNodePackage rec {
-    name = "npmlog-0.0.2";
+  "glob-3" = self.buildNodePackage rec {
+    name = "glob-3.1.12";
     src = fetchurl {
-      url = "http://registry.npmjs.org/npmlog/-/${name}.tgz";
-      sha256 = "ce98d4d3380390c0259695cce407e2e96d2970c5caee1461a62ecbd38e8caed4";
+      url = "http://registry.npmjs.org/glob/-/${name}.tgz";
+      sha256 = "a37c02e9a91915fe4e3232229676e842803151dde831d1046620ec96118f6036";
     };
     deps = [
-      self."ansi-~0.1.2"
+      self."minimatch-0.2"
+      self."graceful-fs-~1.1.2"
+      self."inherits-1"
     ];
   };
 
-  "osenv" = self."osenv-0";
+  "graceful-fs" = self."graceful-fs-1.1.10";
+  "graceful-fs-1" = self."graceful-fs-1.1.10";
+  "graceful-fs-~1.1" = self."graceful-fs-1.1.10";
+  "graceful-fs-~1.1.2" = self."graceful-fs-1.1.10";
 
-  "osenv-0" = self.buildNodePackage rec {
-    name = "osenv-0.0.3";
+  "graceful-fs-1.1.10" = self.buildNodePackage rec {
+    name = "graceful-fs-1.1.10";
     src = fetchurl {
-      url = "http://registry.npmjs.org/osenv/-/${name}.tgz";
-      sha256 = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4";
+      url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz";
+      sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24";
+    };
+    deps = [
+
+    ];
+  };
+
+  "hat" = self."hat-0.0.3";
+
+  "hat-0.0.3" = self.buildNodePackage rec {
+    name = "hat-0.0.3";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hat/-/${name}.tgz";
+      sha256 = "7bf52b3b020ca333a42eb67411090912b21abb6ac746d587022a0955b16e5f5c";
+    };
+    deps = [
+
+    ];
+  };
+
+  "hiredis" = self."hiredis-*";
+
+  "hiredis-*" = self.buildNodePackage rec {
+    name = "hiredis-0.1.14";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hiredis/-/${name}.tgz";
+      sha256 = "9d7ce0a7ae81cf465a0c26c07fb618b6ffd98ca344f14369114abf548d75637a";
+    };
+    deps = [
+
+    ];
+  };
+
+  "inherits" = self."inherits-1.0.0";
+  "inherits-1" = self."inherits-1.0.0";
+  "inherits-1.x" = self."inherits-1.0.0";
+  "inherits-~1.0.0" = self."inherits-1.0.0";
+
+  "inherits-1.0.0" = self.buildNodePackage rec {
+    name = "inherits-1.0.0";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/inherits/-/${name}.tgz";
+      sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186";
+    };
+    deps = [
+
+    ];
+  };
+
+  "less" = self."less-1.3.0";
+
+  "less-1.3.0" = self.buildNodePackage rec {
+    name = "less-1.3.0";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/less/-/${name}.tgz";
+      sha256 = "a182824764d5feefe8a66c5f9c7fe8b92d24a7677942fd650b9092bbd3f63d1b";
+    };
+    deps = [
+
+    ];
+  };
+
+  "lru-cache" = self."lru-cache-~2.0.0";
+
+  "lru-cache-~2.0.0" = self.buildNodePackage rec {
+    name = "lru-cache-2.0.1";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lru-cache/-/${name}.tgz";
+      sha256 = "3b4fd68f0bd75f5abf69e349b6ffa918bfe4990ff36d2d88dc74f334a9ed627e";
+    };
+    deps = [
+
+    ];
+  };
+
+  "mime" = self."mime-1.2.6";
+
+  "mime->= 0.0.1" = self.buildNodePackage rec {
+    name = "mime-1.2.7";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime/-/${name}.tgz";
+      sha256 = "a80244918c9c75fa4d0b37f311920c7d5270aab9a05aca9a74783764ad152df6";
+    };
+    deps = [
+
+    ];
+  };
+
+  "mime-1.2.6" = self.buildNodePackage rec {
+    name = "mime-1.2.6";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime/-/${name}.tgz";
+      sha256 = "7460134d6b4686d64fd1e7b878d34e2bdd258ad29b6665cf62e6d92659e81591";
+    };
+    deps = [
+
+    ];
+  };
+
+  "minimatch" = self."minimatch-0.2";
+
+  "minimatch-0.2" = self.buildNodePackage rec {
+    name = "minimatch-0.2.6";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimatch/-/${name}.tgz";
+      sha256 = "f0030112575a815ff304fa3bc64ee7e60ab8bfddb281602bc37eca0cddd48350";
+    };
+    deps = [
+      self."lru-cache-~2.0.0"
+    ];
+  };
+
+  "mkdirp" = self."mkdirp-0.3";
+
+  "mkdirp-0.3" = self.buildNodePackage rec {
+    name = "mkdirp-0.3.4";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz";
+      sha256 = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425";
+    };
+    deps = [
+
+    ];
+  };
+
+  "mongodb" = self."mongodb-1.1.0-beta";
+
+  "mongodb-1.1.0-beta" = self.buildNodePackage rec {
+    name = "mongodb-1.1.0-beta";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mongodb/-/${name}.tgz";
+      sha256 = "05e5a798d4c3a499af1e77a33eb13a31d4fb688a63e97b3fe970a3bccea39ab3";
+    };
+    deps = [
+      self."bson-0.1.0"
+    ];
+  };
+
+  "mrclean" = self."mrclean-0.1.0";
+
+  "mrclean-0.1.0" = self.buildNodePackage rec {
+    name = "mrclean-0.1.0";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mrclean/-/${name}.tgz";
+      sha256 = "5a8921007d8d3db990d41924d220f90efc8cbeb1f425c52fe0fe28be22223705";
     };
     deps = [
 
@@ -151,100 +527,161 @@ let self = {
     ];
   };
 
-  "rimraf" = self."rimraf-2";
+  "nopt" = self."nopt-2";
 
-  "rimraf-2" = self.buildNodePackage rec {
-    name = "rimraf-2.0.2";
+  "nopt-2" = self.buildNodePackage rec {
+    name = "nopt-2.0.0";
     src = fetchurl {
-      url = "http://registry.npmjs.org/rimraf/-/${name}.tgz";
-      sha256 = "3efcc60c9f6715a8746f3e0b82770468247f3e256778ef20733f334377392ab0";
+      url = "http://registry.npmjs.org/nopt/-/${name}.tgz";
+      sha256 = "112e9bea8b745a2e5a59d239e6f6f02e720e080ab8cdca89b6b8f0143ae718b5";
     };
     deps = [
-      self."graceful-fs-~1.1"
+      self."abbrev-1"
     ];
   };
 
-  "minimatch" = self."minimatch-0.2";
+  "npm2nix" = self."npm2nix-0.1.2";
 
-  "minimatch-0.2" = self.buildNodePackage rec {
-    name = "minimatch-0.2.6";
+  "npm2nix-0.1.2" = self.buildNodePackage rec {
+    name = "npm2nix-0.1.2";
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimatch/-/${name}.tgz";
-      sha256 = "f0030112575a815ff304fa3bc64ee7e60ab8bfddb281602bc37eca0cddd48350";
+      url = https://bitbucket.org/shlevy/npm2nix/get/0.1.2.tar.gz;
+      sha256 = "0wmgdbjvvwqv47113xdipzkmdafsca9av1s0fq605jf97wrpvbw3";
+      name = "${name}.tgz";
     };
     deps = [
-      self."lru-cache-~2.0.0"
+      self."semver-1"
     ];
   };
 
-  "glob" = self."glob-3";
+  "npmlog" = self."npmlog-0";
 
-  "glob-3" = self.buildNodePackage rec {
-    name = "glob-3.1.12";
+  "npmlog-0" = self.buildNodePackage rec {
+    name = "npmlog-0.0.2";
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/${name}.tgz";
-      sha256 = "a37c02e9a91915fe4e3232229676e842803151dde831d1046620ec96118f6036";
+      url = "http://registry.npmjs.org/npmlog/-/${name}.tgz";
+      sha256 = "ce98d4d3380390c0259695cce407e2e96d2970c5caee1461a62ecbd38e8caed4";
     };
     deps = [
-      self."minimatch-0.2"
-      self."graceful-fs-~1.1.2"
-      self."inherits-1"
+      self."ansi-~0.1.2"
     ];
   };
 
-  "tar" = self."tar-~0.1.12";
+  "options" = self."options-*";
 
-  "tar-~0.1.12" = self.buildNodePackage rec {
-    name = "tar-0.1.13";
+  "options-*" = self.buildNodePackage rec {
+    name = "options-0.0.3";
     src = fetchurl {
-      url = "http://registry.npmjs.org/tar/-/${name}.tgz";
-      sha256 = "fdf79b5e172badf924a12b501686e5cbf33c3ec7631eccc29c0e3e9fdcbb5ffe";
+      url = "http://registry.npmjs.org/options/-/${name}.tgz";
+      sha256 = "06cfe21b54b45f8cf7bb0a184d6ea6de3adb2dc471bf0663d06c791b4d48536d";
     };
     deps = [
-      self."inherits-1.x"
-      self."block-stream"
-      self."fstream-~0.1.8"
+
     ];
   };
 
-  "which" = self."which-1";
+  "osenv" = self."osenv-0";
 
-  "which-1" = self.buildNodePackage rec {
-    name = "which-1.0.5";
+  "osenv-0" = self.buildNodePackage rec {
+    name = "osenv-0.0.3";
     src = fetchurl {
-      url = "http://registry.npmjs.org/which/-/${name}.tgz";
-      sha256 = "e26f39d7b152c700636472ab4da57bfb9af17972c49a9e2a06f9ff347d8fad42";
+      url = "http://registry.npmjs.org/osenv/-/${name}.tgz";
+      sha256 = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4";
     };
     deps = [
 
     ];
   };
 
-  "abbrev" = self."abbrev-1";
+  "pause" = self."pause-0.0.1";
 
-  "abbrev-1" = self.buildNodePackage rec {
-    name = "abbrev-1.0.3";
+  "pause-0.0.1" = self.buildNodePackage rec {
+    name = "pause-0.0.1";
     src = fetchurl {
-      url = "http://registry.npmjs.org/abbrev/-/${name}.tgz";
-      sha256 = "d444c07f411418828a5e81ac85569afe638e6441a562086faa0209ec7bdf55f2";
+      url = "http://registry.npmjs.org/pause/-/${name}.tgz";
+      sha256 = "d37b84046db0c28c9768be649e8f02bd991ede34b276b5dba7bade23b523235e";
     };
     deps = [
 
     ];
   };
 
-  "graceful-fs-~1.1.2" = self.buildNodePackage rec {
-    name = "graceful-fs-1.1.10";
+  "policyfile" = self."policyfile-0.0.4";
+
+  "policyfile-0.0.4" = self.buildNodePackage rec {
+    name = "policyfile-0.0.4";
     src = fetchurl {
-      url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz";
-      sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24";
+      url = "http://registry.npmjs.org/policyfile/-/${name}.tgz";
+      sha256 = "e19e9e57d6262ab7965212ec5456eae2c07438de3b09fd8f3cba36a61a14c43f";
+    };
+    deps = [
+
+    ];
+  };
+
+  "qs" = self."qs-0.5.0";
+  "qs->= 0.3.1" = self."qs-0.5.0";
+
+  "qs-0.4.2" = self.buildNodePackage rec {
+    name = "qs-0.4.2";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/${name}.tgz";
+      sha256 = "c44875d3aa882693cf73185b46fed63c1a89c34dce600b191b41dd90fb019b86";
     };
     deps = [
 
     ];
   };
 
-  "request" = self."request-2.9";
+  "qs-0.5.0" = self.buildNodePackage rec {
+    name = "qs-0.5.0";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/${name}.tgz";
+      sha256 = "229a99fc833d50307833a13d898f3de137f2823593220273295e7e1dc81ab993";
+    };
+    deps = [
+
+    ];
+  };
+
+  "range-parser" = self."range-parser-0.0.4";
+
+  "range-parser-0.0.4" = self.buildNodePackage rec {
+    name = "range-parser-0.0.4";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/range-parser/-/${name}.tgz";
+      sha256 = "8e1bcce3544330b51644ea0cb4d25f0daa4b43008a75da27e285635f4ac4b1ce";
+    };
+    deps = [
+
+    ];
+  };
+
+  "redis" = self."redis-0.7.2";
+
+  "redis-0.6.7" = self.buildNodePackage rec {
+    name = "redis-0.6.7";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/redis/-/${name}.tgz";
+      sha256 = "6a65c0204a773ca4adec0635d747c80a7565ba5e2028775c7d0e95d23df088bb";
+    };
+    deps = [
+
+    ];
+  };
+
+  "redis-0.7.2" = self.buildNodePackage rec {
+    name = "redis-0.7.2";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/redis/-/${name}.tgz";
+      sha256 = "d56d99e15dd35f6fabf545d9e91545553d60eaeb32ecf5caa1f357458df161ab";
+    };
+    deps = [
+      self."hiredis"
+    ];
+  };
+
+  "request" = self."request-~2";
 
   "request-2.9" = self.buildNodePackage rec {
     name = "request-2.9.203";
@@ -257,102 +694,247 @@ let self = {
     ];
   };
 
-  "inherits-~1.0.0" = self.buildNodePackage rec {
-    name = "inherits-1.0.0";
+  "request-~2" = self.buildNodePackage rec {
+    name = "request-2.11.0";
     src = fetchurl {
-      url = "http://registry.npmjs.org/inherits/-/${name}.tgz";
-      sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186";
+      url = "http://registry.npmjs.org/request/-/${name}.tgz";
+      sha256 = "01e5c144c755c8ee1a1ec93077b684bd63efb8df32d54675e20737e8e1c1afa6";
     };
     deps = [
 
     ];
   };
 
-  "ansi" = self."ansi-~0.1.2";
+  "rimraf" = self."rimraf-2";
 
-  "ansi-~0.1.2" = self.buildNodePackage rec {
-    name = "ansi-0.1.2";
+  "rimraf-2" = self.buildNodePackage rec {
+    name = "rimraf-2.0.2";
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansi/-/${name}.tgz";
-      sha256 = "6f2288b1db642eb822578f4ee70bf26bf97173cc7d3f10f496070fb96250006b";
+      url = "http://registry.npmjs.org/rimraf/-/${name}.tgz";
+      sha256 = "3efcc60c9f6715a8746f3e0b82770468247f3e256778ef20733f334377392ab0";
+    };
+    deps = [
+      self."graceful-fs-~1.1"
+    ];
+  };
+
+  "semver" = self."semver-1";
+
+  "semver-1" = self.buildNodePackage rec {
+    name = "semver-1.0.14";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/semver/-/${name}.tgz";
+      sha256 = "560df522ae0e8834d8b07f6ca9c60bd8836e844642361abde108018cbe9ca82f";
     };
     deps = [
 
     ];
   };
 
-  "block-stream" = self."block-stream-*";
+  "send" = self."send-0.0.4";
 
-  "block-stream-*" = self.buildNodePackage rec {
-    name = "block-stream-0.0.6";
+  "send-0.0.4" = self.buildNodePackage rec {
+    name = "send-0.0.4";
     src = fetchurl {
-      url = "http://registry.npmjs.org/block-stream/-/${name}.tgz";
-      sha256 = "2fc365b42b8601c8ee150d453f6cc762a01054b7fb28bdfcfcbce7c97e93601b";
+      url = "http://registry.npmjs.org/send/-/${name}.tgz";
+      sha256 = "7e028fa3760884d8103414f079dc4bcc99d0b72bc21bcaa9d66a319d59010d6c";
     };
     deps = [
-      self."inherits-~1.0.0"
+      self."debug"
+      self."mime-1.2.6"
+      self."fresh-0.1.0"
+      self."range-parser-0.0.4"
     ];
   };
 
-  "lru-cache" = self."lru-cache-~2.0.0";
+  "showdown" = self."showdown-0.0.1";
 
-  "lru-cache-~2.0.0" = self.buildNodePackage rec {
-    name = "lru-cache-2.0.1";
+  "showdown-0.0.1" = self.buildNodePackage rec {
+    name = "showdown-0.0.1";
     src = fetchurl {
-      url = "http://registry.npmjs.org/lru-cache/-/${name}.tgz";
-      sha256 = "3b4fd68f0bd75f5abf69e349b6ffa918bfe4990ff36d2d88dc74f334a9ed627e";
+      url = "http://registry.npmjs.org/showdown/-/${name}.tgz";
+      sha256 = "669a3284344a4cb51b0327af8d84b9e35c895ef1cedbafada5284a31f4d4783d";
     };
     deps = [
 
     ];
   };
 
-  "graceful-fs-~1.1" = self.buildNodePackage rec {
-    name = "graceful-fs-1.1.10";
+  "socket.io" = self."socket.io-0.9.6";
+
+  "socket.io-0.9.6" = self.buildNodePackage rec {
+    name = "socket.io-0.9.6";
     src = fetchurl {
-      url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz";
-      sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24";
+      url = "http://registry.npmjs.org/socket.io/-/${name}.tgz";
+      sha256 = "444e346e2701e2212590461a1fcf656f5d685ceb209e473517603286f09e743c";
     };
     deps = [
+      self."socket.io-client-0.9.6"
+      self."policyfile-0.0.4"
+      self."redis-0.6.7"
+    ];
+  };
+
+  "socket.io-client" = self."socket.io-client-0.9.6";
 
+  "socket.io-client-0.9.6" = self.buildNodePackage rec {
+    name = "socket.io-client-0.9.6";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-client/-/${name}.tgz";
+      sha256 = "eab65186515d5206fe18b9ced75aae8c803dbcd18295a9a1cb71e5ae772ba399";
+    };
+    deps = [
+      self."uglify-js-1.2.5"
+      self."ws-0.4.x"
+      self."xmlhttprequest-1.2.2"
+      self."active-x-obfuscator-0.0.1"
     ];
   };
 
-  "inherits" = self."inherits-1";
+  "tar" = self."tar-~0.1.12";
 
-  "inherits-1" = self.buildNodePackage rec {
-    name = "inherits-1.0.0";
+  "tar-~0.1.12" = self.buildNodePackage rec {
+    name = "tar-0.1.13";
     src = fetchurl {
-      url = "http://registry.npmjs.org/inherits/-/${name}.tgz";
-      sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186";
+      url = "http://registry.npmjs.org/tar/-/${name}.tgz";
+      sha256 = "fdf79b5e172badf924a12b501686e5cbf33c3ec7631eccc29c0e3e9fdcbb5ffe";
     };
     deps = [
+      self."inherits-1.x"
+      self."block-stream"
+      self."fstream-~0.1.8"
+    ];
+  };
 
+  "timerstub" = self."timerstub-*";
+
+  "timerstub-*" = self.buildNodePackage rec {
+    name = "timerstub-0.1.3";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/timerstub/-/${name}.tgz";
+      sha256 = "0ecbd05a10e0db1d628505c8a3b6ae07246bb8cf1074c435ddc26f22fcb5e153";
+    };
+    deps = [
+      self."coffee-script-~1.1.2"
     ];
   };
 
-  "inherits-1.x" = self.buildNodePackage rec {
-    name = "inherits-1.0.0";
+  "tinycolor" = self."tinycolor-0.x";
+
+  "tinycolor-0.x" = self.buildNodePackage rec {
+    name = "tinycolor-0.0.1";
     src = fetchurl {
-      url = "http://registry.npmjs.org/inherits/-/${name}.tgz";
-      sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186";
+      url = "http://registry.npmjs.org/tinycolor/-/${name}.tgz";
+      sha256 = "f5aaf5df002750c4af19181988c8789c9e230445747e511dde7c660424f286a0";
     };
     deps = [
 
     ];
   };
 
-  "fstream-~0.1.8" = self.buildNodePackage rec {
-    name = "fstream-0.1.18";
+  "uglify-js" = self."uglify-js-1.2.6";
+
+  "uglify-js-1.2.5" = self.buildNodePackage rec {
+    name = "uglify-js-1.2.5";
     src = fetchurl {
-      url = "http://registry.npmjs.org/fstream/-/${name}.tgz";
-      sha256 = "fd5791dd0ce8d7b707fa171ac5bd482e09f80cd09ec8176b45d547416893372d";
+      url = "http://registry.npmjs.org/uglify-js/-/${name}.tgz";
+      sha256 = "111fa1b844885b94df8cd73eb864bd96ff2e9173e8eb7045cc778fa237304a74";
     };
     deps = [
-      self."rimraf-2"
-      self."mkdirp-0.3"
-      self."graceful-fs-~1.1.2"
-      self."inherits-~1.0.0"
+
+    ];
+  };
+
+  "uglify-js-1.2.6" = self.buildNodePackage rec {
+    name = "uglify-js-1.2.6";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uglify-js/-/${name}.tgz";
+      sha256 = "6d9202c8332e78868510a5441de4d54d8c2e08901ea7945eb332be8d7670788d";
+    };
+    deps = [
+
+    ];
+  };
+
+  "underscore" = self."underscore-1.3.3";
+  "underscore->=1.3.1" = self."underscore-1.3.3";
+
+  "underscore-1.3.3" = self.buildNodePackage rec {
+    name = "underscore-1.3.3";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore/-/${name}.tgz";
+      sha256 = "e710644e53f5a6d75a41a3e19d8c35eedbce0db1e886e470daf9f909c9d1ea8a";
+    };
+    deps = [
+
+    ];
+  };
+
+  "vows" = self."vows->=0.5.4";
+
+  "vows->=0.5.4" = self.buildNodePackage rec {
+    name = "vows-0.6.4";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/vows/-/${name}.tgz";
+      sha256 = "017586c2fbdd5cd15aacdc870ea0c1b1ab60558306457ddc9b0aa4dae8290597";
+    };
+    deps = [
+      self."eyes->=0.1.6"
+      self."diff-~1.0.3"
+    ];
+  };
+
+  "which" = self."which-1";
+
+  "which-1" = self.buildNodePackage rec {
+    name = "which-1.0.5";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/which/-/${name}.tgz";
+      sha256 = "e26f39d7b152c700636472ab4da57bfb9af17972c49a9e2a06f9ff347d8fad42";
+    };
+    deps = [
+
+    ];
+  };
+
+  "ws" = self."ws-0.4.x";
+
+  "ws-0.4.x" = self.buildNodePackage rec {
+    name = "ws-0.4.21";
+    src = self.patchLatest {
+      url = "http://registry.npmjs.org/ws/-/${name}.tgz";
+      sha256 = "f21bc0058730355e1ff9d6ccf84a4cb56a2fc28e939edd15395770ea9e87fa0e";
+    };
+    deps = [
+      self."commander-~0.6.1"
+      self."tinycolor-0.x"
+      self."options"
+    ];
+  };
+
+  "xmlhttprequest" = self."xmlhttprequest-1.2.2";
+
+  "xmlhttprequest-1.2.2" = self.buildNodePackage rec {
+    name = "xmlhttprequest-1.2.2";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xmlhttprequest/-/${name}.tgz";
+      sha256 = "44ce4ed6e5f7b5df84f27590fa142ecd175f53da4807b9f06c0c4733e23bd95d";
+    };
+    deps = [
+
+    ];
+  };
+
+  "zeparser" = self."zeparser-0.0.5";
+
+  "zeparser-0.0.5" = self.buildNodePackage rec {
+    name = "zeparser-0.0.5";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/zeparser/-/${name}.tgz";
+      sha256 = "8b5a57ae84a7b7adf8827d1469c8f66d08d1660bd1375a07381877cd1bb9ed0b";
+    };
+    deps = [
+
     ];
   };
 };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 637d53b06f76..d76215961f2f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -138,6 +138,20 @@ let pythonPackages = python.modules // rec {
   };
 
 
+  area53 = buildPythonPackage (rec {
+    name = "area53-b2c9cdcabd";
+
+    src = fetchgit {
+      url = git://github.com/mariusv/Area53.git;
+      rev = "b2c9cdcabd";
+      sha256 = "b0c12b8c48ed9180c7475fab18de50d63e1b517cfb46da4d2c66fc406fe902bc";
+    };
+    installCommand = "python setup.py install --prefix=$out";
+    doCheck = false;
+    propagatedBuildInputs = [ boto ];
+  });
+
+
   argparse = buildPythonPackage (rec {
     name = "argparse-1.1";
 
@@ -169,6 +183,7 @@ let pythonPackages = python.modules // rec {
     };
   });
 
+
   astng = buildPythonPackage rec {
     name = "logilab-astng-0.21.1";
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index d8e192a6e550..68c387d2a55c 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -361,6 +361,7 @@ with (import ./release-lib.nix);
   firefox36Pkgs.firefox = linux;
   firefox12Pkgs.firefox = linux;
   firefox13Pkgs.firefox = linux;
+  firefox15Pkgs.firefox = linux;
 
   gnome = {
     gnome_panel = linux;