From bb53645b0f3d7ea5df91969b2011e6861f81ee9f Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Wed, 12 Jun 2013 13:23:00 +0200
Subject: [PATCH 001/439] Add Elm and elm-server

---
 pkgs/development/compilers/elm/elm-server.nix | 21 ++++++++++++++++++
 pkgs/development/compilers/elm/elm.nix        | 22 +++++++++++++++++++
 .../haskell/concatenative/default.nix         | 13 +++++++++++
 .../libraries/haskell/indents/default.nix     | 14 ++++++++++++
 pkgs/top-level/haskell-packages.nix           |  8 +++++++
 5 files changed, 78 insertions(+)
 create mode 100644 pkgs/development/compilers/elm/elm-server.nix
 create mode 100644 pkgs/development/compilers/elm/elm.nix
 create mode 100644 pkgs/development/libraries/haskell/concatenative/default.nix
 create mode 100644 pkgs/development/libraries/haskell/indents/default.nix

diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix
new file mode 100644
index 000000000000..1750213ac8af
--- /dev/null
+++ b/pkgs/development/compilers/elm/elm-server.nix
@@ -0,0 +1,21 @@
+{ cabal, blazeHtml, deepseq, Elm, filepath, happstackServer, HTTP
+, mtl, parsec, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "elm-server";
+  version = "0.8";
+  sha256 = "0mnxayfg54f5mr27sd1zw3xrdijppgvrz2yzzmhp07qc1jiyfald";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    blazeHtml deepseq Elm filepath happstackServer HTTP mtl parsec
+    transformers
+  ];
+  meta = {
+    homepage = "http://elm-lang.org";
+    description = "The Elm language server";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix
new file mode 100644
index 000000000000..8196458c70d4
--- /dev/null
+++ b/pkgs/development/compilers/elm/elm.nix
@@ -0,0 +1,22 @@
+{ cabal, blazeHtml, blazeMarkup, cmdargs, deepseq, filepath, hjsmin
+, indents, json, mtl, pandoc, parsec, shakespeare, text
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "Elm";
+  version = "0.8.0.3";
+  sha256 = "0zai8glmkiqramivgz405zh385cz166gpry2yl29g37dxpwxffzb";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    blazeHtml blazeMarkup cmdargs deepseq filepath hjsmin indents json
+    mtl pandoc parsec shakespeare text transformers
+  ];
+  meta = {
+    homepage = "http://elm-lang.org";
+    description = "The Elm language module";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/concatenative/default.nix b/pkgs/development/libraries/haskell/concatenative/default.nix
new file mode 100644
index 000000000000..34344c1566bd
--- /dev/null
+++ b/pkgs/development/libraries/haskell/concatenative/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "concatenative";
+  version = "1.0.1";
+  sha256 = "05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd";
+  meta = {
+    homepage = "https://patch-tag.com/r/salazar/concatenative/snapshot/current/content/pretty";
+    description = "A library for postfix control flow";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/indents/default.nix b/pkgs/development/libraries/haskell/indents/default.nix
new file mode 100644
index 000000000000..84a19f541ee0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/indents/default.nix
@@ -0,0 +1,14 @@
+{ cabal, concatenative, mtl, parsec }:
+
+cabal.mkDerivation (self: {
+  pname = "indents";
+  version = "0.3.3";
+  sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn";
+  buildDepends = [ concatenative mtl parsec ];
+  meta = {
+    homepage = "http://patch-tag.com/r/salazar/indents";
+    description = "indentation sensitive parser-combinators for parsec";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a0d5bad3ec1c..5d622066bdc8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -716,6 +716,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {};
 
+  concatenative = callPackage ../development/libraries/haskell/concatenative {};
+
   conduit = callPackage ../development/libraries/haskell/conduit {};
 
   ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
@@ -893,6 +895,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   elerea = callPackage ../development/libraries/haskell/elerea {};
 
+  Elm = callPackage ../development/compilers/elm/elm.nix {};
+
+  elmServer = callPackage ../development/compilers/elm/elm-server.nix {};
+
   emailValidate = callPackage ../development/libraries/haskell/email-validate {};
 
   encoding = callPackage ../development/libraries/haskell/encoding {};
@@ -1246,6 +1252,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ieee754 = callPackage ../development/libraries/haskell/ieee754 {};
 
+  indents = callPackage ../development/libraries/haskell/indents {};
+
   instantGenerics = callPackage ../development/libraries/haskell/instant-generics {};
 
   ioChoice = callPackage ../development/libraries/haskell/io-choice {};

From 6afd6588d3ac34e8d292b4f58b85c2791a6af200 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Thu, 27 Jun 2013 14:00:58 +0400
Subject: [PATCH 002/439] wicd: fix copying dhclient's config to it's initial
 location

---
 pkgs/tools/networking/wicd/dhclient.patch | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/wicd/dhclient.patch b/pkgs/tools/networking/wicd/dhclient.patch
index 52d91846518f..fbda1caacb7a 100644
--- a/pkgs/tools/networking/wicd/dhclient.patch
+++ b/pkgs/tools/networking/wicd/dhclient.patch
@@ -1,4 +1,23 @@
-diff -ruN wicd-1.7.2.4.orig/wicd/wnettools.py wicd-1.7.2.4/wicd/wnettools.py
+diff -ruN wicd-1.7.2.4.orig/wicd/wicd-daemon.py wicd-1.7.2.4/wicd/wicd-daemon.py
+--- wicd-1.7.2.4.orig/wicd/wicd-daemon.py	2013-06-22 18:55:02.641242947 +0000
++++ wicd-1.7.2.4/wicd/wicd-daemon.py	2013-06-22 18:58:33.990244153 +0000
+@@ -69,6 +69,7 @@
+ wireless_conf = os.path.join(wpath.etc, "wireless-settings.conf")
+ wired_conf = os.path.join(wpath.etc, "wired-settings.conf")
+ dhclient_conf = os.path.join(wpath.etc, "dhclient.conf.template")
++dhclient_conf_default = os.path.join(wpath.share, "other", "dhclient.conf.template.default")
+ 
+ class WicdDaemon(dbus.service.Object):
+     """ The main wicd daemon class.
+@@ -910,7 +911,7 @@
+ 
+         if not os.path.isfile(dhclient_conf):
+             print "dhclient.conf.template not found, copying..."
+-            shutil.copy(dhclient_conf + ".default", dhclient_conf)            
++            shutil.copy(dhclient_conf_default, dhclient_conf)
+         # Hide the files, so the keys aren't exposed.
+         print "chmoding configuration files 0600..."
+         os.chmod(app_conf.get_config(), 0600)diff -ruN wicd-1.7.2.4.orig/wicd/wnettools.py wicd-1.7.2.4/wicd/wnettools.py
 --- wicd-1.7.2.4.orig/wicd/wnettools.py	2013-03-30 21:47:19.804907552 +0000
 +++ wicd-1.7.2.4/wicd/wnettools.py	2013-03-31 08:44:37.572792110 +0000
 @@ -37,6 +37,7 @@

From 52ed09d210d3d6bcb1e3021058c3afe69a02a318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 6 Jul 2013 10:34:17 +0200
Subject: [PATCH 003/439] pciutils: update

This breaks udev145 due to enabling compression again,
but I rather think we should remove udev145 (not used anywhere).
---
 pkgs/tools/system/pciutils/default.nix | 33 ++++++++++++--------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 78ff9131fa8b..3f63d077c7fa 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -1,29 +1,26 @@
-{ stdenv, fetchurl, zlib }:
-
-stdenv.mkDerivation rec {
-  name = "pciutils-3.1.10";
-
-  src = fetchurl {
-    url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2";
-    sha256 = "0xdahcxd00c921wnxi0f0w3lzjqdfphwa5vglfcpf0lv3l2w40pl";
-  };
-
-  buildInputs = [ zlib ];
+{ stdenv, fetchurl, pkgconfig, zlib, kmod, which }:
 
+let
   pciids = fetchurl {
     # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2.
     url = http://tarballs.nixos.org/pci.ids.20120929.bz2;
     sha256 = "1q3i479ay88wam1zz1vbgkbqb2axg8av9qjxaigrqbnw2pv0srmb";
   };
+in
+stdenv.mkDerivation rec {
+  name = "pciutils-3.2.0";
 
-  # Override broken auto-detect logic.
-  # Note: we can't compress pci.ids (ZLIB=yes) because udev requires
-  # an uncompressed pci.ids.
-  makeFlags = "ZLIB=no DNS=yes SHARED=yes PREFIX=\${out}";
+  src = fetchurl {
+    url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2";
+    sha256 = "0d9as9jzjjg5c1nwf58z1y1i7rf9fqxmww1civckhcvcn0xr85mq";
+  };
 
-  preBuild = ''
-    bunzip2 < $pciids > pci.ids
-  '';
+  buildInputs = [ pkgconfig zlib kmod which ];
+
+  # currently up-to-date
+  #preBuild = "bunzip2 < ${pciids} > pci.ids";
+
+  makeFlags = "SHARED=yes PREFIX=\${out}";
 
   installTargets = "install install-lib";
 

From 0a30727ca0f462f866a6fa1c0ef291dc4f42cac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 6 Jul 2013 11:55:40 +0200
Subject: [PATCH 004/439] usbutils: update 006 -> 007

---
 pkgs/os-specific/linux/usbutils/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index 3956b5e04d09..b7d139a534f0 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -11,16 +11,17 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "usbutils-006";
+  name = "usbutils-007";
 
   src = fetchurl {
-    url = mirror://kernel/linux/utils/usb/usbutils/usbutils-006.tar.xz;
-    sha256 = "03pd57vv8c6x0hgjqcbrxnzi14h8hcghmapg89p8k5zpwpkvbdfr";
+    url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz";
+    sha256 = "197gpbxnspy6ncqv5mziaikcfqgb3irbqqlfwjgzvh5v4hbs14vm";
   };
 
   buildInputs = [ pkgconfig libusb1 ];
 
-  preBuild = "bunzip2 < ${usbids} > usb.ids";
+  # currently up-to-date
+  #preBuild = "bunzip2 < ${usbids} > usb.ids";
 
   meta = {
     homepage = http://www.linux-usb.org/;

From e3a67bbb99f8c9d04aa0efae85cc8412d2380c97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 22 May 2013 10:44:32 +0200
Subject: [PATCH 005/439] diffuse: new package, close #731.

Diffuse is a graphical diff and merge tool.
http://diffuse.sourceforge.net/
---
 .../version-management/diffuse/default.nix    | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/version-management/diffuse/default.nix

diff --git a/pkgs/applications/version-management/diffuse/default.nix b/pkgs/applications/version-management/diffuse/default.nix
new file mode 100644
index 000000000000..92cdddd8dcb0
--- /dev/null
+++ b/pkgs/applications/version-management/diffuse/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, python, pygtk, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  version = "0.4.7";
+  name = "diffuse-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${name}.tar.bz2";
+    sha256 = "1b1riy9wix2gby78v9i30ijycjhkcyqsllggjakbkx26sb5nmxdh";
+  };
+
+  buildInputs = [ python pygtk makeWrapper ];
+
+  buildPhase = ''
+    python ./install.py --prefix="$out" --sysconfdir="$out/etc" --pythonbin="${python}/bin/python"
+    wrapProgram "$out/bin/diffuse" --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0
+  '';
+
+  # no-op, everything is done in buildPhase
+  installPhase = "true";
+
+  # NOTE: diffuse installs a .desktop file itself
+
+  meta = with stdenv.lib; {
+    description = "Graphical diff and merge tool";
+    homepage = http://diffuse.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f44a70f22119..c1629e317210 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7207,6 +7207,8 @@ let
     inherit (pkgs.gnome) libart_lgpl libgnomeui;
   };
 
+  diffuse = callPackage ../applications/version-management/diffuse { };
+
   distrho = callPackage ../applications/audio/distrho {};
 
   djvulibre = callPackage ../applications/misc/djvulibre { };

From f8783e18dca53dca5899ee1894fc6f04cb3822ef Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 8 Jul 2013 11:14:59 +0200
Subject: [PATCH 006/439] Add mongoose-schema-extend, passport-http, timezone,
 libyaml and i18next nodejs packages

---
 pkgs/top-level/node-packages-generated.nix | 240 +++++++++++++++------
 pkgs/top-level/node-packages.json          |   5 +
 2 files changed, 177 insertions(+), 68 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index ec40cc2cb5c7..4ff44f541555 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -563,9 +563,9 @@
   }
   {
     baseName = "connect";
-    version = "2.8.1";
-    fullName = "connect-2.8.1";
-    hash = "f838a4e8bccdf065cda7affe0118f018bdf1baa87375cd1df92e2cff29da2948";
+    version = "2.8.3";
+    fullName = "connect-2.8.3";
+    hash = "a68c7f95eb1d8f574ffbba1c6ceaaa8a05189774099dcb327e29721f4514f309";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -573,13 +573,14 @@
       { name = "formidable"; range = "1.0.14"; }
       { name = "cookie-signature"; range = "1.0.1"; }
       { name = "buffer-crc32"; range = "0.2.1"; }
-      { name = "cookie"; range = "0.0.5"; }
-      { name = "send"; range = "0.1.1"; }
+      { name = "cookie"; range = "0.1.0"; }
+      { name = "send"; range = "0.1.2"; }
       { name = "bytes"; range = "0.2.0"; }
       { name = "fresh"; range = "0.1.0"; }
       { name = "pause"; range = "0.0.1"; }
       { name = "uid2"; range = "0.0.2"; }
       { name = "debug"; range = "*"; }
+      { name = "methods"; range = "0.0.1"; }
     ];
   }
   {
@@ -594,9 +595,9 @@
   }
   {
     baseName = "connect-mongo";
-    version = "0.3.2";
+    version = "0.3.3";
     fullName = "connect-mongo-*";
-    hash = "1f37b52d7816769f33dfa94fad0323f8685139a3a01d738b7a29531f172f86b6";
+    hash = "d3613f8e747b83ac1cc559366cba85c47fa391337166719ac87d98dd98bb2433";
     patchLatest = false;
     topLevel = true;
     dependencies = [
@@ -605,9 +606,9 @@
   }
   {
     baseName = "connect";
-    version = "2.8.1";
+    version = "2.8.3";
     fullName = "connect-~2";
-    hash = "f838a4e8bccdf065cda7affe0118f018bdf1baa87375cd1df92e2cff29da2948";
+    hash = "a68c7f95eb1d8f574ffbba1c6ceaaa8a05189774099dcb327e29721f4514f309";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -615,13 +616,14 @@
       { name = "formidable"; range = "1.0.14"; }
       { name = "cookie-signature"; range = "1.0.1"; }
       { name = "buffer-crc32"; range = "0.2.1"; }
-      { name = "cookie"; range = "0.0.5"; }
-      { name = "send"; range = "0.1.1"; }
+      { name = "cookie"; range = "0.1.0"; }
+      { name = "send"; range = "0.1.2"; }
       { name = "bytes"; range = "0.2.0"; }
       { name = "fresh"; range = "0.1.0"; }
       { name = "pause"; range = "0.0.1"; }
       { name = "uid2"; range = "0.0.2"; }
       { name = "debug"; range = "*"; }
+      { name = "methods"; range = "0.0.1"; }
     ];
   }
   {
@@ -715,6 +717,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "cookies";
+    version = "0.3.6";
+    fullName = "cookies->= 0.2.2";
+    hash = "e35b00cc06a33a3bc1d808daa7bc29f02674c02158c5dd812cf73f275bda8b83";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "cryptiles";
     version = "0.1.3";
@@ -728,9 +740,9 @@
   }
   {
     baseName = "cryptiles";
-    version = "0.2.1";
+    version = "0.2.2";
     fullName = "cryptiles-0.2.x";
-    hash = "a7ad8087bf6abbbfa0ae159756c04326a490f373212f6f2fd0f3a1f63f475892";
+    hash = "ed3c2d5d3c1322d5389cceb46778a6c39a62842f737047666d63abda5b39fab5";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -962,21 +974,21 @@
   }
   {
     baseName = "express";
-    version = "3.3.1";
+    version = "3.3.3";
     fullName = "express-*";
-    hash = "8ca5ce06324343402e5186263c2dca3a28f055093bc6e7bd7270ce4a7356ae8b";
+    hash = "ba67b79732082d24acebb38e273ce7749a86590d999bab2d5f2f9cc566ee8c9c";
     patchLatest = false;
     topLevel = true;
     dependencies = [
-      { name = "connect"; range = "2.8.1"; }
-      { name = "commander"; range = "0.6.1"; }
+      { name = "connect"; range = "2.8.3"; }
+      { name = "commander"; range = "1.2.0"; }
       { name = "range-parser"; range = "0.0.4"; }
-      { name = "mkdirp"; range = "0.3.4"; }
+      { name = "mkdirp"; range = "0.3.5"; }
       { name = "cookie"; range = "0.1.0"; }
       { name = "buffer-crc32"; range = "0.2.1"; }
       { name = "fresh"; range = "0.1.0"; }
       { name = "methods"; range = "0.0.1"; }
-      { name = "send"; range = "0.1.1"; }
+      { name = "send"; range = "0.1.2"; }
       { name = "cookie-signature"; range = "1.0.1"; }
       { name = "debug"; range = "*"; }
     ];
@@ -1044,9 +1056,9 @@
   }
   {
     baseName = "faye-websocket";
-    version = "0.6.0";
+    version = "0.6.1";
     fullName = "faye-websocket-*";
-    hash = "192f09ecd1c52fc357d2ad3ae3121be35556b7b09e30ce74117d80b9dbae3f60";
+    hash = "f99544759c7f0ae24f283d6e3e062d4ea816243985b88d00c8cd124ba617d7c5";
     patchLatest = false;
     topLevel = true;
     dependencies = [
@@ -1320,6 +1332,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "growl";
+    version = "1.5.1";
+    fullName = "growl-1.5.x";
+    hash = "81ad61e3f06d087da4c680e5e83a878f164925d3ed5a7f44b734e6ecd79cb8b0";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "growl";
     version = "1.7.0";
@@ -1480,9 +1502,9 @@
   }
   {
     baseName = "http-signature";
-    version = "0.9.11";
-    fullName = "http-signature-~0.9.11";
-    hash = "44b89f3c1917bf02723a5720f08fbe47448e0370a5d3498d1be860eaf28beb3b";
+    version = "0.10.0";
+    fullName = "http-signature-~0.10.0";
+    hash = "badaa47893d7a6c352ffb0746d68dd225fbb057b7d7149ad87093276445bf95b";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -1501,6 +1523,17 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "i18next";
+    version = "1.6.8";
+    fullName = "i18next-*";
+    hash = "5c2652a8efaaefa0d268e4cd02dd79742eb3c5a74725621d6b0f5a856db4210a";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "cookies"; range = ">= 0.2.2"; }
+    ];
+  }
   {
     baseName = "inherits";
     version = "1.0.0";
@@ -1671,7 +1704,7 @@
   {
     baseName = "kerberos";
     version = "0.0.3";
-    fullName = "kerberos-*";
+    fullName = "kerberos-0.0.3";
     hash = "40300bf5e4ca224127b7e88586dce003c58e59cf4972f699fdc95079135a76fe";
     patchLatest = false;
     topLevel = false;
@@ -1728,6 +1761,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "libyaml";
+    version = "0.2.2";
+    fullName = "libyaml-*";
+    hash = "20bd05a1abc5ba18cc3b5de52bc44095fa59b03c6c3ffb6f46c55bd801cff3db";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+    ];
+  }
   {
     baseName = "lru-cache";
     version = "2.3.0";
@@ -1957,16 +2000,6 @@
     dependencies = [
     ];
   }
-  {
-    baseName = "mkdirp";
-    version = "0.3.4";
-    fullName = "mkdirp-0.3.4";
-    hash = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
   {
     baseName = "mkdirp";
     version = "0.3.5";
@@ -2025,6 +2058,21 @@
       { name = "glob"; range = "3.2.1"; }
     ];
   }
+  {
+    baseName = "mocha";
+    version = "1.3.2";
+    fullName = "mocha-~1.3.2";
+    hash = "38bb1638122140c4c8986e02dd0c23105abedaca2ad8d2c8f3bc64bbfa7f6f53";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "commander"; range = "0.6.1"; }
+      { name = "growl"; range = "1.5.x"; }
+      { name = "jade"; range = "0.26.3"; }
+      { name = "diff"; range = "1.0.2"; }
+      { name = "debug"; range = "*"; }
+    ];
+  }
   {
     baseName = "mongodb";
     version = "1.2.14";
@@ -2038,26 +2086,26 @@
   }
   {
     baseName = "mongodb";
-    version = "1.3.10";
-    fullName = "mongodb-1.3.10";
-    hash = "ea6f279c0bebedec94f0d757fef775302dba6dd4a3792f59696d094bd2c2f113";
-    patchLatest = true;
+    version = "1.3.11";
+    fullName = "mongodb-1.3.11";
+    hash = "cd00f9c0fafd280d30f9e604c76aa7eb59748521f5b0438c15ced90533376a62";
+    patchLatest = false;
     topLevel = false;
     dependencies = [
       { name = "bson"; range = "0.1.9"; }
-      { name = "kerberos"; range = "*"; }
+      { name = "kerberos"; range = "0.0.3"; }
     ];
   }
   {
     baseName = "mongoose";
-    version = "3.6.13";
+    version = "3.6.14";
     fullName = "mongoose-*";
-    hash = "b6d79ace01b4acbabb0c07d4c053f6fdf4a6b7252cc506ccbbc7a6db5e6bbe36";
+    hash = "eab35fb10f1da7a24a4b3c3c0edfea6941031e8d9e9b6120c683b736329a5781";
     patchLatest = false;
     topLevel = true;
     dependencies = [
       { name = "hooks"; range = "0.2.1"; }
-      { name = "mongodb"; range = "1.3.10"; }
+      { name = "mongodb"; range = "1.3.11"; }
       { name = "ms"; range = "0.1.0"; }
       { name = "sliced"; range = "0.0.3"; }
       { name = "muri"; range = "0.3.1"; }
@@ -2066,6 +2114,18 @@
       { name = "regexp-clone"; range = "0.0.1"; }
     ];
   }
+  {
+    baseName = "mongoose-schema-extend";
+    version = "0.1.3";
+    fullName = "mongoose-schema-extend-*";
+    hash = "f91e0851475ea525544bc65578e6ca55de345bc4c3332cc732fd3a66e1af1b1b";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "owl-deepcopy"; range = "~0.0.1"; }
+      { name = "mocha"; range = "~1.3.2"; }
+    ];
+  }
   {
     baseName = "monocle";
     version = "0.1.48";
@@ -2242,9 +2302,9 @@
   }
   {
     baseName = "node-gyp";
-    version = "0.10.4";
+    version = "0.10.5";
     fullName = "node-gyp-*";
-    hash = "b8bd44e4f5143fff5c22d5961982ae1504467dff17624be4525728c0500fd3a4";
+    hash = "e52cdb18b2b457600b6c5178a6c5f3de6ec81b94cde85e14c0c8f6e58a2c041a";
     patchLatest = false;
     topLevel = true;
     dependencies = [
@@ -2506,6 +2566,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "owl-deepcopy";
+    version = "0.0.2";
+    fullName = "owl-deepcopy-~0.0.1";
+    hash = "69f76104c1f4610a4905ef7a184026850660b5e1fcaac9beb8ad0d6e4d54b58b";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "passport";
     version = "0.1.17";
@@ -2518,6 +2588,18 @@
       { name = "pause"; range = "0.0.1"; }
     ];
   }
+  {
+    baseName = "passport-http";
+    version = "0.2.2";
+    fullName = "passport-http-*";
+    hash = "3a333781016b3e20462fde18ebeb1d9794c6353564ee646b3008ce2540504d1f";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "pkginfo"; range = "0.2.x"; }
+      { name = "passport"; range = "~0.1.3"; }
+    ];
+  }
   {
     baseName = "passport-local";
     version = "0.1.6";
@@ -2542,6 +2624,18 @@
       { name = "pause"; range = "0.0.1"; }
     ];
   }
+  {
+    baseName = "passport";
+    version = "0.1.17";
+    fullName = "passport-~0.1.3";
+    hash = "65c15a1666abc16a86d586233f40b89b68b50bf88107809878742973af8b516e";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "pkginfo"; range = "0.2.x"; }
+      { name = "pause"; range = "0.0.1"; }
+    ];
+  }
   {
     baseName = "pause";
     version = "0.0.1";
@@ -2796,9 +2890,9 @@
   }
   {
     baseName = "request";
-    version = "2.21.0";
+    version = "2.22.0";
     fullName = "request-2";
-    hash = "fe31c3119bc4423f07aa7c9849cb642d5ad22bdf2a2700eab56fb83fa8ed429c";
+    hash = "d0a7ebc001800143d05cedf616cc164a31425bcbfdb8eb533b59d8c123b1275c";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -2806,7 +2900,7 @@
       { name = "json-stringify-safe"; range = "~4.0.0"; }
       { name = "forever-agent"; range = "~0.5.0"; }
       { name = "tunnel-agent"; range = "~0.3.0"; }
-      { name = "http-signature"; range = "~0.9.11"; }
+      { name = "http-signature"; range = "~0.10.0"; }
       { name = "hawk"; range = "~0.13.0"; }
       { name = "aws-sign"; range = "~0.3.0"; }
       { name = "oauth-sign"; range = "~0.3.0"; }
@@ -2849,9 +2943,9 @@
   }
   {
     baseName = "request";
-    version = "2.21.0";
+    version = "2.22.0";
     fullName = "request-~2";
-    hash = "fe31c3119bc4423f07aa7c9849cb642d5ad22bdf2a2700eab56fb83fa8ed429c";
+    hash = "d0a7ebc001800143d05cedf616cc164a31425bcbfdb8eb533b59d8c123b1275c";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -2859,7 +2953,7 @@
       { name = "json-stringify-safe"; range = "~4.0.0"; }
       { name = "forever-agent"; range = "~0.5.0"; }
       { name = "tunnel-agent"; range = "~0.3.0"; }
-      { name = "http-signature"; range = "~0.9.11"; }
+      { name = "http-signature"; range = "~0.10.0"; }
       { name = "hawk"; range = "~0.13.0"; }
       { name = "aws-sign"; range = "~0.3.0"; }
       { name = "oauth-sign"; range = "~0.3.0"; }
@@ -2973,9 +3067,9 @@
   }
   {
     baseName = "semver";
-    version = "2.0.8";
+    version = "2.0.9";
     fullName = "semver-*";
-    hash = "7eefaea9185bc43025725a55179425f04abc80c33f9d90b10385e0bf54710876";
+    hash = "cc1b4edd155fdec8638cf0acb90ba7855a9c8ea27f0a3ae2da21c12582d40050";
     patchLatest = false;
     topLevel = true;
     dependencies = [
@@ -3003,9 +3097,9 @@
   }
   {
     baseName = "semver";
-    version = "2.0.8";
+    version = "2.0.9";
     fullName = "semver-~2.0.7";
-    hash = "7eefaea9185bc43025725a55179425f04abc80c33f9d90b10385e0bf54710876";
+    hash = "cc1b4edd155fdec8638cf0acb90ba7855a9c8ea27f0a3ae2da21c12582d40050";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -3013,9 +3107,9 @@
   }
   {
     baseName = "send";
-    version = "0.1.1";
+    version = "0.1.2";
     fullName = "send-*";
-    hash = "4d237af8bc86148952d0577bed44bd41928a4422c9a6e25e45fc35103aa6e872";
+    hash = "d3fdea73a77e9f0f826e3fa5fa7ed7ef60a51912f5b976d4c112d7c52ac4668f";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -3041,9 +3135,9 @@
   }
   {
     baseName = "send";
-    version = "0.1.1";
-    fullName = "send-0.1.1";
-    hash = "4d237af8bc86148952d0577bed44bd41928a4422c9a6e25e45fc35103aa6e872";
+    version = "0.1.2";
+    fullName = "send-0.1.2";
+    hash = "d3fdea73a77e9f0f826e3fa5fa7ed7ef60a51912f5b976d4c112d7c52ac4668f";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -3362,6 +3456,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "timezone";
+    version = "0.0.21";
+    fullName = "timezone-*";
+    hash = "6f595e6376708b1c35d1dac3b3c1c44384b3928f7b3a4f33165817275548c8d1";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+    ];
+  }
   {
     baseName = "transformers";
     version = "2.0.1";
@@ -3445,9 +3549,9 @@
   }
   {
     baseName = "underscore";
-    version = "1.4.4";
+    version = "1.5.1";
     fullName = "underscore-*";
-    hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3";
+    hash = "40e2c86742d4af529cbb58f8cb68de128a18a32a78ab3b8bfa9f9a9544003018";
     patchLatest = false;
     topLevel = true;
     dependencies = [
@@ -3465,9 +3569,9 @@
   }
   {
     baseName = "underscore";
-    version = "1.4.4";
+    version = "1.5.1";
     fullName = "underscore->=1.1.7";
-    hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3";
+    hash = "40e2c86742d4af529cbb58f8cb68de128a18a32a78ab3b8bfa9f9a9544003018";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -3475,9 +3579,9 @@
   }
   {
     baseName = "underscore";
-    version = "1.4.4";
+    version = "1.5.1";
     fullName = "underscore->=1.4.3";
-    hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3";
+    hash = "40e2c86742d4af529cbb58f8cb68de128a18a32a78ab3b8bfa9f9a9544003018";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -3614,9 +3718,9 @@
   }
   {
     baseName = "websocket-driver";
-    version = "0.2.1";
+    version = "0.2.2";
     fullName = "websocket-driver->=0.2.0";
-    hash = "8aab2b32695fecd2bca57d95bc51f0eb8a9a5bb298187a8fe3a84cd2cd8e3dc7";
+    hash = "2a5da351b8f716ef2595899b1e6911f739a420df64e65bfba2adf1fab42fe423";
     patchLatest = false;
     topLevel = false;
     dependencies = [
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 1cf0d169dbd7..640777cca298 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -43,10 +43,12 @@
 , "view-helpers"
 , "redis"
 , "mongoose"
+, "mongoose-schema-extend"
 , "connect-mongo"
 , "connect-flash"
 , "passport"
 , "passport-local"
+, "passport-http"
 , "gzippo"
 , "walk"
 , "forever"
@@ -54,4 +56,7 @@
 , "supertest"
 , "should"
 , "nodemon"
+, "timezone"
+, "libyaml"
+, "i18next"
 ]

From 40ad1858915fcf167ab4305df6e5a107256bc08b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Jul 2013 14:04:51 +0200
Subject: [PATCH 007/439] git: update to version 1.8.3.2

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index f042b2e0faa5..fcd3b77889dd 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -10,7 +10,7 @@
 
 let
 
-  version = "1.8.2.3";
+  version = "1.8.3.2";
 
   svn = subversionClient.override { perlBindings = true; };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha1 = "2831f7deec472db4d0d0cdffb4d82d91cecdf295";
+    sha256 = "0mfylhcdrh8prxkbs0gc877rmra2ks48bchg4hhaf2vpw9hpdf63";
   };
 
   patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];

From 7b89bb2da4e3a854210706d9d4996ae2cfe3f70d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Jul 2013 11:53:10 +0200
Subject: [PATCH 008/439] haskell-attoparsec-conduit: update to version 1.0.1.1

---
 .../libraries/haskell/attoparsec-conduit/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
index 663a91b0c30f..a08495db61b7 100644
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@@ -3,14 +3,14 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec-conduit";
-  version = "1.0.1";
-  sha256 = "14b6ym5sjvg1x82ijydhrjk5445kg0fvwqzqwqld59akbqb6fpg5";
+  version = "1.0.1.1";
+  sha256 = "0v6d5a720fksvgaysbhqfzsq9a9h0l37yw3dbskxljbdy66gqsh0";
   buildDepends = [ attoparsec conduit text transformers ];
   testDepends = [ attoparsec conduit hspec resourcet text ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Consume attoparsec parsers via conduit";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };

From 75e376120a4c3894fc49610caa77b8e722c7a8ff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Jul 2013 11:53:10 +0200
Subject: [PATCH 009/439] haskell-conduit: update to version 1.0.7.1

---
 pkgs/development/libraries/haskell/conduit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 26d775772e0e..be94e811e8db 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.7";
-  sha256 = "0nail476sz4dmr052sl5s14hkk336zp22hpgmr2qf141zzy8i2m1";
+  version = "1.0.7.1";
+  sha256 = "1j80kc1nwhsglh991rp9lfawlhr0kc8q8lzglfkda60f0nihiijy";
   buildDepends = [
     liftedBase mmorph monadControl mtl resourcet text transformers
     transformersBase void
@@ -16,7 +16,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Streaming data processing library";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };

From ff42719fd7c9d4343615463935dee782e03f38d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Jul 2013 11:53:10 +0200
Subject: [PATCH 010/439] haskell-data-binary-ieee754: update to version 0.4.4

---
 .../libraries/haskell/data-binary-ieee754/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
index 5066a83c5f60..db9b90574e4b 100644
--- a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
+++ b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-binary-ieee754";
-  version = "0.4.3";
-  sha256 = "0aba7qvjvhfp9cpr65j8zs62niv9yccrardk10aaqpkz3ihc86pm";
+  version = "0.4.4";
+  sha256 = "02nzg1barhqhpf4x26mpzvk7jd29nali033qy01adjplv2z5m5sr";
   buildDepends = [ binary ];
   meta = {
     homepage = "https://john-millikin.com/software/data-binary-ieee754/";

From 1d0fa2194416cd5f9f98eae94f537b6a4674070c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Jul 2013 11:53:10 +0200
Subject: [PATCH 011/439] haskell-filesystem-conduit: update to version 1.0.0.1

---
 .../libraries/haskell/filesystem-conduit/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
index 46ae27fc0901..f1a0554e380c 100644
--- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "filesystem-conduit";
-  version = "1.0.0";
-  sha256 = "1fz3iihcqpg6m3svjqdg8lvkpza955qn8cbs9b3w333vxkglhi6v";
+  version = "1.0.0.1";
+  sha256 = "04l8i97mr0jzkc7vc77j885n45qd2qyn5kmzxyckp3za96sjsqqw";
   buildDepends = [
     conduit systemFileio systemFilepath text transformers
   ];
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Use system-filepath data types with conduits";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
 })

From df2295fa5fe03138d50de499e327d4bf4357713a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Jul 2013 11:53:10 +0200
Subject: [PATCH 012/439] haskell-hmatrix: update to version 0.15.0.0

---
 pkgs/development/libraries/haskell/hmatrix/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index 2542e2005865..eda7e1ff8596 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -1,12 +1,12 @@
-{ cabal, binary, blas, gsl, liblapack, random, storableComplex
-, vector
+{ cabal, binary, blas, deepseq, gsl, liblapack, random
+, storableComplex, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "hmatrix";
-  version = "0.14.1.0";
-  sha256 = "10fvbk3k2fgac46a86mc8g0s5gsw1p1bz4k57gn6dzgwh73mxjx7";
-  buildDepends = [ binary random storableComplex vector ];
+  version = "0.15.0.0";
+  sha256 = "1n3m36kkgxhhmm7cmz4is9q558dw3l5h1laxnxwhs3cfdzfclyfs";
+  buildDepends = [ binary deepseq random storableComplex vector ];
   extraLibraries = [ blas gsl liblapack ];
   meta = {
     homepage = "https://github.com/albertoruiz/hmatrix";

From 68c14a66bee95d466b970e0ccf3cd60d5104458a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Jul 2013 11:53:10 +0200
Subject: [PATCH 013/439] haskell-network-conduit-tls: update to version
 1.0.0.3

---
 .../libraries/haskell/network-conduit-tls/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
index 483271fe9598..2785f9c5ab11 100644
--- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-conduit-tls";
-  version = "1.0.0.2";
-  sha256 = "1vzhalz6hxal73rxm6f2l9m7j34mldamz16wrb6ay67wg6giq55z";
+  version = "1.0.0.3";
+  sha256 = "0gaws4spd50dmqjsxdxvjk5n5l0ib4q0brwnxrk725d3b3hanpz1";
   buildDepends = [
     aeson certificate conduit cryptoApi cryptoRandomApi network
     networkConduit pem systemFileio systemFilepath tls tlsExtra

From 62afa83e715ffd8da168f8c4dc255a755bf1c7aa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Jul 2013 11:53:10 +0200
Subject: [PATCH 014/439] haskell-oeis: update to version 0.3.5

---
 pkgs/development/libraries/haskell/oeis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix
index 0b26de00e05d..d5ec97b6f6a9 100644
--- a/pkgs/development/libraries/haskell/oeis/default.nix
+++ b/pkgs/development/libraries/haskell/oeis/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "oeis";
-  version = "0.3.4";
-  sha256 = "15xn7cybk43lk8wjd22l3zwvkyrmlixpfyrxsy3rnvh0vmn0r25d";
+  version = "0.3.5";
+  sha256 = "0r23mqbfvvvx6shzdclzfrqi8r95gxl93cih7ny7w7px3w5yc5x6";
   buildDepends = [ HTTP network ];
   testDepends = [ HUnit testFramework testFrameworkHunit ];
   meta = {

From 8976670d9dd1ce826cba3cceb852029b93f29c1e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Jul 2013 11:53:10 +0200
Subject: [PATCH 015/439] haskell-persistent: update to version 1.2.1.1

---
 pkgs/development/libraries/haskell/persistent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 7c4c1dba3812..7a5731397956 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "1.2.1";
-  sha256 = "1f01fvagjxqqycblq3z3z6qcas9vp9bgxnjz09173x4c9xvg3qj2";
+  version = "1.2.1.1";
+  sha256 = "12gn84svbi72122si9q61987wmb8zbam0x7jy2x20r2bbdfh50rv";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
     liftedBase monadControl monadLogger pathPieces poolConduit

From 5e867b6e808eb062884d65980ece8f59dbb66cb6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Jul 2013 11:53:10 +0200
Subject: [PATCH 016/439] haskell-threadmanager: update to version 0.1.7

---
 pkgs/development/libraries/haskell/threadmanager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix
index 4641ec80f239..e4a82835c55e 100644
--- a/pkgs/development/libraries/haskell/threadmanager/default.nix
+++ b/pkgs/development/libraries/haskell/threadmanager/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "threadmanager";
-  version = "0.1.6";
-  sha256 = "16q09kx3rfjaa3rvyfwrxpsnvw50r3q8pk1if6xm0v4ya3lbvibs";
+  version = "0.1.7";
+  sha256 = "17s26hlailbr8c9d3dv1pwiy81m3nzr3sw0v9y716rmhldf7k09f";
   meta = {
     description = "(deprecated in favor of 'threads') Simple thread management";
     license = self.stdenv.lib.licenses.bsd3;

From 31d4df10dc1d9e095406f823e6563d948dc3ad99 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Jul 2013 11:53:10 +0200
Subject: [PATCH 017/439] haskell-yesod-auth: update to version 1.2.0.2

---
 pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 22f1c583011f..3327dc1c08cd 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.2.0.1";
-  sha256 = "02nljkc12mgjhvkiv876w6w13q9s9iigya8v4jzj6myv48lainvd";
+  version = "1.2.0.2";
+  sha256 = "1vimv1zcpq167nd8fa3y0mrrwh1hqh2rqwmz5mg9zvqzz95wvhmh";
   buildDepends = [
     aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate
     fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network

From 56518d73b8abe1e1741abf3a28b81012785aa14c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Jul 2013 11:53:11 +0200
Subject: [PATCH 018/439] haskell-yesod-platform: update to version 1.2.2

---
 .../haskell/yesod-platform/default.nix        | 58 ++++++++++---------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix
index fbec41ce1249..20d457816312 100644
--- a/pkgs/development/libraries/haskell/yesod-platform/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix
@@ -1,21 +1,22 @@
 { cabal, aeson, ansiTerminal, asn1Data, asn1Types, attoparsec
 , attoparsecConduit, authenticate, base64Bytestring
 , baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml
-, blazeMarkup, byteorder, caseInsensitive, cereal, certificate
-, cipherAes, cipherRc4, clientsession, conduit, cookie, cprngAes
-, cryptoApi, cryptoConduit, cryptohash, cryptoNumbers, cryptoPubkey
-, cryptoPubkeyTypes, cryptoRandomApi, cssText, dataDefault
-, dataDefaultClass, dataDefaultInstancesBase
+, blazeMarkup, byteable, byteorder, caseInsensitive, cereal
+, certificate, cipherAes, cipherRc4, clientsession, conduit, cookie
+, cprngAes, cryptoApi, cryptoConduit, cryptohash, cryptoNumbers
+, cryptoPubkey, cryptoPubkeyTypes, cryptoRandomApi, cssText
+, dataDefault, dataDefaultClass, dataDefaultInstancesBase
 , dataDefaultInstancesContainers, dataDefaultInstancesDlist
 , dataDefaultInstancesOldLocale, dateCache, dlist, emailValidate
 , entropy, failure, fastLogger, fileEmbed, filesystemConduit
-, hamlet, hashable, hjsmin, hspec, hspecExpectations, htmlConduit
-, httpConduit, httpDate, httpTypes, languageJavascript, liftedBase
-, mimeMail, mimeTypes, mmorph, monadControl, monadLogger
-, networkConduit, pathPieces, pem, persistent, persistentTemplate
-, poolConduit, primitive, publicsuffixlist, pureMD5, pwstoreFast
-, quickcheckIo, resourcePool, resourcet, safe, semigroups, setenv
-, SHA, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs
+, hamlet, hjsmin, hspec, hspecExpectations, htmlConduit
+, httpAttoparsec, httpConduit, httpDate, httpTypes
+, languageJavascript, liftedBase, mimeMail, mimeTypes, mmorph
+, monadControl, monadLogger, networkConduit, pathPieces, pem
+, persistent, persistentTemplate, poolConduit, primitive
+, publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo
+, resourcePool, resourcet, safe, semigroups, setenv, SHA
+, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs
 , shakespeareText, silently, simpleSendfile, skein, socks
 , stringsearch, systemFileio, systemFilepath, tagged, tagsoup
 , tagstreamConduit, tls, tlsExtra, transformersBase, unixCompat
@@ -28,25 +29,26 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-platform";
-  version = "1.2.1";
-  sha256 = "1wa1g37ipigscv8xwb5zyfawjw0fxqmwr2l6wdf507r0kvclk2ap";
+  version = "1.2.2";
+  sha256 = "18kgw094y3vzlpdn1rfrsrrqymhsw5y7kyrql3ghwgp0cm3fiks0";
   buildDepends = [
     aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
     authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
-    blazeBuilderConduit blazeHtml blazeMarkup byteorder caseInsensitive
-    cereal certificate cipherAes cipherRc4 clientsession conduit cookie
-    cprngAes cryptoApi cryptoConduit cryptohash cryptoNumbers
-    cryptoPubkey cryptoPubkeyTypes cryptoRandomApi cssText dataDefault
-    dataDefaultClass dataDefaultInstancesBase
-    dataDefaultInstancesContainers dataDefaultInstancesDlist
-    dataDefaultInstancesOldLocale dateCache dlist emailValidate entropy
-    failure fastLogger fileEmbed filesystemConduit hamlet hashable
-    hjsmin hspec hspecExpectations htmlConduit httpConduit httpDate
-    httpTypes languageJavascript liftedBase mimeMail mimeTypes mmorph
-    monadControl monadLogger networkConduit pathPieces pem persistent
-    persistentTemplate poolConduit primitive publicsuffixlist pureMD5
-    pwstoreFast quickcheckIo resourcePool resourcet safe semigroups
-    setenv SHA shakespeare shakespeareCss shakespeareI18n shakespeareJs
+    blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder
+    caseInsensitive cereal certificate cipherAes cipherRc4
+    clientsession conduit cookie cprngAes cryptoApi cryptoConduit
+    cryptohash cryptoNumbers cryptoPubkey cryptoPubkeyTypes
+    cryptoRandomApi cssText dataDefault dataDefaultClass
+    dataDefaultInstancesBase dataDefaultInstancesContainers
+    dataDefaultInstancesDlist dataDefaultInstancesOldLocale dateCache
+    dlist emailValidate entropy failure fastLogger fileEmbed
+    filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit
+    httpAttoparsec httpConduit httpDate httpTypes languageJavascript
+    liftedBase mimeMail mimeTypes mmorph monadControl monadLogger
+    networkConduit pathPieces pem persistent persistentTemplate
+    poolConduit primitive publicsuffixlist pureMD5 pwstoreFast
+    quickcheckIo resourcePool resourcet safe semigroups setenv SHA
+    shakespeare shakespeareCss shakespeareI18n shakespeareJs
     shakespeareText silently simpleSendfile skein socks stringsearch
     systemFileio systemFilepath tagged tagsoup tagstreamConduit tls
     tlsExtra transformersBase unixCompat unorderedContainers utf8Light

From 5d06f7aa5ab32856dff4b40d309e81092eae70f5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 2 Jul 2013 16:57:10 +0200
Subject: [PATCH 019/439] pythonPackages: Add a callPackage attribute.

This is to allow for easy overriding using <some_pkg>.override <overrides> and
might be used by other python modules not directly in pythonPackages.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b01af3f2cd3a..ca3d7286628e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13,6 +13,8 @@ pythonPackages = python.modules // rec {
 
   # helpers
 
+  callPackage = pkgs.lib.callPackageWith (pkgs // pythonPackages);
+
   buildPythonPackage = import ../development/python-modules/generic {
     inherit (pkgs) lib;
     inherit python wrapPython setuptools recursivePthLoader offlineDistutils;

From 231b182c365f547ddaee30a8dc2eb04aa52bad4c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 2 Jul 2013 17:00:39 +0200
Subject: [PATCH 020/439] python-blivet: Move into python-modules/blivet.

This is in preparation for adding overridable function attributes.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../python-modules/blivet/default.nix         | 46 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 47 +------------------
 2 files changed, 48 insertions(+), 45 deletions(-)
 create mode 100644 pkgs/development/python-modules/blivet/default.nix

diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
new file mode 100644
index 000000000000..00018893eea9
--- /dev/null
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock
+, libselinux, cryptsetup, multipath_tools, lsof, utillinux, udev
+}:
+
+let
+  pyenable = { enablePython = true; };
+  selinuxWithPython = libselinux.override pyenable;
+  cryptsetupWithPython = cryptsetup.override pyenable;
+in buildPythonPackage rec {
+  name = "blivet-${version}";
+  version = "0.17-1";
+
+  src = fetchurl {
+    url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/"
+        + "${name}.tar.bz2";
+    sha256 = "0b28q539657mqif0mn5dfqcpqv7gbyszg83gf2fv6z7q6206rnx5";
+  };
+
+  postPatch = ''
+    sed -i -e '/find_library/,/find_library/ {
+      c libudev = "${udev}/lib/libudev.so.1"
+    }' blivet/pyudev.py
+    sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \
+      blivet/devicelibs/mpath.py blivet/devices.py
+    sed -i -e '/"wipefs"/ {
+      s|wipefs|${utillinux}/sbin/wipefs|
+      s/-f/--force/
+    }' blivet/formats/__init__.py
+    sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
+    sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py
+    sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py
+  '';
+
+  propagatedBuildInputs = [
+    pykickstart pyparted pyblock udev selinuxWithPython cryptsetupWithPython
+  ];
+
+  # tests are currently _heavily_ broken upstream
+  doCheck = false;
+
+  meta = {
+    homepage = "https://fedoraproject.org/wiki/Blivet";
+    description = "Module for management of a system's storage configuration";
+    license = [ "GPLv2+" "LGPLv2.1+" ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ca3d7286628e..cffc7f251415 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -50,6 +50,8 @@ pythonPackages = python.modules // rec {
 
   # packages defined elsewhere
 
+  blivet = callPackage ../development/python-modules/blivet { };
+
   ipython = import ../shells/ipython {
     inherit (pkgs) stdenv fetchurl sip pyqt4;
     inherit buildPythonPackage pythonPackages;
@@ -476,51 +478,6 @@ pythonPackages = python.modules // rec {
   };
 
 
-  blivet = buildPythonPackage rec {
-    name = "blivet-${version}";
-    version = "0.17-1";
-
-    src = fetchurl {
-      url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/"
-          + "${name}.tar.bz2";
-      sha256 = "0b28q539657mqif0mn5dfqcpqv7gbyszg83gf2fv6z7q6206rnx5";
-    };
-
-    postPatch = ''
-      sed -i -e '/find_library/,/find_library/ {
-        c libudev = "${pkgs.udev}/lib/libudev.so.1"
-      }' blivet/pyudev.py
-      sed -i -e 's|"multipath"|"${pkgs.multipath_tools}/sbin/multipath"|' \
-        blivet/devicelibs/mpath.py blivet/devices.py
-      sed -i -e '/"wipefs"/ {
-        s|wipefs|${pkgs.utillinux}/sbin/wipefs|
-        s/-f/--force/
-      }' blivet/formats/__init__.py
-      sed -i -e 's|"lsof"|"${pkgs.lsof}/bin/lsof"|' blivet/formats/fs.py
-      sed -i -r -e 's|"(u?mount)"|"${pkgs.utillinux}/bin/\1"|' blivet/util.py
-      sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py
-    '';
-
-    propagatedBuildInputs = let
-      pyenable = { enablePython = true; };
-      selinuxWithPython = pkgs.libselinux.override pyenable;
-      cryptsetupWithPython = pkgs.cryptsetup.override pyenable;
-    in [
-      pykickstart pyparted pkgs.udev pyblock
-      selinuxWithPython cryptsetupWithPython
-    ];
-
-    # tests are currently _heavily_ broken upstream
-    doCheck = false;
-
-    meta = {
-      homepage = "https://fedoraproject.org/wiki/Blivet";
-      description = "Module for management of a system's storage configuration";
-      license = [ "GPLv2+" "LGPLv2.1+" ];
-    };
-  };
-
-
   # euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work.
   boto_1_9 = buildPythonPackage (rec {
     name = "boto-1.9b";

From 513de0ff572e876454a892a96ce85a681193bb5a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 2 Jul 2013 17:02:14 +0200
Subject: [PATCH 021/439] python-nixpart: Move into tools/filesystems/.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/filesystems/nixpart/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/python-packages.nix         | 22 ++--------------------
 2 files changed, 23 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/tools/filesystems/nixpart/default.nix

diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix
new file mode 100644
index 000000000000..6f787d0ba208
--- /dev/null
+++ b/pkgs/tools/filesystems/nixpart/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, buildPythonPackage, blivet }:
+
+buildPythonPackage rec {
+  name = "nixpart-${version}";
+  version = "0.2.0";
+
+  src = fetchurl {
+    url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz";
+    sha256 = "1z94h76jn9igksgr84wwbi03fjamwb15hg432x189kgsld1ark4n";
+  };
+
+  propagatedBuildInputs = [ blivet ];
+
+  doCheck = false;
+
+  meta = {
+    description = "NixOS storage manager/partitioner";
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.aszlig ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cffc7f251415..bbedf8a87cb0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -65,6 +65,8 @@ pythonPackages = python.modules // rec {
     pylabQtSupport = false;
   });
 
+  nixpart = callPackage ../tools/filesystems/nixpart { };
+
   pil = import ../development/python-modules/pil {
     inherit (pkgs) fetchurl stdenv libjpeg zlib freetype;
     inherit python buildPythonPackage;
@@ -2909,26 +2911,6 @@ pythonPackages = python.modules // rec {
     };
   });
 
-  nixpart = buildPythonPackage rec {
-    name = "nixpart-${version}";
-    version = "0.2.0";
-
-    src = fetchurl {
-      url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz";
-      sha256 = "1z94h76jn9igksgr84wwbi03fjamwb15hg432x189kgsld1ark4n";
-    };
-
-    propagatedBuildInputs = [ blivet ];
-
-    doCheck = false;
-
-    meta = {
-      description = "NixOS storage manager/partitioner";
-      license = pkgs.lib.licenses.gpl2Plus;
-      maintainers = [ stdenv.lib.maintainers.aszlig ];
-    };
-  };
-
   nose = buildPythonPackage rec {
     name = "nose-1.2.1";
 

From ad9af11c1a0338d9d03d5c8267b0d367e9c9a7d6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 2 Jul 2013 17:16:19 +0200
Subject: [PATCH 022/439] python-blivet: Allow to use external udev.

This allows blivet to be used outside of NixOS and with a different udev SO
major number. Particularily, this is needed for the NixOps Hetzner backend which
is coming soon :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../python-modules/blivet/default.nix         | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index 00018893eea9..564b89347b59 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -1,7 +1,12 @@
 { stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock
-, libselinux, cryptsetup, multipath_tools, lsof, utillinux, udev
+, libselinux, cryptsetup, multipath_tools, lsof, utillinux
+, useNixUdev ? true, udev ? null
+# This is only used when useNixUdev is false
+, udevSoMajor ? 1
 }:
 
+assert useNixUdev -> udev != null;
+
 let
   pyenable = { enablePython = true; };
   selinuxWithPython = libselinux.override pyenable;
@@ -17,9 +22,6 @@ in buildPythonPackage rec {
   };
 
   postPatch = ''
-    sed -i -e '/find_library/,/find_library/ {
-      c libudev = "${udev}/lib/libudev.so.1"
-    }' blivet/pyudev.py
     sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \
       blivet/devicelibs/mpath.py blivet/devices.py
     sed -i -e '/"wipefs"/ {
@@ -29,11 +31,18 @@ in buildPythonPackage rec {
     sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
     sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py
     sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py
-  '';
+  '' + (if useNixUdev then ''
+    sed -i -e '/find_library/,/find_library/ {
+      c libudev = "${udev}/lib/libudev.so.1"
+    }' blivet/pyudev.py
+  '' else ''
+    sed -i -e '/^somajor *=/s/=.*/= ${toString udevSoMajor}/p' \
+      blivet/pyudev.py
+  '');
 
   propagatedBuildInputs = [
-    pykickstart pyparted pyblock udev selinuxWithPython cryptsetupWithPython
-  ];
+    pykickstart pyparted pyblock selinuxWithPython cryptsetupWithPython
+  ] ++ stdenv.lib.optional useNixUdev udev;
 
   # tests are currently _heavily_ broken upstream
   doCheck = false;

From b2311fbf3acbb8c747fd3002f2895f773c874c8a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 2 Jul 2013 17:35:31 +0200
Subject: [PATCH 023/439] python-nixpart: Propagate overrides of blivet.

This allows for easy overriding of blivets udev dependency using only
nixpart.override.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/filesystems/nixpart/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix
index 6f787d0ba208..6c13d38c6f9b 100644
--- a/pkgs/tools/filesystems/nixpart/default.nix
+++ b/pkgs/tools/filesystems/nixpart/default.nix
@@ -1,6 +1,13 @@
-{ stdenv, fetchurl, buildPythonPackage, blivet }:
+{ stdenv, fetchurl, buildPythonPackage, blivet
+# Propagated to blivet
+, useNixUdev ? null, udevSoMajor ? null
+}:
 
-buildPythonPackage rec {
+let
+  blivetOverrides = stdenv.lib.filterAttrs (k: v: v != null) {
+    inherit useNixUdev udevSoMajor;
+  };
+in buildPythonPackage rec {
   name = "nixpart-${version}";
   version = "0.2.0";
 
@@ -9,7 +16,7 @@ buildPythonPackage rec {
     sha256 = "1z94h76jn9igksgr84wwbi03fjamwb15hg432x189kgsld1ark4n";
   };
 
-  propagatedBuildInputs = [ blivet ];
+  propagatedBuildInputs = [ (blivet.override blivetOverrides) ];
 
   doCheck = false;
 

From 1a9e99a8e4e9a0521b081958f03b2347d93178cd Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 4 Jul 2013 11:12:01 +0200
Subject: [PATCH 024/439] Add new package minmay in version 1.0.0.

This is a fork of the iksemel library, which is no longer maintained and is
highly broken in regards to TLS support (even in the release versions).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/minmay/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/minmay/default.nix

diff --git a/pkgs/development/libraries/minmay/default.nix b/pkgs/development/libraries/minmay/default.nix
new file mode 100644
index 000000000000..4518b4dd760b
--- /dev/null
+++ b/pkgs/development/libraries/minmay/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, cmake, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "minmay-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "https://github.com/mazhe/minmay/archive/1.0.0.tar.gz";
+    sha256 = "1amycxvhbd0lv6j5zsvxiwrx29jvndcy856j3b3bisys24h95zw2";
+  };
+
+  buildInputs = [ cmake openssl ];
+
+  meta = {
+    homepage = "https://github.com/mazhe/minmay";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    description = "An XMPP library (forked from the iksemel project)";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1629e317210..e22640303fa9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4953,6 +4953,8 @@ let
 
   ming = callPackage ../development/libraries/ming { };
 
+  minmay = callPackage ../development/libraries/minmay { };
+
   mkvtoolnix = callPackage ../applications/video/mkvtoolnix { };
 
   mlt = callPackage ../development/libraries/mlt {

From 1182929a0b74720f772e2d8c6d84a7ccf59a881c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 4 Jul 2013 11:16:02 +0200
Subject: [PATCH 025/439] zabbix20: Migrate XMPP support over to minmay.

This should fix support for TLS and in addition, we now _only_ depend on one
library rather than OpenSSL *and* GnuTLS as we no longer need iksemel.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/servers/monitoring/zabbix/2.0.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix
index fef5010218cc..90206f358538 100644
--- a/pkgs/servers/monitoring/zabbix/2.0.nix
+++ b/pkgs/servers/monitoring/zabbix/2.0.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext
-, enableJabber ? false, iksemel ? null }:
+, enableJabber ? false, minmay ? null }:
 
-assert enableJabber -> iksemel != null;
+assert enableJabber -> minmay != null;
 
 let
 
@@ -37,7 +37,15 @@ in
       "--with-postgresql"
       "--with-libcurl"
       "--with-gettext"
-    ] ++ stdenv.lib.optional enableJabber "--with-jabber=${iksemel}";
+    ] ++ stdenv.lib.optional enableJabber "--with-jabber=${minmay}";
+
+    postPatch = ''
+      sed -i -e 's/iksemel/minmay/g' configure src/libs/zbxmedia/jabber.c
+      sed -i \
+        -e '/^static ikstransport/,/}/d' \
+        -e 's/iks_connect_with\(.*\), &zbx_iks_transport/mmay_connect_via\1/' \
+        -e 's/iks/mmay/g' -e 's/IKS/MMAY/g' src/libs/zbxmedia/jabber.c
+    '';
 
     buildInputs = [ pkgconfig postgresql curl openssl zlib ];
 

From 6fcc6816e7c20f3a9fcaee0947e086febf9d8898 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 6 Jul 2013 10:29:56 +0200
Subject: [PATCH 026/439] nixpart: Update to new version 0.2.1.

This is a minor bugfix release and only corrects "type" in fileSystems output to
"fsType".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/filesystems/nixpart/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix
index 6c13d38c6f9b..8bf7222edd86 100644
--- a/pkgs/tools/filesystems/nixpart/default.nix
+++ b/pkgs/tools/filesystems/nixpart/default.nix
@@ -9,11 +9,11 @@ let
   };
 in buildPythonPackage rec {
   name = "nixpart-${version}";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchurl {
     url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz";
-    sha256 = "1z94h76jn9igksgr84wwbi03fjamwb15hg432x189kgsld1ark4n";
+    sha256 = "03v2n2cf9cq9brnxx3yx26nsm3fkgdhmkcm52s89g33c1rmzzgbk";
   };
 
   propagatedBuildInputs = [ (blivet.override blivetOverrides) ];

From 79b1f3069a7822e36eedf57a7e13833fa559422e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 8 Jul 2013 03:57:23 +0200
Subject: [PATCH 027/439] chromium: Unset -Werror in gypFlags.

Thanks to @jcumming for notifying me about this in #nixos:

03:47 < jack_c> aszlig: chromium builds with -Werror by default.
03:47 < jack_c> Putting: werror = "";
03:48 < jack_c> into gypFlags fixes that..
...
03:52 < jack_c> aszlig: agree -Werror is a good linting tool, but it should
                probably disabled for distribution.

So, I guess it makes sense in our case, especially because different GCC
versions will issue different warnings.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index b5557cc1200f..3f072b509945 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -145,6 +145,7 @@ in stdenv.mkDerivation rec {
     use_cups = cupsSupport;
     linux_sandbox_path="${libExecPath}/${packageName}_sandbox";
     linux_sandbox_chrome_path="${libExecPath}/${packageName}";
+    werror = "";
   } // optionalAttrs proprietaryCodecs {
     # enable support for the H.264 codec
     proprietary_codecs = true;

From d21493cf7d959ff7db86bffdb5f20ad8401b9cf6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 8 Jul 2013 07:30:45 +0200
Subject: [PATCH 028/439] python-nixpart: Add Hetzner-specific attribute.

This is for NixOps and the corresponding Hetzner backend and allows for easy
referencing by nix-build using the -A argument.

Basically the Hetzner rescue system uses an older udev version from Debian, so
we need to use shared object major number 0 here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bbedf8a87cb0..95be4c09fb68 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -66,6 +66,10 @@ pythonPackages = python.modules // rec {
   });
 
   nixpart = callPackage ../tools/filesystems/nixpart { };
+  nixpartHetzner = nixpart.override {
+    useNixUdev = false;
+    udevSoMajor = 0;
+  };
 
   pil = import ../development/python-modules/pil {
     inherit (pkgs) fetchurl stdenv libjpeg zlib freetype;

From 82967d897ec5093a27b569cdfc4b6cbedce2c473 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 8 Jul 2013 15:30:05 +0200
Subject: [PATCH 029/439] Added stylus nodejs package

---
 pkgs/top-level/node-packages-generated.nix | 13 +++++++++++++
 pkgs/top-level/node-packages.json          |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 4ff44f541555..6a74c8075811 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -3349,6 +3349,19 @@
       { name = "buffertools"; range = ">=1.1.1 <2.0.0"; }
     ];
   }
+  {
+    baseName = "stylus";
+    version = "0.33.1";
+    fullName = "stylus-*";
+    hash = "5db972473ed5d5d50ef4b76b019b35b8a6b368209a694ee2f94bb8d6c9f50245";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "cssom"; range = "0.2.x"; }
+      { name = "mkdirp"; range = "0.3.x"; }
+      { name = "debug"; range = "*"; }
+    ];
+  }
   {
     baseName = "stylus";
     version = "0.27.2";
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 640777cca298..64e13d07696c 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -59,4 +59,5 @@
 , "timezone"
 , "libyaml"
 , "i18next"
+, "stylus"
 ]

From 58975755ea696f16c3560ad239cc743213f4d6bf Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 8 Jul 2013 13:58:31 +0200
Subject: [PATCH 030/439] add bpython

---
 pkgs/tools/networking/dd-agent/default.nix |  3 ++-
 pkgs/top-level/python-packages.nix         | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index ab0ba37daac2..91061a457d41 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
     };
 
     buildInputs = [ python unzip ];
+    propagatedBuildInputs = [ python ];
 
     postUnpack = "export sourceRoot=$sourceRoot/packaging";
 
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
 
       homepage = http://www.datadoghq.com;
 
-      maintainers = [ stdenv.lib.maintainers.shlevy ];
+      maintainers = [ stdenv.lib.maintainers.shlevy stdenv.lib.maintainers.iElectric ];
 
       license = stdenv.lib.licenses.bsd3;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 95be4c09fb68..cd77c014d441 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -483,6 +483,25 @@ pythonPackages = python.modules // rec {
     };
   };
 
+  bpython = buildPythonPackage rec {
+     name = "bpython-0.11";
+     src = fetchurl {
+       url = "http://www.bpython-interpreter.org/releases/bpython-0.11.tar.gz";
+       sha256 = "02dkmsmgy04l33nyw54rlxkjwff0yf3cy2kvdx8s5w344mqkkkv0";
+     };
+
+     propagatedBuildInputs = [ python.modules.curses pygments ];
+     doCheck = false;
+     
+     meta = {
+       description = "UNKNOWN";
+       homepage = "UNKNOWN";
+       maintainers = [
+         stdenv.lib.maintainers.iElectric
+       ];
+     };
+   };
+
 
   # euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work.
   boto_1_9 = buildPythonPackage (rec {

From d7d873fb95af64fda99f66fd0c56b4a7568ddaf2 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 8 Jul 2013 21:08:40 +0200
Subject: [PATCH 031/439] add extundelete

---
 .../tools/filesystems/extundelete/default.nix | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/tools/filesystems/extundelete/default.nix

diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix
new file mode 100644
index 000000000000..16ad17aa2438
--- /dev/null
+++ b/pkgs/tools/filesystems/extundelete/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, e2fsprogs }:
+
+stdenv.mkDerivation rec {
+  version = "0.2.4";
+  name = "extundelete-${version}";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/extundelete/extundelete/0.2.4/extundelete-0.2.4.tar.bz2";
+    sha256 = "1x0r7ylxlp9lbj3d7sqf6j2a222dwy2nfpff05jd6mkh4ihxvyd1";
+  };
+
+  buildInputs = [ e2fsprogs ];
+
+  meta = with stdenv.lib; {
+    description = "utility that can recover deleted files from an ext3 or ext4 partition";
+    homepage = http://extundelete.sourceforge.net/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.iElectric ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e22640303fa9..bf546a23b091 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -786,6 +786,8 @@ let
 
   exiftags = callPackage ../tools/graphics/exiftags { };
 
+  extundelete = callPackage ../tools/filesystems/extundelete { };
+
   expect = callPackage ../tools/misc/expect { };
 
   fabric = pythonPackages.fabric;

From 6e8a060bca385953fb47905a908b3048bf39bcc1 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 8 Jul 2013 07:01:21 +0200
Subject: [PATCH 032/439] spice: enable client

this will split nicely once we merge multiple-outputs
---
 pkgs/development/libraries/spice/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index bcbe60ffa6d7..dd16d6ef94ed 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-sasl=no"
     "--disable-smartcard"
+    "--enable-client"
   ];
 
   postInstall = ''

From f154735aefee5b73558cb7b298dfa7b08330d7fb Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 8 Jul 2013 12:09:06 +0200
Subject: [PATCH 033/439] freerdp: upgrade to 1.0.2

---
 pkgs/applications/networking/remote/freerdp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index d8634e31dada..8f89d70405ad 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -21,11 +21,11 @@
 assert printerSupport -> cups != null;
 stdenv.mkDerivation rec {
   name = "freerdp-${version}";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchurl {
     url = "https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz";
-    sha256 = "1my8gamvfrn6v9gcqxsa9cgxr42shc0l826zvxj8wpcay6gd321w";
+    sha256 = "1w9dk7dsbppspnnms2xwwmbg7jm61i7aw5nkwzbpdyxngbgkgwf0";
   };
 
   buildInputs = [

From 2fd13d8fcafdc9291c385787bb8ef4778d3d814d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 9 Jul 2013 07:37:39 +0200
Subject: [PATCH 034/439] Add new hetzner-nixops-installer package.

This fixes a bunch of issues for the NixOps Hetzner backend, because over there,
it's quite difficult to export the references graph without either duplicaing
lots of code or make a bunch of workarounds.

A detailed description about how it works can be found in the
meta.longDescription attribute.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../misc/hetzner-nixops-installer/default.nix | 99 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +
 2 files changed, 102 insertions(+)
 create mode 100644 pkgs/tools/misc/hetzner-nixops-installer/default.nix

diff --git a/pkgs/tools/misc/hetzner-nixops-installer/default.nix b/pkgs/tools/misc/hetzner-nixops-installer/default.nix
new file mode 100644
index 000000000000..3322097ec778
--- /dev/null
+++ b/pkgs/tools/misc/hetzner-nixops-installer/default.nix
@@ -0,0 +1,99 @@
+{ stdenv, perl, gnutar, pathsFromGraph, nix, pythonPackages }:
+
+let
+  base = stdenv.mkDerivation {
+    name = "hetzner-nixops-base";
+
+    buildCommand = ''
+      ensureDir "$out/bin"
+      ln -s "${nix}"/bin/* "$out/bin/"
+      ln -s "${stdenv.shell}" "$out/bin/sh"
+    '';
+  };
+in stdenv.mkDerivation {
+  name = "hetzner-nixops-installer";
+
+  exportReferencesGraph = [
+    "refs-base" base
+    "refs-nixpart" pythonPackages.nixpartHetzner
+  ];
+
+  buildCommand = ''
+    ensureDir "usr/bin"
+
+    # Create the chroot wrappers for Nix
+    for path in "${nix}"/bin/*; do
+      base="$(basename "$path")"
+      wrapper="usr/bin/$base"
+      echo "#!/bin/sh" > "$wrapper"
+      echo "chroot /mnt \"$path\" \$@" >> "$wrapper"
+      chmod +x "$wrapper"
+    done
+
+    # Only a symlink that is goint to be put into the Tar file.
+    ln -ns "${pythonPackages.nixpartHetzner}/bin/nixpart" usr/bin/nixpart
+
+    base_storepaths="$("${perl}/bin/perl" "${pathsFromGraph}" refs-base)"
+    base_registration="$(printRegistration=1 \
+      "${perl}/bin/perl" "${pathsFromGraph}" refs-base)"
+
+    ( # Don't use stdenv.shell here, we're NOT on NixOS!
+      echo "#!/bin/sh"
+      # Do not quote because we want to inline the paths!
+      echo 'mkdir -m 1777 -p "/mnt/nix/store"'
+      echo "cp -a" $base_storepaths "/mnt/nix/store/"
+      echo "chroot /mnt \"${base}/bin/nix-store\" --load-db <<'REGINFO'"
+      echo "$base_registration"
+      echo "REGINFO"
+      echo 'ln -sn "${stdenv.shell}" /mnt/bin/sh'
+    ) > "usr/bin/activate-remote"
+    chmod +x "usr/bin/activate-remote"
+
+    full_storepaths="$("${perl}/bin/perl" "${pathsFromGraph}" refs-*)"
+    stripped_full_storepaths="$(echo "$full_storepaths" | sed 's|/*||')"
+
+    ( echo "#!${stdenv.shell}"
+      echo 'tarfile="$(mktemp)"'
+      echo 'trap "rm -f $tarfile" EXIT'
+      echo "lnum=\"\$(grep -m1 -an '^EXISTING_TAR${"\$"}' \"$out\")\""
+      echo 'tail -n +$((''${lnum%%:*} + 1)) "'"$out"'" > "$tarfile"'
+      # As before, don't quote here!
+      echo '${gnutar}/bin/tar rf "$tarfile" -C /' $stripped_full_storepaths
+      echo 'cat "$tarfile"'
+      echo "exit 0"
+      echo EXISTING_TAR
+      tar c usr
+    ) > "$out"
+    chmod +x "$out"
+  '';
+
+  meta = {
+    description = "Basic Nix bootstrap installer for NixOps";
+    longDescription = ''
+      It works like this:
+
+      Preapare a base image with reference graph, which is to be copied over to
+      the mount point and contains wrappers for the system outside the mount
+      point. Those wrappers basically just chroot into the mountpoint path and
+      execute the corresponding counterparts over there. The base derivation
+      itself only contains everything necessary in order to get a Nix
+      bootstrapped, like Nix itself and a shell linked to /mnt/bin/sh.
+
+      From outside the mountpoint, we just provide a small derivation which
+      contains a partitioner, an activate-remote and a script which is the
+      output of this derivation. In detail:
+
+      $out: Creates a tarball of of the full closure of the base derivation and
+            its reference information, the partitioner and activate-remote. The
+            script outputs the tarball on stdout, so it's easy for NixOps to
+            pipe it to the remote system.
+
+      activate-remote: Copies the base derivation into /mnt and registers it
+                       with the Nix database. Afterwards, it creates the
+                       mentioned chroot wrappers and puts them into /usr/bin
+                       (remember, we're on a non-NixOS system here), together
+                       with the partitioner.
+    '';
+    maintainer = stdenv.lib.maintainers.aszlig;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf546a23b091..027172935aec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7683,6 +7683,9 @@ let
 
   hexedit = callPackage ../applications/editors/hexedit { };
 
+  hetznerNixOpsInstaller =
+    callPackage ../tools/misc/hetzner-nixops-installer { };
+
   hipchat = callPackage_i686 ../applications/networking/instant-messengers/hipchat { };
 
   homebank = callPackage ../applications/office/homebank { };

From d58a5eb5729656661ef68c65f3fef139d1154335 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 9 Jul 2013 07:42:34 +0200
Subject: [PATCH 035/439] Move nixpartHetzner into hetzner-nixops-installer.

This should keep all Hetzner/NixOps specific stuff in one place.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/misc/hetzner-nixops-installer/default.nix | 9 +++++++--
 pkgs/top-level/python-packages.nix                   | 4 ----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/hetzner-nixops-installer/default.nix b/pkgs/tools/misc/hetzner-nixops-installer/default.nix
index 3322097ec778..e1b122c9a86b 100644
--- a/pkgs/tools/misc/hetzner-nixops-installer/default.nix
+++ b/pkgs/tools/misc/hetzner-nixops-installer/default.nix
@@ -1,6 +1,11 @@
 { stdenv, perl, gnutar, pathsFromGraph, nix, pythonPackages }:
 
 let
+  nixpart = pythonPackages.nixpart.override {
+    useNixUdev = false;
+    udevSoMajor = 0;
+  };
+
   base = stdenv.mkDerivation {
     name = "hetzner-nixops-base";
 
@@ -15,7 +20,7 @@ in stdenv.mkDerivation {
 
   exportReferencesGraph = [
     "refs-base" base
-    "refs-nixpart" pythonPackages.nixpartHetzner
+    "refs-nixpart" nixpart
   ];
 
   buildCommand = ''
@@ -31,7 +36,7 @@ in stdenv.mkDerivation {
     done
 
     # Only a symlink that is goint to be put into the Tar file.
-    ln -ns "${pythonPackages.nixpartHetzner}/bin/nixpart" usr/bin/nixpart
+    ln -ns "${nixpart}/bin/nixpart" usr/bin/nixpart
 
     base_storepaths="$("${perl}/bin/perl" "${pathsFromGraph}" refs-base)"
     base_registration="$(printRegistration=1 \
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cd77c014d441..65320967e077 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -66,10 +66,6 @@ pythonPackages = python.modules // rec {
   });
 
   nixpart = callPackage ../tools/filesystems/nixpart { };
-  nixpartHetzner = nixpart.override {
-    useNixUdev = false;
-    udevSoMajor = 0;
-  };
 
   pil = import ../development/python-modules/pil {
     inherit (pkgs) fetchurl stdenv libjpeg zlib freetype;

From 99e4890e9e6add5e967393334c2efd56c489ab89 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 9 Jul 2013 08:23:25 +0200
Subject: [PATCH 036/439] hetzner-nixops-installer: Reset helper timestamps.

This should prevent some annoying messages such as:

tar: usr/bin/nix-build: time stamp 2013-07-09 07:45:19 is 0.159248271 s in the f
uture
tar: usr/bin/nix-channel: time stamp 2013-07-09 07:45:19 is 0.159088763 s in the
future
tar: usr/bin/nix-collect-garbage: time stamp 2013-07-09 07:45:19 is 0.15901664 s
in the future
tar: usr/bin/nix-copy-closure: time stamp 2013-07-09 07:45:19 is 0.158948028 s i
n the future
tar: usr/bin/nix-daemon: time stamp 2013-07-09 07:45:19 is 0.158888042 s in the
future

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/misc/hetzner-nixops-installer/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/hetzner-nixops-installer/default.nix b/pkgs/tools/misc/hetzner-nixops-installer/default.nix
index e1b122c9a86b..f671ea8afcb0 100644
--- a/pkgs/tools/misc/hetzner-nixops-installer/default.nix
+++ b/pkgs/tools/misc/hetzner-nixops-installer/default.nix
@@ -57,6 +57,9 @@ in stdenv.mkDerivation {
     full_storepaths="$("${perl}/bin/perl" "${pathsFromGraph}" refs-*)"
     stripped_full_storepaths="$(echo "$full_storepaths" | sed 's|/*||')"
 
+    # Reset timestamps to those of 'nix-store' to prevent annoying warnings.
+    find usr -exec touch -h -r "${nix}/bin/nix-store" {} +
+
     ( echo "#!${stdenv.shell}"
       echo 'tarfile="$(mktemp)"'
       echo 'trap "rm -f $tarfile" EXIT'

From 3e70cde4debaa88bb8d399b253ef5bc3988c9ddd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jul 2013 11:19:02 +0200
Subject: [PATCH 037/439] nvidia-x11: Update to 319.32

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 809ae316516c..b5d8abab2410 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -8,7 +8,7 @@
 
 with stdenv.lib;
 
-let versionNumber = "319.17"; in
+let versionNumber = "319.32"; in
 
 stdenv.mkDerivation {
   name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}";
@@ -21,12 +21,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "1ja5hc74dff8nhsccqhd5km732a8mafdv7xvzj39asw2r3ma37bp";
+        sha256 = "02rjiizgb9mgal0qrklzjvfzybv139yv6za8xp045k7qdyqvsqzf";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "0a6yir07x38b0z51pi7kqgsaidhsib781rd53bpkkkk33yzviaqj";
+        sha256 = "18268q3pa6v4ygfnlm888jmp84dmg1w9c323cr51pn5jg54vygcm";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From f728650731610548b78b4d4263985e8054843492 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 9 Jul 2013 11:28:39 +0200
Subject: [PATCH 038/439] pythonPackages: Add new hetzner module, v0.2.1.

This is for accessing the Hetzner Robot API (an IPMI-like interface).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 65320967e077..55059c111ef0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2125,6 +2125,29 @@ pythonPackages = python.modules // rec {
     };
   };
 
+
+  hetzner = buildPythonPackage rec {
+    name = "hetzner-${version}";
+    version = "0.2.1";
+
+    src = fetchurl {
+      url = "https://github.com/RedMoonStudios/hetzner/archive/"
+          + "v${version}.tar.gz";
+      sha256 = "0im7frzmbd1v89251ci8ahrjhw578nmksqlfcdakim0jr23si4wh";
+    };
+
+    # not there yet, but coming soon.
+    doCheck = false;
+
+    meta = {
+      homepage = "https://github.com/RedMoonStudios/hetzner";
+      description = "High-level Python API for accessing the Hetzner robot";
+      license = stdenv.lib.licenses.bsd3;
+      maintainers = [ stdenv.lib.maintainers.aszlig ];
+    };
+  };
+
+
   html5lib = buildPythonPackage (rec {
     name = "html5lib-0.95";
 

From 049d2381c569eb1b7eb6e652f76c4debb1e38533 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 9 Jul 2013 11:31:06 +0200
Subject: [PATCH 039/439] hetzner-nixops-install: Correct typo in meta attr.

I think it's called maintainerS :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/misc/hetzner-nixops-installer/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/hetzner-nixops-installer/default.nix b/pkgs/tools/misc/hetzner-nixops-installer/default.nix
index f671ea8afcb0..1aa3fd875bbe 100644
--- a/pkgs/tools/misc/hetzner-nixops-installer/default.nix
+++ b/pkgs/tools/misc/hetzner-nixops-installer/default.nix
@@ -102,6 +102,6 @@ in stdenv.mkDerivation {
                        (remember, we're on a non-NixOS system here), together
                        with the partitioner.
     '';
-    maintainer = stdenv.lib.maintainers.aszlig;
+    maintainers = [ stdenv.lib.maintainers.aszlig ];
   };
 }

From aa35e66257c190f8e7ac79eefecea72fe5b7497f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 9 Jul 2013 11:53:01 +0200
Subject: [PATCH 040/439] hetzner-nixops-installer: Build on Hydra.

This is in order to prepare for fetching the build output from the corresponding
target machine to even further speed up deployment.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/misc/hetzner-nixops-installer/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/hetzner-nixops-installer/default.nix b/pkgs/tools/misc/hetzner-nixops-installer/default.nix
index 1aa3fd875bbe..772f679b9570 100644
--- a/pkgs/tools/misc/hetzner-nixops-installer/default.nix
+++ b/pkgs/tools/misc/hetzner-nixops-installer/default.nix
@@ -102,6 +102,7 @@ in stdenv.mkDerivation {
                        (remember, we're on a non-NixOS system here), together
                        with the partitioner.
     '';
+    platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.aszlig ];
   };
 }

From f2ee089784081f1295782dbf1d271816ec48b9e2 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Tue, 9 Jul 2013 15:37:58 +0200
Subject: [PATCH 041/439] nginx: 1.2.8 -> 1.2.9 (CVE-2013-2070)

---
 pkgs/servers/http/nginx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 52a17ea399c3..aff585fd4ae9 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -9,11 +9,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "nginx-1.2.8";
+  name = "nginx-1.2.9";
 
   src = fetchurl {
     url = "http://nginx.org/download/${name}.tar.gz";
-    sha256 = "0dvi8n3ljh3zz80r5zkb5q7f94mg62kkakn0wsqi3lxyqnc7r56j";
+    sha256 = "071bs9wh1q1xmprhisyy8i4psmc2xxl6xv7plj9smxjpnxs6cj3i";
   };
 
   buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat;

From 1f6fbcb1766100f429988b4d9fc0b732a3716837 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 9 Jul 2013 16:07:14 +0200
Subject: [PATCH 042/439] ikiwiki: update to version 3.20130518

---
 pkgs/applications/misc/ikiwiki/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index de1df426052a..baf97e7a8247 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
 
 let
   name = "ikiwiki";
-  version = "3.20130212";
+  version = "3.20130518";
 
   lib = stdenv.lib;
 in
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "1svajjhrwaq7wwgmhaxc2ld12cla3pdi9i7m8ll2rfa11cdhhf6m";
+    sha256 = "00mmxxlbzv6bz3cz3746r5lqwby6liwsg7m3jfba8258y52w13qp";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate

From ff330bc24e79fe080e7065dcb5969414855c1116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 6 Jul 2013 18:42:17 +0200
Subject: [PATCH 043/439] gnunet_svn update to 27775

---
 pkgs/applications/networking/p2p/gnunet/svn.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix
index eb05461ec85b..b6b9db99f907 100644
--- a/pkgs/applications/networking/p2p/gnunet/svn.nix
+++ b/pkgs/applications/networking/p2p/gnunet/svn.nix
@@ -4,7 +4,7 @@
 , makeWrapper, autoconf, automake }:
 
 let
-  rev = "27399";
+  rev = "27775";
 in
 stdenv.mkDerivation rec {
   name = "gnunet-svn-${rev}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchsvn {
     url =  https://gnunet.org/svn/gnunet;
     inherit rev;
-    sha256 = "0fn7ppfnc4v6lkxwww11s0h8mdvwyv7f40f6wrbfilqpn2ncrf8c";
+    sha256 = "1fa2g63rrn0mmim9v62gnm2hqr556mbcafb7cs7afycbinix4spf";
   };
 
   buildInputs = [

From 9ba86ecd14c57b9946844e8b16cacfa8ef6d8ceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 8 Jul 2013 19:39:00 +0200
Subject: [PATCH 044/439] iptraf: update to 3.0.1

---
 pkgs/applications/networking/iptraf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix
index 1d4c772d6f7c..f0a6dbbe7e77 100644
--- a/pkgs/applications/networking/iptraf/default.nix
+++ b/pkgs/applications/networking/iptraf/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation rec {
-  name = "iptraf-3.0.0";
+  name = "iptraf-3.0.1";
   
   src = fetchurl {
-    url = ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.0.tar.gz;
-    sha256 = "0qsi5f8d84mgdszvz22acyv6mjnbrpk55d54km9i5mkkapck7r4y";
+    url = ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.1.tar.gz;
+    md5 = "004c2c005a1b78739e22bc49d33e244d";
   };
 
   patchPhase = ''

From 42c5584cb109cc6b8c6f611938445948c18b3985 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 10 Jul 2013 01:25:08 +0200
Subject: [PATCH 045/439] easytag: Update to version 2.1.8.

Easytag has moved to gnome.org and thus this commit also updates and cleans up a
few meta attributes. More information about the move can be found in the
announcement:

https://mail.gnome.org/archives/easytag-list/2012-November/msg00006.html

In order to get it to compile, we need to do a bit of patching, for example the
configure script tries to find libid3tag through pkg-config, but unfortunately
libid3tag doesn't have a *.pc script, so we're patching it out of the configure
script and use NIX_LDFLAGS to inject the library during linking (note the "-lz"
- it's a propagated dependency of libid3tag).

Also added for MP4 support: taglib.

Thanks to @devhell for the notification of the new upstream release.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/audio/easytag/default.nix | 38 +++++++++++++--------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index 18a31460987d..c421dcc60cbd 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -1,22 +1,32 @@
-{ stdenv, fetchurl, pkgconfig, gtk, libid3tag, id3lib, libvorbis, libogg, flac }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, glib, libid3tag, id3lib, taglib
+, libvorbis, libogg, flac
+}:
 
-let
-
-  version = "2.1.7";
-  sha256 = "bfed34cbdce96aca299a0db2b531dbc66feb489b911a34f0a9c67f2eb6ee9301";
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "easytag-${version}";
+  version = "2.1.8";
+
   src = fetchurl {
-    url = "mirror://sourceforge/easytag/easytag-${version}.tar.bz2";
-    inherit sha256;
+    url = "mirror://gnome/sources/easytag/2.1/${name}.tar.xz";
+    sha256 = "1ab5iv0a83cdf07qzi81ydfk5apay06nxags9m07msqalz4pabqs";
   };
 
-  buildInputs = [ pkgconfig gtk libid3tag id3lib libvorbis libogg flac ];
+  preConfigure = ''
+    # pkg-config v0.23 should be enough.
+    sed -i -e '/_pkg_min_version=0.24/s/24/23/' \
+           -e 's/have_mp3=no/have_mp3=yes/' \
+           -e 's/ID3TAG_DEPS="id3tag"/ID3TAG_DEPS=""/' configure
+  '';
+
+  NIX_LDFLAGS = "-lid3tag -lz";
+
+  buildInputs = [
+    pkgconfig intltool gtk glib libid3tag id3lib taglib libvorbis libogg flac
+  ];
 
   meta = {
-    description = "an utility for viewing and editing tags for various audio files";
-    homepage = http://http://easytag.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2;
+    description = "View and edit tags for various audio files";
+    homepage = "http://projects.gnome.org/easytag/";
+    license = stdenv.lib.licenses.gpl2Plus;
   };
-}
\ No newline at end of file
+}

From abd423621a33279f5d17abc6854f0a7579b4b5c1 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 10 Jul 2013 08:48:36 +0200
Subject: [PATCH 046/439] php 5.4: Add LDAP support

---
 pkgs/development/interpreters/php/5.4.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index 35b1f82c246f..4aa0c9df75ee 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
 , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext
 , openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype
-, libxslt, libmcrypt, bzip2, icu }:
+, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl }:
 
 let
   libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
@@ -30,6 +30,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
 
       # Extensions
 
+      ldap = {
+        configureFlags = ["--with-ldap=${openldap}"];
+        buildInputs = [openldap cyrus_sasl openssl];
+      };
+
       curl = {
         configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"];
         buildInputs = [curl openssl];
@@ -167,6 +172,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     };
 
   cfg = {
+    ldapSupport = config.php.ldap or true;
     mysqlSupport = config.php.mysql or true;
     mysqliSupport = config.php.mysqli or true;
     pdo_mysqlSupport = config.php.pdo_mysql or true;
@@ -214,7 +220,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
   '';
 
   src = fetchurl {
-    url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
+    urls = [
+      "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"
+      "http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror"
+    ];
     sha256 = "0dh159svdrakvm9nsyg3yyln7cqqzpxgs2163cqxplnc93d8a8id";
     name = "php-${version}.tar.bz2";
   };

From a49aeec10d76977ed2e143337113b12a6fc67529 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 10 Jul 2013 08:49:04 +0200
Subject: [PATCH 047/439] openldap: Upgrade to 2.4.35

---
 pkgs/development/libraries/openldap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 1d5a09613408..60b9c7738a0b 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}:
 
 stdenv.mkDerivation rec {
-  name = "openldap-2.4.34";
+  name = "openldap-2.4.35";
 
   src = fetchurl {
     url = "ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/${name}.tgz";
-    sha256 = "01h6zq6zki9b1k07pbyps5vxj9w39ybzjvkyz5h9xk09dd54raza";
+    sha256 = "1swy3rly6y0asikp862sigmab8gcll6scb65ln10vps7q5s0640n";
   };
 
   buildInputs = [ openssl cyrus_sasl db4 groff ];

From 92083803e66a1dea42f973d5d438fbe520331d10 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 10 Jul 2013 08:49:37 +0200
Subject: [PATCH 048/439] nss-pam-ldapd: Upgrade to 0.8.13

---
 pkgs/tools/networking/nss-pam-ldapd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix
index 92cb053bb44b..a63ec2a3d680 100644
--- a/pkgs/tools/networking/nss-pam-ldapd/default.nix
+++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nss-pam-ldapd-${version}";
-  version = "0.8.11";
+  version = "0.8.13";
   
   src = fetchurl {
     url = "http://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz";
-    sha256 = "9a841f6a46bf9f87213dc806c0f6507ac5016a2ee550d42c3ed9fb280c1e38e6";
+    sha256 = "08jxxskzv983grc28zksk9fd8q5qad64rma9vcjsq0l4r6cax4mp";
   };
   
   buildInputs = [ makeWrapper pkgconfig python openldap pam ];

From ea216363206589ca3a4050353ed05cb938dcc484 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 10 Jul 2013 10:14:05 +0200
Subject: [PATCH 049/439] sane-backends: update saneBackendsGit to the latest
 version

For some reason, SANE suddenly stopped recognizing my scanner recently:

 | $ scanimage -L
 |
 | No scanners were identified. If you were expecting something different,
 | check that the scanner is plugged in, turned on and detected by the
 | sane-find-scanner tool (if appropriate). Please read the documentation
 | which came with this software (README, FAQ, manpages).

I was able to remedy this issue by building SANE with the latest version
of the backends package from Git, by adding the following override to
~/.nixpkgs/config.nix:

 | {
 |   packageOverrides = pkgs:
 |   {
 |     saneBackends = pkgs.saneBackendsGit;
 |   };
 | }
---
 pkgs/applications/graphics/sane/backends-git.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix
index 2455923bbb80..c9cea4109dc4 100644
--- a/pkgs/applications/graphics/sane/backends-git.nix
+++ b/pkgs/applications/graphics/sane/backends-git.nix
@@ -5,12 +5,12 @@ in
 assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
 
 stdenv.mkDerivation {
-  name = "sane-backends-1.0.22.482-g071f226";
+  name = "sane-backends-1.0.23.296-gf139120";
 
   src = fetchgit {
     url = "http://git.debian.org/git/sane/sane-backends.git";
-    rev = "071f2269cd68d3411cbfa05a3d028b74496db970";
-    sha256 = "178xkv30m6irk4k0gqnfcl5kramm1qyj24dar8gp32428z1444xf";
+    rev = "f139120c72db6de98be95b52c206c2a4d8071e92";
+    sha256 = "1b2fv19c8ijh9l0jjilli3j70n17wvcgpqq1nxmiby3ai6nrzk8d";
   };
 
   udevSupport = hotplugSupport;
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.sane-project.org/";
     description = "Scanner Access Now Easy";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
 
     maintainers = [ stdenv.lib.maintainers.simons ];
     platforms = stdenv.lib.platforms.linux;

From b42f757d6bcd594333a903f4df327f5d45ab937f Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Mon, 8 Jul 2013 22:14:13 +0200
Subject: [PATCH 050/439] Build haddock for transformers-compat

---
 .../libraries/haskell/transformers-compat/default.nix            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix
index f3120a61f201..2abd6efa0ce5 100644
--- a/pkgs/development/libraries/haskell/transformers-compat/default.nix
+++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix
@@ -5,7 +5,6 @@ cabal.mkDerivation (self: {
   version = "0.1.1.1";
   sha256 = "0i0bcfmqsnqa8fyp81virr5bh3hk23261xyx28jcfamrc18ly9ij";
   buildDepends = [ transformers ];
-  noHaddock = true;
   meta = {
     homepage = "http://github.com/ekmett/transformers-compat/";
     description = "A small compatibility shim exposing the new types from transformers 0.3 to older Haskell platforms.";

From 70835adb281e3de2916032345ef2c8aeb1aec7d4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 10 Jul 2013 09:20:34 +0200
Subject: [PATCH 051/439] haskell-git-annex: update to version 4.20130709

---
 .../version-management/git-and-tools/git-annex/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 7b56d8f92da2..78c33a24d345 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -14,8 +14,8 @@
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "4.20130627";
-  sha256 = "1q9hdh7m04idx1nm631624s37p6w1b9j1z5n06j2449b3pxqrn3y";
+  version = "4.20130709";
+  sha256 = "1xsv5wi0sipp71p7yw90cwd4spm4sr0kcqj47zyd19mgdyd80p9i";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From cc121fb9fe65ae787bee48c934453a9c51ae81ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 10 Jul 2013 09:20:34 +0200
Subject: [PATCH 052/439] haskell-abstract-deque: update to version 0.2.2

---
 .../libraries/haskell/abstract-deque/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix
index 475abb0b3a9b..6a97c6372e0a 100644
--- a/pkgs/development/libraries/haskell/abstract-deque/default.nix
+++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix
@@ -2,9 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "abstract-deque";
-  version = "0.2";
-  sha256 = "0cq1k74b854flfvh7qhfnpngn4vyzp1az1rkaara23wlylydgs89";
-  buildDepends = [ HUnit random ];
+  version = "0.2.2";
+  sha256 = "12g4y3j59nkjw9ja247m8ydhj6a033lzfbqkp4a5slrqdxfdlvyb";
+  buildDepends = [ HUnit random testFramework testFrameworkHunit ];
   testDepends = [ HUnit random testFramework testFrameworkHunit ];
   meta = {
     homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";

From eda01e3439f0098d2572984335dbae59c03b4457 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 10 Jul 2013 09:20:34 +0200
Subject: [PATCH 053/439] haskell-atomic-primops: update to version 0.2.2

---
 .../libraries/haskell/atomic-primops/default.nix          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix
index 4b37ea84d588..4645442a1997 100644
--- a/pkgs/development/libraries/haskell/atomic-primops/default.nix
+++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix
@@ -1,10 +1,10 @@
-{ cabal, Cabal, primitive }:
+{ cabal, bitsAtomic, Cabal, primitive }:
 
 cabal.mkDerivation (self: {
   pname = "atomic-primops";
-  version = "0.1.0.2";
-  sha256 = "1qjm97hi2wr658yk7f5cfppizaawmrkvs2q7qzq00h14fr71xxca";
-  buildDepends = [ Cabal primitive ];
+  version = "0.2.2";
+  sha256 = "1a3svsh96pl6915g70sf9zhqby0ahhifww6m13cn0zr4za32vl7n";
+  buildDepends = [ bitsAtomic Cabal primitive ];
   meta = {
     homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
     description = "A safe approach to CAS and other atomic ops in Haskell";

From a7c66776cb922eead0a3a0339744f9029ba6daa7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 10 Jul 2013 09:20:34 +0200
Subject: [PATCH 054/439] haskell-persistent: update to version 1.2.2.0

---
 pkgs/development/libraries/haskell/persistent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 7a5731397956..7ccbe145d708 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "1.2.1.1";
-  sha256 = "12gn84svbi72122si9q61987wmb8zbam0x7jy2x20r2bbdfh50rv";
+  version = "1.2.2.0";
+  sha256 = "18p3yz683ks0gdn1l4qys29jj7iqhlwh7i0s50bkl4x1w0mpa1kh";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
     liftedBase monadControl monadLogger pathPieces poolConduit

From 2ddb1bce7421d86ef8f61d4e7f04c998f415b514 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 10 Jul 2013 09:20:35 +0200
Subject: [PATCH 055/439] haskell-postgresql-libpq: update to version 0.8.2.3

---
 .../libraries/haskell/postgresql-libpq/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
index 90a92019f0e1..a3ffd276c2c6 100644
--- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-libpq";
-  version = "0.8.2.2";
-  sha256 = "1mmsfgia318p34l8jx8hihb160sx2wpg2h5r741akcs50v6p5878";
+  version = "0.8.2.3";
+  sha256 = "08l3va5v8ppajgl8ywmzjdvd6v2vhqfj0y55mb1jxkdpvkd5hckl";
   extraLibraries = [ postgresql ];
   meta = {
     homepage = "http://github.com/lpsmith/postgresql-libpq";

From a77b49be65c465f6d10d703d82b756b61b2d6d10 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 10 Jul 2013 09:20:35 +0200
Subject: [PATCH 056/439] haskell-shelly: update to version 1.3.0.6

---
 pkgs/development/libraries/haskell/shelly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index 7bb9466864e3..61342c09084d 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "1.3.0.3";
-  sha256 = "0izfxv45b5j9p3q2nrlxdn9g4vfmzghl4ab7zisn07gx381wk9qq";
+  version = "1.3.0.6";
+  sha256 = "0sm55f02cm89m8szhf9zb2jww86amzd6wdk44b3cqr7aza08clvj";
   buildDepends = [
     mtl systemFileio systemFilepath text time unixCompat
   ];

From 6fde3cf455fba75285768a750f987032d138def4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 10 Jul 2013 09:20:35 +0200
Subject: [PATCH 057/439] haskell-xml-conduit: update to version 1.1.0.4

---
 pkgs/development/libraries/haskell/xml-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index b586a6336bca..7a03815c183d 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "1.1.0.3";
-  sha256 = "04mnn6j9bbkhvav04gl9cbd4rldl7bwgcapvykwvf2p3nb3d7bi4";
+  version = "1.1.0.4";
+  sha256 = "0mbn0xm3br4f645qk1cv09zjlrcws5qdn498iwm5lx4j2ygg9swa";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
     blazeHtml blazeMarkup conduit dataDefault failure monadControl

From eed2a02d868a9e989db69f4adc135d1a300ecd53 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 10 Jul 2013 12:27:25 +0200
Subject: [PATCH 058/439] php 5.4: Add mhash support

---
 pkgs/development/interpreters/php/5.4.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index 4aa0c9df75ee..6cb8c7336018 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
 , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext
 , openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype
-, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl }:
+, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash }:
 
 let
   libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
@@ -35,6 +35,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
         buildInputs = [openldap cyrus_sasl openssl];
       };
 
+      mhash = {
+        configureFlags = ["--with-mhash"];
+        buildInputs = [libmhash];
+      };
+
       curl = {
         configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"];
         buildInputs = [curl openssl];
@@ -173,6 +178,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
 
   cfg = {
     ldapSupport = config.php.ldap or true;
+    mhashSupport = config.php.mhash or true;
     mysqlSupport = config.php.mysql or true;
     mysqliSupport = config.php.mysqli or true;
     pdo_mysqlSupport = config.php.pdo_mysql or true;

From 5a58b0e57a13e18e70dd3cca6481e81e7e86da74 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 10 Jul 2013 17:45:51 +0200
Subject: [PATCH 059/439] Update nixops to version 1.0.1

---
 pkgs/tools/package-management/nixops/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index 4e47a50078a9..7f2b533383e1 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,12 +1,12 @@
 { lib, pythonPackages, fetchurl, libxslt, docbook5_xsl }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "nixops-1.0";
+  name = "nixops-1.0.1";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://nixos.org/releases/nixops/${name}/${name}.tar.bz2";
-    sha256 = "9ae2dfac8e1fa895aef81323b14a3398f03a1cbd8c86ea10b6fff7312e1fadbb";
+    sha256 = "c6dda2597ba0ab2f60c984d4715163c02940f20803619668d6c16eba8570a394";
   };
 
   buildInputs = [ libxslt ];
@@ -21,6 +21,9 @@ pythonPackages.buildPythonPackage rec {
 
   postInstall =
     ''
+      # Backward compatibility symlink.
+      ln -s nixops $out/bin/charon
+
       make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \
         docdir=$out/share/doc/nixops mandir=$out/share/man
 

From 9a8677caeb7f0e3eb6f72d0247054f606a4f1094 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 10 Jul 2013 21:00:56 +0200
Subject: [PATCH 060/439] Add easyrsa

---
 pkgs/tools/networking/easyrsa/default.nix | 45 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/tools/networking/easyrsa/default.nix

diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix
new file mode 100644
index 000000000000..99cfb92a18b6
--- /dev/null
+++ b/pkgs/tools/networking/easyrsa/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, autoconf, automake111x, makeWrapper
+, gnugrep, openssl}:
+
+stdenv.mkDerivation rec {
+  name = "easyrsa-2.2.0";
+
+  src = fetchurl {
+    url = "https://github.com/OpenVPN/easy-rsa/archive/v2.2.0.tar.gz";
+    sha256 = "1xq4by5frb6ikn53ss3y8v7ss639dccxfq8jfrbk07ynkmk668qk";
+  };
+
+  # Copy missing files and autoreconf
+  preConfigure = ''
+    cp ${automake111x}/share/automake/install-sh .
+    cp ${automake111x}/share/automake/missing .
+
+    autoreconf
+  '';
+
+  preBuild = ''
+    mkdir -p $out/share/easy-rsa
+  '';
+
+  nativeBuildInputs = [ autoconf makeWrapper automake111x ];
+  buildInputs = [ gnugrep openssl];
+
+  # Make sane defaults and patch default config vars
+  postInstall = ''
+    for prog in $(find "$out/share/easy-rsa" -executable); do
+      makeWrapper "$prog" "$out/bin/$(basename $prog)" \
+        --set EASY_RSA "$out/share/easy-rsa" \
+        --set OPENSSL "${openssl}/bin/openssl" \
+        --set GREP "${gnugrep}/bin/grep"
+    done
+    sed -i "/EASY_RSA=\|OPENSSL=\|GREP=/d" $out/share/easy-rsa/vars
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple shell based CA utility";
+    homepage = http://openvpn.net/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.offline ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 027172935aec..7698faf4c6db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -753,6 +753,8 @@ let
 
   e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { };
 
+  easyrsa = callPackage ../tools/networking/easyrsa { };
+
   ebook_tools = callPackage ../tools/text/ebook-tools { };
 
   ecryptfs = callPackage ../tools/security/ecryptfs { };

From e9bee7d9cb3c7289570738d694ae25ca42c1d5fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 3 May 2013 21:50:10 +0200
Subject: [PATCH 061/439] ExtUtilsTypemapsDefault: fix for perl < 5.16

Add missing dependencies for ExtUtilsTypemapsDefault, needed when
building with perl < 5.16. This works for perl 5.16 too.

ExtUtils-ParseXS 3.15 has disappeared from the mirrors, so I had to bump
it to something available from CPAN; version 3.18.

See note from CPAN[1]:
  This module [ExtUtilsTypemap] exists merely as a compatibility
  wrapper around ExtUtils::Typemaps. In a nutshell, ExtUtils::Typemap
  was renamed to ExtUtils::Typemaps because the Typemap directory in
  lib/ could collide with the typemap file on case-insensitive file
  systems.

  The ExtUtils::Typemaps module is part of the ExtUtils::ParseXS
  distribution and ships with the standard library of perl starting with
  perl version 5.16.

[1] http://search.cpan.org/~smueller/ExtUtils-Typemap-1.00/lib/ExtUtils/Typemap.pm:
---
 pkgs/top-level/perl-packages.nix | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2139341f3b50..7b113cadd4bd 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2569,19 +2569,40 @@ rec {
   };
 
   ExtUtilsParseXS = buildPerlPackage rec {
-    name = "ExtUtils-ParseXS-3.15";
+    name = "ExtUtils-ParseXS-3.18";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
-      sha256 = "06baf0nsmdkfk50p4x9kss4ncm8h49gkzy8hl5cxbxdsab65gmrb";
+      sha256 = "0kvbx66vncgk2c72994z31bgh2w3rsrlnx0z7cmxqa7w3hlc4741";
     };
   };
 
+  # From CPAN[1]:
+  #   This module exists merely as a compatibility wrapper around
+  #   ExtUtils::Typemaps. In a nutshell, ExtUtils::Typemap was renamed to
+  #   ExtUtils::Typemaps because the Typemap directory in lib/ could collide with
+  #   the typemap file on case-insensitive file systems.
+  #
+  #   The ExtUtils::Typemaps module is part of the ExtUtils::ParseXS distribution
+  #   and ships with the standard library of perl starting with perl version
+  #   5.16.
+  #
+  # [1] http://search.cpan.org/~smueller/ExtUtils-Typemap-1.00/lib/ExtUtils/Typemap.pm:
+  ExtUtilsTypemap = buildPerlPackage rec {
+    name = "ExtUtils-Typemap-1.00";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
+      sha256 = "1iqz0xlscg655gnwb2h1wrjj70llblps1zznl29qn1mv5mvibc5i";
+    };
+    buildInputs = [ ExtUtilsParseXS ];
+  };
+
   ExtUtilsTypemapsDefault = buildPerlModule rec {
     name = "ExtUtils-Typemaps-Default-1.01";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
       sha256 = "0k03rr7bmhnn6j0505w9id5apss85yvqnx76hxf3javn3klj1m5z";
     };
+    propagatedBuildInputs = [ ExtUtilsTypemap ExtUtilsParseXS ];
   };
 
   ExtUtilsXSpp = buildPerlModule rec {

From f094996e9cb2709034d6205225941626ca28be6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 4 May 2013 22:32:17 +0200
Subject: [PATCH 062/439] perlPackages: compatibility with perl <= 5.10

This is just a small dependency fix for ExtUtils::CBuilder and
Module::Build to make them build with perl 5.10.

It seems that perl gradually adds CPAN modules into its core. So when
using older perl there typically some more dependencies to take care of.

ExtUtils-CBuilder 0.280202 is not available anymore, so I had to bump it
to 0.280205.
---
 pkgs/top-level/perl-packages.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7b113cadd4bd..1697ad5be941 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2472,11 +2472,12 @@ rec {
   };
 
   ExtUtilsCBuilder = buildPerlPackage rec {
-    name = "ExtUtils-CBuilder-0.280202";
+    name = "ExtUtils-CBuilder-0.280205";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
-      sha256 = "13qjdz1kmrp5mp404by94cdsyydjadg974ykinqga450djjaqpbq";
+      sha256 = "0nfrr3zd71gnsbp5xacdb70n17slrzj421s4nyr11zg5cqsj3ngs";
     };
+    buildInputs = [ PerlOSType ];
   };
 
   ExtUtilsConfig = buildPerlPackage {
@@ -4064,6 +4065,7 @@ rec {
       url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4005.tar.gz;
       sha256 = "eb2522507251550f459c11223ea6d86b34f1dee9b3e3928d0d6a0497505cb7ef";
     };
+    buildInputs = [ CPANMeta ExtUtilsCBuilder ];
     meta = {
       description = "Build and install Perl modules";
       license = "perl";

From 2efe295e9258cf0783126a7a9abef0733ec4117d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 11 Jul 2013 01:31:48 +0200
Subject: [PATCH 063/439] haskell-hledger-web: update to version 0.21.3

---
 .../libraries/haskell/hledger-web/default.nix          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index acffb0e55ff1..e4dd6ef1faad 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -2,14 +2,14 @@
 , dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib, hspec
 , httpConduit, HUnit, json, networkConduit, parsec, regexpr, safe
 , shakespeareText, text, time, transformers, wai, waiExtra
-, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodPlatform
-, yesodStatic, yesodTest
+, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodStatic
+, yesodTest
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.21.2";
-  sha256 = "1z8nyvqzyjh36g50w4gmh8mzvydanfn1s3gx4nliwk4mjfj4bbkl";
+  version = "0.21.3";
+  sha256 = "18gil6qwlzfk0y0f9q1la5np5phi0h3nqlb8rwn9qjjgvs134jgy";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -17,7 +17,7 @@ cabal.mkDerivation (self: {
     hamlet hjsmin hledger hledgerLib httpConduit HUnit json
     networkConduit parsec regexpr safe shakespeareText text time
     transformers wai waiExtra waiHandlerLaunch warp yaml yesod
-    yesodCore yesodPlatform yesodStatic
+    yesodCore yesodStatic
   ];
   testDepends = [ hspec yesod yesodTest ];
   doCheck = false;

From 49fccb03e9c0509d8b983c4e59665f3192ade9e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 28 Apr 2013 12:59:00 +0200
Subject: [PATCH 064/439] slic3r: new package

Slic3r is a G-code generator for 3D printers.

- Math-Clipper and Boost-Geometry-Utils have been bumped to satisfy
  Slic3r.

- Slic3r has problems with perl 5.16 due to a locale issue (comma vs
  period in floating point numbers). So we use perl 5.14.

- The tests fail, so we skip them. According to the author of Slic3r,
  that should be safe:

    "Tests failed because of a typo when the 0.9.10b tag was applied.
    You can safely ignore the test results, Slic3r will work."

  See https://github.com/alexrj/Slic3r/issues/1303

  For reference, the errors look like this:

    Use of uninitialized value $deg in numeric eq (==) at /tmp/nix-build-perl-slic3r-0.9.10b.drv-0/git-export/t/../lib/Slic3r/TriangleMesh.pm line 328.
    # Looks like your test exited with 255 before it could output anything.
---
 pkgs/applications/misc/slic3r/default.nix | 61 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           | 16 ++++++
 pkgs/top-level/perl-packages.nix          |  8 +--
 3 files changed, 81 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/misc/slic3r/default.nix

diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
new file mode 100644
index 000000000000..aa2ceb08e809
--- /dev/null
+++ b/pkgs/applications/misc/slic3r/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchgit, perl, makeWrapper, makeDesktopItem
+# Perl modules:
+, EncodeLocale, MathClipper, ExtUtilsXSpp, BoostGeometryUtils
+, MathConvexHullMonotoneChain, MathGeometryVoronoi, MathPlanePath, Moo
+, IOStringy, ClassXSAccessor, Wx, GrowlGNTP, NetDBus }:
+
+stdenv.mkDerivation rec {
+  version = "0.9.10b";
+  name = "slic3r-${version}";
+
+  # Slic3r doesn't put out tarballs, only a git repository is available
+  src = fetchgit {
+    url = "git://github.com/alexrj/Slic3r";
+    rev = "refs/tags/${version}";
+    sha256 = "0j06h0z65qn4kyb2b7pnq6bcn4al60q227iz9jlrin0ffx3l0ra7";
+  };
+
+  buildInputs = [ perl makeWrapper
+    EncodeLocale MathClipper ExtUtilsXSpp BoostGeometryUtils
+    MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo
+    IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus
+  ];
+
+  desktopItem = makeDesktopItem {
+    name = "slic3r";
+    exec = "slic3r";
+    icon = "slic3r";
+    comment = "G-code generator for 3D printers";
+    desktopName = "Slic3r";
+    genericName = "3D printer tool";
+    categories = "Application;Development;";
+  };
+
+  # Nothing to do here
+  buildPhase = "true";
+
+  installPhase = ''
+    mkdir -p "$out/share/slic3r/"
+    cp -r * "$out/share/slic3r/"
+    wrapProgram "$out/share/slic3r/slic3r.pl" --prefix PERL5LIB : $PERL5LIB
+    mkdir -p "$out/bin"
+    ln -s "$out/share/slic3r/slic3r.pl" "$out/bin/slic3r"
+    mkdir -p "$out/share/pixmaps/"
+    ln -s "$out/share/slic3r/var/Slic3r.png" "$out/share/pixmaps/slic3r.png"
+    mkdir -p "$out/share/applications"
+    cp "$desktopItem"/share/applications/* "$out/share/applications/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "G-code generator for 3D printers";
+    longDescription = ''
+      Slic3r is the tool you need to convert a digital 3D model into printing
+      instructions for your 3D printer. It cuts the model into horizontal
+      slices (layers), generates toolpaths to fill them and calculates the
+      amount of material to be extruded.'';
+    homepage = http://slic3r.org/;
+    license = licenses.agpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7698faf4c6db..c69fc1a4962c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5679,6 +5679,14 @@ let
     __overrides = (config.perl510PackageOverrides or (p: {})) pkgs;
   };
 
+  perl514Packages = import ./perl-packages.nix {
+    pkgs = pkgs // {
+      perl = perl514;
+      buildPerlPackage = import ../development/perl-modules/generic perl514;
+    };
+    __overrides = (config.perl514PackageOverrides or (p: {})) pkgs;
+  };
+
   perlXMLParser = perlPackages.XMLParser;
 
   ack = perlPackages.ack;
@@ -8301,6 +8309,14 @@ let
 
   lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { };
 
+  # slic3r 0.9.10b says: "Running Slic3r under Perl >= 5.16 is not supported nor recommended"
+  slic3r = callPackage ../applications/misc/slic3r {
+    inherit (perl514Packages) EncodeLocale MathClipper ExtUtilsXSpp
+            BoostGeometryUtils MathConvexHullMonotoneChain MathGeometryVoronoi
+            MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus;
+    perl = perl514;
+  };
+
   slim = callPackage ../applications/display-managers/slim {
     libpng = libpng12;
   };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1697ad5be941..f179f4ed8302 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -296,10 +296,10 @@ rec {
   };
 
   BoostGeometryUtils = buildPerlModule rec {
-    name = "Boost-Geometry-Utils-0.09";
+    name = "Boost-Geometry-Utils-0.12";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AA/AAR/${name}.tar.gz";
-      sha256 = "0wgd36rxd5lj0vlkp7l9zgx8bgbv0nj4kia83ipb7p64xpyysghg";
+      sha256 = "1pywbxjf05qpcixshblhd2cham601zwa9w7c3k5waz4cdild6g1m";
     };
     propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsTypemapsDefault ];
   };
@@ -3934,10 +3934,10 @@ rec {
   };
 
   MathClipper = buildPerlModule rec {
-    name = "Math-Clipper-1.19";
+    name = "Math-Clipper-1.22";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz";
-      sha256 = "1hrdand4i937bgsr3f3yma5ckkdwkprdwmkyyl37v1vqcjdrjr7j";
+      sha256 = "0p5iblg979v3pb6a8kyhjdv33yadr5997nhz9asjksgvww328nfa";
     };
     propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsXSpp ExtUtilsTypemapsDefault TestDeep ];
   };

From 1800db96d731b5e0d2580490ef3cdd46d741d022 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 11 Jul 2013 10:23:35 +0400
Subject: [PATCH 065/439] Update nginx

---
 pkgs/servers/http/nginx/default.nix      | 5 +++--
 pkgs/servers/http/nginx/default.upstream | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/servers/http/nginx/default.upstream

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index aff585fd4ae9..083dbc482f0a 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -9,11 +9,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "nginx-1.2.9";
+  name = "nginx-${meta.version}";
 
   src = fetchurl {
     url = "http://nginx.org/download/${name}.tar.gz";
-    sha256 = "071bs9wh1q1xmprhisyy8i4psmc2xxl6xv7plj9smxjpnxs6cj3i";
+    sha256 = "06ficmjiya3m8mdlyq3bgqx604h475n77qc5c502kfjijzld39dw";
   };
 
   buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat;
@@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
     description = "A reverse proxy and lightweight webserver";
     maintainers = [ stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.all;
+    version = "1.4.1";
   };
 }
diff --git a/pkgs/servers/http/nginx/default.upstream b/pkgs/servers/http/nginx/default.upstream
new file mode 100644
index 000000000000..f6a12eedda42
--- /dev/null
+++ b/pkgs/servers/http/nginx/default.upstream
@@ -0,0 +1,8 @@
+url http://nginx.org/en/download.html
+version_link '.*-([0-9]+[.][0-9]*[02468]([.][0-9]+)*)[.]tar[.][a-z0-9]*$' 
+
+do_overwrite() {
+  ensure_hash
+  set_var_value version "$CURRENT_VERSION"
+  set_var_value sha256 "$CURRENT_HASH" 2
+}

From f75f7e793b790b04c342dd348f432c946a9d6253 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 11 Jul 2013 16:04:06 +0200
Subject: [PATCH 066/439] nixpart: New upstream version 0.3.0.

This fixes two issues:

 - Don't _always_ print out NixOS configuration, only when explicitly
   requested with -p.
 - Add GRUB boot devices to NixOS configuration output.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/filesystems/nixpart/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix
index 8bf7222edd86..3467c07b753b 100644
--- a/pkgs/tools/filesystems/nixpart/default.nix
+++ b/pkgs/tools/filesystems/nixpart/default.nix
@@ -9,11 +9,11 @@ let
   };
 in buildPythonPackage rec {
   name = "nixpart-${version}";
-  version = "0.2.1";
+  version = "0.3.0";
 
   src = fetchurl {
     url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz";
-    sha256 = "03v2n2cf9cq9brnxx3yx26nsm3fkgdhmkcm52s89g33c1rmzzgbk";
+    sha256 = "0v47vgj79k1idsvw7gd3g2vm5zfb2g4i2935y9sd2av5rb2w4c05";
   };
 
   propagatedBuildInputs = [ (blivet.override blivetOverrides) ];

From 4d29005771611bf63d3897c3f8cc1c9b7c7be949 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 12 Jul 2013 02:51:47 +0300
Subject: [PATCH 067/439] Fix url

---
 pkgs/development/libraries/libxtc_dxtn/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libxtc_dxtn/default.nix b/pkgs/development/libraries/libxtc_dxtn/default.nix
index a23d74a2be86..1f94bcbef99e 100644
--- a/pkgs/development/libraries/libxtc_dxtn/default.nix
+++ b/pkgs/development/libraries/libxtc_dxtn/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libtxc_dxtn-1.0.1";
 
   src = fetchurl {
-    url = "people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2";
+    url = "http://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2";
     sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5";
   };
 

From c1749e5fb43dfcb41fb21b7e00e764480e892c66 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 12 Jul 2013 05:09:36 +0300
Subject: [PATCH 068/439] Add Mechanize Gem. Update other gems as a side effect
 :/

---
 .../interpreters/ruby/generated.nix           | 1044 ++++++++---------
 1 file changed, 501 insertions(+), 543 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index 77464bdce37a..97a8eb670019 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -3,122 +3,118 @@
 g: # Get dependencies from patched gems
 {
   aliases = {
-    ZenTest = g.ZenTest_4_9_0;
-    actionmailer = g.actionmailer_3_2_13;
-    actionpack = g.actionpack_3_2_13;
-    activemodel = g.activemodel_3_2_13;
-    activerecord = g.activerecord_3_2_13;
-    activeresource = g.activeresource_3_2_13;
-    activesupport = g.activesupport_3_2_13;
-    addressable = g.addressable_2_3_3;
-    arel = g.arel_3_0_2;
+    ZenTest = g.ZenTest_4_9_2;
+    actionmailer = g.actionmailer_4_0_0;
+    actionpack = g.actionpack_4_0_0;
+    activemodel = g.activemodel_4_0_0;
+    activerecord = g.activerecord_4_0_0;
+    activerecord_deprecated_finders = g.activerecord_deprecated_finders_1_0_3;
+    activesupport = g.activesupport_4_0_0;
+    addressable = g.addressable_2_3_5;
+    arel = g.arel_4_0_0;
+    atomic = g.atomic_1_1_10;
     atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
     autotest_rails = g.autotest_rails_4_1_2;
-    aws_sdk = g.aws_sdk_1_8_5;
+    aws_sdk = g.aws_sdk_1_12_0;
     bitbucket_backup = g.bitbucket_backup_0_2_2;
-    builder = g.builder_3_2_0;
-    buildr = g.buildr_1_4_11;
-    bundler = g.bundler_1_3_4;
+    builder = g.builder_3_2_2;
+    buildr = g.buildr_1_4_12;
+    bundler = g.bundler_1_3_5;
     childprocess = g.childprocess_0_3_9;
     chronic = g.chronic_0_9_1;
     daemons = g.daemons_1_1_9;
     diff_lcs = g.diff_lcs_1_1_3;
     dimensions = g.dimensions_1_2_0;
+    domain_name = g.domain_name_0_5_12;
+    dotenv = g.dotenv_0_8_0;
     em_resolv_replace = g.em_resolv_replace_1_1_3;
     erubis = g.erubis_2_7_0;
     eventmachine = g.eventmachine_1_0_3;
     eventmachine_tail = g.eventmachine_tail_0_6_4;
-    excon = g.excon_0_25_0;
     execjs = g.execjs_1_4_0;
     fakes3 = g.fakes3_0_1_5;
     faraday = g.faraday_0_8_7;
     faraday_middleware = g.faraday_middleware_0_8_8;
-    ffi = g.ffi_1_6_0;
+    ffi = g.ffi_1_9_0;
     file_tail = g.file_tail_1_0_12;
-    foreman = g.foreman_0_62_0;
-    gettext = g.gettext_2_3_9;
-    heroku = g.heroku_2_39_4;
-    heroku_api = g.heroku_api_0_3_13;
-    highline = g.highline_1_6_16;
-    hike = g.hike_1_2_1;
+    foreman = g.foreman_0_63_0;
+    highline = g.highline_1_6_19;
+    hike = g.hike_1_2_3;
     hoe = g.hoe_3_1_0;
+    http_cookie = g.http_cookie_1_0_1;
     i18n = g.i18n_0_6_4;
-    iconv = g.iconv_1_0_3;
-    journey = g.journey_1_0_4;
     jruby_pageant = g.jruby_pageant_1_1_1;
-    jsduck = g.jsduck_4_7_1;
-    json = g.json_1_7_7;
-    json_pure = g.json_pure_1_7_7;
-    launchy = g.launchy_2_3_0;
-    libv8 = g.libv8_3_3_10_4;
-    locale = g.locale_2_0_8;
-    lockfile = g.lockfile_2_1_0;
+    jsduck = g.jsduck_4_10_4;
+    json = g.json_1_8_0;
+    json_pure = g.json_pure_1_8_0;
+    libv8 = g.libv8_3_11_8_17_x86_linux;
     macaddr = g.macaddr_1_6_1;
-    mail = g.mail_2_5_3;
-    mime_types = g.mime_types_1_21;
+    mail = g.mail_2_5_4;
+    mechanize = g.mechanize_2_7_1;
+    mime_types = g.mime_types_1_23;
+    mini_portile = g.mini_portile_0_5_1;
     minitar = g.minitar_0_5_3;
-    multi_json = g.multi_json_1_7_2;
+    minitest = g.minitest_4_7_5;
+    multi_json = g.multi_json_1_7_7;
     multipart_post = g.multipart_post_1_2_0;
+    net_http_digest_auth = g.net_http_digest_auth_1_3;
+    net_http_persistent = g.net_http_persistent_2_8;
     net_sftp = g.net_sftp_2_0_5;
-    net_ssh = g.net_ssh_2_6_6;
-    netrc = g.netrc_0_7_7;
+    net_ssh = g.net_ssh_2_6_8;
     nix = g.nix_0_1_1;
-    nokogiri = g.nokogiri_1_5_9;
+    nokogiri = g.nokogiri_1_6_0;
+    ntlm_http = g.ntlm_http_0_1_1;
     papertrail = g.papertrail_0_9_7;
     papertrail_cli = g.papertrail_cli_0_9_3;
-    parallel = g.parallel_0_6_3;
+    parallel = g.parallel_0_7_1;
     polyglot = g.polyglot_0_3_3;
     rack = g.rack_1_5_2;
-    rack_cache = g.rack_cache_1_2;
     rack_protection = g.rack_protection_1_5_0;
-    rack_ssl = g.rack_ssl_1_3_3;
     rack_test = g.rack_test_0_6_2;
-    rails = g.rails_3_2_13;
-    railties = g.railties_3_2_13;
-    rake = g.rake_10_0_4;
+    rails = g.rails_4_0_0;
+    railties = g.railties_4_0_0;
+    rake = g.rake_10_1_0;
     rb_fsevent = g.rb_fsevent_0_9_3;
-    rb_readline = g.rb_readline_0_5_0;
-    rdiscount = g.rdiscount_2_0_7_1;
-    rdoc = g.rdoc_3_12_2;
-    remote_syslog = g.remote_syslog_1_6_13;
-    rest_client = g.rest_client_1_6_7;
-    right_aws = g.right_aws_3_0_5;
-    right_http_connection = g.right_http_connection_1_3_0;
-    rjb = g.rjb_1_4_6;
-    rmail = g.rmail_1_0_0;
+    rdiscount = g.rdiscount_2_1_6;
+    ref = g.ref_1_0_5;
+    remote_syslog = g.remote_syslog_1_6_14;
+    right_aws = g.right_aws_3_1_0;
+    right_http_connection = g.right_http_connection_1_4_0;
+    rjb = g.rjb_1_4_8;
     rspec = g.rspec_2_11_0;
     rspec_core = g.rspec_core_2_11_1;
     rspec_expectations = g.rspec_expectations_2_11_3;
     rspec_mocks = g.rspec_mocks_2_11_3;
     rubyforge = g.rubyforge_2_0_4;
     rubyzip = g.rubyzip_0_9_9;
-    sass = g.sass_3_2_7;
-    selenium_webdriver = g.selenium_webdriver_2_31_0;
+    sass = g.sass_3_2_9;
+    selenium_webdriver = g.selenium_webdriver_2_33_0;
     servolux = g.servolux_0_10_0;
     sinatra = g.sinatra_1_3_2;
-    sprockets = g.sprockets_2_2_2;
+    sprockets = g.sprockets_2_10_0;
+    sprockets_rails = g.sprockets_rails_2_0_0;
     syslog_protocol = g.syslog_protocol_0_9_2;
     systemu = g.systemu_2_5_2;
-    text = g.text_1_2_1;
-    therubyracer = g.therubyracer_0_10_2;
+    therubyracer = g.therubyracer_0_11_4;
     thin = g.thin_1_5_1;
-    thor = g.thor_0_18_0;
-    tilt = g.tilt_1_3_6;
-    tins = g.tins_0_7_2;
-    treetop = g.treetop_1_4_12;
-    trollop = g.trollop_2_0;
+    thor = g.thor_0_18_1;
+    thread_safe = g.thread_safe_0_1_0;
+    tilt = g.tilt_1_4_1;
+    tins = g.tins_0_8_2;
+    treetop = g.treetop_1_4_14;
     tzinfo = g.tzinfo_0_3_37;
+    unf = g.unf_0_1_1;
+    unf_ext = g.unf_ext_0_0_6;
     uuid = g.uuid_2_3_7;
-    uuidtools = g.uuidtools_2_1_3;
+    uuidtools = g.uuidtools_2_1_4;
+    webrobots = g.webrobots_0_1_1;
     websocket = g.websocket_1_0_7;
-    xapian_full_alaveteli = g.xapian_full_alaveteli_1_2_9_5;
-    xapian_ruby = g.xapian_ruby_1_2_15_1;
     xml_simple = g.xml_simple_1_1_1;
     yajl_ruby = g.yajl_ruby_1_1_0;
   };
-  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
+  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
   gems = {
-    ZenTest_4_9_0 = {
+    ZenTest_4_9_2 = {
       basename = ''ZenTest'';
       meta = {
         description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby'';
@@ -145,89 +141,75 @@ multiruby runs anything you want on multiple versions of ruby. Great
 for compatibility checking! Use multiruby_setup to manage your
 installed versions.'';
       };
-      name = ''ZenTest-4.9.0'';
+      name = ''ZenTest-4.9.2'';
       requiredGems = [  ];
-      sha256 = ''16bp7rwl463m0d213rmwp4rjfwiw1bm529c518v91l18h7hcnb96'';
+      sha256 = ''18hzvxpr3lzjy3gwlxxaihsvabibpcs2yvqvky1d62gkaj6v9npi'';
     };
-    actionmailer_3_2_13 = {
+    actionmailer_4_0_0 = {
       basename = ''actionmailer'';
       meta = {
         description = ''Email composition, delivery, and receiving framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'';
       };
-      name = ''actionmailer-3.2.13'';
-      requiredGems = [ g.actionpack_3_2_13 g.mail_2_5_3 ];
-      sha256 = ''0ksw1b5rba8l6400qgc6zjdn14q68n6crjmm76ggg32r4wv3xn06'';
+      name = ''actionmailer-4.0.0'';
+      requiredGems = [ g.actionpack_4_0_0 g.mail_2_5_4 ];
+      sha256 = ''0d63hmddll0vdbzzxj4zl6njv1pm7j2njvqfccvvyypwsynfjkgk'';
     };
-    actionpack_3_2_13 = {
+    actionpack_4_0_0 = {
       basename = ''actionpack'';
       meta = {
         description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
       };
-      name = ''actionpack-3.2.13'';
-      requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ];
-      sha256 = ''1m3kd3rwa4z0yik68xi0l9q71lyzq4gdciqaw5w2w9pal1cj8y5w'';
+      name = ''actionpack-4.0.0'';
+      requiredGems = [ g.activesupport_4_0_0 g.builder_3_1_4 g.rack_1_5_2 g.rack_test_0_6_2 g.erubis_2_7_0 ];
+      sha256 = ''0hx9hdbqqm73l81p5r520zdk218739414yhw9yrys905ks2f5j4d'';
     };
-    activemodel_3_2_13 = {
+    activemodel_4_0_0 = {
       basename = ''activemodel'';
       meta = {
         description = ''A toolkit for building modeling frameworks (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
-        longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'';
+        longDescription = ''A toolkit for building modeling frameworks like Active Record. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'';
       };
-      name = ''activemodel-3.2.13'';
-      requiredGems = [ g.activesupport_3_2_13 g.builder_3_0_4 ];
-      sha256 = ''0lpc9ylwm00g66hmgj06iq51m2l234ii7k6qsjiywf9x5fq6khn5'';
+      name = ''activemodel-4.0.0'';
+      requiredGems = [ g.activesupport_4_0_0 g.builder_3_1_4 ];
+      sha256 = ''0vsq5bzsyfrzgnhizlipivmh7m9p0ky29avx47wnaqwjlpkir5m2'';
     };
-    activerecord_3_2_13 = {
+    activerecord_4_0_0 = {
       basename = ''activerecord'';
       meta = {
         description = ''Object-relational mapper framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
       };
-      name = ''activerecord-3.2.13'';
-      requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 g.arel_3_0_2 g.tzinfo_0_3_37 ];
-      sha256 = ''1z5rrjy2v27xldr24sd4sxi6k6f5anyg20kwj3qyc0jjn8c0gv85'';
+      name = ''activerecord-4.0.0'';
+      requiredGems = [ g.activesupport_4_0_0 g.activemodel_4_0_0 g.arel_4_0_0 g.activerecord_deprecated_finders_1_0_3 ];
+      sha256 = ''0lhksb0172kz23yhibr1rxihyp01h2ajqxd0l4nahs2qc9jlr722'';
     };
-    activeresource_3_2_13 = {
-      basename = ''activeresource'';
+    activerecord_deprecated_finders_1_0_3 = {
+      basename = ''activerecord_deprecated_finders'';
       meta = {
-        description = ''REST modeling framework (part of Rails).'';
-        homepage = ''http://www.rubyonrails.org'';
-        longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.'';
+        description = ''This gem contains deprecated finder APIs extracted from Active Record.'';
+        homepage = ''https://github.com/rails/activerecord-deprecated_finders'';
+        longDescription = ''Deprecated finder APIs extracted from Active Record.'';
       };
-      name = ''activeresource-3.2.13'';
-      requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 ];
-      sha256 = ''1r4ph4cqd32d4lq9bfyv1dpfxc4qndcqhqx7h7xg4p0va7dz251l'';
+      name = ''activerecord-deprecated_finders-1.0.3'';
+      requiredGems = [  ];
+      sha256 = ''1z2g7h2ywhplrsjrsh8961agf17s9rj8ypdwjj482mw86if3dslp'';
     };
-    activesupport_3_2_13 = {
+    activesupport_4_0_0 = {
       basename = ''activesupport'';
       meta = {
         description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
       };
-      name = ''activesupport-3.2.13'';
-      requiredGems = [ g.i18n_0_6_1 g.multi_json_1_7_2 ];
-      sha256 = ''1vailj8ja9g3s029p5qbvqdpxcis5gcpkl2d6j7a6d36hxlwlf8y'';
-    };
-    addressable_2_3_3 = {
-      basename = ''addressable'';
-      meta = {
-        description = ''URI Implementation'';
-        homepage = ''http://addressable.rubyforge.org/'';
-        longDescription = ''Addressable is a replacement for the URI implementation that is part of
-Ruby's standard library. It more closely conforms to the relevant RFCs and
-adds support for IRIs and URI templates.
-'';
-      };
-      name = ''addressable-2.3.3'';
-      requiredGems = [  ];
-      sha256 = ''0nn583ba8kq4hhpr4lr2zzpm4r0mga0zfalxxpa6a4v27q71v5hh'';
+      name = ''activesupport-4.0.0'';
+      requiredGems = [ g.i18n_0_6_4 g.multi_json_1_7_7 g.tzinfo_0_3_37 g.minitest_4_7_5 g.thread_safe_0_1_0 ];
+      sha256 = ''0agxkvjhhv6r9rpm0lcgjny4sn1ihhvhlgs46rgi3fz0y1d93ids'';
     };
     addressable_2_3_5 = {
       basename = ''addressable'';
@@ -243,7 +225,7 @@ adds support for IRIs and URI templates.
       requiredGems = [  ];
       sha256 = ''11hv69v6h39j7m4v51a4p7my7xwjbhxbsg3y7ja156z7by10wkg7'';
     };
-    arel_3_0_2 = {
+    arel_4_0_0 = {
       basename = ''arel'';
       meta = {
         description = ''Arel is a SQL AST manager for Ruby'';
@@ -257,9 +239,20 @@ It is intended to be a framework framework; that is, you can build your own ORM
 with it, focusing on innovative object and collection modeling as opposed to
 database compatibility and query generation.'';
       };
-      name = ''arel-3.0.2'';
+      name = ''arel-4.0.0'';
       requiredGems = [  ];
-      sha256 = ''158bvrhammpblky9z9dgimjr55bdypfx6w5s1dm4vyj42h49qpkx'';
+      sha256 = ''19xzg8jhp4p18xlf6sp4yhf6vdpc3hl8lm23n6glikclm7rvgick'';
+    };
+    atomic_1_1_10 = {
+      basename = ''atomic'';
+      meta = {
+        description = ''An atomic reference implementation for JRuby, Rubinius, and MRI'';
+        homepage = ''http://github.com/headius/ruby-atomic'';
+        longDescription = ''An atomic reference implementation for JRuby, Rubinius, and MRI'';
+      };
+      name = ''atomic-1.1.10'';
+      requiredGems = [  ];
+      sha256 = ''0ms6b2f9hij6bap901ra2wx7lk4y2bsasifcqr7m3z8l5my372jh'';
     };
     atoulme_Antwrap_0_7_4 = {
       basename = ''atoulme_Antwrap'';
@@ -280,7 +273,7 @@ database compatibility and query generation.'';
 	check out Buildr!'';
       };
       name = ''atoulme-Antwrap-0.7.4'';
-      requiredGems = [ g.rjb_1_4_6 ];
+      requiredGems = [ g.rjb_1_4_8 ];
       sha256 = ''0sh9capkya88qm9mvixwly32fwb2c4nzif9j9vv0f73rqw8kz4j4'';
     };
     autotest_rails_4_1_2 = {
@@ -292,19 +285,19 @@ database compatibility and query generation.'';
 rails support and extra plugins for migrations and fixtures.'';
       };
       name = ''autotest-rails-4.1.2'';
-      requiredGems = [ g.ZenTest_4_9_0 ];
+      requiredGems = [ g.ZenTest_4_9_2 ];
       sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
     };
-    aws_sdk_1_8_5 = {
+    aws_sdk_1_12_0 = {
       basename = ''aws_sdk'';
       meta = {
         description = ''AWS SDK for Ruby'';
         homepage = ''http://aws.amazon.com/sdkforruby'';
         longDescription = ''AWS SDK for Ruby'';
       };
-      name = ''aws-sdk-1.8.5'';
-      requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_9 g.json_1_7_7 ];
-      sha256 = ''0rhkkkfsw0qzckn99mnvpbnl7b1kysma3x8bbqwah2x438kwygpb'';
+      name = ''aws-sdk-1.12.0'';
+      requiredGems = [ g.uuidtools_2_1_4 g.nokogiri_1_5_10 g.json_1_8_0 ];
+      sha256 = ''0ijz5ch7ch5kj19j5caf5h3hdfmmny9v9clkdh664cr46ylvkv3n'';
     };
     bitbucket_backup_0_2_2 = {
       basename = ''bitbucket_backup'';
@@ -314,25 +307,9 @@ rails support and extra plugins for migrations and fixtures.'';
         longDescription = ''A tool to backup Bitbucket repos.'';
       };
       name = ''bitbucket-backup-0.2.2'';
-      requiredGems = [ g.highline_1_6_16 g.json_1_7_7 ];
+      requiredGems = [ g.highline_1_6_19 g.json_1_8_0 ];
       sha256 = ''1kzg6pkzw04n96i6mhb74gpg4c899wly5fc2m1y6m2xvn71qksys'';
     };
-    builder_3_0_4 = {
-      basename = ''builder'';
-      meta = {
-        description = ''Builders for MarkUp.'';
-        homepage = ''http://onestepback.org'';
-        longDescription = ''Builder provides a number of builder objects that make creating structured data
-simple to do.  Currently the following builder objects are supported:
-
-* XML Markup
-* XML Events
-'';
-      };
-      name = ''builder-3.0.4'';
-      requiredGems = [  ];
-      sha256 = ''0hn41h249v82wj7d9vji2lm568jxv8pzq2czh2v0603hjv21r8x1'';
-    };
     builder_3_1_3 = {
       basename = ''builder'';
       meta = {
@@ -349,7 +326,7 @@ simple to do.  Currently the following builder objects are supported:
       requiredGems = [  ];
       sha256 = ''0w6xsq9vyvzdy0xb52sajgipr9ml2bbpivk6dxm69c6987dk7him'';
     };
-    builder_3_2_0 = {
+    builder_3_1_4 = {
       basename = ''builder'';
       meta = {
         description = ''Builders for MarkUp.'';
@@ -361,11 +338,27 @@ simple to do.  Currently the following builder objects are supported:
 * XML Events
 '';
       };
-      name = ''builder-3.2.0'';
+      name = ''builder-3.1.4'';
       requiredGems = [  ];
-      sha256 = ''0f2cpfx6lpazb1wrz3lf06qp6f0qf0gdq5z8xnhkplc3fz3kslb0'';
+      sha256 = ''1p0bjy1vb0zbswd6bsh5qda0f0br53p8vak8cm7hls62094r405p'';
     };
-    buildr_1_4_11 = {
+    builder_3_2_2 = {
+      basename = ''builder'';
+      meta = {
+        description = ''Builders for MarkUp.'';
+        homepage = ''http://onestepback.org'';
+        longDescription = ''Builder provides a number of builder objects that make creating structured data
+simple to do.  Currently the following builder objects are supported:
+
+* XML Markup
+* XML Events
+'';
+      };
+      name = ''builder-3.2.2'';
+      requiredGems = [  ];
+      sha256 = ''14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2'';
+    };
+    buildr_1_4_12 = {
       basename = ''buildr'';
       meta = {
         description = ''Build like you code'';
@@ -377,20 +370,20 @@ to do, and it takes care of the rest.  But also something we can easily extend
 for those one-off tasks, with a language that's a joy to use.
 '';
       };
-      name = ''buildr-1.4.11'';
-      requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_4 ];
-      sha256 = ''0bdrwl9jvxc5h2wqsyacr688hxvzcqan1bhqyryb5bg9a5gpscb4'';
+      name = ''buildr-1.4.12'';
+      requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_5 ];
+      sha256 = ''0hsy9bkfp1pq5f3jx8i6fsk0r309nmq778ykk6w103rkrdb3l6s6'';
     };
-    bundler_1_3_4 = {
+    bundler_1_3_5 = {
       basename = ''bundler'';
       meta = {
         description = ''The best way to manage your application's dependencies'';
         homepage = ''http://gembundler.com'';
         longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
       };
-      name = ''bundler-1.3.4'';
+      name = ''bundler-1.3.5'';
       requiredGems = [  ];
-      sha256 = ''1vgrc71nhnqlrg08zvs63afa1z9kzn2vvn95b14dvy14k2br3qhj'';
+      sha256 = ''1r7zx8qfwzr3pbgrjbsml7z5qgscwyyv33x2jzhz6adqyx3r1f08'';
     };
     childprocess_0_3_9 = {
       basename = ''childprocess'';
@@ -400,7 +393,7 @@ for those one-off tasks, with a language that's a joy to use.
         longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
       };
       name = ''childprocess-0.3.9'';
-      requiredGems = [ g.ffi_1_6_0 ];
+      requiredGems = [ g.ffi_1_9_0 ];
       sha256 = ''0jbz2ix7ff9ry8717lhcq9w8j8yd45akw48giwgdqccay5mlph7d'';
     };
     chronic_0_9_1 = {
@@ -461,6 +454,32 @@ is the MIT license.'';
       requiredGems = [  ];
       sha256 = ''1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0'';
     };
+    domain_name_0_5_12 = {
+      basename = ''domain_name'';
+      meta = {
+        description = ''Domain Name manipulation library for Ruby'';
+        homepage = ''https://github.com/knu/ruby-domain_name'';
+        longDescription = ''This is a Domain Name manipulation library for Ruby.
+
+It can also be used for cookie domain validation based on the Public
+Suffix List.
+'';
+      };
+      name = ''domain_name-0.5.12'';
+      requiredGems = [ g.unf_0_1_1 ];
+      sha256 = ''1i4lrlay8pfxrsdl9ifz7dqvs6p23gf5j87rg16zdvhbkd1d0qx0'';
+    };
+    dotenv_0_8_0 = {
+      basename = ''dotenv'';
+      meta = {
+        description = ''Loads environment variables from `.env`.'';
+        homepage = ''https://github.com/bkeepers/dotenv'';
+        longDescription = ''Loads environment variables from `.env`.'';
+      };
+      name = ''dotenv-0.8.0'';
+      requiredGems = [  ];
+      sha256 = ''1l93ksw6szh77yzrsl4pzsg0ryry3j5n9k0xf8614gyl07p9rh51'';
+    };
     em_resolv_replace_1_1_3 = {
       basename = ''em_resolv_replace'';
       meta = {
@@ -525,17 +544,6 @@ using TCP/IP, especially if custom protocols are required.'';
       requiredGems = [ g.eventmachine_1_0_3 ];
       sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61'';
     };
-    excon_0_25_0 = {
-      basename = ''excon'';
-      meta = {
-        description = ''speed, persistence, http(s)'';
-        homepage = ''https://github.com/geemus/excon'';
-        longDescription = ''EXtended http(s) CONnections'';
-      };
-      name = ''excon-0.25.0'';
-      requiredGems = [  ];
-      sha256 = ''0wv5bc7d138xw2v608ywl9cwhq7d7gl1l2hzdh96ia2a06hf4rry'';
-    };
     execjs_1_4_0 = {
       basename = ''execjs'';
       meta = {
@@ -544,7 +552,7 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''ExecJS lets you run JavaScript code from Ruby.'';
       };
       name = ''execjs-1.4.0'';
-      requiredGems = [ g.multi_json_1_7_2 ];
+      requiredGems = [ g.multi_json_1_7_7 ];
       sha256 = ''0b69ci2afbcdqsri3i89a7s7j7palxsxdb65x6h2wx79kzlc5xcs'';
     };
     fakes3_0_1_5 = {
@@ -554,7 +562,7 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Use FakeS3 to test basic S3 functionality without actually connecting to S3'';
       };
       name = ''fakes3-0.1.5'';
-      requiredGems = [ g.thor_0_18_0 g.builder_3_2_0 ];
+      requiredGems = [ g.thor_0_18_1 g.builder_3_2_2 ];
       sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib'';
     };
     faraday_0_8_7 = {
@@ -578,16 +586,16 @@ using TCP/IP, especially if custom protocols are required.'';
       requiredGems = [ g.faraday_0_8_7 ];
       sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz'';
     };
-    ffi_1_6_0 = {
+    ffi_1_9_0 = {
       basename = ''ffi'';
       meta = {
         description = ''Ruby FFI'';
         homepage = ''http://wiki.github.com/ffi/ffi'';
         longDescription = ''Ruby FFI library'';
       };
-      name = ''ffi-1.6.0'';
+      name = ''ffi-1.9.0'';
       requiredGems = [  ];
-      sha256 = ''0jhjzj8gb6cakv32a6czgrx8krb0hx8mmkwh5yv2lhdcv3ak013v'';
+      sha256 = ''0rnh9yyfzcpdmi8m7giyd21lgqj00afgxvgbx41hsi2ls1ghfwvy'';
     };
     file_tail_1_0_12 = {
       basename = ''file_tail'';
@@ -597,57 +605,21 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Library to tail files in Ruby'';
       };
       name = ''file-tail-1.0.12'';
-      requiredGems = [ g.tins_0_7_2 ];
+      requiredGems = [ g.tins_0_8_2 ];
       sha256 = ''0mzxxnwj7k5pwxs0rdbmb3b41zgvzw7x40sf3qlkch4zdfx91i1j'';
     };
-    foreman_0_62_0 = {
+    foreman_0_63_0 = {
       basename = ''foreman'';
       meta = {
         description = ''Process manager for applications with multiple components'';
         homepage = ''http://github.com/ddollar/foreman'';
         longDescription = ''Process manager for applications with multiple components'';
       };
-      name = ''foreman-0.62.0'';
-      requiredGems = [ g.thor_0_18_0 ];
-      sha256 = ''08i34rgs3bydk52zwpps4p0y2fvcnibp9lvfdhr75ppin7wv7lmr'';
+      name = ''foreman-0.63.0'';
+      requiredGems = [ g.thor_0_18_1 g.dotenv_0_8_0 ];
+      sha256 = ''0yqyjix9jm4iwyc4f3wc32vxr28rpjcw1c9ni5brs4s2a24inzlk'';
     };
-    gettext_2_3_9 = {
-      basename = ''gettext'';
-      meta = {
-        description = ''Gettext is a pure Ruby libary and tools to localize messages.'';
-        homepage = ''http://ruby-gettext.github.com/'';
-        longDescription = ''Gettext is a GNU gettext-like program for Ruby.
-The catalog file(po-file) is same format with GNU gettext.
-So you can use GNU gettext tools for maintaining.
-'';
-      };
-      name = ''gettext-2.3.9'';
-      requiredGems = [ g.locale_2_0_8 g.text_1_2_1 ];
-      sha256 = ''1i4kzkan7mnyr1ihphx0sqs3k4qj9i1ldg4a1cwf5h2fz657wvjj'';
-    };
-    heroku_2_39_4 = {
-      basename = ''heroku'';
-      meta = {
-        description = ''Client library and CLI to deploy apps on Heroku.'';
-        homepage = ''http://heroku.com/'';
-        longDescription = ''Client library and command-line tool to deploy and manage apps on Heroku.'';
-      };
-      name = ''heroku-2.39.4'';
-      requiredGems = [ g.heroku_api_0_3_13 g.netrc_0_7_7 g.rest_client_1_6_7 g.launchy_2_3_0 g.rubyzip_0_9_9 g.rb_readline_0_5_0 ];
-      sha256 = ''1dhj529kqk6q66406f7iwlxwsifndlzcm0513i0hzlhc4lbkbf4x'';
-    };
-    heroku_api_0_3_13 = {
-      basename = ''heroku_api'';
-      meta = {
-        description = ''Ruby Client for the Heroku API'';
-        homepage = ''http://github.com/heroku/heroku.rb'';
-        longDescription = ''Ruby Client for the Heroku API'';
-      };
-      name = ''heroku-api-0.3.13'';
-      requiredGems = [ g.excon_0_25_0 ];
-      sha256 = ''179asf4rxjyg59zh5s7lcrnj7rrz9ymz1km24hdydgyay7px0yvi'';
-    };
-    highline_1_6_16 = {
+    highline_1_6_19 = {
       basename = ''highline'';
       meta = {
         description = ''HighLine is a high-level command-line IO library.'';
@@ -658,9 +630,9 @@ crank out anything from simple list selection to complete shells with just
 minutes of work.
 '';
       };
-      name = ''highline-1.6.16'';
+      name = ''highline-1.6.19'';
       requiredGems = [  ];
-      sha256 = ''1v9dps96hryg7c8hqw41vbm1q02d7wpq7fj1c3bkzsd5518idgzi'';
+      sha256 = ''0gylnz2cdaswgszgl8x2qx0c87md4246r1i0blgm3nqvgd4hlsxd'';
     };
     highline_1_6_2 = {
       basename = ''highline'';
@@ -677,16 +649,16 @@ minutes of work.
       requiredGems = [  ];
       sha256 = ''0azmahb70f1nlg6lq5wljbzcijhfb9lz8skwb4k2977kdml07mcn'';
     };
-    hike_1_2_1 = {
+    hike_1_2_3 = {
       basename = ''hike'';
       meta = {
         description = ''Find files in a set of paths'';
         homepage = ''http://github.com/sstephenson/hike'';
         longDescription = ''A Ruby library for finding files in a set of paths.'';
       };
-      name = ''hike-1.2.1'';
+      name = ''hike-1.2.3'';
       requiredGems = [  ];
-      sha256 = ''1c78gja9i9nj76gdj65czhvwam6550l0w9ilnn8vysj9cwv0rg7b'';
+      sha256 = ''0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm'';
     };
     hoe_3_1_0 = {
       basename = ''hoe'';
@@ -708,16 +680,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [ g.rake_0_9_6 ];
       sha256 = ''0i961x0hrd6fs1nsfham87dhn64gqpnai27l14jag7qbnp3a79yp'';
     };
-    i18n_0_6_1 = {
-      basename = ''i18n'';
+    http_cookie_1_0_1 = {
+      basename = ''http_cookie'';
       meta = {
-        description = ''New wave Internationalization support for Ruby'';
-        homepage = ''http://github.com/svenfuchs/i18n'';
-        longDescription = ''New wave Internationalization support for Ruby.'';
+        description = ''A Ruby library to handle HTTP Cookies based on RFC 6265'';
+        homepage = ''https://github.com/sparklemotion/http-cookie'';
+        longDescription = ''HTTP::Cookie is a Ruby library to handle HTTP Cookies based on RFC 6265.  It has with security, standards compliance and compatibility in mind, to behave just the same as today's major web browsers.  It has builtin support for the legacy cookies.txt and the latest cookies.sqlite formats of Mozilla Firefox, and its modular API makes it easy to add support for a new backend store.'';
       };
-      name = ''i18n-0.6.1'';
-      requiredGems = [  ];
-      sha256 = ''0x3lhp1vl1k4dfqx6k93hhxcpjkz57y8cf007ws7p845ywk6ibfl'';
+      name = ''http-cookie-1.0.1'';
+      requiredGems = [ g.domain_name_0_5_12 ];
+      sha256 = ''0gzghirmim217g7gf1rq3xiav8gfg32r38mcz0w9vznk30psy7d9'';
     };
     i18n_0_6_4 = {
       basename = ''i18n'';
@@ -730,28 +702,6 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''0wz1rnrs4n21j1rw9a120j2pfdkbikp1yvxaqi3mk30iw6mx4p0f'';
     };
-    iconv_1_0_3 = {
-      basename = ''iconv'';
-      meta = {
-        description = ''iconv wrapper library'';
-        homepage = ''https://github.com/nurse/iconv'';
-        longDescription = ''iconv wrapper library'';
-      };
-      name = ''iconv-1.0.3'';
-      requiredGems = [  ];
-      sha256 = ''1nhjn07h2fqivdj6xqzi2x2kzh28vigx8z3q5fv2cqn9aqmbdacl'';
-    };
-    journey_1_0_4 = {
-      basename = ''journey'';
-      meta = {
-        description = ''Journey is a router'';
-        homepage = ''http://github.com/rails/journey'';
-        longDescription = ''Journey is a router.  It routes requests.'';
-      };
-      name = ''journey-1.0.4'';
-      requiredGems = [  ];
-      sha256 = ''03y1xidg1rx1yjz8xb50083vfwcsfkgs4zmizc040y1h4mhvhm3l'';
-    };
     jruby_pageant_1_1_1 = {
       basename = ''jruby_pageant'';
       meta = {
@@ -763,27 +713,27 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl'';
     };
-    jsduck_4_7_1 = {
+    jsduck_4_10_4 = {
       basename = ''jsduck'';
       meta = {
         description = ''Simple JavaScript Duckumentation generator'';
         homepage = ''https://github.com/senchalabs/jsduck'';
         longDescription = ''Documentation generator for Sencha JS frameworks'';
       };
-      name = ''jsduck-4.7.1'';
-      requiredGems = [ g.rdiscount_2_0_7_1 g.json_1_7_7 g.parallel_0_6_3 g.execjs_1_4_0 g.therubyracer_0_10_2 g.dimensions_1_2_0 ];
-      sha256 = ''0yn568ix4j4xpyrsk07cp5c3migsl7ymlg07fsyn5a65yrwyaiyv'';
+      name = ''jsduck-4.10.4'';
+      requiredGems = [ g.rdiscount_2_1_6 g.json_1_8_0 g.parallel_0_7_1 g.execjs_1_4_0 g.therubyracer_0_11_4 g.dimensions_1_2_0 ];
+      sha256 = ''1xnad96wmszz0m66wrwciihba6whpg8bglwkbazrifxh9kcw7wih'';
     };
-    json_1_7_7 = {
+    json_1_8_0 = {
       basename = ''json'';
       meta = {
         description = ''JSON Implementation for Ruby'';
         homepage = ''http://flori.github.com/json'';
         longDescription = ''This is a JSON implementation as a Ruby extension in C.'';
       };
-      name = ''json-1.7.7'';
+      name = ''json-1.8.0'';
       requiredGems = [  ];
-      sha256 = ''1v5pn3g9ignbgrfl72dbf7bzvxsm90ybp24fa3bm9cv5cpa2ww7x'';
+      sha256 = ''0a8prb853nwz9xqjhcd4rm9a5ng8arcn06hlacf0kcizzz69rr47'';
     };
     json_pure_1_7_5 = {
       basename = ''json_pure'';
@@ -796,61 +746,27 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''14nwwf001mh70qnynpb3h8c0kgcfi666yrg2frib4p6lr57jx8ap'';
     };
-    json_pure_1_7_7 = {
+    json_pure_1_8_0 = {
       basename = ''json_pure'';
       meta = {
         description = ''JSON Implementation for Ruby'';
         homepage = ''http://flori.github.com/json'';
         longDescription = ''This is a JSON implementation in pure Ruby.'';
       };
-      name = ''json_pure-1.7.7'';
+      name = ''json_pure-1.8.0'';
       requiredGems = [  ];
-      sha256 = ''0jxp0amx9xhka0ixnhvfgwc5ydr82hkxp81pvw32z31arx7jrwl6'';
+      sha256 = ''0kkn5zhiffav2cffj43wwvzj07825r4j463ilfjgik034vnbjs83'';
     };
-    launchy_2_3_0 = {
-      basename = ''launchy'';
-      meta = {
-        description = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner.'';
-        homepage = ''http://github.com/copiousfreetime/launchy'';
-        longDescription = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner. There are application concepts (browser, email client, etc) that are common across all platforms, and they may be launched differently on each platform. Launchy is here to make a common approach to launching external application from within ruby programs.'';
-      };
-      name = ''launchy-2.3.0'';
-      requiredGems = [ g.addressable_2_3_5 ];
-      sha256 = ''0ckvs40f29ancs0ki12pqb94k380cz41b4gbjplm85ly6kd57sph'';
-    };
-    libv8_3_3_10_4 = {
+    libv8_3_11_8_17_x86_linux = {
       basename = ''libv8'';
       meta = {
         description = ''Distribution of the V8 JavaScript engine'';
-        homepage = ''http://github.com/fractaloop/libv8'';
+        homepage = ''http://github.com/cowboyd/libv8'';
         longDescription = ''Distributes the V8 JavaScript engine in binary and source forms in order to support fast builds of The Ruby Racer'';
       };
-      name = ''libv8-3.3.10.4'';
+      name = ''libv8-3.11.8.17-x86-linux'';
       requiredGems = [  ];
-      sha256 = ''0zy585rs1ihm8nsw525wgmbkcq7aqy1k9dbkk8s6953adl0bpz42'';
-    };
-    locale_2_0_8 = {
-      basename = ''locale'';
-      meta = {
-        description = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization.'';
-        homepage = ''https://github.com/ruby-gettext/locale'';
-        longDescription = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization.
-'';
-      };
-      name = ''locale-2.0.8'';
-      requiredGems = [  ];
-      sha256 = ''1hmixxg4aigl3h1qmz4fdsrv81p0bblcjbks32nrcvcpwmlylf12'';
-    };
-    lockfile_2_1_0 = {
-      basename = ''lockfile'';
-      meta = {
-        description = ''lockfile'';
-        homepage = ''https://github.com/ahoward/lockfile'';
-        longDescription = ''description: lockfile kicks the ass'';
-      };
-      name = ''lockfile-2.1.0'';
-      requiredGems = [  ];
-      sha256 = ''1yfpz9k0crb7q7y5bcaavf2jzbc170dj84hqz13qp75rj7bl3qhf'';
+      sha256 = ''1szy5cjvin3bnydfia5nnb3n3z3prfhjl4q2nbk08zpvp162fk0n'';
     };
     macaddr_1_6_1 = {
       basename = ''macaddr'';
@@ -863,48 +779,31 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [ g.systemu_2_5_2 ];
       sha256 = ''1vd9l1d0lc0sq3rn1ya816wrzgxxqdzq6pgq0y0435qm6ikwy7ch'';
     };
-    mail_2_5_3 = {
+    mail_2_5_4 = {
       basename = ''mail'';
       meta = {
         description = ''Mail provides a nice Ruby DSL for making, sending and reading emails.'';
         homepage = ''http://github.com/mikel/mail'';
         longDescription = ''A really Ruby Mail handler.'';
       };
-      name = ''mail-2.5.3'';
-      requiredGems = [ g.mime_types_1_21 g.treetop_1_4_12 g.i18n_0_6_4 ];
-      sha256 = ''1afr3acz7vsvr4gp6wnrkw1iwbjhf14mh8g8mlm40r86wcwzr39k'';
+      name = ''mail-2.5.4'';
+      requiredGems = [ g.mime_types_1_23 g.treetop_1_4_14 ];
+      sha256 = ''0z15ksb8blcppchv03g34844f7xgf36ckp484qjj2886ig1qara4'';
     };
-    mime_types_1_21 = {
-      basename = ''mime_types'';
+    mechanize_2_7_1 = {
+      basename = ''mechanize'';
       meta = {
-        description = ''This library allows for the identification of a file's likely MIME content type'';
-        homepage = ''http://mime-types.rubyforge.org/'';
-        longDescription = ''This library allows for the identification of a file's likely MIME content
-type. This is release 1.21 with new MIME types. The identification of MIME
-content type is based on a file's filename extensions.
-
-MIME types are used in MIME-compliant communications, as in e-mail or
-HTTP traffic, to indicate the type of content which is transmitted.
-MIME::Types provides the ability for detailed information about MIME
-entities (provided as a set of MIME::Type objects) to be determined and
-used programmatically. There are many types defined by RFCs and vendors,
-so the list is long but not complete; don't hesitate to ask to add
-additional information. This library follows the IANA collection of MIME
-types (see below for reference).
-
-MIME::Types for Ruby was originally based on and synchronized with MIME::Types
-for Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data
-format for the MIME::Type list has changed and the synchronization will no
-longer happen.
-
-MIME::Types is built to conform to the MIME types of RFCs 2045 and 2231. It
-follows the official {IANA registry}[http://www.iana.org/assignments/media-types/]
-({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types
-added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp].'';
+        description = ''The Mechanize library is used for automating interaction with websites'';
+        homepage = ''http://mechanize.rubyforge.org'';
+        longDescription = ''The Mechanize library is used for automating interaction with websites.
+Mechanize automatically stores and sends cookies, follows redirects,
+and can follow links and submit forms.  Form fields can be populated and
+submitted.  Mechanize also keeps track of the sites that you have visited as
+a history.'';
       };
-      name = ''mime-types-1.21'';
-      requiredGems = [  ];
-      sha256 = ''1qmx53a2kqk0nnhjbfvbc213wsxiprl0wqm7f2xvcsh253ld91iw'';
+      name = ''mechanize-2.7.1'';
+      requiredGems = [ g.net_http_digest_auth_1_3 g.net_http_persistent_2_8 g.mime_types_1_23 g.http_cookie_1_0_1 g.nokogiri_1_6_0 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_12 ];
+      sha256 = ''0abcrabsjamp4fjbizp4dv8nkz7jv03r9n0lpn9yypb48ij876vh'';
     };
     mime_types_1_23 = {
       basename = ''mime_types'';
@@ -938,6 +837,17 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [  ];
       sha256 = ''1ch5ngx67nhbq6j1y79c88gzk6i8pzqi860iwfpxp9c0bwf6fags'';
     };
+    mini_portile_0_5_1 = {
+      basename = ''mini_portile'';
+      meta = {
+        description = ''Simplistic port-like solution for developers'';
+        homepage = ''http://github.com/luislavena/mini_portile'';
+        longDescription = ''Simplistic port-like solution for developers. It provides a standard and simplified way to compile against dependency libraries without messing up your system.'';
+      };
+      name = ''mini_portile-0.5.1'';
+      requiredGems = [  ];
+      sha256 = ''0cafnlhdzakzl5vqcm9b97kchj9bvhlcf4ylkyr85lz1263hbagg'';
+    };
     minitar_0_5_3 = {
       basename = ''minitar'';
       meta = {
@@ -949,16 +859,79 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [  ];
       sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53'';
     };
-    multi_json_1_7_2 = {
+    minitest_4_7_5 = {
+      basename = ''minitest'';
+      meta = {
+        description = ''minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking'';
+        homepage = ''https://github.com/seattlerb/minitest'';
+        longDescription = ''minitest provides a complete suite of testing facilities supporting
+TDD, BDD, mocking, and benchmarking.
+
+    "I had a class with Jim Weirich on testing last week and we were
+     allowed to choose our testing frameworks. Kirk Haines and I were
+     paired up and we cracked open the code for a few test
+     frameworks...
+
+     I MUST say that minitest is *very* readable / understandable
+     compared to the 'other two' options we looked at. Nicely done and
+     thank you for helping us keep our mental sanity."
+
+    -- Wayne E. Seguin
+
+minitest/unit is a small and incredibly fast unit testing framework.
+It provides a rich set of assertions to make your tests clean and
+readable.
+
+minitest/spec is a functionally complete spec engine. It hooks onto
+minitest/unit and seamlessly bridges test assertions over to spec
+expectations.
+
+minitest/benchmark is an awesome way to assert the performance of your
+algorithms in a repeatable manner. Now you can assert that your newb
+co-worker doesn't replace your linear algorithm with an exponential
+one!
+
+minitest/mock by Steven Baker, is a beautifully tiny mock (and stub)
+object framework.
+
+minitest/pride shows pride in testing and adds coloring to your test
+output. I guess it is an example of how to write IO pipes too. :P
+
+minitest/unit is meant to have a clean implementation for language
+implementors that need a minimal set of methods to bootstrap a working
+test suite. For example, there is no magic involved for test-case
+discovery.
+
+    "Again, I can't praise enough the idea of a testing/specing
+     framework that I can actually read in full in one sitting!"
+
+    -- Piotr Szotkowski
+
+Comparing to rspec:
+
+    rspec is a testing DSL. minitest is ruby.
+
+    -- Adam Hawkins, "Bow Before MiniTest"
+
+minitest doesn't reinvent anything that ruby already provides, like:
+classes, modules, inheritance, methods. This means you only have to
+learn ruby to use minitest and all of your regular OO practices like
+extract-method refactorings still apply.'';
+      };
+      name = ''minitest-4.7.5'';
+      requiredGems = [  ];
+      sha256 = ''03p6iban9gcpcflzp4z901s1hgj9369p6515h967ny6hlqhcf2iy'';
+    };
+    multi_json_1_7_7 = {
       basename = ''multi_json'';
       meta = {
-        description = ''A gem to provide swappable JSON backends.'';
+        description = ''A common interface to multiple JSON libraries.'';
         homepage = ''http://github.com/intridea/multi_json'';
-        longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.'';
+        longDescription = ''A common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.'';
       };
-      name = ''multi_json-1.7.2'';
+      name = ''multi_json-1.7.7'';
       requiredGems = [  ];
-      sha256 = ''17mfs58bilkn2b9g3ggh6pz1w4c2a72mqsr6zf0qd8vahw5h158q'';
+      sha256 = ''1w3fpi52h4a7r0a670xzrwa40l5irh69r45cbvxw24bsp19sfxzr'';
     };
     multipart_post_1_2_0 = {
       basename = ''multipart_post'';
@@ -971,6 +944,43 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [  ];
       sha256 = ''12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc'';
     };
+    net_http_digest_auth_1_3 = {
+      basename = ''net_http_digest_auth'';
+      meta = {
+        description = ''An implementation of RFC 2617 - Digest Access Authentication'';
+        homepage = ''http://github.com/drbrain/net-http-digest_auth'';
+        longDescription = ''An implementation of RFC 2617 - Digest Access Authentication.  At this time
+the gem does not drop in to Net::HTTP and can be used for with other HTTP
+clients.
+
+In order to use net-http-digest_auth you'll need to perform some request
+wrangling on your own.  See the class documentation at Net::HTTP::DigestAuth
+for an example.'';
+      };
+      name = ''net-http-digest_auth-1.3'';
+      requiredGems = [  ];
+      sha256 = ''11hn4fb02rx799ck1gghmz7b32977zbi9sz2jpfyz43igwz2dvzy'';
+    };
+    net_http_persistent_2_8 = {
+      basename = ''net_http_persistent'';
+      meta = {
+        description = ''Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8'';
+        homepage = ''http://docs.seattlerb.org/net-http-persistent'';
+        longDescription = ''Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8.
+It's thread-safe too!
+
+Using persistent HTTP connections can dramatically increase the speed of HTTP.
+Creating a new HTTP connection for every request involves an extra TCP
+round-trip and causes TCP congestion avoidance negotiation to start over.
+
+Net::HTTP supports persistent connections with some API methods but does not
+handle reconnection gracefully.  Net::HTTP::Persistent supports reconnection
+and retry according to RFC 2616.'';
+      };
+      name = ''net-http-persistent-2.8'';
+      requiredGems = [  ];
+      sha256 = ''1y50ssi8lcxfady4wwy242sgsr1424g5rg3wpav6kqc9rba74v9l'';
+    };
     net_sftp_2_0_5 = {
       basename = ''net_sftp'';
       meta = {
@@ -979,7 +989,7 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
         longDescription = ''A pure Ruby implementation of the SFTP client protocol'';
       };
       name = ''net-sftp-2.0.5'';
-      requiredGems = [ g.net_ssh_2_6_6 ];
+      requiredGems = [ g.net_ssh_2_6_8 ];
       sha256 = ''0lqk735wspm8rbiyxpbil8ikrqcyg00ss1df7fny0761c3as6m0v'';
     };
     net_ssh_2_6_0 = {
@@ -993,27 +1003,16 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [ g.jruby_pageant_1_1_1 ];
       sha256 = ''18fsgps4a9dfrjszkl3py8j7vw0xwi70bcp59ccj2rlr6i1jv5gw'';
     };
-    net_ssh_2_6_6 = {
+    net_ssh_2_6_8 = {
       basename = ''net_ssh'';
       meta = {
         description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
         homepage = ''https://github.com/net-ssh/net-ssh'';
         longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.'';
       };
-      name = ''net-ssh-2.6.6'';
+      name = ''net-ssh-2.6.8'';
       requiredGems = [  ];
-      sha256 = ''00fdnwv3jf311jjcc51lq8w26r62vzma91i79h5hj8i1ylrilx51'';
-    };
-    netrc_0_7_7 = {
-      basename = ''netrc'';
-      meta = {
-        description = ''Library to read and write netrc files.'';
-        homepage = ''https://github.com/geemus/netrc'';
-        longDescription = ''This library can read and update netrc files, preserving formatting including comments and whitespace.'';
-      };
-      name = ''netrc-0.7.7'';
-      requiredGems = [  ];
-      sha256 = ''1y64v93hsxdwgx3dfkyzdki3zqd1slm42dmi23v0zy3kap4vpard'';
+      sha256 = ''0vf9w8b9f5ha94nwhvwxyqk4lfpy42ihl1g0qib8dfvswlkqw3mx'';
     };
     nix_0_1_1 = {
       basename = ''nix'';
@@ -1026,7 +1025,7 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [  ];
       sha256 = ''0kwrbkkg0gxibhsz9dpd5zabcf2wqsicg28yiazyb3dc9dslk26k'';
     };
-    nokogiri_1_5_9 = {
+    nokogiri_1_5_10 = {
       basename = ''nokogiri'';
       meta = {
         description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser'';
@@ -1037,9 +1036,35 @@ many features is the ability to search documents via XPath or CSS3 selectors.
 XML is like violence - if it doesn’t solve your problems, you are not using
 enough of it.'';
       };
-      name = ''nokogiri-1.5.9'';
+      name = ''nokogiri-1.5.10'';
       requiredGems = [  ];
-      sha256 = ''08qx4p3p6dd1yh58c4waz5rjmkzv3v315fr0l6n0dgkg71dczbi9'';
+      sha256 = ''0dblphzwzl705xmlqcflz8s60xzbcgi4xqzx7984l4kcssbkn71b'';
+    };
+    nokogiri_1_6_0 = {
+      basename = ''nokogiri'';
+      meta = {
+        description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser'';
+        homepage = ''http://nokogiri.org'';
+        longDescription = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  Among Nokogiri's
+many features is the ability to search documents via XPath or CSS3 selectors.
+
+XML is like violence - if it doesn’t solve your problems, you are not using
+enough of it.'';
+      };
+      name = ''nokogiri-1.6.0'';
+      requiredGems = [ g.mini_portile_0_5_1 ];
+      sha256 = ''1icrny9w2hd0pm7cyq5wqdkbzr57dkma1lbyrr0x14lsnangkidb'';
+    };
+    ntlm_http_0_1_1 = {
+      basename = ''ntlm_http'';
+      meta = {
+        description = ''Ruby/NTLM HTTP library.'';
+        homepage = ''http://www.mindflowsolutions.net'';
+        longDescription = ''Ruby/NTLM HTTP provides NTLM authentication over http.'';
+      };
+      name = ''ntlm-http-0.1.1'';
+      requiredGems = [  ];
+      sha256 = ''0yx01ffrw87wya1syivqzf8hz02axk7jdpw6aw221xwvib767d36'';
     };
     papertrail_0_9_7 = {
       basename = ''papertrail'';
@@ -1049,7 +1074,7 @@ enough of it.'';
         longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).'';
       };
       name = ''papertrail-0.9.7'';
-      requiredGems = [ g.addressable_2_3_3 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_7 g.faraday_middleware_0_8_8 ];
+      requiredGems = [ g.addressable_2_3_5 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_7 g.faraday_middleware_0_8_8 ];
       sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr'';
     };
     papertrail_cli_0_9_3 = {
@@ -1063,15 +1088,15 @@ enough of it.'';
       requiredGems = [ g.papertrail_0_9_7 ];
       sha256 = ''1914dcfqsmw5rl4xd1zwjrfbgwglyncxm8km06bgxaqn4wnaq5iv'';
     };
-    parallel_0_6_3 = {
+    parallel_0_7_1 = {
       basename = ''parallel'';
       meta = {
         description = ''Run any kind of code in parallel processes'';
         homepage = ''https://github.com/grosser/parallel'';
       };
-      name = ''parallel-0.6.3'';
+      name = ''parallel-0.7.1'';
       requiredGems = [  ];
-      sha256 = ''17mg4vfx1c4z7399azf982a3cn522m43kavdqfhfs6i89m7z0l9n'';
+      sha256 = ''1kzz6ydg7r23ks2b7zbpx4vz3h186n19vhgnjcwi7xwd6h2f1fsq'';
     };
     polyglot_0_3_3 = {
       basename = ''polyglot'';
@@ -1087,24 +1112,6 @@ augments 'require' to find and load matching files.'';
       requiredGems = [  ];
       sha256 = ''082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v'';
     };
-    rack_1_4_5 = {
-      basename = ''rack'';
-      meta = {
-        description = ''a modular Ruby webserver interface'';
-        homepage = ''http://rack.github.com/'';
-        longDescription = ''Rack provides a minimal, modular and adaptable interface for developing
-web applications in Ruby.  By wrapping HTTP requests and responses in
-the simplest way possible, it unifies and distills the API for web
-servers, web frameworks, and software in between (the so-called
-middleware) into a single method call.
-
-Also see http://rack.github.com/.
-'';
-      };
-      name = ''rack-1.4.5'';
-      requiredGems = [  ];
-      sha256 = ''027k0nbb8d7cl24x2cywdc6lgrr4lwvdwwjk8wkgz8h9ism3zgzp'';
-    };
     rack_1_5_2 = {
       basename = ''rack'';
       meta = {
@@ -1123,17 +1130,6 @@ Also see http://rack.github.com/.
       requiredGems = [  ];
       sha256 = ''19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6'';
     };
-    rack_cache_1_2 = {
-      basename = ''rack_cache'';
-      meta = {
-        description = ''HTTP Caching for Rack'';
-        homepage = ''http://tomayko.com/src/rack-cache/'';
-        longDescription = ''Rack::Cache is suitable as a quick drop-in component to enable HTTP caching for Rack-based applications that produce freshness (Expires, Cache-Control) and/or validation (Last-Modified, ETag) information.'';
-      };
-      name = ''rack-cache-1.2'';
-      requiredGems = [ g.rack_1_5_2 ];
-      sha256 = ''073ffpsqmy4nqxz178qisb3a4v3305c49ypj0jw6s9mkz02yvgq2'';
-    };
     rack_protection_1_5_0 = {
       basename = ''rack_protection'';
       meta = {
@@ -1145,18 +1141,6 @@ Also see http://rack.github.com/.
       requiredGems = [ g.rack_1_5_2 ];
       sha256 = ''10wm67f2mp9pryg0s8qapbyxd2lcrpb8ywsbicg29cv2xprhbl4j'';
     };
-    rack_ssl_1_3_3 = {
-      basename = ''rack_ssl'';
-      meta = {
-        description = ''Force SSL/TLS in your app.'';
-        homepage = ''https://github.com/josh/rack-ssl'';
-        longDescription = ''    Rack middleware to force SSL/TLS.
-'';
-      };
-      name = ''rack-ssl-1.3.3'';
-      requiredGems = [ g.rack_1_5_2 ];
-      sha256 = ''0rkmj71s87prswa8sqal42kdllgpfd35ir5m9ahhnlmrrpqd0hr5'';
-    };
     rack_test_0_6_2 = {
       basename = ''rack_test'';
       meta = {
@@ -1171,27 +1155,27 @@ request helpers feature.'';
       requiredGems = [ g.rack_1_5_2 ];
       sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky'';
     };
-    rails_3_2_13 = {
+    rails_4_0_0 = {
       basename = ''rails'';
       meta = {
         description = ''Full-stack web application framework.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
       };
-      name = ''rails-3.2.13'';
-      requiredGems = [ g.activesupport_3_2_13 g.actionpack_3_2_13 g.activerecord_3_2_13 g.activeresource_3_2_13 g.actionmailer_3_2_13 g.railties_3_2_13 g.bundler_1_3_4 ];
-      sha256 = ''1f5w4ivy0jxpjf1gkav064i0gd5x9xqnznwrkbc3slc9savprifz'';
+      name = ''rails-4.0.0'';
+      requiredGems = [ g.activesupport_4_0_0 g.actionpack_4_0_0 g.activerecord_4_0_0 g.actionmailer_4_0_0 g.railties_4_0_0 g.bundler_1_3_5 g.sprockets_rails_2_0_0 ];
+      sha256 = ''12q2z2zpqpr61rqdx8can2ay6y1xxi6ghmlkyvfvxnnwwzxypavf'';
     };
-    railties_3_2_13 = {
+    railties_4_0_0 = {
       basename = ''railties'';
       meta = {
         description = ''Tools for creating, working with, and running Rails applications.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
       };
-      name = ''railties-3.2.13'';
-      requiredGems = [ g.rake_10_0_4 g.rack_ssl_1_3_3 g.thor_0_18_0 g.rdoc_3_12_2 g.activesupport_3_2_13 g.actionpack_3_2_13 ];
-      sha256 = ''01wbqfnlrs9nbs0b97dbxh7aap2bma7my530pcggxdf8ckms8kr9'';
+      name = ''railties-4.0.0'';
+      requiredGems = [ g.activesupport_4_0_0 g.actionpack_4_0_0 g.rake_10_1_0 g.thor_0_18_1 ];
+      sha256 = ''063yyp75b87z0nr1mayzyq462nnhfm834mn97fcyg2mf3zr8qbly'';
     };
     rake_0_9_2_2 = {
       basename = ''rake'';
@@ -1215,16 +1199,16 @@ request helpers feature.'';
       requiredGems = [  ];
       sha256 = ''09kyh351gddn6gjz255hbaza1cw235xvfz9dc15rhyq9phvqdphc'';
     };
-    rake_10_0_4 = {
+    rake_10_1_0 = {
       basename = ''rake'';
       meta = {
         description = ''Ruby based make-like utility.'';
         homepage = ''http://rake.rubyforge.org'';
         longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.'';
       };
-      name = ''rake-10.0.4'';
+      name = ''rake-10.1.0'';
       requiredGems = [  ];
-      sha256 = ''032z0csyi5bjfgzq3winvqvi9fpf3bfx518hzzapkfy90y702ds1'';
+      sha256 = ''1frsqpihi39x3yqaa7m9vbls1kd24wckbj5cpiwqix8xmcwnic7q'';
     };
     rb_fsevent_0_9_3 = {
       basename = ''rb_fsevent'';
@@ -1237,65 +1221,39 @@ request helpers feature.'';
       requiredGems = [  ];
       sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1'';
     };
-    rb_readline_0_5_0 = {
-      basename = ''rb_readline'';
-      meta = {
-        description = ''Pure-Ruby Readline Implementation'';
-        homepage = ''http://github.com/luislavena/rb-readline'';
-        longDescription = ''The readline library provides a pure Ruby implementation of the GNU readline C library, as well as the Readline extension that ships as part of the standard library.'';
-      };
-      name = ''rb-readline-0.5.0'';
-      requiredGems = [  ];
-      sha256 = ''1aixbqpwrlzvrii4c80982jih4syanc2jl0lfcbibqvjasy9h9c8'';
-    };
-    rdiscount_2_0_7_1 = {
+    rdiscount_2_1_6 = {
       basename = ''rdiscount'';
       meta = {
         description = ''Fast Implementation of Gruber's Markdown in C'';
-        homepage = ''http://github.com/rtomayko/rdiscount'';
+        homepage = ''http://dafoster.net/projects/rdiscount/'';
       };
-      name = ''rdiscount-2.0.7.1'';
+      name = ''rdiscount-2.1.6'';
       requiredGems = [  ];
-      sha256 = ''1xjwi99wfyjhn72h8k709kbq2npqmw2zvikszxfg6in83yb8vmxn'';
+      sha256 = ''180ln9gwxn0cyflg0i1viv7jyalmjqvqr34cb65xsmmsz1nz55q2'';
     };
-    rdoc_3_12_2 = {
-      basename = ''rdoc'';
+    ref_1_0_5 = {
+      basename = ''ref'';
       meta = {
-        description = ''RDoc produces HTML and command-line documentation for Ruby projects'';
-        homepage = ''http://docs.seattlerb.org/rdoc'';
-        longDescription = ''RDoc produces HTML and command-line documentation for Ruby projects.  RDoc
-includes the +rdoc+ and +ri+ tools for generating and displaying online
-documentation.
-
-See RDoc for a description of RDoc's markup and basic use.'';
+        description = ''Library that implements weak, soft, and strong references in Ruby.'';
+        homepage = ''http://github.com/bdurand/ref'';
+        longDescription = ''Library that implements weak, soft, and strong references in Ruby that work across multiple runtimes (MRI, REE, YARV, Jruby, Rubinius, and IronRuby). Also includes implementation of maps/hashes that use references and a reference queue.'';
       };
-      name = ''rdoc-3.12.2'';
-      requiredGems = [ g.json_1_7_7 ];
-      sha256 = ''1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8'';
+      name = ''ref-1.0.5'';
+      requiredGems = [  ];
+      sha256 = ''19qgpsfszwc2sfh6wixgky5agn831qq8ap854i1jqqhy1zsci3la'';
     };
-    remote_syslog_1_6_13 = {
+    remote_syslog_1_6_14 = {
       basename = ''remote_syslog'';
       meta = {
         description = ''Monitor plain text log file(s) for new entries and send to remote syslog collector'';
         homepage = ''http://github.com/papertrail/remote_syslog'';
         longDescription = ''Lightweight daemon to tail one or more log files and transmit UDP syslog messages to a remote syslog host (centralized log aggregation). Generates UDP packets itself instead of depending on a system syslog daemon, so it doesn't affect system-wide logging configuration.'';
       };
-      name = ''remote_syslog-1.6.13'';
+      name = ''remote_syslog-1.6.14'';
       requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ];
-      sha256 = ''0q35j02k2l3fw3fdzq0i3rd6chsqr982gj13f3m3lsxm7kms03nw'';
+      sha256 = ''1f2yjyqhbdc4vlx52zli1b33f6yn8qc1kd4n0dpv27zswj9qfdkr'';
     };
-    rest_client_1_6_7 = {
-      basename = ''rest_client'';
-      meta = {
-        description = ''Simple HTTP and REST client for Ruby, inspired by microframework syntax for specifying actions.'';
-        homepage = ''http://github.com/archiloque/rest-client'';
-        longDescription = ''A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete.'';
-      };
-      name = ''rest-client-1.6.7'';
-      requiredGems = [ g.mime_types_1_23 ];
-      sha256 = ''0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853'';
-    };
-    right_aws_3_0_5 = {
+    right_aws_3_1_0 = {
       basename = ''right_aws'';
       meta = {
         description = ''The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.'';
@@ -1339,11 +1297,11 @@ The RightScale AWS gems comprise:
 - Test suite (requires AWS account to do "live" testing).
 '';
       };
-      name = ''right_aws-3.0.5'';
-      requiredGems = [ g.right_http_connection_1_3_0 ];
-      sha256 = ''0pxdmxmqiidy3dpxsp4l0b1l6nq9b1sh4p1gkzalqm4l24646h4k'';
+      name = ''right_aws-3.1.0'';
+      requiredGems = [ g.right_http_connection_1_4_0 ];
+      sha256 = ''1a3l5vyvq078nq976rzkrd6fbj522sbgrxpdq3p9z373h0awha09'';
     };
-    right_http_connection_1_3_0 = {
+    right_http_connection_1_4_0 = {
       basename = ''right_http_connection'';
       meta = {
         description = ''RightScale's robust HTTP/S connection module'';
@@ -1358,9 +1316,9 @@ algorithm for low-level network errors.
 - HTTPS certificate checking
 '';
       };
-      name = ''right_http_connection-1.3.0'';
+      name = ''right_http_connection-1.4.0'';
       requiredGems = [  ];
-      sha256 = ''0900zy2ya57vhxdkdm2gj7xmvzj4gwm5l7ad0lh68ka3vxhdi7ap'';
+      sha256 = ''0m4phly7srnwyvfqp01lpaxrgrybhszar0p23zl8b12r6bdjl84g'';
     };
     rjb_1_4_2 = {
       basename = ''rjb'';
@@ -1374,7 +1332,7 @@ algorithm for low-level network errors.
       requiredGems = [  ];
       sha256 = ''1cgbwpc45djs0mw05ydxf5apmb9ibj61n240ylqwzrajf13banzh'';
     };
-    rjb_1_4_6 = {
+    rjb_1_4_8 = {
       basename = ''rjb'';
       meta = {
         description = ''Ruby Java bridge'';
@@ -1382,20 +1340,9 @@ algorithm for low-level network errors.
         longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
 '';
       };
-      name = ''rjb-1.4.6'';
+      name = ''rjb-1.4.8'';
       requiredGems = [  ];
-      sha256 = ''0q2czc3ghk32hnxf76xsf0jqcfrnx60aqarvdjhgsfdc9a5pmk20'';
-    };
-    rmail_1_0_0 = {
-      basename = ''rmail'';
-      meta = {
-        description = ''A MIME mail parsing and generation library.'';
-        homepage = ''http://www.rfc20.org/rubymail'';
-        longDescription = ''RMail is a lightweight mail library containing various utility classes and modules that allow ruby scripts to parse, modify, and generate MIME mail messages.'';
-      };
-      name = ''rmail-1.0.0'';
-      requiredGems = [  ];
-      sha256 = ''0nsg7yda1gdwa96j4hlrp2s0m06vrhcc4zy5mbq7gxmlmwf9yixp'';
+      sha256 = ''06ps4ssaxb8jwja53h7v7kb31hsdr997b8na89d1yasm5zyraliw'';
     };
     rspec_2_11_0 = {
       basename = ''rspec'';
@@ -1456,7 +1403,7 @@ algorithm for low-level network errors.
 * For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.'';
       };
       name = ''rubyforge-2.0.4'';
-      requiredGems = [ g.json_pure_1_7_7 ];
+      requiredGems = [ g.json_pure_1_8_0 ];
       sha256 = ''1wdaa4nzy39yzy848fa1rybi72qlyf9vhi1ra9wpx9rpi810fwh1'';
     };
     rubyzip_0_9_9 = {
@@ -1469,7 +1416,7 @@ algorithm for low-level network errors.
       requiredGems = [  ];
       sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2'';
     };
-    sass_3_2_7 = {
+    sass_3_2_9 = {
       basename = ''sass'';
       meta = {
         description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
@@ -1480,20 +1427,20 @@ algorithm for low-level network errors.
       command line tool or a web-framework plugin.
 '';
       };
-      name = ''sass-3.2.7'';
+      name = ''sass-3.2.9'';
       requiredGems = [  ];
-      sha256 = ''0c494gh1i4llk4lbi35vidsgclf3cgxind1a7nm499ac9sdz084s'';
+      sha256 = ''08lvbi4siavvci0g4m65576axcagw23i0iamdqv33kwdimik717q'';
     };
-    selenium_webdriver_2_31_0 = {
+    selenium_webdriver_2_33_0 = {
       basename = ''selenium_webdriver'';
       meta = {
         description = ''The next generation developer focused tool for automated testing of webapps'';
         homepage = ''http://selenium.googlecode.com'';
         longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
       };
-      name = ''selenium-webdriver-2.31.0'';
-      requiredGems = [ g.multi_json_1_7_2 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
-      sha256 = ''1nv3ff31g183kdb97jjz0y7ny3vdnccd09pgblpj87bzhrrdfv3r'';
+      name = ''selenium-webdriver-2.33.0'';
+      requiredGems = [ g.multi_json_1_7_7 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
+      sha256 = ''000fpc5vaf268g96vmqq9vlg8fgyh78290agayrk9qkds8i8cr5d'';
     };
     servolux_0_10_0 = {
       basename = ''servolux'';
@@ -1517,19 +1464,29 @@ interpreters.'';
         longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.'';
       };
       name = ''sinatra-1.3.2'';
-      requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_3_6 ];
+      requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_4_1 ];
       sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc'';
     };
-    sprockets_2_2_2 = {
+    sprockets_2_10_0 = {
       basename = ''sprockets'';
       meta = {
         description = ''Rack-based asset packaging system'';
         homepage = ''http://getsprockets.org/'';
         longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
       };
-      name = ''sprockets-2.2.2'';
-      requiredGems = [ g.hike_1_2_1 g.multi_json_1_7_2 g.rack_1_5_2 g.tilt_1_3_6 ];
-      sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s'';
+      name = ''sprockets-2.10.0'';
+      requiredGems = [ g.hike_1_2_3 g.multi_json_1_7_7 g.rack_1_5_2 g.tilt_1_4_1 ];
+      sha256 = ''1z0kiaymvqm07wqqy479vd8a60ggr3f3520b4splljbn2055fn3s'';
+    };
+    sprockets_rails_2_0_0 = {
+      basename = ''sprockets_rails'';
+      meta = {
+        description = ''Sprockets Rails integration'';
+        homepage = ''https://github.com/rails/sprockets-rails'';
+      };
+      name = ''sprockets-rails-2.0.0'';
+      requiredGems = [ g.sprockets_2_10_0 g.actionpack_4_0_0 g.activesupport_4_0_0 ];
+      sha256 = ''068w0ly7x1vciy4j6mwgsnz6a983pld4rzk1fpvfsmkdqcizb20x'';
     };
     syslog_protocol_0_9_2 = {
       basename = ''syslog_protocol'';
@@ -1553,27 +1510,16 @@ interpreters.'';
       requiredGems = [  ];
       sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr'';
     };
-    text_1_2_1 = {
-      basename = ''text'';
-      meta = {
-        description = ''A collection of text algorithms'';
-        homepage = ''http://github.com/threedaymonk/text'';
-        longDescription = ''A collection of text algorithms: Levenshtein, Soundex, Metaphone, Double Metaphone, Porter Stemming'';
-      };
-      name = ''text-1.2.1'';
-      requiredGems = [  ];
-      sha256 = ''0s186kh125imdr7dahr10payc1gmxgk6wjy1v3agdyvl53yn5z3z'';
-    };
-    therubyracer_0_10_2 = {
+    therubyracer_0_11_4 = {
       basename = ''therubyracer'';
       meta = {
-        description = ''Embed the V8 Javascript interpreter into Ruby'';
+        description = ''Embed the V8 JavaScript interpreter into Ruby'';
         homepage = ''http://github.com/cowboyd/therubyracer'';
-        longDescription = ''Call javascript code and manipulate javascript objects from ruby. Call ruby code and manipulate ruby objects from javascript.'';
+        longDescription = ''Call JavaScript code and manipulate JavaScript objects from Ruby. Call Ruby code and manipulate Ruby objects from JavaScript.'';
       };
-      name = ''therubyracer-0.10.2'';
-      requiredGems = [ g.libv8_3_3_10_4 ];
-      sha256 = ''111hm2l613v06sy7pzjzmnyi4x11rg3c2syhnpv8fn0wnn9rdiyb'';
+      name = ''therubyracer-0.11.4'';
+      requiredGems = [ g.ref_1_0_5 g.libv8_3_11_8_17_x86_linux ];
+      sha256 = ''15n9zi9jzb5k34id9xfkxx39y0nap7a4h02z8r00msjjajxag3iq'';
     };
     thin_1_5_1 = {
       basename = ''thin'';
@@ -1586,63 +1532,59 @@ interpreters.'';
       requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_3 g.daemons_1_1_9 ];
       sha256 = ''0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga'';
     };
-    thor_0_18_0 = {
+    thor_0_18_1 = {
       basename = ''thor'';
       meta = {
         description = ''A scripting framework that replaces rake, sake and rubigen'';
         homepage = ''http://whatisthor.com/'';
         longDescription = ''A scripting framework that replaces rake, sake and rubigen'';
       };
-      name = ''thor-0.18.0'';
+      name = ''thor-0.18.1'';
       requiredGems = [  ];
-      sha256 = ''0m7pl518j5q1ymgxmsi6xfjp6k40mwbmzk33s760v53azwxkfxan'';
+      sha256 = ''0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3'';
     };
-    tilt_1_3_6 = {
+    thread_safe_0_1_0 = {
+      basename = ''thread_safe'';
+      meta = {
+        description = ''A collection of data structures and utilities to make thread-safe programming in Ruby easier'';
+        homepage = ''https://github.com/headius/thread_safe'';
+        longDescription = ''Thread-safe collections and utilities for Ruby'';
+      };
+      name = ''thread_safe-0.1.0'';
+      requiredGems = [ g.atomic_1_1_10 ];
+      sha256 = ''0fhx4110il4iiij5wdfq3afn0wvsz7pdvmx5v2zv24gah1861rsf'';
+    };
+    tilt_1_4_1 = {
       basename = ''tilt'';
       meta = {
         description = ''Generic interface to multiple Ruby template engines'';
         homepage = ''http://github.com/rtomayko/tilt/'';
         longDescription = ''Generic interface to multiple Ruby template engines'';
       };
-      name = ''tilt-1.3.6'';
+      name = ''tilt-1.4.1'';
       requiredGems = [  ];
-      sha256 = ''1yz6zfnwq0qyjn71115vd63ly8zm1jss0b2v7fbcbzzj9lrnq9y6'';
+      sha256 = ''00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir'';
     };
-    tins_0_7_2 = {
+    tins_0_8_2 = {
       basename = ''tins'';
       meta = {
         description = ''Useful stuff.'';
         homepage = ''http://flori.github.com/tins'';
         longDescription = ''All the stuff that isn't good/big enough for a real library.'';
       };
-      name = ''tins-0.7.2'';
+      name = ''tins-0.8.2'';
       requiredGems = [  ];
-      sha256 = ''142mvgn8218wikwdvd5gq4g6k3p24f273wlqvczzfhz02livrz90'';
+      sha256 = ''0wjc21jf374pyhfha8yw0zvf9br4pnmibx98z8yk9pa4qbslryq9'';
     };
-    treetop_1_4_12 = {
+    treetop_1_4_14 = {
       basename = ''treetop'';
       meta = {
         description = ''A Ruby-based text parsing and interpretation DSL'';
         homepage = ''https://github.com/cjheath/treetop'';
       };
-      name = ''treetop-1.4.12'';
+      name = ''treetop-1.4.14'';
       requiredGems = [ g.polyglot_0_3_3 g.polyglot_0_3_3 ];
-      sha256 = ''1jlfjq67n933sm0px0s2j965v1kl1rj8fbx6xk8y4yppkv6ygxc8'';
-    };
-    trollop_2_0 = {
-      basename = ''trollop'';
-      meta = {
-        description = ''Trollop is a commandline option parser for Ruby that just gets out of your way.'';
-        homepage = ''http://trollop.rubyforge.org'';
-        longDescription = ''Trollop is a commandline option parser for Ruby that just
-gets out of your way. One line of code per option is all you need to write.
-For that, you get a nice automatically-generated help page, robust option
-parsing, command subcompletion, and sensible defaults for everything you don't
-specify.'';
-      };
-      name = ''trollop-2.0'';
-      requiredGems = [  ];
-      sha256 = ''0iz5k7ax7a5jm9x6p81k6f4mgp48wxxb0j55ypnwxnznih8fsghz'';
+      sha256 = ''0qbk97wgbvj31sz4h3p8kfmvc8ig97gh91dfmk3m7j1h8vq87acs'';
     };
     tzinfo_0_3_37 = {
       basename = ''tzinfo'';
@@ -1655,6 +1597,30 @@ specify.'';
       requiredGems = [  ];
       sha256 = ''0pi2vabsg73h6z4wfwyd27k63issp2qp1nh0vd74rdk740gmb3kc'';
     };
+    unf_0_1_1 = {
+      basename = ''unf'';
+      meta = {
+        description = ''A wrapper library to bring Unicode Normalization Form support to Ruby/JRuby'';
+        homepage = ''https://github.com/knu/ruby-unf'';
+        longDescription = ''This is a wrapper library to bring Unicode Normalization Form support
+to Ruby/JRuby.
+'';
+      };
+      name = ''unf-0.1.1'';
+      requiredGems = [ g.unf_ext_0_0_6 ];
+      sha256 = ''1q7g7kf1w0bkbfmkbbcsz4hrc45kamll9br8a65l5fv8clbb0m7f'';
+    };
+    unf_ext_0_0_6 = {
+      basename = ''unf_ext'';
+      meta = {
+        description = ''Unicode Normalization Form support library for CRuby'';
+        homepage = ''https://github.com/knu/ruby-unf_ext'';
+        longDescription = ''Unicode Normalization Form support library for CRuby'';
+      };
+      name = ''unf_ext-0.0.6'';
+      requiredGems = [  ];
+      sha256 = ''07zbmkzcid6pzdqgla3456ipfdka7j1v4hsx1iaa8rbnllqbmkdg'';
+    };
     uuid_2_3_7 = {
       basename = ''uuid'';
       meta = {
@@ -1668,7 +1634,7 @@ specify.'';
       requiredGems = [ g.macaddr_1_6_1 ];
       sha256 = ''04q10an3v40zwjihvdwm23fw6vl39fbkhdiwfw78a51ym9airnlp'';
     };
-    uuidtools_2_1_3 = {
+    uuidtools_2_1_4 = {
       basename = ''uuidtools'';
       meta = {
         description = ''UUID generator'';
@@ -1676,9 +1642,21 @@ specify.'';
         longDescription = ''A simple universally unique ID generation library.
 '';
       };
-      name = ''uuidtools-2.1.3'';
+      name = ''uuidtools-2.1.4'';
       requiredGems = [  ];
-      sha256 = ''0v8scs7760334kkwca7n8kah6nk4hyw7izgk014zg1l1yv7kzpi9'';
+      sha256 = ''1w0bhnkp5515f3yx5fakfrfkawxjpb4fjm1r2c6lk691xlr696s3'';
+    };
+    webrobots_0_1_1 = {
+      basename = ''webrobots'';
+      meta = {
+        description = ''A Ruby library to help write robots.txt compliant web robots'';
+        homepage = ''https://github.com/knu/webrobots'';
+        longDescription = ''This library helps write robots.txt compliant web robots in Ruby.
+'';
+      };
+      name = ''webrobots-0.1.1'';
+      requiredGems = [  ];
+      sha256 = ''1jlnhhpa1mkrgsmihs2qx13z3n6xhswjnlk5a2ypyplw2id5x32n'';
     };
     websocket_1_0_7 = {
       basename = ''websocket'';
@@ -1691,26 +1669,6 @@ specify.'';
       requiredGems = [  ];
       sha256 = ''1jrfz4295qbnjaxv37fw9jzxyxz61izp7c0683mnscacpx262zw0'';
     };
-    xapian_full_alaveteli_1_2_9_5 = {
-      basename = ''xapian_full_alaveteli'';
-      meta = {
-        description = ''xapian-core + Ruby xapian-bindings'';
-        longDescription = ''Xapian bindings for Ruby without dependency on system Xapian library'';
-      };
-      name = ''xapian-full-alaveteli-1.2.9.5'';
-      requiredGems = [  ];
-      sha256 = ''0qg1jkx5lr4a5v7l3f9gq7f07al6qaxxzma230zrzs48bz3qnhxm'';
-    };
-    xapian_ruby_1_2_15_1 = {
-      basename = ''xapian_ruby'';
-      meta = {
-        description = ''xapian libraries and ruby bindings'';
-        homepage = ''https://github.com/garaio/xapian-ruby'';
-      };
-      name = ''xapian-ruby-1.2.15.1'';
-      requiredGems = [  ];
-      sha256 = ''02v3l931246asbcivkr4j0x99pl4i4fjvfsr8ga8v6lkvz0ls1xp'';
-    };
     xml_simple_1_1_1 = {
       basename = ''xml_simple'';
       meta = {

From 50e1a9a06e45cd860ce2d3dbc2263b99d90813c6 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 11 Jul 2013 10:54:15 +0200
Subject: [PATCH 069/439] Update bittorrent-sync to 1.1.33.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/applications/networking/bittorrentsync/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix
index ae339abb7996..73b456dc9a51 100644
--- a/pkgs/applications/networking/bittorrentsync/default.nix
+++ b/pkgs/applications/networking/bittorrentsync/default.nix
@@ -14,9 +14,9 @@ let
     else if stdenv.system == "i686-linux" then "ld-linux.so.2"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  version = "1.0.134";
-  sha256 = if stdenv.system == "x86_64-linux" then "1kyxiqjabqgsg7n0a8snh03axxzpniazp93shb2l1b6x0f7d24n7"
-    else if stdenv.system == "i686-linux" then "02wb8pqcb1rk108r49cqyg7s14grmjnkr6p3068pkiwdwwgi8jak"
+  version = "1.1.33";
+  sha256 = if stdenv.system == "x86_64-linux" then "1h3b84cbj6w28q591v6ydvmkgv9ydl0qknxjb3vaba0dym5gblvv"
+    else if stdenv.system == "i686-linux" then "1l7l6najsbqxb01wld54fzgsb122z5a2mlnv1r48sxq26cfwp6bk"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
 in stdenv.mkDerivation {

From 096f422545f0e48c5dbf6f41f52c55920c6e11ea Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 12 Jul 2013 14:57:32 +0200
Subject: [PATCH 070/439] Add memcached to the channel

---
 pkgs/servers/memcached/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index 17c674b4d066..1c3c3f706e48 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation {
     homepage = http://memcached.org/;
     license = "bsd";
     maintainers = [ stdenv.lib.maintainers.coconnor ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
 

From 5a562ccac8cb238044f26c0d8e3fd5c978a4e89e Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 12 Jul 2013 16:30:24 +0300
Subject: [PATCH 071/439] Soprano: version bump to 2.9.3

---
 pkgs/development/libraries/soprano/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix
index 8ca16ff72c7f..1447dd5346a3 100644
--- a/pkgs/development/libraries/soprano/default.nix
+++ b/pkgs/development/libraries/soprano/default.nix
@@ -2,11 +2,11 @@
 , pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "soprano-2.9.2";
+  name = "soprano-2.9.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/soprano/${name}.tar.bz2";
-    sha256 = "105xlng1ka0661gk2ap39rjjy7znp670df0c5569x04vppgd45g1";
+    sha256 = "08gb5d8bgy7vc6qd6r1kkmmc5rli67dlglpjqjlahpnvs26r1cwl";
   };
 
   patches = [ ./find-virtuoso.patch ];

From 67b0d62aa9216f55fb1e5b258ccd2bfd991d1191 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 12 Jul 2013 16:31:01 +0300
Subject: [PATCH 072/439] attica: version bump to 0.4.2

---
 pkgs/development/libraries/attica/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/attica/default.nix b/pkgs/development/libraries/attica/default.nix
index 99fe36faa4b1..87f6c019fb75 100644
--- a/pkgs/development/libraries/attica/default.nix
+++ b/pkgs/development/libraries/attica/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "attica-0.4.1";
+  name = "attica-0.4.2";
   
   src = fetchurl {
     url = "mirror://kde/stable/attica/${name}.tar.bz2";
-    sha256 = "1rnd861vy6waf25b1ilsr3rwb06dmmlnd8zq3l8y6r0lq5i2bl9n";
+    sha256 = "1y74gsyzi70dfr9d1f1b08k130rm3jaibsppg8dv5h3211vm771v";
   };
   
   buildInputs = [ qt4 ];

From c7fbb70af0e3188e78e0b06a6ca261d17679b222 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 12 Jul 2013 16:31:27 +0300
Subject: [PATCH 073/439] shared-desktop-ontologies: version bump to 0.11.0

---
 pkgs/data/misc/shared-desktop-ontologies/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix
index 23a800f6ae0f..831028467f42 100644
--- a/pkgs/data/misc/shared-desktop-ontologies/default.nix
+++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "shared-desktop-ontologies-0.10.0";
+  name = "shared-desktop-ontologies-0.11.0";
   
   src = fetchurl {
     url = "mirror://sourceforge/oscaf/${name}.tar.bz2";
-    sha256 = "00y55bjmxrwiiw8q0n0jcv95l945hp7nglbwj408sk5m2vq026di";
+    sha256 = "1m5vnijg7rnwg41vig2ckg632dlczzdab1gsq51g4x7m9k1fdbw2";
   };
   
   buildInputs = [ cmake ];

From f95ece9acdcf01a6961570628493b37141a16549 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 12 Jul 2013 16:35:34 +0300
Subject: [PATCH 074/439] KDE 4.10: bump to 4.10.5

---
 pkgs/desktops/kde-4.10/default.nix            |   4 +-
 pkgs/desktops/kde-4.10/kde-base-artwork.nix   |   2 +-
 pkgs/desktops/kde-4.10/kde-package/4.10.5.nix | 399 ++++++++++++++++++
 ...sharing.nix => kdenetwork-filesharing.nix} |   0
 ...ns.nix => kdenetwork-strigi-analyzers.nix} |   0
 .../kde-4.10/l10n/manifest-4.10.5.nix         | 282 +++++++++++++
 pkgs/desktops/kde-4.10/oxygen-icons.nix       |   2 +-
 7 files changed, 684 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.10/kde-package/4.10.5.nix
 rename pkgs/desktops/kde-4.10/kdenetwork/{filesharing.nix => kdenetwork-filesharing.nix} (100%)
 rename pkgs/desktops/kde-4.10/kdenetwork/{kfile-plugins.nix => kdenetwork-strigi-analyzers.nix} (100%)
 create mode 100644 pkgs/desktops/kde-4.10/l10n/manifest-4.10.5.nix

diff --git a/pkgs/desktops/kde-4.10/default.nix b/pkgs/desktops/kde-4.10/default.nix
index 9fbb58fe2425..f56e64e2d158 100644
--- a/pkgs/desktops/kde-4.10/default.nix
+++ b/pkgs/desktops/kde-4.10/default.nix
@@ -1,8 +1,6 @@
-{ callPackage, callPackageOrig, stdenv, qt48 }:
+{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.10.5" }:
 
 let
-  release = "4.10.4";
-
   # Need callPackageOrig to avoid infinite cycle
   kde = callPackageOrig ./kde-package {
     inherit release ignoreList extraSubpkgs callPackage;
diff --git a/pkgs/desktops/kde-4.10/kde-base-artwork.nix b/pkgs/desktops/kde-4.10/kde-base-artwork.nix
index 3f416cebddc4..d953a8306412 100644
--- a/pkgs/desktops/kde-4.10/kde-base-artwork.nix
+++ b/pkgs/desktops/kde-4.10/kde-base-artwork.nix
@@ -3,7 +3,7 @@
 kde {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8";
+  outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk5";
 
   buildInputs = [ kdelibs ];
 
diff --git a/pkgs/desktops/kde-4.10/kde-package/4.10.5.nix b/pkgs/desktops/kde-4.10/kde-package/4.10.5.nix
new file mode 100644
index 000000000000..b1abdb8afec7
--- /dev/null
+++ b/pkgs/desktops/kde-4.10/kde-package/4.10.5.nix
@@ -0,0 +1,399 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="analitza";value="0lc83vmapd66ilph26hlf8shd4xv0v9y8jsjycw5nl4xpfm7l5nr";}
+  {name="ark";value="1fvb6phcfd17fxcbb5w4njmkj0vlnz6g5qa6wv5szn4fakb5db1v";}
+  {name="audiocd-kio";value="11ma2pvc7w6gdd98h806i163dsjhxxly4wv4xdcqq4yhdviq29qv";}
+  {name="blinken";value="1lfv15blwy3m88zylqsa7k1a5z01qmakjrb9wq9yxnjbhb12nyf8";}
+  {name="bomber";value="0z704hzpgl1s7jdcpicvixd2dnfsh7i4ainjd5zc1rcljgabmvmx";}
+  {name="bovo";value="10wp4spcdwsa4nbq9qhancvddv83q12qbi72ksnvds50md12h5xx";}
+  {name="cantor";value="070al4dx7x7kk568lpd1ajq0q5gws48w3n76g0wlf4dqqlijjfx6";}
+  {name="dragon";value="0wj89v1d34s595ky97zwph7rxb97h03qya3bi6y1npcp7kjlv2j9";}
+  {name="ffmpegthumbs";value="0ilc8k601g3m4x1slfcczah87f402a9143a70gvbjprffd7iyf9q";}
+  {name="filelight";value="1wfd498ir1ivcks1ys3h8whvi0l4xwfgz2j5c4m4b517dskrmaxf";}
+  {name="granatier";value="04i1zzqkv0da6ymqvdxlaxgws7z44521zj51nw4mvapf1jcck7bq";}
+  {name="gwenview";value="0rz3va3djm3qxqvchxa3549r1qf124sb4105bs6s42a05h4mzhqv";}
+  {name="jovie";value="05cc6qzn9hgdvqgi8a2k2i89ggx10fv970293z8d59r6wbh1skv6";}
+  {name="juk";value="00j9c3g1zsa9vbfwpg37jb4w8753sr28q9xbxp3kfablndwid3w9";}
+  {name="kaccessible";value="0rsdxzqamq2i3f59npsv6pir9bys3g6zd345sfnpbdkinvxyhrdn";}
+  {name="kactivities";value="0sfbc3w0cvjfp2zs6v28fv69pq5ikignily572jamm8nwaid5h2g";}
+  {name="kajongg";value="1yffsgbabnp4mckirl888bghpyrj71d8fbsb0rjk96av1kzl2yvx";}
+  {name="kalgebra";value="0slvk1c1n9g2b5nakfi53l7gh3c2y78pvcy2snj9f1z5c0sr05cn";}
+  {name="kalzium";value="12gp0k11zf3m5g2aabrbrd7kpi5k3z46w74kalzzk3s1babgnwxn";}
+  {name="kamera";value="13qka1nc0ibn3kb03l11v64r6w3k4g7ayq539ncp1syba5726xy1";}
+  {name="kanagram";value="11vd5abdsggzv4svj4wj6q7mcpbxnpjk4gv0m1zw82ya26aarjnk";}
+  {name="kapman";value="19r8a7k2ib2fijipajbj461b1sfvlfxrlpfmm52njg61xizdxy20";}
+  {name="kate";value="0wzvhywvkagshs1q8q1rmq3dxlc5h62y7mlfb2x9wzp945rshq6d";}
+  {name="katomic";value="0vqqjv1magpc7wgwj0cvbykl9qvphc3s03i30qndygi96mf36iwc";}
+  {name="kblackbox";value="197r2nfrpdynqix1c81y1y72jrbzzl3prjd6q9sca9qnd47xx9kb";}
+  {name="kblocks";value="0nnbaskl1s9gy6kn8qk3j9qr6vmsbnpmjj4ddn1fvr32kqjfzr3h";}
+  {name="kbounce";value="0i962rbbi41m8fd7x1vrbi6q46qnij3d8kdc3cwn7mmjp79gzwmq";}
+  {name="kbreakout";value="1mh7ki87y1jjk7g4n8flr0ym6qk9nh922xsca2ww1vv16mpxww9w";}
+  {name="kbruch";value="1632a7rjrmll42yazdab1hmgjv39mp16xhkj6mq61sqdd4pj316v";}
+  {name="kcalc";value="1gyp45f873q6v2y1l8k52x70b92893314h6ci5a07c0asm8ffrpa";}
+  {name="kcharselect";value="12w3mzh0gqgh6aaih69djv3f4b1z34cxwhnchqz75z2yb9lcdj1c";}
+  {name="kcolorchooser";value="19b0r8jjy3fkhhzp9hhxw7zyrkb7fafkxs22ik3lzlm6wri1dwpj";}
+  {name="kdeadmin";value="1fg49z2lgmsvkhhyvahasb5z0l9cad4xwq5ps3qv5f1yj0hfzic4";}
+  {name="kdeartwork";value="1z1xnljs5lzmahn3i5xs429bpyxzc6b8sw2m216cs06dwfk77if6";}
+  {name="kde-baseapps";value="1d08wqb3a9fi0gzkls4jmlnmqpfd5fmg4310d2ih78gflv1yk2gz";}
+  {name="kde-base-artwork";value="1hq35i8mw3akbg9m6wvp9fv6xpamv9na2bjqzqyph8sx0633dxrw";}
+  {name="kdegraphics-mobipocket";value="0jq1qrrax9w60w35qxvjrazl4c8qvninhgp9na7pgz6sk6ydb0jf";}
+  {name="kdegraphics-strigi-analyzer";value="07z3nzmfw5pxg97qx2jj54f3r6qc2x22yxhn3kmcpifzr3gyi555";}
+  {name="kdegraphics-thumbnailers";value="1iwmyn2r43i3bykrc4vx0785f3x5zrnvvfdhfpr88f6pxr95f7bq";}
+  {name="kdelibs";value="1lgjz90irrqwz8h6w7iwy8icvqyj4kb2sarnyrxna8dy1fah9m5n";}
+  {name="kdenetwork";value="1lra150av4ndq5s9msx1khwdwd8k0n756qg6d4fsjp2fy7scf26k";}
+  {name="kdepim";value="0qs1znrvfzrkhlh1d68pri9fnaq2nhxnih5fsjcn2m7d537havq1";}
+  {name="kdepimlibs";value="01hyi3r2an8g9ds59az39c8qdm8qiws6q16558jna7f6w4m0yq5r";}
+  {name="kdepim-runtime";value="1p293zqwdc0g77h996slc0qwa01a24nq5yh5a4q6ng92rfzzkrl3";}
+  {name="kdeplasma-addons";value="0hs9bmg4gcl9lks78pmb0n29jzzh56w5islyzhzccrrcbimsqvzp";}
+  {name="kde-runtime";value="0daw0sjyqrdhsah920fla05wvcf9zrck1lbkdcbvrk1qvvqwjhpx";}
+  {name="kdesdk";value="0h1il5dza8qcfz1fgz6qhsaccqkp0g5fdi4k3413vr6lhg67dh78";}
+  {name="kdetoys";value="1r2rh0hdipwfxwq29whicbvxa7dr5vswh9pqw60x1c634cgba49p";}
+  {name="kde-wallpapers";value="1d96asb1nn88rwzb2nis37d8qwliaswpzfc15zq6jkcbdyzaxfpv";}
+  {name="kdewebdev";value="18s79ah9j01mb3lpzpsi6wxbh3wjpkswx5snpv1fyphf760jzb3n";}
+  {name="kde-workspace";value="0xg8asnxq48x6zydh09bfga11363bya7hfkygas7ar7rb0144im3";}
+  {name="kdf";value="0d3i5jpikh285vwr93044lws34ihhbszb05gbyvibx7faqdllg2h";}
+  {name="kdiamond";value="1dca5h88lm2syhnk5bd8g83lx9422hyg972di4xj69vnnpl5nsp9";}
+  {name="kfloppy";value="02yq8p8ma1aghm9k442xznk1xwb4mcd36h040ix5rc7j3j02l79m";}
+  {name="kfourinline";value="0ljs9szk4r6iasn4qkclpq3nij5hb8xnyqj36w8nxbvsmka69d2p";}
+  {name="kgamma";value="0byvsk5j2g1ycfq5zskg9bkbmq9jddv0nzck2w4qayf072cqn8b3";}
+  {name="kgeography";value="0icf21sr6w920ga6as9yx1ja85gwk3h2bb1ra9k5bs32vw5r7nk9";}
+  {name="kgoldrunner";value="18i0mj3j6q1gycf33z416kcf9lsksrmk8fnp4j1jg9mlr6y1xc6c";}
+  {name="kgpg";value="1x04mj6ykmhmlr2074bn6kc88zz4y3lgbvnf4qkcj8q5wil1p3gv";}
+  {name="khangman";value="0yrqd17w78pl18ln8rqcb0cmqis8al9k3zvg0hvxyh3qp013xb9m";}
+  {name="kig";value="1wd8kk4gkvgxp83q6dqdqkqaznbrl8kk88ixk17qhlj03iykxfcj";}
+  {name="kigo";value="1g78wqsk72mki48inxam6337hpjd491325j3cmvvlz0196q3s4zn";}
+  {name="killbots";value="1kjmwsrqmj85yawbw6xr025bkv3kidwasiyrjr01mgsndlkn3y47";}
+  {name="kimono";value="0wswbykjq56rxf0rkkl97ipy36r5q8h9sws758fvwmd16nylhdg0";}
+  {name="kiriki";value="0iv3lak13szc93gqqjlqdmdbg3jy4xbxvnahzka0d3m2nkg9iv6h";}
+  {name="kiten";value="1112kl5vbz58v52nss4gd4plnrl3nkp57mnhdbs58dlxv1s1s7b9";}
+  {name="kjumpingcube";value="1y9pgqsq72v9mxw04dkg4x2m15jyl5iahqshxczzihh3pjllv7sr";}
+  {name="klettres";value="0kqjw7vrpzvrr4g6zhdsqppbr2viqr7jann4npnzh0bw48842zhp";}
+  {name="klickety";value="0d78nak6dzmkfsxq7cxndca51paw2giawk31s70fgr7kwa7s9g9f";}
+  {name="klines";value="0z8bp1xwy17k1nv7d8mrgsk7vgb5137icdy0d66jwaa9bzsv3khh";}
+  {name="kmag";value="1iamiy8ppyd4qkbdhqykxgh6c8w31glpjv1srk9s4gqyqj51mf24";}
+  {name="kmahjongg";value="02ai75zc5rfch3b7a2zz9kmw6r3kgkbzr9pi8c1zrdgif8awrl3x";}
+  {name="kmines";value="0hc838cd5h8gjm4alszi8z70r3jmjxqwmhni1silk16gsiy3kqvy";}
+  {name="kmix";value="08ls620ndrvszx36sy2xj32fvwm5b8aggp86cwvzqjvp47c46wjv";}
+  {name="kmousetool";value="02lg84gpnic2l84ay01adw2fynr0x7byklqdz3zphiqhddhfnb81";}
+  {name="kmouth";value="09jg2xar4p6rrcc41qfj0h57fapdgpdpjh6ackhyana0871q5cam";}
+  {name="kmplot";value="17s7n51x2nl5g4l0862gnzigkwa7qwipmvy7krn8b1z051n2jwfx";}
+  {name="knavalbattle";value="15qpgn5bjbk4smwzz5x0x9f1kd5mjhg6p4h4dalcay8k9zixxxvl";}
+  {name="knetwalk";value="0yqdxcah56z1q21xfrk33s4fx6l9q21na5dx1p12d114vzgr3gzq";}
+  {name="kolf";value="08ba3flnknzjgys73lhpy7b98j544wwv6vvbrd6p2675imwk168w";}
+  {name="kollision";value="1jahrgkb9j8shwrmm1486f3w1hd5snwfwv53gj7973z0mmm5468r";}
+  {name="kolourpaint";value="18ql77778zdc9149qd7mslkh780v6qkhdc1wfljrr1mj98p08av9";}
+  {name="konquest";value="1iyqgzyg004lyqssmvh4951m9v56ayw7ggza6awh6a805j0zz0sp";}
+  {name="konsole";value="1zqmmv4zpq59nm2r7ccmp1ij5q3qjclmbmcm667hxmq9dyrwv5an";}
+  {name="korundum";value="12cqg6ib06icadyslnqzqmkal6rmjhki02na09gacqdiwc7gf2p2";}
+  {name="kpat";value="1zdv4jvqg0xbbsf39d2n8d0ya2mqzva06s46m2hb66flyjz5pd3p";}
+  {name="kremotecontrol";value="0jw4jjlhy378f58wgqm5cikqj8i3bdz1s1qm4r24bb1677dqyd4x";}
+  {name="kreversi";value="1mxgb60zbq8qkjnamvlr072vii2px224mg03fjjds063321swx0z";}
+  {name="kross-interpreters";value="0r2y7lscsgk6jkzby7dqwd62yk2nyzwm6chihsvivl9frl38wqza";}
+  {name="kruler";value="0gwyy0k8h705bnp6q7jgzbk8i9d6csffhwlas7y0zwcl7n03664x";}
+  {name="ksaneplugin";value="187n3s19xdfl7bbcpgyappw1v2bgjki8kh1qh8dy8mscm2qn50j9";}
+  {name="kscd";value="0wqm2vhj593x4vps3205gfnl29yglr2szzpdiazi6rq80r8ifvbq";}
+  {name="kshisen";value="1n5131kckixwbllp8sxn5y93z9q2fdvjj77pcy4sadngx5slz718";}
+  {name="ksirk";value="0b2084h246jhphwpa5iwpxbib4z4h6cwvi8bp18l7yid77wz28f2";}
+  {name="ksnakeduel";value="0v74l5svmr21gahxzfz7sjnj5gzhnyir7l7cny1q7xnha7bnaw81";}
+  {name="ksnapshot";value="05l18i9mv9pghlf50qax9drlcrmdahgiljnvcq20vadrxw4qxghv";}
+  {name="kspaceduel";value="0q8iqg5n7w0v5llbgan7vnf41zbfagc0rd8ya7fp9gf5pmx422zf";}
+  {name="ksquares";value="0fnz1hy2n0i1gal9b8ij8bi5sql5iybbjpkyy55dapcbph2br8xc";}
+  {name="kstars";value="0nf3n9f6dmp8401d2jfcyh26xbwmwdav4maacp5dmhv6xvr2ivis";}
+  {name="ksudoku";value="07lxxaw6ykhlxzkbhzsz43ingfx0l1gb38v2z0ag8jd3iln7l79v";}
+  {name="ktimer";value="112449fn8zbgz3s22bswyc8fisa126j6xvmwxzb91c5vx0wj9qg8";}
+  {name="ktouch";value="0a9x6ym3gw3d6jqvlfaw5qyxzcn9vi4sa55ig0d9cdy8057y5pwz";}
+  {name="ktuberling";value="1ihvv3mais39yk84k1a76mpz5c9sbbnw80n536adh3y3fad4yw5a";}
+  {name="kturtle";value="07fxjiaq69x97w45z8r3g1iyi0vyk0wyqwjwn1qb7a1ziwva5jl9";}
+  {name="kubrick";value="0mqf52lp0s61qsv8q47h012m5k8mf6gqwjpb7swrs7hxsc58dspy";}
+  {name="kwallet";value="0mb8ph0wf761gpss7xmi4zngxfalm3sdngjxrpr8brczjp8v9wdm";}
+  {name="kwordquiz";value="0rbrfswf13pw4cam8fj9w7g12yhzvg82izzy79xsxb0dkk4ki42n";}
+  {name="libkcddb";value="033vmv8fin87m788qjyjaravf5gr9cj953yvcfg9438qpavd79qr";}
+  {name="libkcompactdisc";value="105w0bnw6gzjb8gnp2gmwcjgaz3gi4f16fninbl2658dnb24b1kq";}
+  {name="libkdcraw";value="0p1wbdrhpp6rg82kfrxhaz4lxqjix6mb1grj16zy1i24x89mxlya";}
+  {name="libkdeedu";value="1b6qpd3i59hfd7rwij255xyrxp5ylw5mpyr6k10py5pj7fn4zhc2";}
+  {name="libkdegames";value="1cc5011xm9rz9fz2dk3ibfr4cqq3rmw3i7vlcsrhfscsx0xm88sc";}
+  {name="libkexiv2";value="18ngfrz30q0prsrwy92hb7y0hxhcxlr4ic7lq7fv4l45434ry7pv";}
+  {name="libkipi";value="00nn96qwynfx2ajqllh8zkwccc1prigbcq75s1hnpm67nnfc98as";}
+  {name="libkmahjongg";value="06qpykgaxx5r7n3ymph1g2fy0dj2vclfqlnzbdc41ma3l66jci64";}
+  {name="libksane";value="0a0ipz9jmrw076mxsj2k3njaf7dwfrdqd5bqwcc4q8qqlhpp4ljy";}
+  {name="lskat";value="1sxmjhw61w1d19zidf96qkddx9r0h8z5kbjl8xgah8k25ji5qsr6";}
+  {name="marble";value="04cy00jsnahmigffjyqviizj5bvj2aldfgkyj2g5iadfsqflxvy4";}
+  {name="mplayerthumbs";value="0hmdvyillr779c1fmia3h6dcy7j7j0kvxvh4mdz1adfwaz4zgymy";}
+  {name="nepomuk-core";value="12grw88gc4b4i1h346ahpkv8493gyvhvkpcqxwc2dqpsqsfc7rpz";}
+  {name="nepomuk-widgets";value="1npmwv1vh5ci6c9a291vyps85c5cvdg5dn9r9h28dq58s2h274yh";}
+  {name="okular";value="05v23g4w6sw525w7qllcbyhk92k75hyqrvx9hncylig4blivjp9f";}
+  {name="oxygen-icons";value="1y7iq77fyiykmjf8xdyprnshlasazdv6fcjp6ayfx0jkixb2gqya";}
+  {name="pairs";value="1v4h0d04b7g59axkl69gyml02hzxjkfzcgg320mj05xx5q0kjyq5";}
+  {name="palapeli";value="13hvppav7yz9wvvly8f8kads9arqvl25spwa8awpl2f4a394c0sa";}
+  {name="parley";value="0wk6p4rw6063089iq758a0mcq10fh8c1pg0wq00dhs9d05gwk873";}
+  {name="perlkde";value="1hh5y4zmmb97py281i0jhzwg8r4ii3qmilzbwbrvk9j4ngcz37gg";}
+  {name="perlqt";value="09880varap78a44zifqx72wbx23wq0hqq540hf466fmmxk744877";}
+  {name="picmi";value="060a1n5lclsaz4zjq1dpm9y20fqgq3rjlkm54prp3kkj5hpi6kcl";}
+  {name="print-manager";value="0jmvfy376axdwi4a2fc78ldlny4jbk7kxvhi1mwf8piibwc10dvf";}
+  {name="pykde4";value="10aqvx6dfcbi9mrsr0sdhhxp2jqkw06rf55p2nxdadmcszad2k7k";}
+  {name="qtruby";value="042nya6n5sp2r9a9s3limbph8wv5z04fha7pkqznvrkr040qykvj";}
+  {name="qyoto";value="0nxhxvh4zpskvxv7mjz06vililg2wqlabaaaf61j0naxz4aynyrv";}
+  {name="rocs";value="10xb6qh29g4l369dyimwj0yk8s5yi6jg1byaf4z5jnr2w8ysbf7j";}
+  {name="smokegen";value="0myzqfqcl7i8kikcyj2vbip9y4al411jmjm02hv55baccygls8yr";}
+  {name="smokekde";value="0b1m9g1swj9r44zbg8lbqmxp9l342dz8b4wsnn6n9ih0b15p512h";}
+  {name="smokeqt";value="047am45yjkyyza281zfzvv84kvldvmbgch5q3fd89vcvl5sh399j";}
+  {name="step";value="05rjnb16mzz91q7473k2g83g792xqh77p4gc2xmw0a5j4qk6f6ga";}
+  {name="superkaramba";value="0vxb8656ag6hmy3nx9w3xa38j12rajkqsmv4kx6ylnpk6v71s7x2";}
+  {name="svgpart";value="17j59rwg483p7ip1zxq37jnzvkafrkj7yabwrbwk0vvxkqcbqpx3";}
+  {name="sweeper";value="0yhp6k2ai7wgn242932w10xwainq07bf9zjm2fvaavrg3gh38644";}
+];
+modules=[
+{
+  module="kdemultimedia";
+  split=true;
+  pkgs=[
+    { name="audiocd-kio"; sane="audiocd_kio"; }
+    { name="dragon";  }
+    { name="ffmpegthumbs";  }
+    { name="juk";  }
+    { name="kmix";  }
+    { name="kscd";  }
+    { name="libkcddb";  }
+    { name="libkcompactdisc";  }
+    { name="mplayerthumbs";  }
+  ];
+}
+{
+  module="kdegraphics";
+  split=true;
+  pkgs=[
+    { name="gwenview";  }
+    { name="kamera";  }
+    { name="kcolorchooser";  }
+    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
+    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
+    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
+    { name="kgamma";  }
+    { name="kolourpaint";  }
+    { name="kruler";  }
+    { name="ksaneplugin";  }
+    { name="ksnapshot";  }
+    { name="libkdcraw";  }
+    { name="libkexiv2";  }
+    { name="libkipi";  }
+    { name="libksane";  }
+    { name="okular";  }
+    { name="svgpart";  }
+  ];
+}
+{
+  module="kdelibs";
+  split=true;
+  pkgs=[
+    { name="kdelibs";  }
+    { name="nepomuk-core"; sane="nepomuk_core"; }
+    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
+  ];
+}
+{
+  module="kdeutils";
+  split=true;
+  pkgs=[
+    { name="ark";  }
+    { name="filelight";  }
+    { name="kcalc";  }
+    { name="kcharselect";  }
+    { name="kdf";  }
+    { name="kfloppy";  }
+    { name="kgpg";  }
+    { name="kremotecontrol";  }
+    { name="ktimer";  }
+    { name="kwallet";  }
+    { name="print-manager"; sane="print_manager"; }
+    { name="superkaramba";  }
+    { name="sweeper";  }
+  ];
+}
+{
+  module="applications";
+  split=true;
+  pkgs=[
+    { name="kate";  }
+    { name="konsole";  }
+  ];
+}
+{
+  module="kdegames";
+  split=true;
+  pkgs=[
+    { name="bomber";  }
+    { name="bovo";  }
+    { name="granatier";  }
+    { name="kajongg";  }
+    { name="kapman";  }
+    { name="katomic";  }
+    { name="kblackbox";  }
+    { name="kblocks";  }
+    { name="kbounce";  }
+    { name="kbreakout";  }
+    { name="kdiamond";  }
+    { name="kfourinline";  }
+    { name="kgoldrunner";  }
+    { name="kigo";  }
+    { name="killbots";  }
+    { name="kiriki";  }
+    { name="kjumpingcube";  }
+    { name="klickety";  }
+    { name="klines";  }
+    { name="kmahjongg";  }
+    { name="kmines";  }
+    { name="knavalbattle";  }
+    { name="knetwalk";  }
+    { name="kolf";  }
+    { name="kollision";  }
+    { name="konquest";  }
+    { name="kpat";  }
+    { name="kreversi";  }
+    { name="kshisen";  }
+    { name="ksirk";  }
+    { name="ksnakeduel";  }
+    { name="kspaceduel";  }
+    { name="ksquares";  }
+    { name="ksudoku";  }
+    { name="ktuberling";  }
+    { name="kubrick";  }
+    { name="libkdegames";  }
+    { name="libkmahjongg";  }
+    { name="lskat";  }
+    { name="palapeli";  }
+    { name="picmi";  }
+  ];
+}
+{
+  module="kdeedu";
+  split=true;
+  pkgs=[
+    { name="analitza";  }
+    { name="blinken";  }
+    { name="cantor";  }
+    { name="kalgebra";  }
+    { name="kalzium";  }
+    { name="kanagram";  }
+    { name="kbruch";  }
+    { name="kgeography";  }
+    { name="khangman";  }
+    { name="kig";  }
+    { name="kiten";  }
+    { name="klettres";  }
+    { name="kmplot";  }
+    { name="kstars";  }
+    { name="ktouch";  }
+    { name="kturtle";  }
+    { name="kwordquiz";  }
+    { name="libkdeedu";  }
+    { name="marble";  }
+    { name="pairs";  }
+    { name="parley";  }
+    { name="rocs";  }
+    { name="step";  }
+  ];
+}
+{
+  module="kdebindings";
+  split=true;
+  pkgs=[
+    { name="kimono";  }
+    { name="korundum";  }
+    { name="kross-interpreters"; sane="kross_interpreters"; }
+    { name="perlkde";  }
+    { name="perlqt";  }
+    { name="pykde4";  }
+    { name="qtruby";  }
+    { name="qyoto";  }
+    { name="smokegen";  }
+    { name="smokekde";  }
+    { name="smokeqt";  }
+  ];
+}
+{
+  module="kdeaccessibility";
+  split=true;
+  pkgs=[
+    { name="jovie";  }
+    { name="kaccessible";  }
+    { name="kmag";  }
+    { name="kmousetool";  }
+    { name="kmouth";  }
+  ];
+}
+{
+  module="kde-baseapps";
+sane="kde_baseapps";  split=true;
+  pkgs=[
+    { name="kde-baseapps"; sane="kde_baseapps"; }
+  ];
+}
+{ module="kactivities";  split=false;}
+{ module="kdeadmin";  split=false;
+  pkgs=[
+    { name="strigi-analyzer"; sane="strigi_analyzer";}
+    { name="kuser"; }
+    { name="ksystemlog"; }
+    { name="kcron"; }
+  ];
+
+}
+{ module="kdeartwork";  split=false;
+  pkgs=[
+    { name="ColorSchemes"; }
+    { name="IconThemes"; }
+    { name="emoticons"; }
+    { name="kscreensaver"; }
+    { name="kwin-styles"; sane="kwin_styles";}
+    { name="sounds"; }
+    { name="styles"; }
+    { name="wallpapers"; }
+    { name="HighResolutionWallpapers"; }
+    { name="WeatherWallpapers"; }
+    { name="desktopthemes"; }
+  ];
+
+}
+{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
+{ module="kdenetwork";  split=false;
+  pkgs=[
+    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers";}
+    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing";}
+    { name="kppp"; }
+    { name="kdnssd"; }
+    { name="krdc"; }
+    { name="krfb"; }
+    { name="kget"; }
+    { name="kopete"; }
+  ];
+
+}
+{ module="kdepim";  split=false;}
+{ module="kdepimlibs";  split=false;}
+{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
+{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
+{ module="kde-runtime"; sane="kde_runtime"; split=false;}
+#had to add fake pkgs to kdesdk to get it to be treated like a split module
+{ module="kdesdk";  split=false; pkgs = [{ name="fake"; }]; }
+{ module="kdetoys";  split=false;
+  pkgs=[
+    { name="kteatime"; }
+    { name="ktux"; }
+    { name="amor"; }
+  ];
+
+}
+{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
+{ module="kdewebdev";  split=false;
+  pkgs=[
+    { name="klinkstatus"; }
+    { name="kfilereplace"; }
+    { name="kimagemapeditor"; }
+    { name="kommander"; }
+  ];
+
+}
+{ module="kde-workspace"; sane="kde_workspace"; split=false;}
+{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
+];
+}
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/filesharing.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix
similarity index 100%
rename from pkgs/desktops/kde-4.10/kdenetwork/filesharing.nix
rename to pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kfile-plugins.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix
similarity index 100%
rename from pkgs/desktops/kde-4.10/kdenetwork/kfile-plugins.nix
rename to pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix
diff --git a/pkgs/desktops/kde-4.10/l10n/manifest-4.10.5.nix b/pkgs/desktops/kde-4.10/l10n/manifest-4.10.5.nix
new file mode 100644
index 000000000000..9862efe0b582
--- /dev/null
+++ b/pkgs/desktops/kde-4.10/l10n/manifest-4.10.5.nix
@@ -0,0 +1,282 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "0mxvp97sf1f6w2rfy966fdhpflqfmwv253zswaz3cv9b5m9yf5q8";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "0fk5r0bqnks1ygac6cs8f5gb16lr4qrh32jgdk50hnv6ad51agfv";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "10kc76l1fm56rhnc6wvm29ij15v2pvmsq1djvm6zxhsdm99af25k";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "0gn4ghvwwi09aibmx5940b159d7svnbcq25cg02lhvjvfrmyfp1j";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "175j2gn35vzjb17rbd0mvrxas180wq3v1x6q1caykm2qddqqmqgv";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "0zxa2cmcwdbdwgz5wm58v0gqzphcc1b1vzzgrrnpsmfjqb6h951c";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "0qab4gbilpb8fwyjqcvvmzms4hdbrii4xr5xgcl87v8va5gcdc8s";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "1vh9h185qa42q7gkyflp7g93hgvhxjd2cknwz0yq6dxsx8dg5iqd";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "1f8wsq9hh2d6wpd7v1bz5mchb1zjnc895mmpawy67rv6s45vx6y8";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "1nz7q6fq3242vjh2961r4v4kp1fywknnjrnfadgf3g0dvav2vkq8";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "1mazkh53vdvsz5zrx41fi49x44isibpwmrrqwcmpbcwdqx7iaf9v";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "0f7bi50gzrhnvif7c1h6mgscbbjvz0cqifdnaaqr9m7d9iafwwyz";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "0k0w849nqjsaxsi8rm4jd13fqcvk88v6j0yar36mvblh6x61qgq8";
+}
+{
+  lang = "fa";
+  saneName = "fa";
+  sha256 = "12fmd6zy14wsd2i1nszc4bl3q0asvf9wqsgwihxipw34fwa6irpv";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "0k76zlfjjz7vlvlz298713c27zbcybjip33wix76ldj7is9yb07v";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "03qxm8q3bvx4cqaxvfbdj07q2rpcwrqyp333x3jwmcc5xj731pww";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "09n5wpc4s2xxv1016dvg8zwbvx6lx6942lnyq3b4adl4yjcghs32";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "1w7hj6ma3d03wv2x651hwhxxc4ird23f0khc4z03ncpl9xvyikky";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "0jirch5cw99lcs9d83kzifb9wdqz1aqdjmi4wam0gi8nciws8hwr";
+}
+{
+  lang = "hi";
+  saneName = "hi";
+  sha256 = "02g0a4l1mlmx64acxfl6a1lqbivnwdfx98q8f9nyb3836i8i3sd7";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "087jww1daqqwrrxi1hz72kc39ipj6hj73cqzy4ds24hm112z58dc";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "1mwmbhnzvhxzcfk3j6f61jfprfwaan8mf9l4s7r8f3ddmsz66kha";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "0grmi972ndizf3gpjxjv79crc0si4b3dadayzmayrykndd5b30i6";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "13d8ikfhlswpaxrj9l6f0kf4dzbmgri5d3miz3r8h6lmmszq2phr";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "1m17wqak0alhkk81fhl32fcv0b2nnszjs7xia0df75z8c2js9vmm";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "1br0gipw4ra3bvzdal9dn8x8kldmmk4miw1z5hsimhkgc5y5amb3";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "0vmdfcy2dmxd6bjvz31xhjkxd2q55px70c9d6lj3fmf4bxiqlmc4";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "1snrn2yw7z2m0m3wqxgqrq1rxqnjb4ylngdnn0ym87yh7bh6kjsc";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "1dyymy3wdldmkxai47y25qzpcajsi18h4rl0m1izm90giwadrk85";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "1im120mlnvjdlh5gna9q0qfixg2zz2shhzbxih37ikzpjxr7v5zs";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "07303s04qkh7pa78ranvcvqs75wll427vdb0iv6sr07smd0fzf1d";
+}
+{
+  lang = "mr";
+  saneName = "mr";
+  sha256 = "1dzzzc3wkjhapmdlbp178w6rm00ibixmp4xhkbsavr7hy18a048c";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "039gi1ba8z9w80b6xsh3b51alq91d4phr6pmfnaqngwqmaksxidh";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "0bg55dl284y7wvcl40sgspnvpfiqkapvwwi02n4jyl3w4xsy3b8j";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "048pr21vfcwvfxpw56kil4awmx7samva4jd86g6rvrs6q85c0mxj";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "10xy5r3s79gh28zzy72dhs79ap616qnrqms3mgg9kdvmmi2n32nm";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "08ib4pbahgjww4d82vcgahc7jxky85riim1p0ck5dzhri0664zx8";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "0kqr4jvqsyasdacv0kxjcx5nfd6m0kd1vk7418mzbabjyb2nbvl1";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "0nfnwcq2n5dp721wi7arp3via0kvhf3rfq8h78k9dqs5afyhf4n1";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "1886fga94c7zp0g1hdijqj64mi8asgbmykic6n0mzin33c4rwyjs";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "0q51v23dviwrgy1zaq3823xh2vfm2zvkpqizgmi111m681s0n4kx";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "0mm8mfqlfbj0r2d4xyli2n8x8sgpw2bjxnlq8yy38pgi9pksgcsl";
+}
+{
+  lang = "si";
+  saneName = "si";
+  sha256 = "0qcvdil9gbgwf10v4j606d0vi4705vb77aq7p1kq3y57khldlhsa";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "1rmxh12r7i9cc7nkigxx6igvzjjq1rk3y5nm2mdjq7gcv067gp9i";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "0xdd5ini0b0fi5xfai533y8a5g8gyphfrz6qvivpgdd81rfckpk1";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "09rfcrw58f0bvqqkdcpiy56xv591yk6v0iinlabamza63h011rmk";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "1slznfn6ghqy5cy870apwgcygdhvbfvh1dy6rplhwnv0riwnx3ay";
+}
+{
+  lang = "tg";
+  saneName = "tg";
+  sha256 = "12ic6nd65l6w7vqymfr1djbkn8jfghc5vyyi783mdf3pwx3xjk8i";
+}
+{
+  lang = "th";
+  saneName = "th";
+  sha256 = "0v02h8gdwnabahb3invxvp2ap5x6b4a0pf0sl15phi8s2m1y9fad";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "10asd6ha7fjs4b11vp27xp1piycalvidv3l6z5sv9j5bs4hayp1g";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "11n6z1d2b2b93lj9vps4ry6k671m5lssrv4hi5nr0a1vbc1d6ix1";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "1lrghs0s3hmhmrqarsc29518ax95wz6gnhimxs8lyc88b4jil0p5";
+}
+{
+  lang = "vi";
+  saneName = "vi";
+  sha256 = "198rr7i673a77v3qlld1c0rm2vr86rr6nf97v4wckcvyz8b6s6i8";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "01glzj5vhhmv6zvrmwd4wwx0bq6b0p08ixx0rf3bh4pdbi42hiin";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "0cj8flr5c73crrwchfz3j60snzmvbr3bc1p4pnk4s3vajmwsdaas";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "0lc896x55ww3s5jz7ms0gmm22qq9yjpnbzbjfq64574pvr2m3s5y";
+}
+]
diff --git a/pkgs/desktops/kde-4.10/oxygen-icons.nix b/pkgs/desktops/kde-4.10/oxygen-icons.nix
index 373f2c7b5ac9..adee87c83169 100644
--- a/pkgs/desktops/kde-4.10/oxygen-icons.nix
+++ b/pkgs/desktops/kde-4.10/oxygen-icons.nix
@@ -3,7 +3,7 @@
 kde {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "0nl3praln6kfdpr4diln850f29242496p5yrfcyq6xjkpsswq55w";
+  outputHash = "1aad2qb9zrjcild5s584q4zz6zc3wgkclv79gnfwkhmy0viqx9l6";
 
   nativeBuildInputs = [ cmake ];
 

From 0024926701875c6cac245281f07d899f2ee14d92 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 12 Jul 2013 15:43:51 +0200
Subject: [PATCH 075/439] Updated nodejs packages

---
 pkgs/top-level/node-packages-generated.nix | 148 ++++++++++++---------
 1 file changed, 84 insertions(+), 64 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 6a74c8075811..141ba26ea523 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -143,9 +143,9 @@
   }
   {
     baseName = "aws-sdk";
-    version = "1.3.1";
+    version = "1.3.2";
     fullName = "aws-sdk-*";
-    hash = "1c8c49435a4ddf5ceb29b0c9d130893a95de30207785c3dc9d902c9174362967";
+    hash = "6ad0b23bf6eba85609caed4a190ff0068cf0a0a94437b6cfab98fa6ea0c911fe";
     patchLatest = true;
     topLevel = true;
     dependencies = [
@@ -155,9 +155,9 @@
   }
   {
     baseName = "aws-sdk";
-    version = "1.3.1";
+    version = "1.3.2";
     fullName = "aws-sdk->=1.2.0 <2";
-    hash = "1c8c49435a4ddf5ceb29b0c9d130893a95de30207785c3dc9d902c9174362967";
+    hash = "6ad0b23bf6eba85609caed4a190ff0068cf0a0a94437b6cfab98fa6ea0c911fe";
     patchLatest = true;
     topLevel = false;
     dependencies = [
@@ -219,9 +219,9 @@
   }
   {
     baseName = "bindings";
-    version = "1.1.0";
+    version = "1.1.1";
     fullName = "bindings-*";
-    hash = "9ce864c7ce347eb3f8728fc03bc5a01f5e6195b145e6b9674eb2b98c5c715865";
+    hash = "6145f4ae35591a3c51bbcc20628070347353ab90b5313993eda1c1c6927e375b";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -563,9 +563,9 @@
   }
   {
     baseName = "connect";
-    version = "2.8.3";
-    fullName = "connect-2.8.3";
-    hash = "a68c7f95eb1d8f574ffbba1c6ceaaa8a05189774099dcb327e29721f4514f309";
+    version = "2.8.4";
+    fullName = "connect-2.8.4";
+    hash = "e42ef0828b98bdcbbe32f3208ee40b0a92026f3b1fd04425854577454e26546f";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -574,7 +574,7 @@
       { name = "cookie-signature"; range = "1.0.1"; }
       { name = "buffer-crc32"; range = "0.2.1"; }
       { name = "cookie"; range = "0.1.0"; }
-      { name = "send"; range = "0.1.2"; }
+      { name = "send"; range = "0.1.3"; }
       { name = "bytes"; range = "0.2.0"; }
       { name = "fresh"; range = "0.1.0"; }
       { name = "pause"; range = "0.0.1"; }
@@ -606,9 +606,9 @@
   }
   {
     baseName = "connect";
-    version = "2.8.3";
+    version = "2.8.4";
     fullName = "connect-~2";
-    hash = "a68c7f95eb1d8f574ffbba1c6ceaaa8a05189774099dcb327e29721f4514f309";
+    hash = "e42ef0828b98bdcbbe32f3208ee40b0a92026f3b1fd04425854577454e26546f";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -617,7 +617,7 @@
       { name = "cookie-signature"; range = "1.0.1"; }
       { name = "buffer-crc32"; range = "0.2.1"; }
       { name = "cookie"; range = "0.1.0"; }
-      { name = "send"; range = "0.1.2"; }
+      { name = "send"; range = "0.1.3"; }
       { name = "bytes"; range = "0.2.0"; }
       { name = "fresh"; range = "0.1.0"; }
       { name = "pause"; range = "0.0.1"; }
@@ -974,13 +974,13 @@
   }
   {
     baseName = "express";
-    version = "3.3.3";
+    version = "3.3.4";
     fullName = "express-*";
-    hash = "ba67b79732082d24acebb38e273ce7749a86590d999bab2d5f2f9cc566ee8c9c";
+    hash = "96a3fc9c2250d13f9aa183660466590fe285a2dd19e6ebdc4b2340295ee1aa65";
     patchLatest = false;
     topLevel = true;
     dependencies = [
-      { name = "connect"; range = "2.8.3"; }
+      { name = "connect"; range = "2.8.4"; }
       { name = "commander"; range = "1.2.0"; }
       { name = "range-parser"; range = "0.0.4"; }
       { name = "mkdirp"; range = "0.3.5"; }
@@ -988,7 +988,7 @@
       { name = "buffer-crc32"; range = "0.2.1"; }
       { name = "fresh"; range = "0.1.0"; }
       { name = "methods"; range = "0.0.1"; }
-      { name = "send"; range = "0.1.2"; }
+      { name = "send"; range = "0.1.3"; }
       { name = "cookie-signature"; range = "1.0.1"; }
       { name = "debug"; range = "*"; }
     ];
@@ -1237,43 +1237,43 @@
   }
   {
     baseName = "fstream";
-    version = "0.1.22";
+    version = "0.1.23";
     fullName = "fstream-0";
-    hash = "2ace3993d34cbf5e97bcb9c7eec3f011fa2041ce66cb688e39e747285084496a";
+    hash = "1f3f03be2b18815b133e551b0cde8ab77148d0de31fdd61d90f21317f02c8342";
     patchLatest = false;
     topLevel = false;
     dependencies = [
       { name = "rimraf"; range = "2"; }
       { name = "mkdirp"; range = "0.3"; }
-      { name = "graceful-fs"; range = "~1.2.0"; }
+      { name = "graceful-fs"; range = "~2.0.0"; }
       { name = "inherits"; range = "~1.0.0"; }
     ];
   }
   {
     baseName = "fstream";
-    version = "0.1.22";
+    version = "0.1.23";
     fullName = "fstream-~0.1.8";
-    hash = "2ace3993d34cbf5e97bcb9c7eec3f011fa2041ce66cb688e39e747285084496a";
+    hash = "1f3f03be2b18815b133e551b0cde8ab77148d0de31fdd61d90f21317f02c8342";
     patchLatest = false;
     topLevel = false;
     dependencies = [
       { name = "rimraf"; range = "2"; }
       { name = "mkdirp"; range = "0.3"; }
-      { name = "graceful-fs"; range = "~1.2.0"; }
+      { name = "graceful-fs"; range = "~2.0.0"; }
       { name = "inherits"; range = "~1.0.0"; }
     ];
   }
   {
     baseName = "glob";
-    version = "3.2.1";
+    version = "3.2.3";
     fullName = "glob-3";
-    hash = "a457c2115213ce2cb59582ddc3a25eb3ae7490af687e412111c0032f72966f51";
+    hash = "82e04561e897c9b682c0568bafbc57b0ee2fc592579535bb0f5929cd1605c9c3";
     patchLatest = false;
     topLevel = false;
     dependencies = [
       { name = "minimatch"; range = "~0.2.11"; }
-      { name = "graceful-fs"; range = "~1.2.0"; }
-      { name = "inherits"; range = "1"; }
+      { name = "graceful-fs"; range = "~2.0.0"; }
+      { name = "inherits"; range = "2"; }
     ];
   }
   {
@@ -1291,22 +1291,22 @@
   }
   {
     baseName = "glob";
-    version = "3.2.1";
+    version = "3.2.3";
     fullName = "glob->= 3.1.4";
-    hash = "a457c2115213ce2cb59582ddc3a25eb3ae7490af687e412111c0032f72966f51";
+    hash = "82e04561e897c9b682c0568bafbc57b0ee2fc592579535bb0f5929cd1605c9c3";
     patchLatest = false;
     topLevel = false;
     dependencies = [
       { name = "minimatch"; range = "~0.2.11"; }
-      { name = "graceful-fs"; range = "~1.2.0"; }
-      { name = "inherits"; range = "1"; }
+      { name = "graceful-fs"; range = "~2.0.0"; }
+      { name = "inherits"; range = "2"; }
     ];
   }
   {
     baseName = "graceful-fs";
-    version = "1.2.2";
-    fullName = "graceful-fs-1";
-    hash = "a23fe552c6b0a221fc961e1ef0ed567e081ad948f4fcac6be660fa6741c0dbd6";
+    version = "2.0.0";
+    fullName = "graceful-fs-2";
+    hash = "36f8fb1de88a8599cc828a0eb4c96f12c25437756e91e42aeadce00a7887241c";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -1314,9 +1314,9 @@
   }
   {
     baseName = "graceful-fs";
-    version = "1.2.2";
+    version = "1.2.3";
     fullName = "graceful-fs-~1";
-    hash = "a23fe552c6b0a221fc961e1ef0ed567e081ad948f4fcac6be660fa6741c0dbd6";
+    hash = "b8d9e0af2261259525a65281573e416b70b91788ea7f7b13f4598aaa7818255a";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -1324,9 +1324,19 @@
   }
   {
     baseName = "graceful-fs";
-    version = "1.2.2";
+    version = "1.2.3";
     fullName = "graceful-fs-~1.2.0";
-    hash = "a23fe552c6b0a221fc961e1ef0ed567e081ad948f4fcac6be660fa6741c0dbd6";
+    hash = "b8d9e0af2261259525a65281573e416b70b91788ea7f7b13f4598aaa7818255a";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "graceful-fs";
+    version = "2.0.0";
+    fullName = "graceful-fs-~2.0.0";
+    hash = "36f8fb1de88a8599cc828a0eb4c96f12c25437756e91e42aeadce00a7887241c";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -1554,6 +1564,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "inherits";
+    version = "2.0.0";
+    fullName = "inherits-2";
+    hash = "9c0e9ab9e025f0be599d62752764964416832d38d93a4143242ec4deb4de1ae0";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "inherits";
     version = "1.0.0";
@@ -1586,9 +1606,9 @@
   }
   {
     baseName = "jade";
-    version = "0.32.0";
+    version = "0.33.0";
     fullName = "jade-*";
-    hash = "25bd8ad332bdf7dba4bcd2bf38b6f5ff49e1a9401668a4c4edf50e1277031e2d";
+    hash = "9c03589c5ca55fcf6b4583c1daefd052fb8ef46e91962bab4ee75f6135963e4f";
     patchLatest = false;
     topLevel = true;
     dependencies = [
@@ -1670,9 +1690,9 @@
   }
   {
     baseName = "jsontool";
-    version = "5.1.3";
+    version = "6.0.0";
     fullName = "jsontool-*";
-    hash = "097889f294920e43c2a8f8d9156971860c67c61ecfe5a1e411c4d641e521985c";
+    hash = "4a1e5d6d89571a561b3f7aea39d6ba6274bb8075d802b0a514e17abf186d781c";
     patchLatest = false;
     topLevel = true;
     dependencies = [
@@ -2281,9 +2301,9 @@
   }
   {
     baseName = "nijs";
-    version = "0.0.8";
+    version = "0.0.9";
     fullName = "nijs-*";
-    hash = "134a4f764835280487334f5cfd5a0d271cdd784fe954ad619fad250f54c3b3b9";
+    hash = "1be26e71151d67b0bcced2431b8507ad9a1ce07fdc895480b63c058e89ed4f0b";
     patchLatest = false;
     topLevel = true;
     dependencies = [
@@ -2302,14 +2322,14 @@
   }
   {
     baseName = "node-gyp";
-    version = "0.10.5";
+    version = "0.10.6";
     fullName = "node-gyp-*";
-    hash = "e52cdb18b2b457600b6c5178a6c5f3de6ec81b94cde85e14c0c8f6e58a2c041a";
+    hash = "1b1fc060c1a84eb0f52c495d7d13e3a7f03b2753b74dc6c1c801c5b8d563c5b0";
     patchLatest = false;
     topLevel = true;
     dependencies = [
       { name = "glob"; range = "3"; }
-      { name = "graceful-fs"; range = "1"; }
+      { name = "graceful-fs"; range = "2"; }
       { name = "fstream"; range = "0"; }
       { name = "minimatch"; range = "0"; }
       { name = "mkdirp"; range = "0"; }
@@ -2418,9 +2438,9 @@
   }
   {
     baseName = "npmlog";
-    version = "0.0.3";
+    version = "0.0.4";
     fullName = "npmlog-0";
-    hash = "3214a04d9a54c588d2585b657c7068f9561dba34dd2323c4ac7ec98e69e3e9cd";
+    hash = "16da9f0f239813f201156b81a5ebe552c9a3f78a405dbb24c2c1743fe3a0d579";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -2795,9 +2815,9 @@
   }
   {
     baseName = "rbytes";
-    version = "0.0.2";
+    version = "1.0.0";
     fullName = "rbytes-*";
-    hash = "0fd4697be996ee12c65f8fb13b2edc7a554d22c31d1a344539bc611ce73b69aa";
+    hash = "ccacb9951421c0a219f63b5d356098adffa43e42367be78afb94a433f84593e7";
     patchLatest = false;
     topLevel = true;
     dependencies = [
@@ -3067,9 +3087,9 @@
   }
   {
     baseName = "semver";
-    version = "2.0.9";
+    version = "2.0.10";
     fullName = "semver-*";
-    hash = "cc1b4edd155fdec8638cf0acb90ba7855a9c8ea27f0a3ae2da21c12582d40050";
+    hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111";
     patchLatest = false;
     topLevel = true;
     dependencies = [
@@ -3097,9 +3117,9 @@
   }
   {
     baseName = "semver";
-    version = "2.0.9";
+    version = "2.0.10";
     fullName = "semver-~2.0.7";
-    hash = "cc1b4edd155fdec8638cf0acb90ba7855a9c8ea27f0a3ae2da21c12582d40050";
+    hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -3107,9 +3127,9 @@
   }
   {
     baseName = "send";
-    version = "0.1.2";
+    version = "0.1.3";
     fullName = "send-*";
-    hash = "d3fdea73a77e9f0f826e3fa5fa7ed7ef60a51912f5b976d4c112d7c52ac4668f";
+    hash = "45d768e247b184ec2d78aef495d4986b62675daa2d40add4f993cc122bba557f";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -3135,9 +3155,9 @@
   }
   {
     baseName = "send";
-    version = "0.1.2";
-    fullName = "send-0.1.2";
-    hash = "d3fdea73a77e9f0f826e3fa5fa7ed7ef60a51912f5b976d4c112d7c52ac4668f";
+    version = "0.1.3";
+    fullName = "send-0.1.3";
+    hash = "45d768e247b184ec2d78aef495d4986b62675daa2d40add4f993cc122bba557f";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -3351,9 +3371,9 @@
   }
   {
     baseName = "stylus";
-    version = "0.33.1";
+    version = "0.34.1";
     fullName = "stylus-*";
-    hash = "5db972473ed5d5d50ef4b76b019b35b8a6b368209a694ee2f94bb8d6c9f50245";
+    hash = "efbcf5f35d84264609be85b122513af30e922687a4f5c961928febf0f27e3d9e";
     patchLatest = false;
     topLevel = true;
     dependencies = [
@@ -3471,9 +3491,9 @@
   }
   {
     baseName = "timezone";
-    version = "0.0.21";
+    version = "0.0.22";
     fullName = "timezone-*";
-    hash = "6f595e6376708b1c35d1dac3b3c1c44384b3928f7b3a4f33165817275548c8d1";
+    hash = "5bb9d42f401ae3084ab7dba7e0ecf1158995a987242311c86062177ad89561c3";
     patchLatest = false;
     topLevel = true;
     dependencies = [

From 7ef50f50986b0a830051e641f1a5c795d79d8460 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 14:52:51 +1000
Subject: [PATCH 076/439] audiofile: fix build on darwin

* disable alsaLib
* build with gccApple
---
 pkgs/development/libraries/audiofile/default.nix | 11 ++++++-----
 pkgs/top-level/all-packages.nix                  |  6 +++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index 8ea6470cde84..1190f7437cbc 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -3,17 +3,18 @@
 stdenv.mkDerivation rec {
   name = "audiofile-0.3.3";
 
-  buildInputs = [ alsaLib ];
+  buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
 
   src = fetchurl {
     url = "http://audiofile.68k.org/${name}.tar.gz";
     sha256 = "1qm7z0g1d9rcxi1m87slgdi0rhl94g13dx3d2b05dilghwpgjjgq";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A library for reading and writing audio files in various formats";
-    homepage = http://www.68k.org/~michael/audiofile/; 
-    license = "lgpl";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    homepage    = http://www.68k.org/~michael/audiofile/; 
+    license     = licenses.lgpl;
+    maintainers = with maintainers; [ lovek323 shlevy ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c69fc1a4962c..c19d1126d8c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3703,7 +3703,11 @@ let
 
   aubio = callPackage ../development/libraries/aubio { };
 
-  audiofile = callPackage ../development/libraries/audiofile { };
+  audiofile = callPackage ../development/libraries/audiofile {
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
 
   axis = callPackage ../development/libraries/axis { };
 

From 735555d86fb3c707f94a06f85048c239c89d75d1 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 14:55:32 +1000
Subject: [PATCH 077/439] ffmpeg: fix build on darwin

* build with gccApple
* don't delete '*.a' files when building xvidcore
---
 pkgs/development/libraries/ffmpeg/default.nix |  6 ++++--
 .../libraries/xvidcore/default.nix            | 19 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  4 ++++
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index b37fcdf4436c..98a6c35c8b87 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -78,8 +78,10 @@ stdenv.mkDerivation rec {
     inherit vdpauSupport;
   };
 
-  meta = {
-    homepage = http://www.ffmpeg.org/;
+  meta = with stdenv.lib; {
+    homepage    = http://www.ffmpeg.org/;
     description = "A complete, cross-platform solution to record, convert and stream audio and video";
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix
index e03773292bb5..4ddbc5484ba3 100644
--- a/pkgs/development/libraries/xvidcore/default.nix
+++ b/pkgs/development/libraries/xvidcore/default.nix
@@ -12,11 +12,20 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ nasm ];
 
-  postInstall =
-    ''
-      rm $out/lib/*.a
-      (cd $out/lib && ln -s *.so.4.* libxvidcore.so && ln -s *.so.4.* libxvidcore.so.4 )
-    '';
+  buildInputs = [ nasm ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ autoconf automake libtool ];
+
+  # don't delete the '.a' files on darwin -- they're needed to compile ffmpeg
+  # (and perhaps other things)
+  postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    rm $out/lib/*.a
+  '' + ''
+    cd $out/lib
+    ln -s *.so.4.* libxvidcore.so
+    if [ ! -e libxvidcore.so.4 ]; then
+        ln -s *.so.4.* libxvidcore.so.4
+    fi
+  '';
   
   meta = {
     description = "MPEG-4 video codec for PC";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c19d1126d8c6..e063024c0c56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3896,6 +3896,10 @@ let
 
   ffmpeg = callPackage ../development/libraries/ffmpeg {
     vpxSupport = !stdenv.isMips;
+
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
   };
 
   ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix {

From 8ac7701c4cc0538108430b7f9a7b3bdd787df29d Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 14:51:32 +1000
Subject: [PATCH 078/439] fluidsynth: fix build on darwin

* disable pulseaudio
* disable alaLib
* disable jackaudio
* add CoreAudio headers
* link to CoreAudio framework
---
 .../applications/audio/fluidsynth/default.nix | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index 70a405b3fd6d..413e7d0661b0 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -10,12 +10,25 @@ stdenv.mkDerivation  rec {
     sha256 = "1x73a5rsyvfmh1j0484kzgnk251q61g1g2jdja673l8fizi0xd24";
   };
 
-  buildInputs = [ alsaLib glib jackaudio libsndfile pkgconfig pulseaudio ];
+  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i '40 i\
+    #include <CoreAudio/AudioHardware.h>\
+    #include <CoreAudio/AudioHardwareBase.h>\
+    #include <CoreAudio/AudioHardwareDeprecated.h>' \
+    src/drivers/fluid_coreaudio.c
+  '';
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
+    "-framework CoreAudio";
+
+  buildInputs = [ glib libsndfile pkgconfig ]
+    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jackaudio ];
 
   meta = with stdenv.lib; {
-    description = "real-time software synthesizer based on the SoundFont 2 specifications";
-    homepage = http://www.fluidsynth.org;
-    license = licenses.lgpl2;
-    maintainers = [ maintainers.goibhniu ];
+    description = "Real-time software synthesizer based on the SoundFont 2 specifications";
+    homepage    = http://www.fluidsynth.org;
+    license     = licenses.lgpl2;
+    maintainers = with maintainers; [ goibhniu lovek323 ];
+    platforms   = platforms.unix;
   };
 }

From 8c54b95273cd97d87c3372d53b9c820da9394927 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 14:54:20 +1000
Subject: [PATCH 079/439] glib: fix build on darwin

* add libintlOrEmpty to build inputs
* add -lintl to CFLAGS
---
 pkgs/development/libraries/glib/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index b500967af78e..b5e2b1e43b21 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrEmpty, zlib, libffi
-, python, pcre, libelf }:
+, python, pcre, libelf, libintlOrEmpty }:
 
 # TODO:
 # * Add gio-module-fam
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   };
 
   # configure script looks for d-bus but it is only needed for tests
-  buildInputs = [ libelf ];
+  buildInputs = [ libelf ] ++ libintlOrEmpty;
 
   nativeBuildInputs = [ perl pkgconfig gettext python ];
 
@@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
 
   postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h";
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+
   enableParallelBuilding = true;
 
   postInstall = ''rm -rvf $out/share/gtk-doc'';

From 75730566521b2a40836a3f215732bf6a885b5982 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 14:54:57 +1000
Subject: [PATCH 080/439] gtk++: fix build on darwin

* add -lintl to CFLAGS
---
 pkgs/development/libraries/gtk+/2.x.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index c7dc45aa462c..6b889f76ca59 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
+  NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"
+    + stdenv.lib.optionalString (libintlOrEmpty != null) " -lintl";
 
   nativeBuildInputs = [ perl pkgconfig gettext ];
 
@@ -34,8 +35,12 @@ stdenv.mkDerivation rec {
 
   postInstall = "rm -rf $out/share/gtk-doc";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A multi-platform toolkit for creating graphical user interfaces";
+    homepage    = http://www.gtk.org/;
+    license     = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ lovek323 raskin ];
+    platforms   = platforms.all;
 
     longDescription = ''
       GTK+ is a highly usable, feature rich toolkit for creating
@@ -47,12 +52,5 @@ stdenv.mkDerivation rec {
       proprietary software with GTK+ without any license fees or
       royalties.
     '';
-
-    homepage = http://www.gtk.org/;
-
-    license = "LGPLv2+";
-
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.all;
   };
 }

From 970346e2d1309335b789bd71161cc3c44bf3eabd Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 17:07:30 +1000
Subject: [PATCH 081/439] libmad: fix build on darwin

* stop building with an i486 architecture

Conflicts:
	pkgs/development/libraries/libmad/default.nix
---
 pkgs/development/libraries/libmad/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix
index 6e2e2c949cca..883ad072c7b9 100644
--- a/pkgs/development/libraries/libmad/default.nix
+++ b/pkgs/development/libraries/libmad/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, autoconf}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "libmad-0.15.1b";
   
   src = fetchurl {
-    url = mirror://sourceforge/mad/libmad-0.15.1b.tar.gz;
+    url = "mirror://sourceforge/mad/${name}.tar.gz";
     sha256 = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690";
   };
 
@@ -16,10 +16,13 @@ stdenv.mkDerivation {
   preConfigure = ''
     autoconf
     substituteInPlace configure --replace "-fforce-mem" ""
+    substituteInPlace configure --replace "arch=\"-march=i486\"" ""
   '';
 
-  meta = {
-    homepage = http://sourceforge.net/projects/mad/;
+  meta = with stdenv.lib; {
+    homepage    = http://sourceforge.net/projects/mad/;
     description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2";
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 }

From c449a67e0176b5fc0027ace17d6d6b58a5b43b0c Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 14:58:32 +1000
Subject: [PATCH 082/439] libmikmod: fix build on darwin

* build with gccApple
---
 pkgs/development/libraries/libmikmod/default.nix | 12 +++++++-----
 pkgs/top-level/all-packages.nix                  |  7 ++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix
index cde3aecce078..8ef95650ce68 100644
--- a/pkgs/development/libraries/libmikmod/default.nix
+++ b/pkgs/development/libraries/libmikmod/default.nix
@@ -6,15 +6,17 @@ stdenv.mkDerivation rec {
     sha256 = "07k6iyx6pyzisncgdkd071w2dhm3rx6l34hbja3wbc7rpf888k3k";
   };
   buildInputs = [ texinfo ];
-  meta = {
+
+  meta = with stdenv.lib; {
     description = "A library for playing tracker music module files";
+    homepage    = http://mikmod.shlomifish.org/;
+    license     = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ astsmtl lovek323 ];
+    platforms   = platforms.unix;
+
     longDescription = ''
       A library for playing tracker music module files supporting many formats,
       including MOD, S3M, IT and XM.
     '';
-    homepage = http://mikmod.shlomifish.org/;
-    license = "LGPLv2+";
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e063024c0c56..66116c1266a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4676,7 +4676,12 @@ let
 
   libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { };
 
-  libmikmod = callPackage ../development/libraries/libmikmod { };
+  libmikmod = callPackage ../development/libraries/libmikmod {
+    # resolve the "stray '@' in program" errors
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
 
   libmilter = callPackage ../development/libraries/libmilter { };
 

From 3a1a7b2d6ab4509453f211125ab7d76018e95ca3 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 14:59:41 +1000
Subject: [PATCH 083/439] libsamplerate: fix build on darwin

* build with gccApple
* add Carbon include path
---
 .../libraries/libsamplerate/default.nix       | 19 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  6 +++++-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix
index 17f06e46711c..3b7434dc9fbf 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/pkgs/development/libraries/libsamplerate/default.nix
@@ -15,14 +15,19 @@ stdenv.mkDerivation rec {
   #--disable-fftw          disable usage of FFTW
   #--disable-cpu-clip      disable tricky cpu specific clipper
 
-  meta = {
+  # need headers from the Carbon.framework in /System/Library/Frameworks to
+  # compile this on darwin -- not sure how to handle
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
+    "-I/System/Library/Frameworks/Carbon.framework/Versions/A/Headers";
+
+  meta = with stdenv.lib; {
     description = "Sample Rate Converter for audio";
-    homepage = http://www.mega-nerd.com/SRC/index.html;
+    homepage    = http://www.mega-nerd.com/SRC/index.html;
     # you can choose one of the following licenses:
-    license = [
-      "GPL"
-      # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf
-      "libsamplerate Commercial Use License"
-    ];
+    # GPL or a commercial-use license (available at
+    # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf)
+    licenses    = with licenses; [ gpl unfree ];
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66116c1266a6..ba18fd850e41 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4618,7 +4618,11 @@ let
   libre = callPackage ../development/libraries/libre {};
   librem = callPackage ../development/libraries/librem {};
 
-  libsamplerate = callPackage ../development/libraries/libsamplerate { };
+  libsamplerate = callPackage ../development/libraries/libsamplerate {
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
 
   libspectre = callPackage ../development/libraries/libspectre { };
 

From dcc4ffdb7f49ade1bafa947a4e602df3ca87432e Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 15:02:09 +1000
Subject: [PATCH 084/439] libsndfile: fix build on darwin

* build with gccApple
* add Carbon headers to include path
---
 .../libraries/libsndfile/default.nix          | 55 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  6 +-
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index d9b4afbf0ff8..7cf9cbca51f8 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }:
+{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "libsndfile-1.0.23";
@@ -8,35 +8,38 @@ stdenv.mkDerivation rec {
     sha256 = "0k9x4804gfh9d9zd4rm1v2izm8l716rzk4d6jlrjcf45b5sw7jal";
   };
 
-  buildInputs = [pkgconfig flac libogg libvorbis];
+  buildInputs = [ pkgconfig flac libogg libvorbis ];
 
-  meta = {
-    description = "Libsndfile, a C library for reading and writing files containing sampled sound";
+  # need headers from the Carbon.framework in /System/Library/Frameworks to
+  # compile this on darwin -- not sure how to handle
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
+    "-I/System/Library/Frameworks/Carbon.framework/Versions/A/Headers";
 
-    longDescription =
-      '' Libsndfile is a C library for reading and writing files containing
-         sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format)
-         through one standard library interface.  It is released in source
-         code format under the GNU Lesser General Public License.
+  meta = with stdenv.lib; {
+    description = "A C library for reading and writing files containing sampled sound";
+    homepage    = http://www.mega-nerd.com/libsndfile/;
+    license     = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ lovek323 ludo ];
+    platfomrs   = platforms.unix;
 
-         The library was written to compile and run on a Linux system but
-         should compile and run on just about any Unix (including MacOS X).
-         There are also pre-compiled binaries available for 32 and 64 bit
-         windows.
+    longDescription = ''
+      Libsndfile is a C library for reading and writing files containing
+      sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format)
+      through one standard library interface.  It is released in source
+      code format under the GNU Lesser General Public License.
 
-         It was designed to handle both little-endian (such as WAV) and
-         big-endian (such as AIFF) data, and to compile and run correctly on
-         little-endian (such as Intel and DEC/Compaq Alpha) processor systems
-         as well as big-endian processor systems such as Motorola 68k, Power
-         PC, MIPS and SPARC.  Hopefully the design of the library will also
-         make it easy to extend for reading and writing new sound file
-         formats.
-       '';
+      The library was written to compile and run on a Linux system but
+      should compile and run on just about any Unix (including MacOS X).
+      There are also pre-compiled binaries available for 32 and 64 bit
+      windows.
 
-    homepage = http://www.mega-nerd.com/libsndfile/;
-
-    license = "LGPLv2+";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+      It was designed to handle both little-endian (such as WAV) and
+      big-endian (such as AIFF) data, and to compile and run correctly on
+      little-endian (such as Intel and DEC/Compaq Alpha) processor systems
+      as well as big-endian processor systems such as Motorola 68k, Power
+      PC, MIPS and SPARC.  Hopefully the design of the library will also
+      make it easy to extend for reading and writing new sound file
+      formats.
+    '';
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba18fd850e41..22623abb0464 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4781,7 +4781,11 @@ let
   # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5
   libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { };
 
-  libsndfile = callPackage ../development/libraries/libsndfile { };
+  libsndfile = callPackage ../development/libraries/libsndfile {
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
 
   libsoup = callPackage ../development/libraries/libsoup { };
 

From f3c863b8e3868ae4d427727f8dfc4d5bf9dd89c6 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 15:02:52 +1000
Subject: [PATCH 085/439] libsoup: fix build on darwin

* add libintlOrEmpty to build inputs
* add -lintl to LDFLAGS
---
 pkgs/development/libraries/libsoup/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 08784a0f2574..a5ce0fda2704 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, glib, libxml2, pkgconfig
-, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }:
+, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking
+, libintlOrEmpty }:
 
 stdenv.mkDerivation {
   name = "libsoup-2.38.1";
@@ -10,6 +11,7 @@ stdenv.mkDerivation {
   };
 
 
+  buildInputs = libintlOrEmpty;
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ glib libxml2 ]
     ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
@@ -18,6 +20,8 @@ stdenv.mkDerivation {
   # glib_networking is a runtime dependency, not a compile-time dependency
   configureFlags = "--disable-tls-check";
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+
   meta = {
     inherit (glib.meta) maintainers platforms;
   };

From 7b975abc16f4f8774ee5bf621a820fe800c5cabc Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 15:03:18 +1000
Subject: [PATCH 086/439] libvdpau: fix build on drawin

* force x86_64 arch
---
 pkgs/development/libraries/libvdpau/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index 158106247055..835e2711a776 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
   buildInputs = with xlibs; [ pkgconfig dri2proto libXext ];
 
   propagatedBuildInputs = [ xlibs.libX11 ];
+  
+  configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--build=x86_64" ];
 
   meta = {
     homepage = http://people.freedesktop.org/~aplattner/vdpau/;

From 481be8185fbc6d3d01382347c45075032508e48a Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 15:03:46 +1000
Subject: [PATCH 087/439] libvpx: fix build on darwin

* remove --enable-shared configure flag
* replace '-arch x86_64' with 'march=x86-64'
---
 pkgs/development/libraries/libvpx/default.nix | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 494a5c36a3c4..3ca2239ac8e4 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -21,27 +21,26 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     mkdir -p build
     cd build
+    substituteInPlace make/configure.sh --replace "-arch x86_64" "-march=x86-64"
   '';
 
   configureScript = "../configure";
-  configureFlags = [
-    "--disable-install-srcs"
-    "--disable-install-docs"
-    "--disable-examples"
-    "--enable-vp8"
-    "--enable-runtime-cpu-detect"
-    "--enable-shared"
-    "--enable-pic"
-  ];
+  configureFlags =
+    [ "--disable-install-srcs" "--disable-install-docs" "--disable-examples"
+      "--enable-vp8" "--enable-runtime-cpu-detect" "--enable-pic" ]
+    # --enable-shared is only supported on ELF
+    ++ stdenv.lib.optional (!stdenv.isDarwin) "--enable-shared";
 
   installPhase = ''
     make quiet=false DIST_DIR=$out install
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "VP8 video encoder";
-    homepage = http://code.google.com/p/webm;
-    license = "BSD";
+    homepage    = http://code.google.com/p/webm;
+    license     = licenses.bsd;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 }
 

From 5c8a44fd181a95eb246fbe4d5faed83fa8e0cf4c Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 15:07:37 +1000
Subject: [PATCH 088/439] mpd: fix build on darwin

* disable systemd
* disable alsaLib
* disable ffado
* compile with gccApple
* disable libmad
---
 pkgs/servers/mpd/default.nix    | 80 +++++++++++++++++----------------
 pkgs/top-level/all-packages.nix |  8 +++-
 2 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 54c9d1605655..43da84dcb819 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -18,8 +18,7 @@
 , samplerateSupport ? true, libsamplerate
 , mmsSupport ? true, libmms
 , mpg123Support ? true, mpg123
-, aacSupport ? true, faad2
-}:
+, aacSupport ? true, faad2 }:
 
 let
 
@@ -28,17 +27,20 @@ let
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
 
 in stdenv.mkDerivation rec {
-  name = "mpd-0.17.3";
+  name = "mpd-0.17.4";
   src = fetchurl {
-    url = "mirror://sourceforge/musicpd/${name}.tar.bz2";
-    sha256 = "1iilimlyhw22lpbqiab4qprznxg9c4d68fkrr9jww765b4c7x1ip";
+    url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz";
+    sha256 = "06diyprg65xx0c0bgxdwlgrc5bhwy6cf39rabwnv9ikhimh94ir3";
   };
 
-  buildInputs = [ pkgconfig glib systemd ]
-    ++ opt alsaSupport alsaLib
+  buildInputs = [ pkgconfig glib ]
+    ++ opt (!stdenv.isDarwin) systemd
+    ++ opt (!stdenv.isDarwin && alsaSupport) alsaLib
     ++ opt flacSupport flac
     ++ opt vorbisSupport libvorbis
-    ++ opt madSupport libmad
+    # using libmad to decode mp3 files on darwin is causing a segfault -- there
+    # is probably a solution, but I'm disabling it for now
+    ++ opt (!stdenv.isDarwin && madSupport) libmad
     ++ opt id3tagSupport libid3tag
     ++ opt mikmodSupport libmikmod
     ++ opt shoutSupport libshout
@@ -47,7 +49,7 @@ in stdenv.mkDerivation rec {
     ++ opt soupSupport libsoup
     ++ opt bzip2Support bzip2
     ++ opt audiofileSupport audiofile
-    ++ opt ffadoSupport ffado
+    ++ opt (!stdenv.isDarwin && ffadoSupport) ffado
     ++ opt ffmpegSupport ffmpeg
     ++ opt fluidsynthSupport fluidsynth
     ++ opt samplerateSupport libsamplerate
@@ -56,45 +58,47 @@ in stdenv.mkDerivation rec {
     ++ opt aacSupport faad2
     ++ opt zipSupport zziplib;
 
-  configureFlags = [
-    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
-    (mkFlag alsaSupport "alsa")
-    (mkFlag flacSupport "flac")
-    (mkFlag vorbisSupport "vorbis")
-    (mkFlag vorbisSupport "vorbis-encoder")
-    (mkFlag madSupport "mad")
-    (mkFlag mikmodSupport "mikmod")
-    (mkFlag id3tagSupport "id3")
-    (mkFlag shoutSupport "shout")
-    (mkFlag sqliteSupport "sqlite")
-    (mkFlag curlSupport "curl")
-    (mkFlag soupSupport "soup")
-    (mkFlag audiofileSupport "audiofile")
-    (mkFlag bzip2Support "bzip2")
-    (mkFlag ffadoSupport "ffado")
-    (mkFlag ffmpegSupport "ffmpeg")
-    (mkFlag fluidsynthSupport "fluidsynth")
-    (mkFlag zipSupport "zzip")
-    (mkFlag samplerateSupport "lsr")
-    (mkFlag mmsSupport "mms")
-    (mkFlag mpg123Support "mpg123")
-    (mkFlag aacSupport "aac")
-  ];
+  configureFlags =
+    [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa")
+      (mkFlag flacSupport "flac")
+      (mkFlag vorbisSupport "vorbis")
+      (mkFlag vorbisSupport "vorbis-encoder")
+      (mkFlag (!stdenv.isDarwin && madSupport) "mad")
+      (mkFlag mikmodSupport "mikmod")
+      (mkFlag id3tagSupport "id3")
+      (mkFlag shoutSupport "shout")
+      (mkFlag sqliteSupport "sqlite")
+      (mkFlag curlSupport "curl")
+      (mkFlag soupSupport "soup")
+      (mkFlag audiofileSupport "audiofile")
+      (mkFlag bzip2Support "bzip2")
+      (mkFlag (!stdenv.isDarwin && ffadoSupport) "ffado")
+      (mkFlag ffmpegSupport "ffmpeg")
+      (mkFlag fluidsynthSupport "fluidsynth")
+      (mkFlag zipSupport "zzip")
+      (mkFlag samplerateSupport "lsr")
+      (mkFlag mmsSupport "mms")
+      (mkFlag mpg123Support "mpg123")
+      (mkFlag aacSupport "aac")
+      "--enable-debugging" ]
+    ++ opt (!stdenv.isDarwin)
+      "--with-systemdsystemunitdir=$(out)/etc/systemd/system";
 
   NIX_LDFLAGS = ''
     ${if shoutSupport then "-lshout" else ""}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A flexible, powerful daemon for playing music";
+    homepage    = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ astsmtl ];
+    platforms   = platforms.unix;
+
     longDescription = ''
       Music Player Daemon (MPD) is a flexible, powerful daemon for playing
       music. Through plugins and libraries it can play a variety of sound
       files while being controlled by its network protocol.
     '';
-    homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
-    license = "GPLv2";
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22623abb0464..0bd4252a8fb2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5902,7 +5902,13 @@ let
 
   mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { };
 
-  mpd = callPackage ../servers/mpd { };
+  mpd = callPackage ../servers/mpd {
+    # resolve the "stray '@' in program" errors
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
+
   mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { };
 
   miniHttpd = callPackage ../servers/http/mini-httpd {};

From 8df4be3ee32520c98732f64f9f9818eae063a73f Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 14:52:14 +1000
Subject: [PATCH 089/439] mpg123: fix darwin build (and upgrade to latest)

* disable alsaLib
* upgrade to 1.15.4
---
 pkgs/applications/audio/mpg123/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 80de5567000d..029c2ba4bcdf 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchurl, alsaLib }:
 
 stdenv.mkDerivation {
-  name = "mpg123-1.12.3";
+  name = "mpg123-1.15.4";
 
   src = fetchurl {
-    url = mirror://sourceforge/mpg123/mpg123-1.12.3.tar.bz2;
-    sha256 = "1ij689s7jch3d4g0ja3jylaphallc8vgrsrm9b12254phnyy23xf";
+    url = mirror://sourceforge/mpg123/mpg123-1.15.4.tar.bz2;
+    sha256 = "05aizspky9mp1bq2lfrkjzrsnjykl7gkbrhn93xcarj5b2izv1b8";
   };
 
-  buildInputs = [ alsaLib ];
+  buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
 
   crossAttrs = {
     configureFlags = if stdenv.cross ? mpg123 then

From ab067cf633af53d3229336e6c0516a2fd16b3b52 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 15:04:19 +1000
Subject: [PATCH 090/439] openal: fix build on darwin

* disable alsaLib
---
 pkgs/development/libraries/openal/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix
index 2c23e51c22a6..75d6033e1cc5 100644
--- a/pkgs/development/libraries/openal/default.nix
+++ b/pkgs/development/libraries/openal/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     name = "openal-soft-${version}.tar.bz2";
   };
 
-  buildInputs = [ cmake alsaLib ];
+  buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
 
   meta = {
     description = "OpenAL, a cross-platform 3D audio API";

From 3d6f857f9958e64e33c8dd85fdbc1138e578128a Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 15:04:58 +1000
Subject: [PATCH 091/439] pangomm: fix build on darwin

* add cairo to build inputs
* fix cairo include path
---
 pkgs/development/libraries/pangomm/2.28.x.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix
index 7f4d14dfbacf..46875901181e 100644
--- a/pkgs/development/libraries/pangomm/2.28.x.nix
+++ b/pkgs/development/libraries/pangomm/2.28.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }:
+{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng, cairo }:
 
 stdenv.mkDerivation rec {
   name = "pangomm-2.28.4";
@@ -9,10 +9,16 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ pango glibmm cairomm libpng ];
+  propagatedBuildInputs = [ pango glibmm cairomm libpng cairo ];
 
-  meta = {
+  NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
+
+  meta = with stdenv.lib; {
     description = "C++ interface to the Pango text rendering library";
+    homepage    = http://www.pango.org/;
+    license     = licenses.lgplv2Plus;
+    maintainers = with maintainers; [ lovek323 raskin ];
+    platforms   = platforms.unix;
 
     longDescription = ''
       Pango is a library for laying out and rendering of text, with an
@@ -21,11 +27,5 @@ stdenv.mkDerivation rec {
       far has been done in the context of the GTK+ widget toolkit.
       Pango forms the core of text and font handling for GTK+-2.x.
     '';
-
-    homepage = http://www.pango.org/;
-    license = "LGPLv2+";
-
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
   };
 }

From 6fc89eead6ff281ef8d482c08ef4e61fd16ea32d Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 15:05:41 +1000
Subject: [PATCH 092/439] qt48: fix build on darwin

* build with clang
---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                   | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index b797f631b8e7..29116d0eb118 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -147,10 +147,10 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = http://qt-project.org/;
+    homepage    = http://qt-project.org/;
     description = "A cross-platform application framework for C++";
-    license = "GPL/LGPL";
-    maintainers = with maintainers; [ urkud sander phreedom ];
-    platforms = platforms.all;
+    license     = "GPL/LGPL";
+    maintainers = with maintainers; [ lovek323 phreedom sander urkud ];
+    platforms   = platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0bd4252a8fb2..73cfc6f005ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5222,6 +5222,11 @@ let
     # GNOME dependencies are not used unless gtkStyle == true
     inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
     cups = if stdenv.isLinux then cups else null;
+
+    # resolve unrecognised flag '-fconstant-cfstrings' errors
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
   };
 
   qt48Full = callPackage ../development/libraries/qt-4.x/4.8 {

From fbe2fe36e35f0b665cc919c6de897af966fec8bd Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 15:07:02 +1000
Subject: [PATCH 093/439] sip: fix build on darwin

* prevent complaints about python not being built as a framework
---
 .../python-modules/python-sip/default.nix       | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix
index fa958971cf38..fa2bae7ae27c 100644
--- a/pkgs/development/python-modules/python-sip/default.nix
+++ b/pkgs/development/python-modules/python-sip/default.nix
@@ -10,14 +10,21 @@ stdenv.mkDerivation rec {
     ];
     sha256 = "1bwdd5xhrx8dx8rr86r043ddlbg7gd1vh0pm2nxw5l1yprwa7paa";
   };
-  
-  configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include";
+
+  configurePhase = stdenv.lib.optionalString stdenv.isDarwin ''
+    # prevent sip from complaining about python not being built as a framework
+    sed -i -e 1564,1565d siputils.py
+  '' + ''
+    python ./configure.py -d $out/lib/${python.libPrefix}/site-packages \
+      -b $out/bin -e $out/include
+  '';
   
   buildInputs = [ python ];
   
-  meta = {
+  meta = with stdenv.lib; {
     description = "Creates C++ bindings for Python modules";
-    license = "GPL";
-    maintainers = with stdenv.lib.maintainers; [ urkud sander ];
+    license     = licenses.gpl;
+    maintainers = with maintainers; [ lovek323 sander urkud ];
+    platforms   = platforms.all;
   };
 }

From f2dea7d2875d88ee1cc8e3ea1ce9e58e914b9816 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 15:06:22 +1000
Subject: [PATCH 094/439] xvidcore: fix build on darwin

* remove unnecessary gcc flag
* add --enable-macosx_module configure flag
* add --disable-assembly configure flag
* fix postInstall phase
---
 .../libraries/xvidcore/default.nix            | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix
index 4ddbc5484ba3..df7404e1faf6 100644
--- a/pkgs/development/libraries/xvidcore/default.nix
+++ b/pkgs/development/libraries/xvidcore/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, nasm}:
+{ stdenv, fetchurl, nasm, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   name = "xvidcore-1.3.2";
@@ -8,9 +8,14 @@ stdenv.mkDerivation rec {
     sha256 = "1x0b2rq6fv99ramifhkakycd0prjc93lbzrffbjgjwg7w4s17hfn";
   };
 
-  preConfigure = "cd build/generic";
+  preConfigure = ''
+    cd build/generic
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace configure --replace "-no-cpp-precomp" ""
+  '';
 
-  buildInputs = [ nasm ];
+  configureFlags = stdenv.lib.optionals stdenv.isDarwin
+    [ "--enable-macosx_module" "--disable-assembly" ];
 
   buildInputs = [ nasm ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ autoconf automake libtool ];
@@ -27,10 +32,12 @@ stdenv.mkDerivation rec {
     fi
   '';
   
-  meta = {
+  meta = with stdenv.lib; {
     description = "MPEG-4 video codec for PC";
-    homepage = http://www.xvid.org/;
-    license = "GPLv2+";
+    homepage    = http://www.xvid.org/;
+    license     = licenses.gplv2Plus;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.all;
   };
 }
 

From 1af178559f71821478765bfc76c87bf1cf14dce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 11 Jul 2013 22:03:49 +0200
Subject: [PATCH 095/439] ethtool: 3.2 -> 3.10

And add package meta data.
---
 pkgs/tools/misc/ethtool/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index 1fc03a4ebff1..90d345daa135 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -1,11 +1,18 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "ethtool-3.2";
+stdenv.mkDerivation rec {
+  name = "ethtool-3.10";
 
   src = fetchurl {
-    url = mirror://kernel/software/network/ethtool/ethtool-3.2.tar.xz;
-    sha256 = "0g9ldaba3vwlsmf490j33y3fgsmpfzxlzzblwashl448f8lcfap7";
+    url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
+    sha256 = "0h0wvi0s6s80v26plkh66aiyybpfyi18sjg5pl9idrd0ccdr93gq";
   };
 
+  meta = with stdenv.lib; {
+    description = "Utility for controlling network drivers and hardware";
+    homepage = https://www.kernel.org/pub/software/network/ethtool/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
 }

From a97936fba88f859121299d715c0e1bf93af0f159 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Thu, 11 Jul 2013 18:55:46 +0200
Subject: [PATCH 096/439] Add bindings-DSL and bindings-posix hackage packages

---
 .../libraries/haskell/bindings-DSL/default.nix      | 13 +++++++++++++
 .../libraries/haskell/bindings-posix/default.nix    | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  4 ++++
 3 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/bindings-DSL/default.nix
 create mode 100644 pkgs/development/libraries/haskell/bindings-posix/default.nix

diff --git a/pkgs/development/libraries/haskell/bindings-DSL/default.nix b/pkgs/development/libraries/haskell/bindings-DSL/default.nix
new file mode 100644
index 000000000000..9d6e8d1a04d5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bindings-DSL/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "bindings-DSL";
+  version = "1.0.16";
+  sha256 = "1sly88585f94dsnhyw6nagnr4jfjixnn61my85x05987flf325px";
+  meta = {
+    homepage = "http://bitbucket.org/mauricio/bindings-dsl";
+    description = "FFI domain specific language, on top of hsc2hs";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/bindings-posix/default.nix b/pkgs/development/libraries/haskell/bindings-posix/default.nix
new file mode 100644
index 000000000000..23994140d6c0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bindings-posix/default.nix
@@ -0,0 +1,13 @@
+{ cabal, bindingsDSL }:
+
+cabal.mkDerivation (self: {
+  pname = "bindings-posix";
+  version = "1.2.3";
+  sha256 = "0nj18lfpn8hmlaa7cmvdkjnk8fi2f6ysjbigkx7zbrpqnvbi63ba";
+  buildDepends = [ bindingsDSL ];
+  meta = {
+    description = "Low level bindings to posix";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f92a67ed5b73..bd7959463f37 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -591,6 +591,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   binaryShared = callPackage ../development/libraries/haskell/binary-shared {};
 
+  bindingsDSL = callPackage ../development/libraries/haskell/bindings-DSL {};
+
+  bindingsPosix = callPackage ../development/libraries/haskell/bindings-posix {};
+
   bitarray = callPackage ../development/libraries/haskell/bitarray {};
 
   bitmap = callPackage ../development/libraries/haskell/bitmap {};

From b17f4486a1040fabb6f55797505e905b8f34d050 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Fri, 5 Jul 2013 17:47:02 +0100
Subject: [PATCH 097/439] More Perl libraries

Adds:

- File-Share-0.02
- Module-Install-AuthorRequires-0.02
- Module-Install-AuthorTests-0.002
- Test-EOL-1.5
- Test-NoTabs-1.3
---
 pkgs/top-level/perl-packages.nix | 65 ++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f179f4ed8302..05fed84dff53 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2740,6 +2740,20 @@ rec {
     };
   };
 
+  FileShare = buildPerlPackage {
+    name = "File-Share-0.02";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/I/IN/INGY/File-Share-0.02.tar.gz;
+      sha256 = "1vdgyf3m08s4pwj70bgbb31jsj8hixdl940m15phyx2hpy8dkabw";
+    };
+    propagatedBuildInputs = [ FileShareDir ];
+    meta = {
+      homepage = http://github.com/ingydotnet/file-share-pm/tree;
+      description = "Extend File::ShareDir to Local Libraries";
+      license = "perl";
+    };
+  };
+
   FileShareDir = buildPerlPackage {
     name = "File-ShareDir-1.03";
     src = fetchurl {
@@ -4136,6 +4150,32 @@ rec {
     };
   };
 
+  ModuleInstallAuthorRequires = buildPerlPackage {
+    name = "Module-Install-AuthorRequires-0.02";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FL/FLORA/Module-Install-AuthorRequires-0.02.tar.gz;
+      sha256 = "1v2ciw75dj5y8lh10d1vrhwmjx266gpqavr8m21jlpblgm9j2qyc";
+    };
+    propagatedBuildInputs = [ ModuleInstall ];
+    meta = {
+      description = "Declare author-only dependencies";
+      license = "perl";
+    };
+  };
+
+  ModuleInstallAuthorTests = buildPerlPackage {
+    name = "Module-Install-AuthorTests-0.002";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Module-Install-AuthorTests-0.002.tar.gz;
+      sha256 = "121dyggy38316xss06v1zkwx4b59gl7b00c5q99xyzimwqnp49a0";
+    };
+    propagatedBuildInputs = [ ModuleInstall ];
+    meta = {
+      description = "Designate tests only run by module authors";
+      license = "perl";
+    };
+  };
+
   ModuleMetadata = buildPerlPackage rec {
     name = "Module-Metadata-1.000005";
     src = fetchurl {
@@ -6227,6 +6267,19 @@ rec {
     };
   };
 
+  TestEOL = buildPerlPackage {
+    name = "Test-EOL-1.5";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BO/BOBTFISH/Test-EOL-1.5.tar.gz;
+      sha256 = "0qfdn71562xzmgnhmkkdbpp3vj851ldl1zlmxvharxsr16gjh6s3";
+    };
+    meta = {
+      homepage = http://metacpan.org/release/Test-EOL;
+      description = "Check the correct line endings in your project";
+      license = "perl5";
+    };
+  };
+
   TestException = buildPerlPackage rec {
     name = "Test-Exception-0.31";
     src = fetchurl {
@@ -6356,6 +6409,18 @@ rec {
     };
   };
 
+  TestNoTabs = buildPerlPackage {
+    name = "Test-NoTabs-1.3";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BO/BOBTFISH/Test-NoTabs-1.3.tar.gz;
+      sha256 = "06gvj0pgljc7n9rxhvwb0gq9wk51i3ks41lgh7a5ycqfkh9d0glw";
+    };
+    meta = {
+      description = "Check the presence of tabs in your project";
+      license = "perl";
+    };
+  };
+
   TestNoWarnings = buildPerlPackage {
     name = "Test-NoWarnings-1.04";
     src = fetchurl {

From 18e9efe0f7a491041a49d5904d391009691a7434 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 12 Jul 2013 16:55:19 +0200
Subject: [PATCH 098/439] nijs: update to 0.0.9

---
 pkgs/top-level/node-packages-generated.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 141ba26ea523..15b5c05b6f12 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -2303,7 +2303,7 @@
     baseName = "nijs";
     version = "0.0.9";
     fullName = "nijs-*";
-    hash = "1be26e71151d67b0bcced2431b8507ad9a1ce07fdc895480b63c058e89ed4f0b";
+    hash = "fdcc60b869d3308549818608593c5a9eab75574a5e85df66e35f6f896a4d3544";
     patchLatest = false;
     topLevel = true;
     dependencies = [

From a4c333474c66eeadf14373f135c66079b2631c21 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 12 Jul 2013 12:36:36 -0400
Subject: [PATCH 099/439] lib/lists.nix: Remove uses of the tail function

nix lists are not like haskell lists, and tail is an O(n) operation.
This makes recursion using tail less efficient than recursion using
length + elemAt.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/lib/lists.nix | 154 ++++++++++++++++++++++++---------------------
 1 file changed, 83 insertions(+), 71 deletions(-)

diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix
index 3c01b165fc1c..164ff3e1ec99 100644
--- a/pkgs/lib/lists.nix
+++ b/pkgs/lib/lists.nix
@@ -1,9 +1,13 @@
 # General list operations.
-with {
+let
   inherit (import ./trivial.nix) deepSeq;
-};
 
-rec {
+  inc = builtins.add 1;
+
+  dec = n: builtins.sub n 1;
+
+  inherit (builtins) elemAt;
+in rec {
   inherit (builtins) head tail length isList add sub lessThan;
 
 
@@ -17,50 +21,39 @@ rec {
   # `list' with `nul' as the starting value, i.e., `fold op nul [x_1
   # x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'.  (This is
   # Haskell's foldr).
-  fold =
-    if builtins ? elemAt
-    then op: nul: list:
-      let
-        len = length list;
-        fold' = n:
-          if n == len
-          then nul
-          else op (builtins.elemAt list n) (fold' (add n 1));
-      in fold' 0
-    else op: nul:
-      let fold' = list:
-        if list == []
+  fold = op: nul: list:
+    let
+      len = length list;
+      fold' = n:
+        if n == len
         then nul
-        else op (head list) (fold' (tail list));
-      in fold';
+        else op (elemAt list n) (fold' (inc n));
+    in fold' 0;
 
-    
   # Left fold: `fold op nul [x_1 x_2 ... x_n] == op (... (op (op nul
   # x_1) x_2) ... x_n)'.
-  foldl =
-    if builtins ? elemAt
-    then op: nul: list:
-      let
-        len = length list;
-        foldl' = n:
-          if n == minus1
-          then nul
-          else op (foldl' (sub n 1)) (builtins.elemAt list n);
-      in foldl' (sub (length list) 1)
-    else op:
-      let foldl' = nul: list:
-        if list == []
+  foldl = op: nul: list:
+    let
+      len = length list;
+      foldl' = n:
+        if n == minus1
         then nul
-        else foldl' (op nul (head list)) (tail list);
-      in foldl';
+        else op (foldl' (dec n)) (elemAt list n);
+    in foldl' (dec (length list));
 
-  minus1 = sub 0 1;
+  minus1 = dec 0;
 
 
   # map with index: `imap (i: v: "${v}-${toString i}") ["a" "b"] ==
   # ["a-1" "b-2"]'
   imap = f: list:
-    zipListsWith f (range 1 (length list)) list;
+    let
+      len = length list;
+      imap' = n:
+        if n == len
+          then []
+          else [ (f n (elemAt list n)) ] ++ imap' (inc n);
+    in imap' 0;
 
     
   # Concatenate a list of lists.
@@ -102,10 +95,10 @@ rec {
   # predicate, returns `default' if no such element exists, or
   # `multiple' if there are multiple matching elements.
   findSingle = pred: default: multiple: list:
-    let found = filter pred list;
-    in if found == [] then default
-       else if tail found != [] then multiple
-       else head found;
+    let found = filter pred list; len = length found;
+    in if len == 0 then default
+      else if len != 1 then multiple
+      else head found;
 
 
   # Find the first element in the list matching the specified
@@ -159,65 +152,84 @@ rec {
 
 
   zipListsWith = f: fst: snd:
-    if fst != [] && snd != [] then
-      [ (f (head fst) (head snd)) ]
-      ++ zipListsWith f (tail fst) (tail snd)
-    else [];
+    let
+      len1 = length fst;
+      len2 = length snd;
+      len = if builtins.lessThan len1 len2 then len1 else len2;
+      zipListsWith' = n:
+        if n != len then
+          [ (f (elemAt fst n) (elemAt snd n)) ]
+          ++ zipListsWith' (inc n)
+        else [];
+    in zipListsWith' 0;
 
   zipLists = zipListsWith (fst: snd: { inherit fst snd; });
 
   
   # Reverse the order of the elements of a list.
-  reverseList = l:
-    let reverse_ = accu: l:
-      if l == [] then accu
-      else reverse_ ([(head l)] ++ accu) (tail l);
-    in reverse_ [] l;
+  reverseList = fold (e: acc: acc ++ [ e ]) [];
 
-    
   # Sort a list based on a comparator function which compares two
   # elements and returns true if the first argument is strictly below
   # the second argument.  The returned list is sorted in an increasing
   # order.  The implementation does a quick-sort.
   sort = strictLess: list:
     let
-      # This implementation only has one element list on the left hand
-      # side of the concatenation operator.
-      qs = l: concat:
-        if l == [] then concat
-        else if length l == 1 then l ++ concat
-        else let
-          part = partition (strictLess (head l)) (tail l);
-        in
-          qs part.wrong ([(head l)] ++ qs part.right concat);
+      len = length list;
+      first = head list;
+      pivot' = n: acc@{ left, right }: let el = elemAt list n; next = pivot' (inc n); in
+        if n == len
+          then acc
+        else if strictLess first el
+          then next { inherit left; right = [ el ] ++ right; }
+        else
+          next { left = [ el ] ++ left; inherit right; };
+      pivot = pivot' 1 { left = []; right = []; };
     in
-      qs list [];
+      if lessThan len 2 then list
+      else (sort strictLess pivot.left) ++  [ first ] ++  (sort strictLess pivot.right);
 
 
   # Return the first (at most) N elements of a list.
   take = count: list:
-    if list == [] || count == 0 then []
-    else [ (head list) ] ++ take (builtins.sub count 1) (tail list);
+    let
+      len = length list;
+      take' = n:
+        if n == len || n == count
+          then []
+        else
+          [ (elemAt list n) ] ++ take' (inc n);
+    in take' 0;
 
     
   # Remove the first (at most) N elements of a list.
   drop = count: list:
-    if count == 0 then list
-    else drop (builtins.sub count 1) (tail list);
+    let
+      len = length list;
+      drop' = n:
+        if n == minus1 || lessThan n count
+          then []
+        else
+          drop' (dec n) ++ [ (elemAt list n) ];
+    in drop' (dec len);
 
     
   last = list:
-    assert list != [];
-    let loop = l: if tail l == [] then head l else loop (tail l); in
-    loop list;
+    assert list != []; elemAt list (dec (length list));
 
 
   # Zip two lists together.
   zipTwoLists = xs: ys:
-    if xs != [] && ys != [] then
-      [ {first = head xs; second = head ys;} ]
-      ++ zipTwoLists (tail xs) (tail ys)
-    else [];
+    let
+      len1 = length xs;
+      len2 = length ys;
+      len = if lessThan len1 len2 then len1 else len2;
+      zipTwoLists' = n:
+        if n != len then
+          [ { first = elemAt xs n; second = elemAt ys n; } ]
+          ++ zipTwoLists' (inc n)
+        else [];
+    in zipTwoLists' 0;
 
   deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y;
 }

From b47e2c2ab6db02e57ac72c200944739a7b4e53e1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 12 Jul 2013 18:38:41 +0200
Subject: [PATCH 100/439] nixpart: New upstream version 0.4.0.

Changes are:

 - Properly detect GPT disklabels and create proper BIOS boot partitions
   if necessary.
 - Return exit code 100 if reboot is required due to the kernel not
   picking up the new partition table.
 - Don't include BIOS boot partition in GRUB devices.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/filesystems/nixpart/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix
index 3467c07b753b..36972573b358 100644
--- a/pkgs/tools/filesystems/nixpart/default.nix
+++ b/pkgs/tools/filesystems/nixpart/default.nix
@@ -9,11 +9,11 @@ let
   };
 in buildPythonPackage rec {
   name = "nixpart-${version}";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchurl {
     url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz";
-    sha256 = "0v47vgj79k1idsvw7gd3g2vm5zfb2g4i2935y9sd2av5rb2w4c05";
+    sha256 = "1kgiyqh7gndr0zs3qgi6r0dpy5p71d32c2k9kbd8pjf2xyyb6fk6";
   };
 
   propagatedBuildInputs = [ (blivet.override blivetOverrides) ];

From 8a66c8b8f8b0629cb03babb2cd9f26d6884b0541 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 12 Jul 2013 13:06:15 -0400
Subject: [PATCH 101/439] imap previously mapped with 1-based indices

Why????

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/lib/lists.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix
index 164ff3e1ec99..578686ae3668 100644
--- a/pkgs/lib/lists.nix
+++ b/pkgs/lib/lists.nix
@@ -52,7 +52,7 @@ in rec {
       imap' = n:
         if n == len
           then []
-          else [ (f n (elemAt list n)) ] ++ imap' (inc n);
+          else [ (f (inc n) (elemAt list n)) ] ++ imap' (inc n);
     in imap' 0;
 
     

From e820a54431bc4a3277378c468737b72b8a2d82e7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 13 Jul 2013 15:15:50 -0400
Subject: [PATCH 102/439] Linux 3.10.1

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index bcf555201a27..c0242406075e 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -259,8 +259,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.10";
-    modDirVersion = "3.10.0";
+    version = "3.10.1";
     testing = false;
 
     preConfigure = ''
@@ -269,7 +268,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "0i1mmp1fym49az75rjnwxbbh11b387qqjjkczq5l373ssa9gl9yz";
+      sha256 = "1gqrafyzi381pbd4719g853hgi17q79nvzwdja2gk1d9jiq69f6s";
     };
 
     config = configWithPlatform stdenv.platform;

From 3b274caaac78eda9d0a8f67c916f3b18ec111c59 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 13 Jul 2013 15:54:39 -0400
Subject: [PATCH 103/439] Fix tarball

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../interpreters/ruby/generated.nix           | 136 ++++++++++++++++--
 .../libraries/audiofile/default.nix           |   2 +-
 .../libraries/libsamplerate/default.nix       |   2 +-
 pkgs/development/libraries/libvpx/default.nix |   2 +-
 pkgs/development/libraries/pangomm/2.28.x.nix |   2 +-
 .../libraries/xvidcore/default.nix            |   2 +-
 .../python-modules/python-sip/default.nix     |   2 +-
 pkgs/top-level/all-packages.nix               |   2 +-
 8 files changed, 132 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index 97a8eb670019..7446e52704c8 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -38,16 +38,20 @@ g: # Get dependencies from patched gems
     ffi = g.ffi_1_9_0;
     file_tail = g.file_tail_1_0_12;
     foreman = g.foreman_0_63_0;
+    gettext = g.gettext_2_3_9;
     highline = g.highline_1_6_19;
     hike = g.hike_1_2_3;
     hoe = g.hoe_3_1_0;
     http_cookie = g.http_cookie_1_0_1;
     i18n = g.i18n_0_6_4;
+    iconv = g.iconv_1_0_3;
     jruby_pageant = g.jruby_pageant_1_1_1;
     jsduck = g.jsduck_4_10_4;
     json = g.json_1_8_0;
     json_pure = g.json_pure_1_8_0;
-    libv8 = g.libv8_3_11_8_17_x86_linux;
+    libv8 = g.libv8_3_11_8_17_x86_64_linux;
+    locale = g.locale_2_0_8;
+    lockfile = g.lockfile_2_1_0;
     macaddr = g.macaddr_1_6_1;
     mail = g.mail_2_5_4;
     mechanize = g.mechanize_2_7_1;
@@ -81,6 +85,7 @@ g: # Get dependencies from patched gems
     right_aws = g.right_aws_3_1_0;
     right_http_connection = g.right_http_connection_1_4_0;
     rjb = g.rjb_1_4_8;
+    rmail = g.rmail_1_0_0;
     rspec = g.rspec_2_11_0;
     rspec_core = g.rspec_core_2_11_1;
     rspec_expectations = g.rspec_expectations_2_11_3;
@@ -95,13 +100,15 @@ g: # Get dependencies from patched gems
     sprockets_rails = g.sprockets_rails_2_0_0;
     syslog_protocol = g.syslog_protocol_0_9_2;
     systemu = g.systemu_2_5_2;
+    text = g.text_1_2_1;
     therubyracer = g.therubyracer_0_11_4;
     thin = g.thin_1_5_1;
     thor = g.thor_0_18_1;
     thread_safe = g.thread_safe_0_1_0;
     tilt = g.tilt_1_4_1;
-    tins = g.tins_0_8_2;
+    tins = g.tins_0_8_3;
     treetop = g.treetop_1_4_14;
+    trollop = g.trollop_2_0;
     tzinfo = g.tzinfo_0_3_37;
     unf = g.unf_0_1_1;
     unf_ext = g.unf_ext_0_0_6;
@@ -109,10 +116,12 @@ g: # Get dependencies from patched gems
     uuidtools = g.uuidtools_2_1_4;
     webrobots = g.webrobots_0_1_1;
     websocket = g.websocket_1_0_7;
+    xapian_full = g.xapian_full_1_2_3;
+    xapian_ruby = g.xapian_ruby_1_2_15_1;
     xml_simple = g.xml_simple_1_1_1;
     yajl_ruby = g.yajl_ruby_1_1_0;
   };
-  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
+  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ];
   gems = {
     ZenTest_4_9_2 = {
       basename = ''ZenTest'';
@@ -605,7 +614,7 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Library to tail files in Ruby'';
       };
       name = ''file-tail-1.0.12'';
-      requiredGems = [ g.tins_0_8_2 ];
+      requiredGems = [ g.tins_0_8_3 ];
       sha256 = ''0mzxxnwj7k5pwxs0rdbmb3b41zgvzw7x40sf3qlkch4zdfx91i1j'';
     };
     foreman_0_63_0 = {
@@ -619,6 +628,20 @@ using TCP/IP, especially if custom protocols are required.'';
       requiredGems = [ g.thor_0_18_1 g.dotenv_0_8_0 ];
       sha256 = ''0yqyjix9jm4iwyc4f3wc32vxr28rpjcw1c9ni5brs4s2a24inzlk'';
     };
+    gettext_2_3_9 = {
+      basename = ''gettext'';
+      meta = {
+        description = ''Gettext is a pure Ruby libary and tools to localize messages.'';
+        homepage = ''http://ruby-gettext.github.com/'';
+        longDescription = ''Gettext is a GNU gettext-like program for Ruby.
+The catalog file(po-file) is same format with GNU gettext.
+So you can use GNU gettext tools for maintaining.
+'';
+      };
+      name = ''gettext-2.3.9'';
+      requiredGems = [ g.locale_2_0_8 g.text_1_2_1 ];
+      sha256 = ''1i4kzkan7mnyr1ihphx0sqs3k4qj9i1ldg4a1cwf5h2fz657wvjj'';
+    };
     highline_1_6_19 = {
       basename = ''highline'';
       meta = {
@@ -702,6 +725,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''0wz1rnrs4n21j1rw9a120j2pfdkbikp1yvxaqi3mk30iw6mx4p0f'';
     };
+    iconv_1_0_3 = {
+      basename = ''iconv'';
+      meta = {
+        description = ''iconv wrapper library'';
+        homepage = ''https://github.com/nurse/iconv'';
+        longDescription = ''iconv wrapper library'';
+      };
+      name = ''iconv-1.0.3'';
+      requiredGems = [  ];
+      sha256 = ''1nhjn07h2fqivdj6xqzi2x2kzh28vigx8z3q5fv2cqn9aqmbdacl'';
+    };
     jruby_pageant_1_1_1 = {
       basename = ''jruby_pageant'';
       meta = {
@@ -757,16 +791,39 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''0kkn5zhiffav2cffj43wwvzj07825r4j463ilfjgik034vnbjs83'';
     };
-    libv8_3_11_8_17_x86_linux = {
+    libv8_3_11_8_17_x86_64_linux = {
       basename = ''libv8'';
       meta = {
         description = ''Distribution of the V8 JavaScript engine'';
         homepage = ''http://github.com/cowboyd/libv8'';
         longDescription = ''Distributes the V8 JavaScript engine in binary and source forms in order to support fast builds of The Ruby Racer'';
       };
-      name = ''libv8-3.11.8.17-x86-linux'';
+      name = ''libv8-3.11.8.17-x86_64-linux'';
       requiredGems = [  ];
-      sha256 = ''1szy5cjvin3bnydfia5nnb3n3z3prfhjl4q2nbk08zpvp162fk0n'';
+      sha256 = ''1s2j79rm2idny701l6rsnig6451w2wfipgmfvxf05d1syn14cmg9'';
+    };
+    locale_2_0_8 = {
+      basename = ''locale'';
+      meta = {
+        description = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization.'';
+        homepage = ''https://github.com/ruby-gettext/locale'';
+        longDescription = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization.
+'';
+      };
+      name = ''locale-2.0.8'';
+      requiredGems = [  ];
+      sha256 = ''1hmixxg4aigl3h1qmz4fdsrv81p0bblcjbks32nrcvcpwmlylf12'';
+    };
+    lockfile_2_1_0 = {
+      basename = ''lockfile'';
+      meta = {
+        description = ''lockfile'';
+        homepage = ''https://github.com/ahoward/lockfile'';
+        longDescription = ''description: lockfile kicks the ass'';
+      };
+      name = ''lockfile-2.1.0'';
+      requiredGems = [  ];
+      sha256 = ''1yfpz9k0crb7q7y5bcaavf2jzbc170dj84hqz13qp75rj7bl3qhf'';
     };
     macaddr_1_6_1 = {
       basename = ''macaddr'';
@@ -1344,6 +1401,17 @@ algorithm for low-level network errors.
       requiredGems = [  ];
       sha256 = ''06ps4ssaxb8jwja53h7v7kb31hsdr997b8na89d1yasm5zyraliw'';
     };
+    rmail_1_0_0 = {
+      basename = ''rmail'';
+      meta = {
+        description = ''A MIME mail parsing and generation library.'';
+        homepage = ''http://www.rfc20.org/rubymail'';
+        longDescription = ''RMail is a lightweight mail library containing various utility classes and modules that allow ruby scripts to parse, modify, and generate MIME mail messages.'';
+      };
+      name = ''rmail-1.0.0'';
+      requiredGems = [  ];
+      sha256 = ''0nsg7yda1gdwa96j4hlrp2s0m06vrhcc4zy5mbq7gxmlmwf9yixp'';
+    };
     rspec_2_11_0 = {
       basename = ''rspec'';
       meta = {
@@ -1510,6 +1578,17 @@ interpreters.'';
       requiredGems = [  ];
       sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr'';
     };
+    text_1_2_1 = {
+      basename = ''text'';
+      meta = {
+        description = ''A collection of text algorithms'';
+        homepage = ''http://github.com/threedaymonk/text'';
+        longDescription = ''A collection of text algorithms: Levenshtein, Soundex, Metaphone, Double Metaphone, Porter Stemming'';
+      };
+      name = ''text-1.2.1'';
+      requiredGems = [  ];
+      sha256 = ''0s186kh125imdr7dahr10payc1gmxgk6wjy1v3agdyvl53yn5z3z'';
+    };
     therubyracer_0_11_4 = {
       basename = ''therubyracer'';
       meta = {
@@ -1518,7 +1597,7 @@ interpreters.'';
         longDescription = ''Call JavaScript code and manipulate JavaScript objects from Ruby. Call Ruby code and manipulate Ruby objects from JavaScript.'';
       };
       name = ''therubyracer-0.11.4'';
-      requiredGems = [ g.ref_1_0_5 g.libv8_3_11_8_17_x86_linux ];
+      requiredGems = [ g.ref_1_0_5 g.libv8_3_11_8_17_x86_64_linux ];
       sha256 = ''15n9zi9jzb5k34id9xfkxx39y0nap7a4h02z8r00msjjajxag3iq'';
     };
     thin_1_5_1 = {
@@ -1565,16 +1644,16 @@ interpreters.'';
       requiredGems = [  ];
       sha256 = ''00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir'';
     };
-    tins_0_8_2 = {
+    tins_0_8_3 = {
       basename = ''tins'';
       meta = {
         description = ''Useful stuff.'';
         homepage = ''http://flori.github.com/tins'';
         longDescription = ''All the stuff that isn't good/big enough for a real library.'';
       };
-      name = ''tins-0.8.2'';
+      name = ''tins-0.8.3'';
       requiredGems = [  ];
-      sha256 = ''0wjc21jf374pyhfha8yw0zvf9br4pnmibx98z8yk9pa4qbslryq9'';
+      sha256 = ''14wrkki06g088fla8pab331p31ywdij90m14cva1hcpsd9a666ld'';
     };
     treetop_1_4_14 = {
       basename = ''treetop'';
@@ -1586,6 +1665,21 @@ interpreters.'';
       requiredGems = [ g.polyglot_0_3_3 g.polyglot_0_3_3 ];
       sha256 = ''0qbk97wgbvj31sz4h3p8kfmvc8ig97gh91dfmk3m7j1h8vq87acs'';
     };
+    trollop_2_0 = {
+      basename = ''trollop'';
+      meta = {
+        description = ''Trollop is a commandline option parser for Ruby that just gets out of your way.'';
+        homepage = ''http://trollop.rubyforge.org'';
+        longDescription = ''Trollop is a commandline option parser for Ruby that just
+gets out of your way. One line of code per option is all you need to write.
+For that, you get a nice automatically-generated help page, robust option
+parsing, command subcompletion, and sensible defaults for everything you don't
+specify.'';
+      };
+      name = ''trollop-2.0'';
+      requiredGems = [  ];
+      sha256 = ''0iz5k7ax7a5jm9x6p81k6f4mgp48wxxb0j55ypnwxnznih8fsghz'';
+    };
     tzinfo_0_3_37 = {
       basename = ''tzinfo'';
       meta = {
@@ -1669,6 +1763,26 @@ to Ruby/JRuby.
       requiredGems = [  ];
       sha256 = ''1jrfz4295qbnjaxv37fw9jzxyxz61izp7c0683mnscacpx262zw0'';
     };
+    xapian_full_1_2_3 = {
+      basename = ''xapian_full'';
+      meta = {
+        description = ''xapian-core + Ruby xapian-bindings'';
+        longDescription = ''Xapian bindings for Ruby without dependency on system Xapian library'';
+      };
+      name = ''xapian-full-1.2.3'';
+      requiredGems = [  ];
+      sha256 = ''02z0wsir38jsp5d6sqrkgv5prk8s6sdf6g2h718j2374kpnkyrxv'';
+    };
+    xapian_ruby_1_2_15_1 = {
+      basename = ''xapian_ruby'';
+      meta = {
+        description = ''xapian libraries and ruby bindings'';
+        homepage = ''https://github.com/garaio/xapian-ruby'';
+      };
+      name = ''xapian-ruby-1.2.15.1'';
+      requiredGems = [  ];
+      sha256 = ''02v3l931246asbcivkr4j0x99pl4i4fjvfsr8ga8v6lkvz0ls1xp'';
+    };
     xml_simple_1_1_1 = {
       basename = ''xml_simple'';
       meta = {
diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index 1190f7437cbc..57ca21885dd8 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A library for reading and writing audio files in various formats";
     homepage    = http://www.68k.org/~michael/audiofile/; 
-    license     = licenses.lgpl;
+    license     = licenses.lgpl21;
     maintainers = with maintainers; [ lovek323 shlevy ];
     platforms   = platforms.unix;
   };
diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix
index 3b7434dc9fbf..57eaf529a63f 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/pkgs/development/libraries/libsamplerate/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     # you can choose one of the following licenses:
     # GPL or a commercial-use license (available at
     # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf)
-    licenses    = with licenses; [ gpl unfree ];
+    licenses    = with licenses; [ gpl3.shortName unfree ];
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.all;
   };
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 3ca2239ac8e4..46e73a121fe3 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "VP8 video encoder";
     homepage    = http://code.google.com/p/webm;
-    license     = licenses.bsd;
+    license     = licenses.bsd3;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
   };
diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix
index 46875901181e..411b969cb242 100644
--- a/pkgs/development/libraries/pangomm/2.28.x.nix
+++ b/pkgs/development/libraries/pangomm/2.28.x.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "C++ interface to the Pango text rendering library";
     homepage    = http://www.pango.org/;
-    license     = licenses.lgplv2Plus;
+    license     = licenses.lgpl2Plus;
     maintainers = with maintainers; [ lovek323 raskin ];
     platforms   = platforms.unix;
 
diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix
index df7404e1faf6..b4d44be17386 100644
--- a/pkgs/development/libraries/xvidcore/default.nix
+++ b/pkgs/development/libraries/xvidcore/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "MPEG-4 video codec for PC";
     homepage    = http://www.xvid.org/;
-    license     = licenses.gplv2Plus;
+    license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.all;
   };
diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix
index fa2bae7ae27c..076cba1fad29 100644
--- a/pkgs/development/python-modules/python-sip/default.nix
+++ b/pkgs/development/python-modules/python-sip/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   
   meta = with stdenv.lib; {
     description = "Creates C++ bindings for Python modules";
-    license     = licenses.gpl;
+    license     = licenses.gpl3Plus;
     maintainers = with maintainers; [ lovek323 sander urkud ];
     platforms   = platforms.all;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73cfc6f005ec..a656cdf1c419 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8086,7 +8086,7 @@ let
     lockfile = rubyLibs.lockfile;
     mime_types = rubyLibs.mime_types;
     ncursesw_sup = ruby_ncursesw_sup;
-    rake = rubyLibs.rake_10_0_4;
+    rake = rubyLibs.rake_10_1_0;
     rmail = rubyLibs.rmail;
     text = rubyLibs.text;
     trollop = rubyLibs.trollop;

From e193a4f8987e2ffeb4c65fd39ede34082dd199df Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 13 Jul 2013 16:01:06 -0400
Subject: [PATCH 104/439] Fix gtk2 build

libintlOrEmpty is [], not null, when libintl isn't needed

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/libraries/gtk+/2.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 6b889f76ca59..8c6e76726af5 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"
-    + stdenv.lib.optionalString (libintlOrEmpty != null) " -lintl";
+    + stdenv.lib.optionalString (libintlOrEmpty != []) " -lintl";
 
   nativeBuildInputs = [ perl pkgconfig gettext ];
 

From b4dbb8e4983efe6d834cad8551c5d327bb7c76ce Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sun, 14 Jul 2013 07:35:03 +1000
Subject: [PATCH 105/439] fluidsynth: fix build on darwin

* remove unnecessary include
---
 pkgs/applications/audio/fluidsynth/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index 413e7d0661b0..b0c5a88cb1a6 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -13,7 +13,6 @@ stdenv.mkDerivation  rec {
   preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i '40 i\
     #include <CoreAudio/AudioHardware.h>\
-    #include <CoreAudio/AudioHardwareBase.h>\
     #include <CoreAudio/AudioHardwareDeprecated.h>' \
     src/drivers/fluid_coreaudio.c
   '';

From 291e0a111a712aa4e02f0af0d8ca4fadc0929d9a Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sun, 14 Jul 2013 08:06:01 +1000
Subject: [PATCH 106/439] gst-plugins-base: fix build on darwin

* add libintl
---
 .../libraries/gstreamer/gst-plugins-base/default.nix        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
index da861dda12da..d6717d799f17 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
@@ -1,5 +1,6 @@
 { fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia
 , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo
+, libintlOrEmpty
 , # Whether to build no plugins that have external dependencies
   # (except the ALSA plugin).
   minimalDeps ? false
@@ -30,7 +31,10 @@ stdenv.mkDerivation rec {
       [ xlibs.xlibs xlibs.libXv libogg libtheora libvorbis freetype pango
         liboil ]
     # can't build cdparanoia on darwin
-    ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia;
+    ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia
+    ++ libintlOrEmpty;
+
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
   propagatedBuildInputs = [ gstreamer ];
  

From 3af273f3c30199a322836afc75ce9f1f5c5833f2 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 22:34:04 +0300
Subject: [PATCH 107/439] 3dpong: fix version to match tarball

---
 pkgs/games/pong3d/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/pong3d/default.nix b/pkgs/games/pong3d/default.nix
index 24baff5394a8..d5f9ca6ee23d 100644
--- a/pkgs/games/pong3d/default.nix
+++ b/pkgs/games/pong3d/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, libX11}:
 
 stdenv.mkDerivation {
-  name = "3dpong-0.5.0";
+  name = "3dpong-0.5";
   src = fetchurl {
     url = ftp://ftp.tuxpaint.org/unix/x/3dpong/src/3dpong-0.5.tar.gz;
     sha256 = "1ibb79sbzlbn4ra3n0qk22gqr6fg7q0jy6cm0wg2qj4z64c7hmdi";

From 83e37cdac8db0f710ed378ce0f0b9803409aa7ca Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 22:40:19 +0300
Subject: [PATCH 108/439] atool: fix version to match tarball

---
 pkgs/tools/archivers/atool/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix
index d376f75a552c..e0ece8825c03 100644
--- a/pkgs/tools/archivers/atool/default.nix
+++ b/pkgs/tools/archivers/atool/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, perl}:
 
 stdenv.mkDerivation rec {
-  name = "atool-0.39";
+  name = "atool-0.39.0";
   src = fetchurl {
     url = http://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz;
     sha256 = "aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b";

From 6c1fc08df7a855433ddbe4a954695a5db575de40 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 22:41:52 +0300
Subject: [PATCH 109/439] blobby-volley: fix version to match tarball

---
 pkgs/games/blobby/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
index 5c10154998d4..7e4f6b00587b 100644
--- a/pkgs/games/blobby/default.nix
+++ b/pkgs/games/blobby/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boost, zip, zlib}:
 stdenv.mkDerivation rec {
-  version = "2.0-rc3";
+  version = "1.0-rc3";
   name = "blobby-volley-${version}";
 
   src = fetchurl {

From 7e5e50a084224478752f72fc20492c8dab9f77d3 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 22:46:09 +0300
Subject: [PATCH 110/439] strategoxt.dryad: fix version to match tarball

---
 pkgs/development/compilers/strategoxt/0.17.nix | 2 +-
 pkgs/development/compilers/strategoxt/0.18.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/strategoxt/0.17.nix b/pkgs/development/compilers/strategoxt/0.17.nix
index c84734d7ac7e..d621cbf5f0c2 100644
--- a/pkgs/development/compilers/strategoxt/0.17.nix
+++ b/pkgs/development/compilers/strategoxt/0.17.nix
@@ -82,7 +82,7 @@ rec {
 
 
   dryad = stdenv.mkDerivation rec {
-    name = "dryad-0.2pre1835518355";
+    name = "dryad-0.2pre18355";
 
     src = fetchurl {
       url = "http://releases.strategoxt.org/dryad/${name}-zbqfh1rm/dryad-0.2pre18355.tar.gz";
diff --git a/pkgs/development/compilers/strategoxt/0.18.nix b/pkgs/development/compilers/strategoxt/0.18.nix
index 85d373afa0d8..83ee5f3b06e9 100644
--- a/pkgs/development/compilers/strategoxt/0.18.nix
+++ b/pkgs/development/compilers/strategoxt/0.18.nix
@@ -92,7 +92,7 @@ rec {
   } // ( if stdenv.system == "i686-cygwin" then { CFLAGS = "-O2"; } else {} ) ) ;
 
   dryad = stdenv.mkDerivation rec {
-    name = "dryad-0.2pre1835518355";
+    name = "dryad-0.2pre18355";
 
     src = fetchurl {
       url = "http://releases.strategoxt.org/dryad/${name}-zbqfh1rm/dryad-0.2pre18355.tar.gz";

From a42ba6d8fedb8083b5535116aababc08f89ba597 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 22:53:33 +0300
Subject: [PATCH 111/439] filegive: change url so that it's friendlyto
 automated processing. This changes the tarball a little(likely metadata) but
 it still builds.

---
 pkgs/tools/networking/filegive/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix
index 3072ba3bd4fc..fc2b56efd105 100644
--- a/pkgs/tools/networking/filegive/default.nix
+++ b/pkgs/tools/networking/filegive/default.nix
@@ -18,9 +18,8 @@ stdenv.mkDerivation rec {
   name = "filegive-${version}";
 
   src = fetchurl {
-    url = "http://viric.name/cgi-bin/filegive/tarball/${name}.tar.gz?uuid=v${version}";
-    name = "${name}.tar.gz";
-    sha256 = "172cvm41bqaixz50f86ppqbbridb0qnrcdldfswrs03dc569szm1";
+    url = "http://viric.name/cgi-bin/filegive/tarball/${name}.tar.gz";
+    sha256 = "11rjw906nr73kysm9l84yg443rxzh22l934hir7892h02924i4c4";
   };
 
   buildInputs = [ go ];

From 14d4740ba76267a51944e27d966f6c407f00c1c9 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 22:59:03 +0300
Subject: [PATCH 112/439] firebird: fix version to match tarball

---
 pkgs/servers/firebird/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index 12dfc20e7360..8ad16a3df2e9 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -22,7 +22,7 @@
 */
 
 stdenv.mkDerivation rec {
-  version = "2.5.2";
+  version = "2.5.2.26539-0";
   name = "firebird-${version}";
 
   configureFlags =
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     ++ (stdenv.lib.optional superServer "--enable-superserver=true");
 
   src = fetchurl {
-    url = "mirror://sourceforge/firebird/Firebird-${version}.26539-0.tar.bz2";
+    url = "mirror://sourceforge/firebird/Firebird-${version}.tar.bz2";
     sha256 = "1j5bcfl35hr6i4lcd08zls19bal2js3ar16gnwkzbhwxkxbyb43b";
   };
 

From 33dac7832315d595e15eed21d34f5b3250b4bbf7 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:01:58 +0300
Subject: [PATCH 113/439] golly: fix version to match tarball

---
 pkgs/applications/science/misc/golly/src-for-default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/misc/golly/src-for-default.nix b/pkgs/applications/science/misc/golly/src-for-default.nix
index 00038373d568..23742ac90407 100644
--- a/pkgs/applications/science/misc/golly/src-for-default.nix
+++ b/pkgs/applications/science/misc/golly/src-for-default.nix
@@ -1,5 +1,5 @@
 rec {
-   version="2.4-src";
+   version="2.4";
    name="golly-2.4-src";
    hash="06vajm019q4q4wfy6pc1669fbjqdb4jaxcc419bk0vzky40anl9w";
    url="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz";

From 9a3d4fba5e4895a3f609edf3c69808abec10c827 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:04:19 +0300
Subject: [PATCH 114/439] hdf5: fix version to match tarball

---
 pkgs/tools/misc/hdf5/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index c8ba478af330..0aacf744b1ab 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -3,7 +3,7 @@
 , fetchurl
 }:
 stdenv.mkDerivation {
-  name = "hdf5-1.8.10";
+  name = "hdf5-1.8.10-patch1";
   src = fetchurl {
     url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.10-patch1.tar.gz;
     sha256 = "08ad32fhnci6rdfn6mn3w9v1wcaxdcd326n3ljwkcq4dzhkh28qz";  			

From 36d0df04987ee422981683d5432f55b92e60b753 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:09:19 +0300
Subject: [PATCH 115/439] lesstif: fix version to match tarball

---
 pkgs/development/libraries/lesstif/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index feeed3c14a63..21b4eac30af3 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, x11, libXp, libXau}:
 
 stdenv.mkDerivation {
-  name = "lesstif-0.95-p2";
+  name = "lesstif-0.95.0-p2";
   src = fetchurl {
     url = mirror://sourceforge/lesstif/lesstif-0.95.0.tar.bz2;
     md5 = "ab895165c149d7f95843c7584b1c7ad4";

From 8a2da9525595638718a2d658c16775d2f453a1f1 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:10:46 +0300
Subject: [PATCH 116/439] luarocks: fix version to match tarball

---
 pkgs/development/tools/misc/luarocks/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index da44a7d73a56..7681c8153dbb 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -3,7 +3,7 @@ let
   s = # Generated upstream information
   rec {
     baseName="luarocks";
-    version="2.0.13";
+    version="2.0.13-rc1";
     name="${baseName}-${version}";
     hash="1cpdi61dwcc2i4bwrn7bb8fibkd1s75jrr0bjcbs8p76rn6hkb2y";
     url="http://luarocks.org/releases/luarocks-2.0.13-rc1.tar.gz";

From 64d5bf475c530a5034ba280a76a0e4aec3600f5b Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:12:59 +0300
Subject: [PATCH 117/439] matchbox: fix version to match tarball

---
 pkgs/applications/window-managers/matchbox/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix
index 27a4014d461d..ed2637eff6e5 100644
--- a/pkgs/applications/window-managers/matchbox/default.nix
+++ b/pkgs/applications/window-managers/matchbox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libmatchbox, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  name = "matchbox-1.2.2";
+  name = "matchbox-1.2";
 
   buildInputs = [ libmatchbox pkgconfig ];
 

From 8c8ac0fc8b0aa3acf7d76b6ea0b4ce3b8ff9eaa5 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:14:00 +0300
Subject: [PATCH 118/439] mktorrent: fix version to match tarball

---
 pkgs/tools/misc/mktorrent/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix
index 713d6dc70b81..f177e9e84c28 100644
--- a/pkgs/tools/misc/mktorrent/default.nix
+++ b/pkgs/tools/misc/mktorrent/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, openssl}:
 
 stdenv.mkDerivation {
-  name = "mktorrent-1.0.0";
+  name = "mktorrent-1.0";
 
   src = fetchurl {
     url = mirror://sourceforge/mktorrent/mktorrent-1.0.tar.gz;

From f889b52c300df93f20694423aa244ff5ae258aa0 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:16:23 +0300
Subject: [PATCH 119/439] libgeotiff: fix version to match tarball

---
 pkgs/development/libraries/libgeotiff/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix
index 920f40abd5ab..07e8d2869ce2 100644
--- a/pkgs/development/libraries/libgeotiff/default.nix
+++ b/pkgs/development/libraries/libgeotiff/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libtiff }:
 
 stdenv.mkDerivation {
-  name = "libgeotiff-1.2.4";
+  name = "libgeotiff-1.2.5";
 
   src = fetchurl {
     url = ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/libgeotiff-1.2.5.tar.gz;

From fb07ba725be1fe2fdedf66e9cfc26d785e5c4901 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:18:36 +0300
Subject: [PATCH 120/439] libgnomeprintui: fix version to match tarball

---
 pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
index a406f9209a33..da7673de419d 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, pkgconfig, gtk, gettext, intltool, libgnomecanvas, libgnomeprint, gnomeicontheme}:
 
 stdenv.mkDerivation {
-  name = "libgnomeprintui-2.11.1";
+  name = "libgnomeprintui-2.18.4";
 
   src = fetchurl {
     url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.4.tar.bz2;

From c8e8cfc0d13d237631254e47b924ce87c759a3f1 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:20:15 +0300
Subject: [PATCH 121/439] libmrss: fix version to match tarball

---
 pkgs/development/libraries/libmrss/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix
index 395b254d34d6..b1f7b0071c85 100644
--- a/pkgs/development/libraries/libmrss/default.nix
+++ b/pkgs/development/libraries/libmrss/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, curl, libnxml, pkgconfig}:
 
 stdenv.mkDerivation {
-  name = "libmrss-1.0";
+  name = "libmrss-0.19.2";
 
   src = fetchurl {
     url = "http://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz";

From 5d56681505225f06be9c228c4c8d0d27d0508942 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:21:11 +0300
Subject: [PATCH 122/439] extlib: fix version to match tarball

---
 pkgs/development/ocaml-modules/extlib/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix
index d59dbae45fe9..41620b9424f8 100644
--- a/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/pkgs/development/ocaml-modules/extlib/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, ocaml, findlib}:
 
 stdenv.mkDerivation {
-  name = "ocaml-extlib-1.5.2";
+  name = "ocaml-extlib-1.5.3";
 
   src = fetchurl {
     url = http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz;

From e01d16f7d481054fe9a5fd105d1afc7f93d87366 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:23:22 +0300
Subject: [PATCH 123/439] pam_console: fix version to match tarball

---
 pkgs/os-specific/linux/pam_console/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/pam_console/default.nix b/pkgs/os-specific/linux/pam_console/default.nix
index fbdcce2d1b13..7c1e83c0ed60 100644
--- a/pkgs/os-specific/linux/pam_console/default.nix
+++ b/pkgs/os-specific/linux/pam_console/default.nix
@@ -9,7 +9,7 @@ let
 in
    
 stdenv.mkDerivation {
-  name = "pam_console-0.99.5";
+  name = "pam_console-0.99.5-1";
    
   src = fetchurl {
     url = http://cvs.fedora.redhat.com/repo/dist/pam/pam-redhat-0.99.5-1.tar.bz2/e2edde7861c48195728bc531e5a277e0/pam-redhat-0.99.5-1.tar.bz2;

From e675a2a9960a3a293b49e3a116ddf67932758e65 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:24:34 +0300
Subject: [PATCH 124/439] perl-io-pager: fix version

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 05fed84dff53..edc0160f96f9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3408,7 +3408,7 @@ rec {
   };
 
   IOPager = buildPerlPackage {
-    name = "IO-Pager-0.06.tgz";
+    name = "IO-Pager-0.06";
     src = fetchurl {
       url = mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-0.06.tgz;
       sha256 = "0r3af4gyjpy0f7bhs7hy5s7900w0yhbckb2dl3a1x5wpv7hcbkjb";

From 3fe900b053235038adcb5d4d46d9832fcaa4b4bb Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:27:51 +0300
Subject: [PATCH 125/439] perl-uri-url: fix version to match tarball

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index edc0160f96f9..307e277a2b1c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7084,7 +7084,7 @@ rec {
   };
 
   URIURL = buildPerlPackage {
-    name = "URI-URL-5.04";
+    name = "URI-URL-1.60";
     src = fetchurl {
       url = mirror://cpan/authors/id/G/GA/GAAS/URI-1.60.tar.gz;
       sha256 = "0xr31mf7lfrwhyvlx4pzp6p7alls5gi4bj8pk5g89f5cckfd74hz";

From 744e06b4c3f6bcfe76dba9ca064c9d07bd1050b4 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:29:40 +0300
Subject: [PATCH 126/439] python-colorama: fix name

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 55059c111ef0..87e0201b5e9a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -758,7 +758,7 @@ pythonPackages = python.modules // rec {
 
 
   colorama = buildPythonPackage rec {
-    name = "clientform-0.2.10";
+    name = "colorama-0.2.5";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/c/colorama/colorama-0.2.5.tar.gz";

From 88a2e70184b02d2c0e4ff4979f5ec8e3481b6283 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:30:23 +0300
Subject: [PATCH 127/439] python-paramiko: fix version to match tarball

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 87e0201b5e9a..e4ff3b6968a3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3211,7 +3211,7 @@ pythonPackages = python.modules // rec {
   };
 
   paramiko = buildPythonPackage rec {
-    name = "paramiko-1.10";
+    name = "paramiko-1.10.1";
 
     src = fetchurl {
       url = https://pypi.python.org/packages/source/p/paramiko/paramiko-1.10.1.tar.gz;

From 366dfa988317660517dd83a45cc611e5a6e7d6f8 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:31:28 +0300
Subject: [PATCH 128/439] python-twisted: fix version to match tarball

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e4ff3b6968a3..d080e913399c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5134,7 +5134,7 @@ pythonPackages = python.modules // rec {
   });
 
   twisted = buildPythonPackage rec {
-    name = "twisted-12.3.0";
+    name = "twisted-10.2.0";
 
     src = fetchurl {
       url = http://tmrc.mit.edu/mirror/twisted/Twisted/10.2/Twisted-10.2.0.tar.bz2;

From 649dd8377ec85928cd93fb6cf37ef48f39daa7c2 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:33:06 +0300
Subject: [PATCH 129/439] perl-net-amazon-s3-policy: fix version to match
 tarball

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 307e277a2b1c..64f677093b32 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4790,7 +4790,7 @@ rec {
   };
 
   NetAmazonS3Policy = buildPerlPackage {
-    name = "Net-Amazon-S3-Policy-0.001002";
+    name = "Net-Amazon-S3-Policy-0.1.2";
     src = fetchurl {
       url = mirror://cpan/authors/id/P/PO/POLETTIX/Net-Amazon-S3-Policy-0.1.2.tar.gz;
       sha256 = "1kkzimvxwxx0mypf75dalksxmvwsb8b575yx2nzmvjkvjg3j9na0";

From b53f429c6cfea2eae58bfa2c4b4ac9ae16f21f7c Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:34:53 +0300
Subject: [PATCH 130/439] rapidvn: fix version to match tarball

---
 pkgs/applications/version-management/rapidsvn/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix
index 3a22338ed7e4..264340b48262 100644
--- a/pkgs/applications/version-management/rapidsvn/default.nix
+++ b/pkgs/applications/version-management/rapidsvn/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python}:
 
 stdenv.mkDerivation {
-  name = "rapidsvn-0.12";
+  name = "rapidsvn-0.12.0-1";
 
   src = fetchurl {
     url = http://www.rapidsvn.org/download/release/0.12/rapidsvn-0.12.0-1.tar.gz;

From f61a4118d03a14010c399854fc962a0d16457c90 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:36:41 +0300
Subject: [PATCH 131/439] renameutils: fix version to match tarball

---
 pkgs/tools/misc/renameutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix
index 6d4793a4aab5..527dbe858138 100644
--- a/pkgs/tools/misc/renameutils/default.nix
+++ b/pkgs/tools/misc/renameutils/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, readline}:
 
 stdenv.mkDerivation {
-  name = "renameutils-0.12";
+  name = "renameutils-0.12.0";
 
   src = fetchurl {
     url = mirror://savannah/renameutils/renameutils-0.12.0.tar.gz;

From d614ae9959982414beddd0b2e21b7a3222ec2f23 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:39:00 +0300
Subject: [PATCH 132/439] sylpheed: fix version to match tarball

---
 pkgs/applications/networking/mailreaders/sylpheed/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index bf9e19642b83..31e65a857df6 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -11,7 +11,7 @@ assert sslSupport -> openssl != null;
 assert gpgSupport -> gpgme != null;
 
 stdenv.mkDerivation {
-  name = "sylpheed-3.2";
+  name = "sylpheed-3.2.0";
 
   src = fetchurl {
     url = http://sylpheed.sraoss.jp/sylpheed/v3.2/sylpheed-3.2.0.tar.bz2;

From bbd631250dda231527fc0c8f7dcaa0a73c7900ab Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:42:17 +0300
Subject: [PATCH 133/439] ucl: fix version to match tarball

---
 pkgs/development/libraries/ucl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix
index e9739d44bca4..cef853698a8e 100644
--- a/pkgs/development/libraries/ucl/default.nix
+++ b/pkgs/development/libraries/ucl/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "ucl-1.0.3";
+  name = "ucl-1.03";
   src = fetchurl {
     url = http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz;
     sha256 = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348";

From 9afe9c9c53430e321d3008dd66a8d210003042f3 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:44:33 +0300
Subject: [PATCH 134/439] uw-imap: fix version to match tarball

---
 pkgs/tools/networking/uwimap/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix
index be3153ba2814..5ffeb53dd29e 100644
--- a/pkgs/tools/networking/uwimap/default.nix
+++ b/pkgs/tools/networking/uwimap/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, pam, openssl}:
 
 stdenv.mkDerivation {
-  name = "uw-imap-2007";
+  name = "uw-imap-2007f";
 
   src = fetchurl {
     url = "ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz";

From 1d07e3ef7771eaf83b15cc32a2578b0c375557b6 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:46:54 +0300
Subject: [PATCH 135/439] wmii: fix version to match tarball

---
 pkgs/applications/window-managers/wmii/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix
index 3df24cf33603..a44c54f7b575 100644
--- a/pkgs/applications/window-managers/wmii/default.nix
+++ b/pkgs/applications/window-managers/wmii/default.nix
@@ -1,5 +1,5 @@
 args: with args; stdenv.mkDerivation {
-  name = "wmii-20071116";
+  name = "wmii-3.6";
 
   src = fetchurl {
     url = http://dl.suckless.org/wmii/wmii-3.6.tar.gz;

From 58988f332508b8463cd0606acb8e11432def9724 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 13 Jul 2013 23:58:14 +0300
Subject: [PATCH 136/439] python-rhpl: fix mirror. unfortunately can't use
 mirror://fedora for this because this is a very old package which isn't
 hosted by all the mirrors.

---
 pkgs/development/python-modules/rhpl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix
index 7b33932492b9..92330a378c89 100644
--- a/pkgs/development/python-modules/rhpl/default.nix
+++ b/pkgs/development/python-modules/rhpl/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "rhpl-0.218";
   
   src = fetchurl {
-    url = http://ftp.stw-bonn.de/pub/fedora/linux/releases/10/Everything/source/SRPMS/rhpl-0.218-1.src.rpm;
+    url = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/releases/10/Everything/source/SRPMS//rhpl-0.218-1.src.rpm;
     md5 = "a72c6b66df782ca1d4950959d2aad292";
   };
   

From 567b74b5d3c581296bd55929f8a0ef160e6aeb9f Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 14 Jul 2013 00:11:40 +0300
Subject: [PATCH 137/439] vmime: indicate that this is a pre-release version

---
 pkgs/development/libraries/vmime/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix
index 24234469fa2f..c92df5a8bcb4 100644
--- a/pkgs/development/libraries/vmime/default.nix
+++ b/pkgs/development/libraries/vmime/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, gsasl, gnutls, pkgconfig, zlib, libtasn1, libgcrypt }:
 
 stdenv.mkDerivation {
-  name = "vmime-0.9.2svn";
+  name = "vmime-0.9.2-pre-svn603";
   src = fetchurl {
     url = http://download.zarafa.com/community/final/7.0/7.0.5-31880/sourcecode/libvmime-0.9.2+svn603.tar.bz2;
     #url = mirror://sourceforge/vmime/libvmime-0.9.1.tar.bz2;

From d078f07f4c551ac6de1ec540169ac08e4094caea Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 14 Jul 2013 00:14:07 +0300
Subject: [PATCH 138/439] strategoxt.java-front: fix version to match tarball

---
 pkgs/development/compilers/strategoxt/0.18.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/strategoxt/0.18.nix b/pkgs/development/compilers/strategoxt/0.18.nix
index 83ee5f3b06e9..7e58c561739f 100644
--- a/pkgs/development/compilers/strategoxt/0.18.nix
+++ b/pkgs/development/compilers/strategoxt/0.18.nix
@@ -59,7 +59,7 @@ rec {
   };
 
   javafront = stdenv.mkDerivation (rec {
-    name = "java-front-0.9.1";
+    name = "java-front-0.9.1pre20122";
 
     src = fetchurl {
       url = "http://hydra.nixos.org/build/766286/download/1/java-front-0.9.1pre20122.tar.gz";

From 297a56149188d0cb4452a7e4afc9fb49fe3ab693 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 14 Jul 2013 00:19:20 +0300
Subject: [PATCH 139/439] eduke32: fix version to match tarball

---
 pkgs/games/eduke32/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index b8a215e3b49c..4f1b126ac47e 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, SDL, SDL_mixer, libvorbis, mesa, gtk, pkgconfig, nasm, libvpx, flac, makeDesktopItem}:
 
 stdenv.mkDerivation rec {
-  name = "eduke32-3542";
+  name = "eduke32-20130303-3542";
   
   src = fetchurl {
     url = http://dukeworld.duke4.net/eduke32/synthesis/20130303-3542/eduke32_src_20130303-3542.tar.bz2;

From 4c952c64de901a9beb52dd09f3be09e596a05e85 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 14 Jul 2013 00:23:46 +0300
Subject: [PATCH 140/439] eggdrop: fix version to match tarball

---
 pkgs/tools/networking/eggdrop/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix
index 8649eda4bf71..13efc944bd04 100644
--- a/pkgs/tools/networking/eggdrop/default.nix
+++ b/pkgs/tools/networking/eggdrop/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, tcl}:
 
 stdenv.mkDerivation {
-  name = "eggdrop-1.6.19";
+  name = "eggdrop-1.6.19+ctcpfix";
 
   src = fetchurl {
     url = ftp://ftp.eggheads.org/pub/eggdrop/GNU/1.6/eggdrop1.6.19+ctcpfix.tar.gz;

From 0f99aace031aec27fbd874473bc1bbe6ad7571c4 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 14 Jul 2013 00:38:34 +0300
Subject: [PATCH 141/439] ssreflect: fix url

---
 pkgs/applications/science/logic/ssreflect/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/ssreflect/default.nix b/pkgs/applications/science/logic/ssreflect/default.nix
index 764954f54f8f..ba831cc62f51 100644
--- a/pkgs/applications/science/logic/ssreflect/default.nix
+++ b/pkgs/applications/science/logic/ssreflect/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "${webpage}/${name}-coq8.4.tar.gz";
+    url = "https://gforge.inria.fr/frs/download.php/31453/${name}-coq8.4.tar.gz";
     sha256 = "1ysx29xw09i86lq0d92z9cnyx133jfgq4qddy3501000fn7xwi7h";
   };
 

From d3f53cdde47ef962a4bf6f439d45234d25c6fa95 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 14 Jul 2013 00:48:06 +0300
Subject: [PATCH 142/439] alchemy: fix version to match tarball

---
 pkgs/applications/graphics/alchemy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix
index 2f31b568e34c..6a212a7a931d 100644
--- a/pkgs/applications/graphics/alchemy/default.nix
+++ b/pkgs/applications/graphics/alchemy/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, jre}:
 
 stdenv.mkDerivation {
-  name = "alchemy-007-alpha";
+  name = "alchemy-007";
   enableParallelBuilding = true;
 
   src = fetchurl {

From 075796e0531506fa106be1d2f47a9c866b70b99c Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 14 Jul 2013 01:11:27 +0300
Subject: [PATCH 143/439] aspell dictionaries: update where possible and try to
 make it easier to automatically parse versions

---
 .../libraries/aspell/dictionaries.nix         | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index c2aefd64c797..100960ef8e88 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -29,43 +29,43 @@ let
 in {
 
   de = buildDict {
-    shortName = "de-20030222_1";
+    shortName = "de-20120607";
     fullName = "German";
     src = fetchurl {
-      url = mirror://gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2;
-      sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s";
+      url = https://www.j3e.de/ispell/igerman98/dict/igerman98-20120607.tar.bz2;
+      sha256 = "1m9jzxwrh0hwsrjs6l98v88miia45y643nbayzjjria2harq7yy5";
     };
   };
     
   en = buildDict {
-    shortName = "en-6.0_0";
+    shortName = "en-7.1-0";
     fullName = "English";
     src = fetchurl {
-      url = mirror://gnu/aspell/dict/en/aspell6-en-6.0-0.tar.bz2;
-      sha256 = "1628rrx1yq9jmnd86sr24vih101smb818vf10vx97f6j263niw14";
+      url = mirror://gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2;
+      sha256 = "02ldfiny4iakgfgy4sdrzjqdzi7l1rmb6y30lv31kfy5x31g77gz";
     };
   };
     
   es = buildDict {
-    shortName = "es-0.50_2";
+    shortName = "es-1.11-2";
     fullName = "Spanish";
     src = fetchurl {
-      url = mirror://gnu/aspell/dict/es/aspell-es-0.50-2.tar.bz2;
-      sha256 = "0i96xswcng35n5zhgpiswmi5sdpx63kl8bg7fl1zp5j1shr2l3jw";
+      url = mirror://gnu/aspell/dict/es/aspell6-es-1.11-2.tar.bz2;
+      sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd";
     };
   };
     
   eo = buildDict {
-    shortName = "eo-0.50_2";
+    shortName = "eo-2.1.20000225a-2";
     fullName = "Esperanto";
     src = fetchurl {
-      url = mirror://gnu/aspell/dict/eo/aspell-eo-0.50-2.tar.bz2;
-      sha256 = "19vhdm599ng98nq8jxspgvanv5hwryp0qri1vx6zsjl0jx1acqbc";
+      url = mirror://gnu/aspell/dict/eo/aspell6-eo-2.1.20000225a-2.tar.bz2;
+      sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1";
     };
   };
 
   fr = buildDict {
-    shortName = "fr-0.50_3";
+    shortName = "fr-0.50-3";
     fullName = "French";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/fr/aspell-fr-0.50-3.tar.bz2;
@@ -74,16 +74,16 @@ in {
   };
     
   it = buildDict {
-    shortName = "it-0.53_0";
+    shortName = "it-2.2_20050523-0";
     fullName = "Italian";
     src = fetchurl {
-      url = mirror://gnu/aspell/dict/it/aspell-it-0.53-0.tar.bz2;
-      sha256 = "0vzs2mk0h2znx0jjs5lqiwdrc4nf6v3f8xbrsni8pfnxhh5ik1rv";
+      url = mirror://gnu/aspell/dict/it/aspell6-it-2.2_20050523-0.tar.bz2;
+      sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v";
     };
   };
     
   la = buildDict {
-    shortName = "la-20020503_0";
+    shortName = "la-20020503-0";
     fullName = "Latin";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2;
@@ -92,7 +92,7 @@ in {
   };
     
   nl = buildDict {
-    shortName = "nl-0.50_2";
+    shortName = "nl-0.50-2";
     fullName = "Dutch";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/nl/aspell-nl-0.50-2.tar.bz2;
@@ -105,7 +105,7 @@ in {
   };
     
   pl = buildDict {
-    shortName = "pl-6.0_20061121_0";
+    shortName = "pl-6.0_20061121-0";
     fullName = "Polish";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/pl/aspell6-pl-6.0_20061121-0.tar.bz2;
@@ -114,7 +114,7 @@ in {
   };
      
   ru = buildDict {
-    shortName = "ru-0.99f7_1";
+    shortName = "ru-0.99f7-1";
     fullName = "Russian";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2;

From 22e62bc467042fb56a9bfb0c9d4409665ba72d59 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 14 Jul 2013 01:29:50 +0300
Subject: [PATCH 144/439] seg3d: fix version to match tarball

---
 pkgs/applications/graphics/seg3d/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix
index 7cca0c8f8abb..23a2d23b1ae1 100644
--- a/pkgs/applications/graphics/seg3d/default.nix
+++ b/pkgs/applications/graphics/seg3d/default.nix
@@ -4,7 +4,7 @@ libuuid }:
 assert (stdenv ? glibc);
 
 stdenv.mkDerivation {
-  name = "seg3d-1.12";
+  name = "seg3d-1.12_20090930";
   src = fetchurl {
     url = http://www.sci.utah.edu/releases/seg3d_v1.12/Seg3D_1.12_20090930_source.tgz;
     sha256 = "1wr6rc6v5qjjkmws8yrc03z35h3iydxk1z28p06v1wdnca0y71z8";

From bb48cab77745a1337540961dabd7cbf41bfe50ca Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 14 Jul 2013 02:08:03 +0300
Subject: [PATCH 145/439] Fix licenses. My fixes were more carefully checked
 against sources and home page license claims :)

---
 pkgs/development/libraries/audiofile/default.nix       | 2 +-
 pkgs/development/libraries/pangomm/2.28.x.nix          | 2 +-
 pkgs/development/libraries/xvidcore/default.nix        | 2 +-
 pkgs/development/python-modules/python-sip/default.nix | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index 57ca21885dd8..2f4de88c94c2 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A library for reading and writing audio files in various formats";
     homepage    = http://www.68k.org/~michael/audiofile/; 
-    license     = licenses.lgpl21;
+    license     = licenses.lgpl21Plus;
     maintainers = with maintainers; [ lovek323 shlevy ];
     platforms   = platforms.unix;
   };
diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix
index 411b969cb242..d03aa4311fe0 100644
--- a/pkgs/development/libraries/pangomm/2.28.x.nix
+++ b/pkgs/development/libraries/pangomm/2.28.x.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "C++ interface to the Pango text rendering library";
     homepage    = http://www.pango.org/;
-    license     = licenses.lgpl2Plus;
+    license     = with licenses; [ lgpl2 lgpl21 ];
     maintainers = with maintainers; [ lovek323 raskin ];
     platforms   = platforms.unix;
 
diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix
index b4d44be17386..fd5efdcc3d1b 100644
--- a/pkgs/development/libraries/xvidcore/default.nix
+++ b/pkgs/development/libraries/xvidcore/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "MPEG-4 video codec for PC";
     homepage    = http://www.xvid.org/;
-    license     = licenses.gpl2Plus;
+    license     = licenses.gpl2;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.all;
   };
diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix
index 076cba1fad29..6d79cf53a6b5 100644
--- a/pkgs/development/python-modules/python-sip/default.nix
+++ b/pkgs/development/python-modules/python-sip/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   
   meta = with stdenv.lib; {
     description = "Creates C++ bindings for Python modules";
-    license     = licenses.gpl3Plus;
+    license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ lovek323 sander urkud ];
     platforms   = platforms.all;
   };

From aa85b804595660a541e727632f0cdc86b0779fe6 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 14 Jul 2013 02:35:26 +0300
Subject: [PATCH 146/439] Change package urls to use mirror://sourceforge

---
 pkgs/applications/editors/emacs-modes/bbdb/default.nix | 1 +
 pkgs/os-specific/linux/lxc/default.nix                 | 2 +-
 pkgs/tools/networking/aria/default.nix                 | 2 +-
 pkgs/tools/security/bmrsa/11.nix                       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
index ec7a3e8e6002..da92c38d0780 100644
--- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix
+++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
@@ -4,6 +4,7 @@ stdenv.mkDerivation {
   name = "bbdb-2.35";
 
   src = fetchurl {
+    # not using mirror:// because it produces a different file
     url = http://bbdb.sourceforge.net/bbdb-2.35.tar.gz;
     sha256 = "3fb1316e2ed74d47ca61187fada550e58797467bd9e8ad67343ed16da769f916";
   };
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index c2a9deaa11f2..c1dec8b926a3 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "lxc-0.9.0";
 
   src = fetchurl {
-    url = "http://lxc.sf.net/download/lxc/${name}.tar.gz";
+    url = "mirror://sourceforge/lxc/${name}.tar.gz";
     sha256 = "0821clxymkgp71n720xj5ngs22s2v8jks68f5j4vypycwvm6f5qy";
   };
 
diff --git a/pkgs/tools/networking/aria/default.nix b/pkgs/tools/networking/aria/default.nix
index 120e32ab29cc..4f58463ecf93 100644
--- a/pkgs/tools/networking/aria/default.nix
+++ b/pkgs/tools/networking/aria/default.nix
@@ -4,7 +4,7 @@ let version="0.14.0"; in
 rec {
   src = /* Here a fetchurl expression goes */
   fetchurl {
-    url = "http://downloads.sourceforge.net/aria2/aria2c-${version}.tar.bz2";
+    url = "mirror://sourceforge/aria2/aria2c-${version}.tar.bz2";
     sha256 = "0d6vpy7f4228byahsg4dlhalfkbscx941klhdlxd0y5c3mxxwkfr";
   };
 
diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix
index 3200d27c004b..5d6eaf551734 100644
--- a/pkgs/tools/security/bmrsa/11.nix
+++ b/pkgs/tools/security/bmrsa/11.nix
@@ -11,7 +11,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://prdownloads.sourceforge.net/sourceforge/bmrsa/bmrsa${version}.zip";
+    url = "mirror://sourceforge/bmrsa/bmrsa${version}.zip";
     sha256 = "0ksd9xkvm9lkvj4yl5sl0zmydp1wn3xhc55b28gj70gi4k75kcl4";
   };
 

From 5ae43d2494ad18f06278f79c49cd3c5f25524aaa Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 14 Jul 2013 02:48:32 +0300
Subject: [PATCH 147/439] Change more packages from direct downloads to
 mirror://sourceforge

---
 pkgs/applications/audio/csound/default.nix                      | 2 +-
 pkgs/applications/editors/bvi/default.nix                       | 2 +-
 .../networking/instant-messengers/carrier/2.5.0.nix             | 2 +-
 pkgs/applications/science/geometry/drgeo/default.nix            | 2 +-
 pkgs/development/libraries/ctl/default.nix                      | 2 +-
 pkgs/tools/graphics/dmtx/default.nix                            | 2 +-
 pkgs/tools/security/clamav/default.nix                          | 2 +-
 pkgs/tools/text/cheetah-template/2.0.1.nix                      | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index 5e3d056f4989..34e98ae620db 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = http://netcologne.dl.sourceforge.net/project/csound/csound5/csound5.18/Csound5.18.02.tar.gz;
+    url = mirror://sourceforge/csound/Csound5.18.02.tar.gz;
     sha256 = "4c461cf3bf60b83671224949dd33805379b7121bf2c0ad6af5e191e7f6f8adc8";
   };
 
diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix
index 4dfe3a204d38..84b810bf4602 100644
--- a/pkgs/applications/editors/bvi/default.nix
+++ b/pkgs/applications/editors/bvi/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "bvi-1.3.2";
 
   src = fetchurl {
-    url = http://prdownloads.sourceforge.net/bvi/bvi-1.3.2.src.tar.gz;
+    url = mirror://sourceforge/bvi/bvi-1.3.2.src.tar.gz;
     sha256 = "110wxqnyianqamxq4y53drqqxb9vp4k2fcvic45qggvlqkqhlfgz";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
index 8bb28f7ce000..9cf2558ef320 100644
--- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
+++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
@@ -9,7 +9,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = http://downloads.sourceforge.net/funpidgin/carrier-2.5.0.tar.bz2;
+    url = mirror://sourceforge/funpidgin/carrier-2.5.0.tar.bz2;
     sha256 = "0m80s7hnvz5vc2dy3xiy1zfb6incmb7p28zahzxdif2vz44riz28";
   };
 
diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix
index 2b10ec238c90..c18a6ed7426c 100644
--- a/pkgs/applications/science/geometry/drgeo/default.nix
+++ b/pkgs/applications/science/geometry/drgeo/default.nix
@@ -2,7 +2,7 @@ args : with args;
 let version = lib.attrByPath ["version"] "1.1.0" args; in
 rec {
   src = fetchurl {
-    url = http://downloads.sourceforge.net/ofset/drgeo-1.1.0.tar.gz;
+    url = mirror://sourceforge/ofset/drgeo-1.1.0.tar.gz;
     sha256 = "05i2czgzhpzi80xxghinvkyqx4ym0gm9f38fz53idjhigiivp4wc";
   };
 
diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix
index 950fe1baf089..a802f5716746 100644
--- a/pkgs/development/libraries/ctl/default.nix
+++ b/pkgs/development/libraries/ctl/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ctl-1.4.1";
 
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/ampasctl/ctl-1.4.1.tar.gz;
+    url = mirror://sourceforge/ampasctl/ctl-1.4.1.tar.gz;
     sha256 = "16lzgbpxdyhykdwndj1i9vx3h4bfkxqqcrvasvgg70gb5raxj0mj";
   };
 
diff --git a/pkgs/tools/graphics/dmtx/default.nix b/pkgs/tools/graphics/dmtx/default.nix
index ae3a227a4fe0..29c6b5ebf795 100644
--- a/pkgs/tools/graphics/dmtx/default.nix
+++ b/pkgs/tools/graphics/dmtx/default.nix
@@ -12,7 +12,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://prdownloads.sourceforge.net/libdmtx/libdmtx-${version}.tar.bz2";
+    url = "mirror://sourceforge/libdmtx/libdmtx-${version}.tar.bz2";
     sha256 = "0iin2j3ad7ldj32dwc04g28k54iv3lrc5121rgyphm7l9hvigbvk";
   };
 
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index bccf0cc77c5b..cb32085a8cfe 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   version = "0.97.5";
 
   src = fetchurl {
-    url = "http://tenet.dl.sourceforge.net/project/clamav/clamav/${version}/clamav-${version}.tar.gz";
+    url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz";
     sha256 = "039wm64wl2sx7k019g5ll5dkdlsq64fnd0ng0s00pjn8bqd5wv6v";
   };
 
diff --git a/pkgs/tools/text/cheetah-template/2.0.1.nix b/pkgs/tools/text/cheetah-template/2.0.1.nix
index c20f5db97984..0bfa72ca00d5 100644
--- a/pkgs/tools/text/cheetah-template/2.0.1.nix
+++ b/pkgs/tools/text/cheetah-template/2.0.1.nix
@@ -1,7 +1,7 @@
 args : with args; 
 rec {
   src = fetchurl {
-    url = http://downloads.sourceforge.net/cheetahtemplate/Cheetah-2.0.1.tar.gz;
+    url = mirror://sourceforge/cheetahtemplate/Cheetah-2.0.1.tar.gz;
     sha256 = "134k4s5f116k23vb7wf9bynlx3gf0wwl7y0zp9ciz0q66nh1idkh";
   };
 

From d0b4c8bfaa97c299acf9dfa2dfe710ecf00d8eb9 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 14 Jul 2013 03:09:34 +0300
Subject: [PATCH 148/439] gktspell: version bump to 2.0.16 because the old one
 has disappeared

---
 pkgs/applications/graphics/gimp/plugins/default.nix      | 2 +-
 pkgs/applications/misc/gmrun/default.nix                 | 4 ++--
 pkgs/applications/science/misc/golly/src-for-default.nix | 2 +-
 pkgs/development/compilers/fpc/default.nix               | 2 +-
 pkgs/development/libraries/faac/default.nix              | 2 +-
 pkgs/development/libraries/gtkspell/default.nix          | 6 +++---
 pkgs/games/extremetuxracer/default.nix                   | 2 +-
 pkgs/os-specific/linux/e1000e/default.nix                | 2 +-
 pkgs/os-specific/linux/frandom/default.nix               | 2 +-
 pkgs/tools/filesystems/extundelete/default.nix           | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 962cb387c736..bdb4fa631f0d 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -148,7 +148,7 @@ rec {
       name = "gmic-1.3.2.0";
       buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.nativeBuildInputs;
       src = fetchurl {
-        url = http://dfn.dl.sourceforge.net/sourceforge/gmic/gmic_1.3.2.0.tar.gz;
+        url = mirror://sourceforge/gmic/gmic_1.3.2.0.tar.gz;
         sha256 = "0mxq664vzzc2l6k6sqm9syp34mihhi262i6fixk1g12lmc28797h";
       };
       preConfigure = ''
diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix
index 930df87214ad..0b19eef3c8ca 100644
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/pkgs/applications/misc/gmrun/default.nix
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
   name = "gmrun-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/gmrun/gmrun/${version}/${name}.tar.gz";
-    md5 = "6cef37a968006d9496fc56a7099c603c";
+    url = "mirror://sourceforge/gmrun/${name}.tar.gz";
+    sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p";
   };
 
   buildInputs = [ glib gtk2 pkgconfig popt ];
diff --git a/pkgs/applications/science/misc/golly/src-for-default.nix b/pkgs/applications/science/misc/golly/src-for-default.nix
index 23742ac90407..331c63aa1803 100644
--- a/pkgs/applications/science/misc/golly/src-for-default.nix
+++ b/pkgs/applications/science/misc/golly/src-for-default.nix
@@ -2,7 +2,7 @@ rec {
    version="2.4";
    name="golly-2.4-src";
    hash="06vajm019q4q4wfy6pc1669fbjqdb4jaxcc419bk0vzky40anl9w";
-   url="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz";
+   url="mirror://sourceforge/golly/golly-2.4-src.tar.gz";
    advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz";
   
   
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index e87dd88bf0d8..6be976783bcd 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "fpc-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/sourceforge/freepascal/Source/${version}/fpcbuild-${version}.tar.gz";
+    url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz";
     sha256 = "1vxy2y8pm0ribhpdhqlwwz696ncnz4rk2dafbn1mjgipm97qb26p";
   };
 
diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix
index 732b591353c8..8e79afb5f9ef 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "faac-1.28";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/faac/${name}.tar.gz";
+    url = "mirror://sourceforge/faac/${name}.tar.gz";
     sha256 = "1pqr7nf6p2r283n0yby2czd3iy159gz8rfinkis7vcfgyjci2565";
   };
 
diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix
index 46e1bba488a5..017c5be403af 100644
--- a/pkgs/development/libraries/gtkspell/default.nix
+++ b/pkgs/development/libraries/gtkspell/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, gtk, aspell, pkgconfig}:
 
 stdenv.mkDerivation {
-  name = "gtkspell-2.0.11";
+  name = "gtkspell-2.0.16";
   
   src = fetchurl {
-    url = http://gtkspell.sourceforge.net/download/gtkspell-2.0.11.tar.gz;
-    md5 = "494869f67146a12a3f17a958f51aeb05";
+    url = mirror://sourceforge/gtkspell/gtkspell-2.0.16.tar.gz;
+    sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg";
   };
   
   buildInputs = [aspell pkgconfig gtk];
diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix
index db24a6d1ebf0..898334a1d4ab 100644
--- a/pkgs/games/extremetuxracer/default.nix
+++ b/pkgs/games/extremetuxracer/default.nix
@@ -12,7 +12,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-${version}.tar.gz";
+    url = "mirror://sourceforge/extremetuxracer/extremetuxracer-${version}.tar.gz";
     sha256 = "04d99fsfna5mc9apjxsiyw0zgnswy33kwmm1s9d03ihw6rba2zxs";
   };
 
diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix
index 8d1320afc681..e1abeea49b70 100644
--- a/pkgs/os-specific/linux/e1000e/default.nix
+++ b/pkgs/os-specific/linux/e1000e/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "e1000e-1.5.1-${kernelDev.version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/e1000/e1000e-1.5.1.tar.gz";
+    url = "mirror://sourceforge/e1000/e1000e-1.5.1.tar.gz";
     sha256 = "0nzjlarpqcpm5y112n3vzra4qv32hiygpfkk10y8g4nln4adhqsw";
   };
 
diff --git a/pkgs/os-specific/linux/frandom/default.nix b/pkgs/os-specific/linux/frandom/default.nix
index 10876e96fc82..a28ba527218e 100644
--- a/pkgs/os-specific/linux/frandom/default.nix
+++ b/pkgs/os-specific/linux/frandom/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "${baseName}-${kernelDev.version}";
 
   src = fetchurl {
-    url = "http://sourceforge.net/projects/frandom/files/${baseName}.tar.gz";
+    url = "mirror://sourceforge/frandom/${baseName}.tar.gz";
     sha256 = "15rgyk4hfawqg7z1spk2xlk1nn6rcdls8gdhc70f91shrc9pvlls";
   };
 
diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix
index 16ad17aa2438..3d8fa0827ca4 100644
--- a/pkgs/tools/filesystems/extundelete/default.nix
+++ b/pkgs/tools/filesystems/extundelete/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "extundelete-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/extundelete/extundelete/0.2.4/extundelete-0.2.4.tar.bz2";
+    url = "mirror://sourceforge/extundelete/extundelete-0.2.4.tar.bz2";
     sha256 = "1x0r7ylxlp9lbj3d7sqf6j2a222dwy2nfpff05jd6mkh4ihxvyd1";
   };
 

From cea107c07fce8d577c05f177df83c6883cbec75f Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 14 Jul 2013 03:31:12 +0300
Subject: [PATCH 149/439] More mirror:// URL fixes

---
 pkgs/applications/video/kino/default.nix            | 2 +-
 pkgs/data/fonts/junicode/default.nix                | 2 +-
 pkgs/development/libraries/libvncserver/default.nix | 2 +-
 pkgs/os-specific/linux/ndiswrapper/default.nix      | 2 +-
 pkgs/tools/filesystems/jfsrec/default.nix           | 2 +-
 pkgs/tools/misc/mdbtools/default.nix                | 2 +-
 pkgs/tools/networking/iperf/default.nix             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix
index 696c1e4738c3..30e0bdfb197a 100644
--- a/pkgs/applications/video/kino/default.nix
+++ b/pkgs/applications/video/kino/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
   name = "kino-1.3.4";
 
   src = fetchurl {
-    url = http://downloads.sourceforge.net/kino/kino-1.3.4.tar.gz;
+    url = mirror://sourceforge/kino/kino-1.3.4.tar.gz;
     sha256 = "020s05k0ma83rq2kfs8x474pqicaqp9spar81qc816ddfrnh8k8i";
   };
 
diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix
index 1690f82aa37d..ea579a589c47 100644
--- a/pkgs/data/fonts/junicode/default.nix
+++ b/pkgs/data/fonts/junicode/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "junicode-0.6.15";
 
   src = fetchurl {
-    url = http://prdownloads.sourceforge.net/junicode/junicode-0.6.15.zip;
+    url = mirror://sourceforge/junicode/junicode-0.6.15.zip;
     sha256 = "0p16r5s6qwyz0hayb6k61s5r2sfachlx7r6gpqqx5myx6ipbfdns";
   };
 
diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix
index 65a8880fc9d5..7856183e5e9b 100644
--- a/pkgs/development/libraries/libvncserver/default.nix
+++ b/pkgs/development/libraries/libvncserver/default.nix
@@ -12,7 +12,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/libvncserver/LibVNCServer-${version}.tar.gz";
+    url = "mirror://sourceforge/libvncserver/LibVNCServer-${version}.tar.gz";
     sha256 = "1y83z31wbjivbxs60kj8a8mmjmdkgxlvr2x15yz95yy24lshs1ng";
   };
 
diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix
index 109faac97c5e..e2db1a4106ba 100644
--- a/pkgs/os-specific/linux/ndiswrapper/default.nix
+++ b/pkgs/os-specific/linux/ndiswrapper/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   # should we use unstable? 
   src = fetchurl {
-    url = http://downloads.sourceforge.net/ndiswrapper/ndiswrapper-1.56.tar.gz;
+    url = mirror://sourceforge/ndiswrapper/ndiswrapper-1.56.tar.gz;
     sha256 = "10yqg1a08v6z1qm1qr1v4rbhl35c90gzrazapr09vp372hky8f57";
   };
 
diff --git a/pkgs/tools/filesystems/jfsrec/default.nix b/pkgs/tools/filesystems/jfsrec/default.nix
index 91060795e7cd..fb5b72d714af 100644
--- a/pkgs/tools/filesystems/jfsrec/default.nix
+++ b/pkgs/tools/filesystems/jfsrec/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "jfsrec-pre-svn-7";
   
   src = fetchurl {
-    url = http://downloads.sourceforge.net/jfsrec/jfsrec-svn-7.tar.gz;
+    url = mirror://sourceforge/jfsrec/jfsrec-svn-7.tar.gz;
     sha256 = "163z6ljr05vw2k5mj4fim2nlg4khjyibrii95370pvn474mg28vg";
   };
 
diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix
index 9b1968c6fd1f..ee9dc4f28b60 100644
--- a/pkgs/tools/misc/mdbtools/default.nix
+++ b/pkgs/tools/misc/mdbtools/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "mdbtools-0.6pre1";
 
   src = fetchurl {
-    url = http://prdownloads.sourceforge.net/mdbtools/mdbtools-0.6pre1.tar.gz;
+    url = mirror://sourceforge/mdbtools/mdbtools-0.6pre1.tar.gz;
     sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi";
   };
 
diff --git a/pkgs/tools/networking/iperf/default.nix b/pkgs/tools/networking/iperf/default.nix
index 1cb984e3d1c4..66f600f76784 100644
--- a/pkgs/tools/networking/iperf/default.nix
+++ b/pkgs/tools/networking/iperf/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "iperf-2.0.4";
 
   src = fetchurl {
-    url = http://garr.dl.sourceforge.net/sourceforge/iperf/iperf-2.0.4.tar.gz;
+    url = mirror://sourceforge/iperf/iperf-2.0.4.tar.gz;
     sha256 = "0i3r75prbyxs56rngjbrag8rg480ki3daaa924krrafng30z2liv";
   };
 

From b084b29d268d534464862860f81426274581c2e6 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 14 Jul 2013 04:17:07 +0300
Subject: [PATCH 150/439] Even more mirror:// fixes

---
 pkgs/applications/audio/snd/default.nix                     | 2 +-
 pkgs/applications/editors/emacs-modes/php/default.nix       | 2 +-
 .../emacs-modes/session-management-for-emacs/default.nix    | 3 +--
 pkgs/applications/graphics/gimp/plugins/default.nix         | 2 +-
 pkgs/applications/misc/rxvt/default.nix                     | 2 +-
 .../pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix         | 2 +-
 pkgs/data/fonts/wqy-zenhei/default.nix                      | 2 +-
 pkgs/development/compilers/yap/default.nix                  | 2 +-
 pkgs/development/libraries/ode/default.nix                  | 2 +-
 pkgs/development/libraries/openexr_ctl/default.nix          | 2 +-
 pkgs/development/python-modules/irclib/default.nix          | 2 +-
 pkgs/development/python-modules/xmpppy/default.nix          | 2 +-
 pkgs/development/tools/misc/openocd/default.nix             | 2 +-
 pkgs/os-specific/linux/firmware/zd1211/default.nix          | 2 +-
 pkgs/os-specific/linux/statifier/default.nix                | 2 +-
 pkgs/servers/rpcbind/default.nix                            | 2 +-
 pkgs/servers/sabnzbd/default.nix                            | 2 +-
 pkgs/servers/xmpp/pyIRCt/default.nix                        | 2 +-
 pkgs/tools/admin/webdruid/src-for-default.nix               | 2 +-
 pkgs/tools/backup/partimage/default.nix                     | 2 +-
 pkgs/tools/compression/upx/default.nix                      | 2 +-
 pkgs/tools/graphics/pstoedit/default.nix                    | 2 +-
 pkgs/tools/misc/ttf2pt1/default.nix                         | 2 +-
 pkgs/tools/networking/philter/default.nix                   | 2 +-
 pkgs/tools/security/pwgen/default.nix                       | 2 +-
 pkgs/tools/system/thinkfan/default.nix                      | 2 +-
 pkgs/top-level/python-packages.nix                          | 6 +++---
 27 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index c295767687f6..fe32aca029bc 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -27,7 +27,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/snd/snd-${version}.tar.gz";
+    url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
     sha256 = "0zqgfnkvkqxby1k74mwba1r4pb520glcsz5jjmpzm9m41nqnghmm";
   };
 
diff --git a/pkgs/applications/editors/emacs-modes/php/default.nix b/pkgs/applications/editors/emacs-modes/php/default.nix
index ec160dccd9fb..2b3cf7b29712 100644
--- a/pkgs/applications/editors/emacs-modes/php/default.nix
+++ b/pkgs/applications/editors/emacs-modes/php/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "php-mode-1.5.0";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/php-mode/${name}.tar.gz";
+    url = "mirror://sourceforge/php-mode/${name}.tar.gz";
     sha256 = "1bffgg4rpiggxqc1hvjcby24sfyzj5728zg7r6f4v6a126a7kcfq";
   };
 
diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
index 185bc20021e0..0d2fcf097863 100644
--- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
+++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
@@ -4,8 +4,7 @@ stdenv.mkDerivation rec {
   name = "session-management-for-emacs-2.2a";
   
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/emacs-session/session/2.2a/session-2.2a.tar.gz";
-#    url = "mirror://sourceforge.net/sourceforge/emacs-session/session-2.2a.tar.gz";
+    url = "mirror://sourceforge/emacs-session/session-2.2a.tar.gz";
     sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144";
   };
 
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index bdb4fa631f0d..d314d93ea4c3 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -107,7 +107,7 @@ rec {
     name = "texturize-2.1";
     buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
     src = fetchurl {
-      url = http://prdownloads.sourceforge.net/gimp-texturize/texturize-2.1_src.tgz;
+      url = mirror://sourceforge/gimp-texturize/texturize-2.1_src.tgz;
       sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3";
     };
     installPhase = "installPlugins src/texturize";
diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix
index 13597f3ee9bc..c3b5fc861a85 100644
--- a/pkgs/applications/misc/rxvt/default.nix
+++ b/pkgs/applications/misc/rxvt/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "rxvt-2.6.4";
 
   src = fetchurl {
-    url = http://downloads.sourceforge.net/rxvt/rxvt-2.6.4.tar.gz;
+    url = mirror://sourceforge/rxvt/rxvt-2.6.4.tar.gz;
     sha256 = "0hi29whjv8v11nkjbq1i6ms411v6csykghmlpkmayfjn9nxr02xg";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix
index 868b5dbb342b..7f7d5abccfda 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix
@@ -1,7 +1,7 @@
 args : with args; 
 rec {
   src = fetchurl {
-    url = http://mesh.dl.sourceforge.net/sourceforge/pidgin-latex/pidgin-latex-1.2.1.tar.bz2;
+    url = mirror://sourceforge/pidgin-latex/pidgin-latex-1.2.1.tar.bz2;
     sha256 = "19h76fwsx5y30l5wda2930k10r385aipngfljz5bdi7b9y52lii7";
   };
 
diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix
index 698ecc530462..960c74f68413 100644
--- a/pkgs/data/fonts/wqy-zenhei/default.nix
+++ b/pkgs/data/fonts/wqy-zenhei/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "wqy-zenhei-0.4.23-1";
 
   src = fetchurl {
-    url = http://prdownloads.sourceforge.net/wqy/wqy-zenhei-0.4.23-1.tar.gz;
+    url = mirror://sourceforge/wqy/wqy-zenhei-0.4.23-1.tar.gz;
     sha256 = "138nn81ai240av0xvcq4ab3rl73n0qlj3gwr3a36i63ry8vdj5qm";
   };
 
diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix
index 753c0f8ee778..f9a48468df31 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/pkgs/development/compilers/yap/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "yap-5.1.1";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/yap/Yap-5.1.1.tar.gz";
+    url = "mirror://sourceforge/yap/Yap-5.1.1.tar.gz";
     sha256 = "0bajxmlla9gay4m4l7y7x6qldxzi0jcq2ykgpjk9liky7g5kbnya";
   };
 
diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix
index 31b2aa7dad91..e7368e4f60bf 100644
--- a/pkgs/development/libraries/ode/default.nix
+++ b/pkgs/development/libraries/ode/default.nix
@@ -10,7 +10,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/opende/ode-${version}.tar.bz2";
+    url = "mirror://sourceforge/opende/ode-${version}.tar.bz2";
     sha256 = "1883gbsnn7zldrpwfdh6kwj20g627n5bspz3yb2z6lrxdal88y47";
   };
 
diff --git a/pkgs/development/libraries/openexr_ctl/default.nix b/pkgs/development/libraries/openexr_ctl/default.nix
index 1b15fdb6c9ed..cd26aae660c4 100644
--- a/pkgs/development/libraries/openexr_ctl/default.nix
+++ b/pkgs/development/libraries/openexr_ctl/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "openexr_ctl-1.0.1";
 
   src = fetchurl {
-    url = http://kent.dl.sourceforge.net/sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz;
+    url = mirror://sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz;
     sha256 = "1jg9smpaplal8l14djp184wzk11nwd3dvm4lhkp69kjgw8jdd21d";
   };
 
diff --git a/pkgs/development/python-modules/irclib/default.nix b/pkgs/development/python-modules/irclib/default.nix
index c840e0a10035..3e0eda34b17a 100644
--- a/pkgs/development/python-modules/irclib/default.nix
+++ b/pkgs/development/python-modules/irclib/default.nix
@@ -9,7 +9,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://prdownloads.sourceforge.net/sourceforge/python-irclib/python-irclib-${version}.tar.gz";
+    url = "mirror://sourceforge/python-irclib/python-irclib-${version}.tar.gz";
     sha256 = "1x5456y4rbxmnw4yblhb4as5791glcw394bm36px3x6l05j3mvl1";
   };
   patches = [(fetchurl {
diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix
index df5d37853f72..57b35ad91ed0 100644
--- a/pkgs/development/python-modules/xmpppy/default.nix
+++ b/pkgs/development/python-modules/xmpppy/default.nix
@@ -9,7 +9,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://prdownloads.sourceforge.net/sourceforge/xmpppy/xmpppy-${version}.tar.gz";
+    url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz";
     sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si";
   };
 
diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index c87bd9d55354..e0da284887cc 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.7.0";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/openocd/openocd/${version}/openocd-${version}.tar.bz2";
+    url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2";
     sha256 = "0qwfyd821sy5p0agz0ybgn5nd7vplipw4mhm485ldj1hcmw7n8sj";
   };
 
diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix
index a717bd9e1171..cb4466dc20f4 100644
--- a/pkgs/os-specific/linux/firmware/zd1211/default.nix
+++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   
   src = fetchurl {
-    url = "http://surfnet.dl.sourceforge.net/sourceforge/zd1211/${name}.tar.bz2";
+    url = "mirror://sourceforge/zd1211/${name}.tar.bz2";
     sha256 = "866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1";
   };
   
diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix
index 4e28dce1670c..b4e37a36ff52 100644
--- a/pkgs/os-specific/linux/statifier/default.nix
+++ b/pkgs/os-specific/linux/statifier/default.nix
@@ -9,7 +9,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://sourceforge.net/projects/statifier/files/statifier/statifier-${version}.tar.gz";
+    url = "mirror://sourceforge/statifier/statifier-${version}.tar.gz";
     sha256 = "0lhdbp7hc15nn6r31yxx7i993a5k8926n5r6j2gi2vvkmf1hciqf";
   };
 
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index 33965299a9b2..8d8a677647c2 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "rpcbind-0.2.0";
   
   src = fetchurl {
-    url = "http://freefr.dl.sourceforge.net/project/rpcbind/rpcbind/0.2.0/rpcbind-0.2.0.tar.bz2";
+    url = "mirror://sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2";
     sha256 = "c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497a00de3";
   };
 
diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index 50e07f273291..599f6ee31f3e 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sabnzbd-0.4.12";
   
   src = fetchurl {
-    url = http://mesh.dl.sourceforge.net/project/sabnzbdplus/sabnzbdplus/sabnzbd-0.4.12/SABnzbd-0.4.12-src.tar.gz;
+    url = mirro://sourceforge/sabnzbdplus/SABnzbd-0.4.12-src.tar.gz;
     sha256 = "35ce4172688925ef608fba433ff676357dab7d2abdc1cf83112a1c99682fdd32";
   };
 
diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix
index 27982601f73a..422ddd8c73d9 100644
--- a/pkgs/servers/xmpp/pyIRCt/default.nix
+++ b/pkgs/servers/xmpp/pyIRCt/default.nix
@@ -9,7 +9,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://prdownloads.sourceforge.net/sourceforge/xmpppy/irc-transport-${version}.tar.gz";
+    url = "mirror://sourceforge/xmpppy/irc-transport-${version}.tar.gz";
     sha256 = "0gbc0dvj1p3088b6x315yjrlwnc5vvzp0var36wlf9z60ghvk8yb";
   };
 
diff --git a/pkgs/tools/admin/webdruid/src-for-default.nix b/pkgs/tools/admin/webdruid/src-for-default.nix
index edc770a5fbb8..73102be6afe5 100644
--- a/pkgs/tools/admin/webdruid/src-for-default.nix
+++ b/pkgs/tools/admin/webdruid/src-for-default.nix
@@ -1,7 +1,7 @@
 rec {
   advertisedUrl="http://downloads.sourceforge.net/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz";
   version = "0.6.0-alpha5";
-  url="http://downloads.sourceforge.net/webdruid/files/webdruid/${version}/webdruid-${version}.tar.gz";
+  url="mirror://sourceforge/webdruid/webdruid-${version}.tar.gz";
   hash = "1aiqffccayvf02snl9la62zqb1674cp4rv19af6xyxgvw4334hw0";
   name = "webdruid-0.6.0-alpha5";
   
diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix
index d06ef2c83662..009dc90576b3 100644
--- a/pkgs/tools/backup/partimage/default.nix
+++ b/pkgs/tools/backup/partimage/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = http://sourceforge.net/projects/partimage/files/stable/0.6.9/partimage-0.6.9.tar.bz2;
+    url = mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2;
     sha256 = "0db6xiphk6xnlpbxraiy31c5xzj0ql6k4rfkmqzh665yyj0nqfkm";
   };
   configureFlags = "--with-ssl-headers=${openssl}/include/openssl";
diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix
index f3b8037a9f19..4df2947d1374 100644
--- a/pkgs/tools/compression/upx/default.nix
+++ b/pkgs/tools/compression/upx/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "upx-3.07";
   src = fetchurl {
-    url = http://upx.sourceforge.net/download/upx-3.07-src.tar.bz2;
+    url = mirror://sourceforge/upx/upx-3.07-src.tar.bz2;
     sha256 = "07pcgjn7x0a734mvhgqwz24qkm1rzqrkcp67pmagzz6i765cp7bs";
   };
 
diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix
index b3d75106980b..efdeffe1ad79 100644
--- a/pkgs/tools/graphics/pstoedit/default.nix
+++ b/pkgs/tools/graphics/pstoedit/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pstoedit-3.50";
 
   src = fetchurl {
-    url = http://prdownloads.sourceforge.net/pstoedit/pstoedit-3.50.tar.gz;
+    url = mirror://sourceforge/pstoedit/pstoedit-3.50.tar.gz;
     sha256 = "04ap21fxj2zn6vj9mv7zknj4svcbkb1gxwfzxkw5i0sksx969c92";
   };
 
diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix
index 659b04a62386..5a03e0995393 100644
--- a/pkgs/tools/misc/ttf2pt1/default.nix
+++ b/pkgs/tools/misc/ttf2pt1/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ttf2pt1-3.4.4";
 
   src = fetchurl {
-    url = http://prdownloads.sourceforge.net/ttf2pt1/ttf2pt1-3.4.4.tgz;
+    url = mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz;
     sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf";
   };
 
diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix
index 7457a72b5d50..af5b9aacffcc 100644
--- a/pkgs/tools/networking/philter/default.nix
+++ b/pkgs/tools/networking/philter/default.nix
@@ -13,7 +13,7 @@ let
     baseName="philter";
     version="1.1";
     name="${baseName}-${version}";
-    url="http://prdownloads.sourceforge.net/${baseName}/${name}.tar.gz";
+    url="mirror://sourceforge/${baseName}/${name}.tar.gz";
     hash="177pqfflhdn2mw9lc1wv9ik32ji69rjqr6dw83hfndwlsva5151l";
   };
 in
diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix
index ecbc95362e61..aaa3b577657f 100644
--- a/pkgs/tools/security/pwgen/default.nix
+++ b/pkgs/tools/security/pwgen/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation {
   name = "pwgen-2.05";
 
   src = fetchurl {
-    url = ftp://ftp.chg.ru/pub/sourceforge/p/pw/pwgen/pwgen-2.05.tar.gz;
+    url = mirror://sourceforge/pwgen/pwgen-2.05.tar.gz;
     sha256 = "1afxbkdl9b81760pyb972k18dmidrciy3vzcnspp3jg0aa316yn8";
   };
   meta = {
diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index a13f500c34f8..63850454b3df 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   name = "thinkfan-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/thinkfan/thinkfan-${version}.tar.gz";
+    url = "mirror://sourceforge/thinkfan/thinkfan-${version}.tar.gz";
     sha256 = "04akla66r8k10x0jvmcpfi92hj2sppygcl7hhwn8n8zsvvf0yqxs";
   };
   
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d080e913399c..5fbe0ea553f6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1956,7 +1956,7 @@ pythonPackages = python.modules // rec {
     name = "${baseName}-${version}";
 
     src = fetchurl {
-      url = "http://downloads.sourceforge.net/sourceforge/fuse/fuse-python-${version}.tar.gz";
+      url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz";
       sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi";
     };
 
@@ -2564,7 +2564,7 @@ pythonPackages = python.modules // rec {
   matplotlib = buildPythonPackage ( rec {
     name = "matplotlib-1.1.0";
     src = fetchurl {
-      url = "http://downloads.sourceforge.net/matplotlib/${name}.tar.gz";
+      url = "mirror://sourceforge/matplotlib/${name}.tar.gz";
       sha256 = "be37e1d86c65ecacae6683f8805e051e9904e5f2e02bf2b7a34262c46a6d06a7";
     };
 
@@ -3314,7 +3314,7 @@ pythonPackages = python.modules // rec {
     name = "pexpect-2.3";
 
     src = fetchurl {
-      url = "http://pexpect.sourceforge.net/pexpect-2.3.tar.gz";
+      url = "mirror://sourceforge/pexpect/pexpect-2.3.tar.gz";
       sha256 = "0x8bfjjqygriry1iyygm5048ykl5qpbpzqfp6i8dhkslm3ryf5fk";
     };
 

From 1d7d0addcc0df4ae50f5d11ece142f33bc241f5e Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sun, 14 Jul 2013 11:24:45 +1000
Subject: [PATCH 151/439] vim-plugins: add expression command-t

* also fix build of vim on darwin
---
 pkgs/applications/editors/vim/default.nix |  6 ++--
 pkgs/misc/vim-plugins/default.nix         | 35 ++++++++++++++++++++++-
 pkgs/top-level/all-packages.nix           |  7 ++++-
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index ff8da0e09473..a3e40004550b 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -41,8 +41,10 @@ stdenv.mkDerivation rec {
     sed -i -e 's/as_fn_error.*int32.*/:/' src/auto/configure
   '';
   
-  meta = {
+  meta = with stdenv.lib; {
     description = "The most popular clone of the VI editor";
-    homepage = http://www.vim.org;
+    homepage    = http://www.vim.org;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 68e968d571e9..e8d9e9a11e4b 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,4 +1,4 @@
-{fetchurl, stdenv, python, cmake, vim}:
+{ fetchurl, stdenv, python, cmake, vim, perl, ruby }:
 
 /*
 About Vim and plugins
@@ -142,6 +142,8 @@ in
       cp -R doc "$out/vim-plugins"
       cp -R plugin "$out/vim-plugins"
       cp -R syntax_checkers "$out/vim-plugins"
+
+      ${vimHelptags "$out/vim-plugins/doc"}
     '';
   };
 
@@ -164,6 +166,35 @@ in
       cp -R ftplugin "$out/vim-plugins"
       cp -R indent "$out/vim-plugins"
       cp -R syntax "$out/vim-plugins"
+
+      ${vimHelptags "$out/vim-plugins/doc"}
+    '';
+  };
+
+  commandT = stdenv.mkDerivation {
+    name = "vim-command-t-1.4";
+
+    src = fetchurl {
+      url    = "https://github.com/wincent/Command-T/archive/1.4.tar.gz";
+      sha256 = "1ka9hwx9n0vj1dd5qsd2l1wq0kriwl76jmmdjzh7zaf0p547v98s";
+    };
+
+    buildInputs = [ perl ruby ];
+
+    buildPhase = ''
+      pushd ruby/command-t
+      ruby extconf.rb
+      make
+      popd
+    '';
+
+    installPhase = ''
+      mkdir -p "$out/vim-plugins"
+      cp -R doc "$out/doc"
+      cp -R plugin "$out/vim-plugins"
+      cp -R ruby "$out/vim-plugins"
+
+      ${vimHelptags "$out/vim-plugins/doc"}
     '';
   };
 
@@ -179,6 +210,8 @@ in
       mkdir -p "$out/vim-plugins"
       cp -R plugin "$out/vim-plugins"
     '';
+
+    postInstall = false;
   };
 }
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a656cdf1c419..3edefd59eedd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8546,7 +8546,12 @@ let
     flup = pythonPackages.flup;
   };
 
-  vim = callPackage ../applications/editors/vim { };
+  vim = callPackage ../applications/editors/vim {
+    # for Objective-C compilation
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
 
   vimHugeX = vim_configurable;
 

From da4be371e97fb6e51c39e1972f78769b98ba47ec Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 14 Jul 2013 05:23:06 +0300
Subject: [PATCH 152/439] make package use mirror:// for gnu, savannah and
 gnome repositories where possible

---
 pkgs/applications/audio/lingot/default.nix                    | 2 +-
 pkgs/applications/audio/normalize/default.nix                 | 2 +-
 pkgs/applications/editors/emacs-modes/color-theme/default.nix | 2 +-
 pkgs/applications/graphics/exrdisplay/default.nix             | 2 +-
 pkgs/applications/version-management/cvs/default.nix          | 2 +-
 pkgs/applications/version-management/meld/default.nix         | 2 +-
 pkgs/applications/window-managers/stumpwm/default.nix         | 2 +-
 pkgs/data/fonts/ttf-bitstream-vera/default.nix                | 2 +-
 pkgs/desktops/gnome-2/bindings/gnome-python/default.nix       | 2 +-
 pkgs/desktops/gnome-2/desktop/vte/default.nix                 | 2 +-
 pkgs/desktops/gnome-3/core/evince/default.nix                 | 2 +-
 pkgs/development/libraries/aspell/default.nix                 | 2 +-
 pkgs/development/libraries/confuse/default.nix                | 2 +-
 pkgs/development/libraries/exosip/3.x.nix                     | 2 +-
 pkgs/development/libraries/exosip/default.nix                 | 2 +-
 pkgs/development/libraries/gtk-sharp-2/default.nix            | 2 +-
 pkgs/development/libraries/ilmbase/default.nix                | 2 +-
 pkgs/development/libraries/libchamplain/0.6.nix               | 2 +-
 pkgs/development/libraries/libcm/default.nix                  | 2 +-
 pkgs/development/libraries/libsigcxx/1.2.nix                  | 2 +-
 pkgs/development/libraries/libsigcxx/default.nix              | 2 +-
 pkgs/development/libraries/libunwind/default.nix              | 2 +-
 pkgs/development/libraries/openexr/default.nix                | 2 +-
 pkgs/development/python-modules/pygobject/3.nix               | 2 +-
 pkgs/development/python-modules/pygobject/default.nix         | 2 +-
 pkgs/development/python-modules/pygtk/default.nix             | 2 +-
 pkgs/development/tools/misc/avrdude/default.nix               | 2 +-
 pkgs/development/tools/misc/indent/default.nix                | 2 +-
 pkgs/development/tools/misc/texi2html/default.nix             | 2 +-
 pkgs/games/globulation/default.nix                            | 2 +-
 pkgs/games/gnuchess/default.nix                               | 2 +-
 pkgs/games/gtypist/default.nix                                | 2 +-
 pkgs/games/liquidwar/default.nix                              | 2 +-
 pkgs/games/xboard/default.nix                                 | 2 +-
 pkgs/os-specific/linux/dmidecode/default.nix                  | 2 +-
 pkgs/tools/X11/autocutsel/default.nix                         | 2 +-
 pkgs/tools/archivers/atool/default.nix                        | 2 +-
 pkgs/tools/backup/rdiff-backup/default.nix                    | 2 +-
 pkgs/tools/compression/lzip/default.nix                       | 2 +-
 pkgs/tools/graphics/barcode/default.nix                       | 3 +--
 pkgs/tools/misc/hddtemp/default.nix                           | 4 ++--
 pkgs/tools/misc/man-db/default.nix                            | 2 +-
 pkgs/tools/misc/units/default.nix                             | 2 +-
 pkgs/tools/networking/flvstreamer/default.nix                 | 2 +-
 pkgs/tools/networking/gvpe/src-for-default.nix                | 2 +-
 pkgs/tools/security/oath-toolkit/default.nix                  | 2 +-
 pkgs/tools/text/numdiff/default.nix                           | 2 +-
 pkgs/tools/typesetting/tex/auctex/default.nix                 | 2 +-
 48 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix
index e93f6ffc584d..44d946af2dbd 100644
--- a/pkgs/applications/audio/lingot/default.nix
+++ b/pkgs/applications/audio/lingot/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "lingot-0.9.0";
 
   src = fetchurl {
-    url = http://download.savannah.gnu.org/releases/lingot/lingot-0.9.0.tar.gz;
+    url = mirror://savannah/lingot/lingot-0.9.0.tar.gz;
     sha256 = "07z129lp8m4sz608q409wb11c639w7cbn497r7bscgg08p6c07xb";
   };
 
diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix
index e422eee363c4..ca746f524c5a 100644
--- a/pkgs/applications/audio/normalize/default.nix
+++ b/pkgs/applications/audio/normalize/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.7.7";
 
   src = fetchurl {
-    url = "http://savannah.nongnu.org/download/normalize/normalize-0.7.7.tar.gz";
+    url = "mirror://savannah/normalize/normalize-0.7.7.tar.gz";
     sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0";
   };
 
diff --git a/pkgs/applications/editors/emacs-modes/color-theme/default.nix b/pkgs/applications/editors/emacs-modes/color-theme/default.nix
index 9cc0e7fd42b2..327e11bf0862 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme/default.nix
+++ b/pkgs/applications/editors/emacs-modes/color-theme/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "color-theme-6.6.0";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/color-theme/${name}.tar.gz";
+    url = "mirror://savannah/color-theme/${name}.tar.gz";
     sha256 = "0yx1ghcjc66s1rl0v3d4r1k88ifw591hf814ly3d73acvh15zlsn";
   };
 
diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix
index 65c86a6cf97a..7b415df42f5b 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/pkgs/applications/graphics/exrdisplay/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name ="openexr_viewers-1.0.1";
 
   src = fetchurl {
-    url =  "http://download.savannah.nongnu.org/releases/openexr/openexr_viewers-1.0.1.tar.gz";
+    url =  "mirror://savannah/openexr/openexr_viewers-1.0.1.tar.gz";
     sha256 = "1w5qbcdp7sw48z1wk2v07f7p14vqqb1m2ncxyxnbkm9f4ab0ymg6";
   };
 
diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix
index 0be984df7618..0e43972fab6a 100644
--- a/pkgs/applications/version-management/cvs/default.nix
+++ b/pkgs/applications/version-management/cvs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "cvs-1.12.13";
 
   src = fetchurl {
-    url = http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2;
+    url = mirror://savannah/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2;
     sha256 = "0pjir8cwn0087mxszzbsi1gyfc6373vif96cw4q3m1x6p49kd1bq";
   };
 
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 6e099cd56083..9c547b2193d4 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "meld-${version}";
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.xz";
+    url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
     sha256 = "00rsff0yl5qwzh0igkdns6ry2xsbxad70avpqpkbd2bldi94v76y";
   };
 
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index db0b6e1037c3..ab261a78fb01 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -12,7 +12,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/stumpwm/${pkgName}-${version}.tgz";
+    url = "mirror://savannah/stumpwm/${pkgName}-${version}.tgz";
     sha256 = "a0793d22ef90731d34f84e51deafb4bc2095a357c70b9505dc57516f481cdf78";
   };
 
diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
index 64b18ffdaaab..1dfaa376df4c 100644
--- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix
+++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "ttf-bitstream-vera-1.10";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2;
+    url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2;
     sha256 = "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv";
   };
   buildPhase = "true";
diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
index 83505dc42fc3..ed794715ff8d 100644
--- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "gnome-python-${version}.1";
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/gnome-python/${version}/${name}.tar.bz2";
+    url = "mirror://gnome/sources/gnome-python/${version}/${name}.tar.bz2";
     sha256 = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8";
   };
 
diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
index c91522e695ef..00072657e06a 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "vte-0.28.0";
   
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/gnome/sources/vte/0.28/${name}.tar.bz2";
+    url = "mirror://gnome/sources/vte/0.28/${name}.tar.bz2";
     sha256 = "0blmblvjr35xajr0a07zcd58lk6x2hzympx17biw2mcym9kcarql";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index de49bffc419e..a9fce6369372 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   name = "evince-3.6.1";
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/evince/3.6/${name}.tar.xz";
+    url = "mirror://gnome/sources/evince/3.6/${name}.tar.xz";
     sha256 = "1da1pij030dh8mb0pr0jnyszgsbjnh8lc17rj5ii52j3kmbv51qv";
   };
 
diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index cac5ec483fe6..dd7b6fcb2187 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "aspell-0.60.6.1";
 
   src = fetchurl {
-    url = "ftp://ftp.gnu.org/gnu/aspell/${name}.tar.gz";
+    url = "mirror://gnu/aspell/${name}.tar.gz";
     sha256 = "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm";
   };
 
diff --git a/pkgs/development/libraries/confuse/default.nix b/pkgs/development/libraries/confuse/default.nix
index 7291aa5eb385..67fe669a0374 100644
--- a/pkgs/development/libraries/confuse/default.nix
+++ b/pkgs/development/libraries/confuse/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "confuse-2.7";
   src = fetchurl {
-    url = "http://savannah.nongnu.org/download/confuse/${name}.tar.gz";
+    url = "mirror://savannah/confuse/${name}.tar.gz";
     sha256 = "0y47r2ashz44wvnxdb18ivpmj8nxhw3y9bf7v9w0g5byhgyp89g3";
   };
 
diff --git a/pkgs/development/libraries/exosip/3.x.nix b/pkgs/development/libraries/exosip/3.x.nix
index d850618ecdf9..123b53783a68 100644
--- a/pkgs/development/libraries/exosip/3.x.nix
+++ b/pkgs/development/libraries/exosip/3.x.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   version = "3.6.0";
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/exosip/libeXosip2-${version}.tar.gz";
+    url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz";
     sha256 = "0r1mj8x5991bgwf03bx1ajn5kbbmw1136jabw2pn7dls9h41mnli";
   };
   name = "libexosip2-${version}";
diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix
index 2a1aea6df32b..fb13e0b8c6f5 100644
--- a/pkgs/development/libraries/exosip/default.nix
+++ b/pkgs/development/libraries/exosip/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   version = "4.0.0";
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/exosip/libeXosip2-${version}.tar.gz";
+    url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz";
     sha256 = "1rdjr3x7s992w004cqf4xji1522an9rpzsr9wvyhp685khmahrsj";
   };
   name = "libexosip2-${version}";
diff --git a/pkgs/development/libraries/gtk-sharp-2/default.nix b/pkgs/development/libraries/gtk-sharp-2/default.nix
index 9baac518ff76..0e659fb074bd 100644
--- a/pkgs/development/libraries/gtk-sharp-2/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-2/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.gz;
+    url = mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.gz;
     sha256 = "1y55vc2cp4lggmbil2lb28d0gn71iq6wfyja1l9mya5xll8svzwc";
   };
 
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix
index 2b7952d3b209..3c9ad9cfc333 100644
--- a/pkgs/development/libraries/ilmbase/default.nix
+++ b/pkgs/development/libraries/ilmbase/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ilmbase-1.0.1";
   
   src = fetchurl {
-    url = http://download.savannah.nongnu.org/releases/openexr/ilmbase-1.0.1.tar.gz;
+    url = mirror://savannah/openexr/ilmbase-1.0.1.tar.gz;
     sha256 = "0z9r3r0bxyhgwhkdwln0dg1lnxz691qnjygrqlg3jym34rxzq52g";
   };
 }
diff --git a/pkgs/development/libraries/libchamplain/0.6.nix b/pkgs/development/libraries/libchamplain/0.6.nix
index 86b8dc5d5500..5ec324131e35 100644
--- a/pkgs/development/libraries/libchamplain/0.6.nix
+++ b/pkgs/development/libraries/libchamplain/0.6.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "libchamplain-0.6.1";
 
   src = fetchurl {
-    url = "http://download.gnome.org/sources/libchamplain/0.6/${name}.tar.gz";
+    url = "mirror://gnome/sources/libchamplain/0.6/${name}.tar.gz";
     sha256 = "1l1in4khnral157j46aq2d26nviz23icnm353587vcwjhdbw86sg";
   };
 
diff --git a/pkgs/development/libraries/libcm/default.nix b/pkgs/development/libraries/libcm/default.nix
index 197a1e7fc97b..09ef21dff597 100644
--- a/pkgs/development/libraries/libcm/default.nix
+++ b/pkgs/development/libraries/libcm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libcm-0.1.1";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/libcm/0.1/libcm-0.1.1.tar.bz2;
+    url = mirror://gnome/sources/libcm/0.1/libcm-0.1.1.tar.bz2;
     sha256 = "11i5z8l5v5ffihif35k5j8igj0rahsk4jdmsj24xhdw2s0zx53kn";
   };
   buildInputs = [
diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix
index 6436a88bdc81..29a7093dbbdd 100644
--- a/pkgs/development/libraries/libsigcxx/1.2.nix
+++ b/pkgs/development/libraries/libsigcxx/1.2.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libsigc++-1.2.7";
   
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/${name}.tar.bz2";
+    url = "mirror://gnome/sources/libsigc++/1.2/${name}.tar.bz2";
     sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr";
   };
 
diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix
index f8fdb4c28c2a..b1e4f31c567e 100644
--- a/pkgs/development/libraries/libsigcxx/default.nix
+++ b/pkgs/development/libraries/libsigcxx/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libsigc++-2.2.10";
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/${name}.tar.xz";
+    url = "mirror://gnome/sources/libsigc++/2.2/${name}.tar.xz";
     sha256 = "8ceb6f2732f5399ef50d5b70f433d49945a12e0900b8f9f43c135866a2e5bf47";
   };
 
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index 49e230173697..5c3670e2365c 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libunwind-1.0.1";
   
   src = fetchurl {
-    url = "http://download.savannah.nongnu.org/releases/libunwind/${name}.tar.gz";
+    url = "mirror://savannah/libunwind/${name}.tar.gz";
     sha256 = "aa95fd184c0b90d95891c2f3bac2c7df708ff016d2a6ee8b2eabb769f864101f";
   };
   
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 33397e8b98eb..b54375ae062a 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "openexr-1.7.1";
   
   src = fetchurl {
-    url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
+    url = "mirror://savannah/openexr/${name}.tar.gz";
     sha256 = "0l2rdbx9lg4qk2ms98hwbsnzpggdrx3pbjl6pcvrrpjqp5m905n6";
   };
   
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index b5b8f8408aa5..ffbe906a9007 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "pygobject-3.0.4";
    
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.0/${name}.tar.xz";
+    url = "mirror://gnome/sources/pygobject/3.0/${name}.tar.xz";
     sha256 = "f457b1d7f6b8bfa727593c3696d2b405da66b4a8d34cd7d3362ebda1221f0661";
   };
 
diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix
index 8d6a1368d8b0..9393b0a2f94e 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "pygobject-2.28.6";
   
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/${name}.tar.xz";
+    url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz";
     sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv";
   };
 
diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
index 940ba18f2a2a..e291544911cc 100644
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/pkgs/development/python-modules/pygtk/default.nix
@@ -5,7 +5,7 @@ buildPythonPackage rec {
   name = "pygtk-2.22.0";
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.22/${name}.tar.bz2";
+    url = "mirror://gnome/sources/pygtk/2.22/${name}.tar.bz2";
     sha256 = "4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8";
   };
 
diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix
index adbaf5e3e8bf..7574500dbbb2 100644
--- a/pkgs/development/tools/misc/avrdude/default.nix
+++ b/pkgs/development/tools/misc/avrdude/default.nix
@@ -6,7 +6,7 @@ composableDerivation.composableDerivation {} rec {
   name="avrdude-5.10";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/avrdude/${name}.tar.gz";
+    url = "mirror://savannah/avrdude/${name}.tar.gz";
     sha256 = "0pmy73777x8p7f2aj2w2q1dnk1bvhd1cm7hcs1s9hsdqsmiinl41";
   };
 
diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix
index 00ff11c3c880..0c82c2cd2759 100644
--- a/pkgs/development/tools/misc/indent/default.nix
+++ b/pkgs/development/tools/misc/indent/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "indent-2.2.10";
 
   src = fetchurl {
-    url = "ftp://ftp.gnu.org/gnu/indent/${name}.tar.gz";
+    url = "mirror://gnu/indent/${name}.tar.gz";
     sha256 = "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa";
   };
 
diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix
index 2089142284f4..7fa604e4af65 100644
--- a/pkgs/development/tools/misc/texi2html/default.nix
+++ b/pkgs/development/tools/misc/texi2html/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "texi2html-1.82";
 
   src = fetchurl {
-    url = "http://www.very-clever.com/download/nongnu/texi2html/${name}.tar.bz2";
+    url = "mirror://savannah/texi2html/${name}.tar.bz2";
     sha256 = "1wdli2szkgm3l0vx8rf6lylw0b0m47dlz9iy004n928nqkzix76n";
   };
 
diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix
index 2b60abd00925..f1ffec855661 100644
--- a/pkgs/games/globulation/default.nix
+++ b/pkgs/games/globulation/default.nix
@@ -15,7 +15,7 @@ let
     version="0.9.4";
     patchlevel="4";
     name="${baseName}-${version}.${patchlevel}";
-    url="http://dl.sv.nongnu.org/releases/glob2/${version}/${name}.tar.gz";
+    url="mirror://savannah/glob2/${version}/${name}.tar.gz";
     hash="1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g";
   };
 in
diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix
index ae7938c02b88..8a4bfe5f6ecf 100644
--- a/pkgs/games/gnuchess/default.nix
+++ b/pkgs/games/gnuchess/default.nix
@@ -6,7 +6,7 @@ let
     version="6.0.3";
     name="${baseName}-${version}";
     hash="01ff8qd8pk39c6pv24wbcqkx78kvay8rxvgxqq9cqp9gqv39jfkw";
-    url="http://ftp.gnu.org/gnu/chess/gnuchess-6.0.3.tar.gz";
+    url="mirror://gnu/chess/gnuchess-6.0.3.tar.gz";
     sha256="01ff8qd8pk39c6pv24wbcqkx78kvay8rxvgxqq9cqp9gqv39jfkw";
   };
   buildInputs = [
diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix
index d0793a8d13dd..f83e21eab7c0 100644
--- a/pkgs/games/gtypist/default.nix
+++ b/pkgs/games/gtypist/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gtypist-2.9.1";
 
   src = fetchurl {
-    url = "ftp://ftp.gnu.org/gnu/gtypist/gtypist-2.9.1.tar.xz";
+    url = "mirror://gnu/gtypist/gtypist-2.9.1.tar.xz";
     sha256 = "1yv209aih1ixbs477vzzk1xj013g6w32vi33g0hldfzvfxbl9y5s";
   };
 
diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index 085c990f1a0b..292aa2ff1904 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -14,7 +14,7 @@ rec {
   name = "liquidwar6-0.0.13beta";
 
   src = a.fetchurl {
-    url = "http://ftp.gnu.org/gnu/liquidwar6/${name}.tar.gz";
+    url = "mirror://gnu/liquidwar6/${name}.tar.gz";
     sha256 = "1jjf7wzb8jf02hl3473vz1q74fhmxn0szbishgi1f1j6a7234wx2";
   };
 
diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix
index 21870fc3777c..7e73bfad5403 100644
--- a/pkgs/games/xboard/default.nix
+++ b/pkgs/games/xboard/default.nix
@@ -8,7 +8,7 @@ let
     version="4.7.1";
     name="${baseName}-${version}";
     hash="0hnav2swswaf0463c4wnmgwaif3g42f2a1mqyqc5fa1py32iy6ry";
-    url="http://ftp.gnu.org/gnu/xboard/xboard-4.7.1.tar.gz";
+    url="mirror://gnu/xboard/xboard-4.7.1.tar.gz";
     sha256="0hnav2swswaf0463c4wnmgwaif3g42f2a1mqyqc5fa1py32iy6ry";
   };
   buildInputs = [
diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix
index f0649ccc3902..e6b5035bd8ed 100644
--- a/pkgs/os-specific/linux/dmidecode/default.nix
+++ b/pkgs/os-specific/linux/dmidecode/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "dmidecode-2.11";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/dmidecode/${name}.tar.bz2";
+    url = "mirror://savannah/dmidecode/${name}.tar.bz2";
     sha256 = "0l9v8985piykc98hmbg1cq5r4xwvp0jjl4li3avr3ddkg4s699bd";
   };
 
diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix
index 871dc5e130a6..f4776933e53d 100644
--- a/pkgs/tools/X11/autocutsel/default.nix
+++ b/pkgs/tools/X11/autocutsel/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   inherit name;
  
   src = fetchurl {
-    url = "http://savannah.nongnu.org/download/autocutsel/${name}.tar.gz";
+    url = "mirror://savannah/autocutsel/${name}.tar.gz";
     sha256 = "0hp335qq57l0kp58pfwb0bk930zx5497frq8y0lzr4icvk1fpw5y";
   };
  
diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix
index e0ece8825c03..f041f2050ea0 100644
--- a/pkgs/tools/archivers/atool/default.nix
+++ b/pkgs/tools/archivers/atool/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "atool-0.39.0";
   src = fetchurl {
-    url = http://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz;
+    url = mirror://savannah/atool/atool-0.39.0.tar.gz;
     sha256 = "aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b";
   };
 
diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix
index f108e6a50634..d52cbdebb677 100644
--- a/pkgs/tools/backup/rdiff-backup/default.nix
+++ b/pkgs/tools/backup/rdiff-backup/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "rdiff-backup-1.2.8";
 
   src = fetchurl {
-    url = http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-1.2.8.tar.gz;
+    url = mirror://savannah/rdiff-backup/rdiff-backup-1.2.8.tar.gz;
     sha256 = "1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d";
   };
 
diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index de29c34f150e..03a8a7f169db 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ texinfo ];
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/lzip/${name}.tar.gz";
+    url = "mirror://savannah/lzip/${name}.tar.gz";
     sha256 = "1rybhk2pxpfh2789ck9mrkdv3bpx7b7miwndlshb5vb02m9crxbz";
   };
 
diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix
index 946d18b8cc57..6f8ec54c4c04 100644
--- a/pkgs/tools/graphics/barcode/default.nix
+++ b/pkgs/tools/graphics/barcode/default.nix
@@ -12,8 +12,7 @@ let
     version="0.98";
     baseName="barcode";
     name="${baseName}-${version}";
-    # mirror://gnu/ doesn't work for this package
-    url="http://ftp.gnu.org/gnu/${baseName}/${name}.tar.gz";
+    url="mirror://gnu/${baseName}/${name}.tar.gz";
     hash="0ddn17a6hz817bchgjxrjg76v64kzl5zlll8x73ply5rg69f2aa2";
   };
 in
diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix
index eb9aa5feaa3b..f3c5dd02c7e5 100644
--- a/pkgs/tools/misc/hddtemp/default.nix
+++ b/pkgs/tools/misc/hddtemp/default.nix
@@ -4,12 +4,12 @@ stdenv.mkDerivation {
   name = "hddtemp-0.3_beta15";
 
   db = fetchurl{
-    url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db;
+    url = mirror://savannah/hddtemp/hddtemp.db;
     sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya";
   };
 
   src = fetchurl {
-    url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2;
+    url = mirror://savannah/hddtemp/hddtemp-0.3-beta15.tar.bz2;
     sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1";
   };
 
diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index 54367e671ea4..5374cb743618 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "man-db-2.5.1";
   
   src = fetchurl {
-    url = http://download.savannah.nongnu.org/releases/man-db/man-db-2.5.1.tar.gz;
+    url = mirror://savannah/man-db/man-db-2.5.1.tar.gz;
     sha256 = "178w1fk23ffh8vabj29cn0yyg5ps7bwy1zrrrcsw8aypbh3sfjy3";
   };
   
diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix
index a056ec13f027..d4cd07aa4c6f 100644
--- a/pkgs/tools/misc/units/default.nix
+++ b/pkgs/tools/misc/units/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation {
   name = "units-1.86";
 
   src = fetchurl {
-    url = ftp://ftp.gnu.org/gnu/units/units-1.86.tar.gz;
+    url = mirror://gnu/units/units-1.86.tar.gz;
     sha256 = "1syc4d3x1wb03hcxnz7rkgapk96biazfk2qqn2wfyx54bq829lhi";
   };
 
diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix
index cbc07522019a..c9bc05658d03 100644
--- a/pkgs/tools/networking/flvstreamer/default.nix
+++ b/pkgs/tools/networking/flvstreamer/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "flvstreamer-2.1c1";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/flvstreamer/source/${name}.tar.gz";
+    url = "mirror://savannah/flvstreamer/source/${name}.tar.gz";
     sha256 = "e90e24e13a48c57b1be01e41c9a7ec41f59953cdb862b50cf3e667429394d1ee";
   };
 
diff --git a/pkgs/tools/networking/gvpe/src-for-default.nix b/pkgs/tools/networking/gvpe/src-for-default.nix
index 097f275feffd..88264c5d7715 100644
--- a/pkgs/tools/networking/gvpe/src-for-default.nix
+++ b/pkgs/tools/networking/gvpe/src-for-default.nix
@@ -2,7 +2,7 @@ rec {
    version="2.24";
    name="gvpe-2.24";
    hash="1szwia7n24fx9n40yvmdidna55b97459ccq6d2c4863q4pfkqpjy";
-   url="http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz";
+   url="mirror://gnu/gvpe/gvpe-${version}.tar.gz";
    advertisedUrl="http://ftp.gnu.org/gnu/gvpe/gvpe-2.24.tar.gz";
   
   
diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix
index 58786f1bd61e..80ab866e1f3f 100644
--- a/pkgs/tools/security/oath-toolkit/default.nix
+++ b/pkgs/tools/security/oath-toolkit/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "oath-toolkit-2.0.2";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/oath-toolkit/${name}.tar.gz";
+    url = "mirror://savannah/oath-toolkit/${name}.tar.gz";
     sha256 = "0i2rf5j83kb8h3sd9lsm0a46zq805kzagvccc4rk7879lg1fnl99";
   };
 
diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix
index eb5ebf612b2b..1eae8c4d5274 100644
--- a/pkgs/tools/text/numdiff/default.nix
+++ b/pkgs/tools/text/numdiff/default.nix
@@ -6,7 +6,7 @@ in
 stdenv.mkDerivation {
   name = "numdiff-${version}";
   src = fetchurl {
-    url = "http://ftp.igh.cnrs.fr/pub/nongnu/numdiff/numdiff-${version}.tar.gz";
+    url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz";
     sha256 = "062byxp9vajj4flg1rqh0r2nwg9yx608mbsj5y25wkrzmkgcq3fx";
   };
   meta = {
diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix
index 6ca85167aeda..9774d7d1a948 100644
--- a/pkgs/tools/typesetting/tex/auctex/default.nix
+++ b/pkgs/tools/typesetting/tex/auctex/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation ( rec {
   };
 
   src = fetchurl {
-    url = "http://ftp.gnu.org/pub/gnu/${pname}/${name}.tar.gz";
+    url = "mirror://gnu/${pname}/${name}.tar.gz";
     sha256 = "aebbea00431f8fd1e6be6519d9cc28e974942000737f956027da2c952a6d304e";
   };
 

From 021c40c72d3d857180659ce8208e02c7ab511b84 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 13 Jul 2013 22:22:44 -0400
Subject: [PATCH 153/439] buildNodePackage: Handle bundledDependencies by
 nuking them

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/web/nodejs/build-node-package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index d260b2900160..8a56e3e798b9 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation ({
     mkdir -p $out/node_modules
     mv node_modules/${requireName} $out/node_modules
     mv node_modules/.bin $out/node_modules 2>/dev/null || true
+    rm -fR $out/node_modules/${requireName}/node_modules
     mv node_modules $out/node_modules/${requireName}
     if [ -d "$out/node_modules/.bin" ]; then
       ln -sv node_modules/.bin $out/bin

From aefae32c8ca79c8c9ae9faf2e5a04f23796b923d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 13 Jul 2013 22:23:59 -0400
Subject: [PATCH 154/439] Add npm nodePackage

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/node-packages-generated.nix | 804 ++++++++++++++++++++-
 pkgs/top-level/node-packages.json          |   1 +
 2 files changed, 803 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 15b5c05b6f12..4e1cc57a0a48 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -9,6 +9,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "abbrev";
+    version = "1.0.4";
+    fullName = "abbrev-~1.0.4";
+    hash = "8dc0f480571a4a19e74f1abd4f31f6a70f94953d1ccafa16ed1a544a19a6f3a8";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "amdefine";
     version = "0.0.5";
@@ -60,6 +70,16 @@
       { name = "sylvester"; range = ">= 0.0.8"; }
     ];
   }
+  {
+    baseName = "archy";
+    version = "0.0.2";
+    fullName = "archy-0";
+    hash = "355bafab4acbb86e4e94c00c55900215abe41ae72ab454be889c766e5889a6e5";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "asn1";
     version = "0.1.11";
@@ -415,6 +435,36 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "child-process-close";
+    version = "0.1.1";
+    fullName = "child-process-close-~0.1.1";
+    hash = "b68574f217d23d11cd4a1e5f1f2be17bf93e2bd38940ae6b07c35b69ec8d456a";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "chmodr";
+    version = "0.1.0";
+    fullName = "chmodr-~0.1.0";
+    hash = "2c0bda3df1766290f9fe21940ab455e92bc37d608f2030b0e0b7dfdda9cff9cd";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "chownr";
+    version = "0.0.1";
+    fullName = "chownr-0";
+    hash = "da1fbb894b4103a1a3c912fc780f6dcf7339865298f2fdc4e20afdf00a94b821";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "cli";
     version = "0.4.4-2";
@@ -459,6 +509,18 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "cmd-shim";
+    version = "1.1.0";
+    fullName = "cmd-shim-~1.1.0";
+    hash = "ccc0d6f184b9f77ab9d723e4bcecd88b8fa1a480507eb45cdd67b182617fad33";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "mkdirp"; range = "~0.3.3"; }
+      { name = "graceful-fs"; range = "1.2"; }
+    ];
+  }
   {
     baseName = "coffee-script";
     version = "1.6.3";
@@ -541,6 +603,18 @@
       { name = "keypress"; range = "0.1.x"; }
     ];
   }
+  {
+    baseName = "config-chain";
+    version = "1.1.7";
+    fullName = "config-chain-~1.1.1";
+    hash = "a161af33500f1dc18e4da364ff9f3e0a516c08aa030859ea639480676b9c3f5c";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "proto-list"; range = "~1.2.1"; }
+      { name = "ini"; range = "1"; }
+    ];
+  }
   {
     baseName = "connect";
     version = "2.7.5";
@@ -727,6 +801,17 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "couch-login";
+    version = "0.1.17";
+    fullName = "couch-login-~0.1.15";
+    hash = "49b941220d82f17077187b66f9fd88d2eb4a791b9f5beaac046290389c73d268";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "request"; range = "2 >=2.14"; }
+    ];
+  }
   {
     baseName = "cryptiles";
     version = "0.1.3";
@@ -911,6 +996,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "editor";
+    version = "0.0.4";
+    fullName = "editor-0.0.4";
+    hash = "2f66957e121e49c8b52a9c54ff24b718ab8bf571591177ff09121e603704b591";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "emitter-component";
     version = "1.0.0";
@@ -1249,6 +1344,59 @@
       { name = "inherits"; range = "~1.0.0"; }
     ];
   }
+  {
+    baseName = "fstream-ignore";
+    version = "0.0.7";
+    fullName = "fstream-ignore-~0.0.5";
+    hash = "1f009e5aac56314d31c5adc339990d1b814595a5020e828cda4a06da536425c5";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "minimatch"; range = "~0.2.0"; }
+      { name = "fstream"; range = "~0.1.17"; }
+      { name = "inherits"; range = "2"; }
+    ];
+  }
+  {
+    baseName = "fstream-npm";
+    version = "0.1.5";
+    fullName = "fstream-npm-~0.1.3";
+    hash = "23751124b295b9d9beefd7b4146b8e6d4fe0d4587cc70bc0b134c10da307b1b0";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "fstream-ignore"; range = "~0.0.5"; }
+      { name = "inherits"; range = "2"; }
+    ];
+  }
+  {
+    baseName = "fstream";
+    version = "0.1.23";
+    fullName = "fstream-~0.1.17";
+    hash = "1f3f03be2b18815b133e551b0cde8ab77148d0de31fdd61d90f21317f02c8342";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "rimraf"; range = "2"; }
+      { name = "mkdirp"; range = "0.3"; }
+      { name = "graceful-fs"; range = "~2.0.0"; }
+      { name = "inherits"; range = "~1.0.0"; }
+    ];
+  }
+  {
+    baseName = "fstream";
+    version = "0.1.23";
+    fullName = "fstream-~0.1.23";
+    hash = "1f3f03be2b18815b133e551b0cde8ab77148d0de31fdd61d90f21317f02c8342";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "rimraf"; range = "2"; }
+      { name = "mkdirp"; range = "0.3"; }
+      { name = "graceful-fs"; range = "~2.0.0"; }
+      { name = "inherits"; range = "~1.0.0"; }
+    ];
+  }
   {
     baseName = "fstream";
     version = "0.1.23";
@@ -1263,6 +1411,16 @@
       { name = "inherits"; range = "~1.0.0"; }
     ];
   }
+  {
+    baseName = "github-url-from-git";
+    version = "1.1.1";
+    fullName = "github-url-from-git-~1.1.1";
+    hash = "7f02b5799b4d73af273a2f4c290118b0cfa999ba5888896b85ab1cbb0c2e207e";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "glob";
     version = "3.2.3";
@@ -1302,6 +1460,42 @@
       { name = "inherits"; range = "2"; }
     ];
   }
+  {
+    baseName = "glob";
+    version = "3.2.3";
+    fullName = "glob-~3.2.1";
+    hash = "82e04561e897c9b682c0568bafbc57b0ee2fc592579535bb0f5929cd1605c9c3";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "minimatch"; range = "~0.2.11"; }
+      { name = "graceful-fs"; range = "~2.0.0"; }
+      { name = "inherits"; range = "2"; }
+    ];
+  }
+  {
+    baseName = "glob";
+    version = "3.2.3";
+    fullName = "glob-~3.2.3";
+    hash = "82e04561e897c9b682c0568bafbc57b0ee2fc592579535bb0f5929cd1605c9c3";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "minimatch"; range = "~0.2.11"; }
+      { name = "graceful-fs"; range = "~2.0.0"; }
+      { name = "inherits"; range = "2"; }
+    ];
+  }
+  {
+    baseName = "graceful-fs";
+    version = "1.2.3";
+    fullName = "graceful-fs-1.2";
+    hash = "b8d9e0af2261259525a65281573e416b70b91788ea7f7b13f4598aaa7818255a";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "graceful-fs";
     version = "2.0.0";
@@ -1322,6 +1516,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "graceful-fs";
+    version = "1.2.3";
+    fullName = "graceful-fs-~1.2";
+    hash = "b8d9e0af2261259525a65281573e416b70b91788ea7f7b13f4598aaa7818255a";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "graceful-fs";
     version = "1.2.3";
@@ -1523,6 +1727,19 @@
       { name = "ctype"; range = "0.5.2"; }
     ];
   }
+  {
+    baseName = "http-signature";
+    version = "0.9.11";
+    fullName = "http-signature-~0.9.11";
+    hash = "44b89f3c1917bf02723a5720f08fbe47448e0370a5d3498d1be860eaf28beb3b";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "assert-plus"; range = "0.1.2"; }
+      { name = "asn1"; range = "0.1.11"; }
+      { name = "ctype"; range = "0.5.2"; }
+    ];
+  }
   {
     baseName = "i";
     version = "0.3.1";
@@ -1584,6 +1801,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "ini";
+    version = "1.1.0";
+    fullName = "ini-1";
+    hash = "307ecc5f8664773587a0d74165d1dbdb226754b638542596b7a1e2ed0a578a28";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "ini";
     version = "1.1.0";
@@ -1594,6 +1821,30 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "ini";
+    version = "1.1.0";
+    fullName = "ini-~1.1.0";
+    hash = "307ecc5f8664773587a0d74165d1dbdb226754b638542596b7a1e2ed0a578a28";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "init-package-json";
+    version = "0.0.10";
+    fullName = "init-package-json-0.0.10";
+    hash = "6efeef6f30253ee6b8cc9a22154096f42e1ea8621e79acce96b5425925229431";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "promzard"; range = "~0.2.0"; }
+      { name = "read"; range = "~1.0.1"; }
+      { name = "read-package-json"; range = "1"; }
+      { name = "semver"; range = "2.x"; }
+    ];
+  }
   {
     baseName = "is-promise";
     version = "1.0.0";
@@ -1743,9 +1994,9 @@
   }
   {
     baseName = "knox";
-    version = "0.8.3";
+    version = "0.8.4";
     fullName = "knox-*";
-    hash = "fe3cb0d94b3e85413626ffee386c751931afe200b170bd555173e413d7044c75";
+    hash = "14072716bf13af98ab908f9f370f18e2353e326a0a945c53e1ff82f70725f161";
     patchLatest = false;
     topLevel = true;
     dependencies = [
@@ -1791,6 +2042,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "lockfile";
+    version = "0.4.0";
+    fullName = "lockfile-~0.4.0";
+    hash = "80b81e5d9e8af9f661cfa57f6cf88ec7f2cac90196dae8ca4b382a812694d68e";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "lru-cache";
     version = "2.3.0";
@@ -1831,6 +2092,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "lru-cache";
+    version = "2.3.0";
+    fullName = "lru-cache-~2.3.0";
+    hash = "fbb1a14e0314095b7999a3a7489c92983f3d95b188857af697487ac8a778e942";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "methods";
     version = "0.0.1";
@@ -1958,6 +2229,18 @@
       { name = "sigmund"; range = "~1.0.0"; }
     ];
   }
+  {
+    baseName = "minimatch";
+    version = "0.2.12";
+    fullName = "minimatch-~0.2.0";
+    hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "lru-cache"; range = "2"; }
+      { name = "sigmund"; range = "~1.0.0"; }
+    ];
+  }
   {
     baseName = "minimatch";
     version = "0.2.12";
@@ -1970,6 +2253,18 @@
       { name = "sigmund"; range = "~1.0.0"; }
     ];
   }
+  {
+    baseName = "minimatch";
+    version = "0.2.12";
+    fullName = "minimatch-~0.2.12";
+    hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "lru-cache"; range = "2"; }
+      { name = "sigmund"; range = "~1.0.0"; }
+    ];
+  }
   {
     baseName = "minimist";
     version = "0.0.1";
@@ -2050,6 +2345,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "mkdirp";
+    version = "0.3.5";
+    fullName = "mkdirp-~0.3.3";
+    hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "mkdirp";
     version = "0.3.5";
@@ -2343,6 +2648,29 @@
       { name = "which"; range = "1"; }
     ];
   }
+  {
+    baseName = "node-gyp";
+    version = "0.10.6";
+    fullName = "node-gyp-~0.10.6";
+    hash = "1b1fc060c1a84eb0f52c495d7d13e3a7f03b2753b74dc6c1c801c5b8d563c5b0";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "glob"; range = "3"; }
+      { name = "graceful-fs"; range = "2"; }
+      { name = "fstream"; range = "0"; }
+      { name = "minimatch"; range = "0"; }
+      { name = "mkdirp"; range = "0"; }
+      { name = "nopt"; range = "2"; }
+      { name = "npmlog"; range = "0"; }
+      { name = "osenv"; range = "0"; }
+      { name = "request"; range = "2"; }
+      { name = "rimraf"; range = "2"; }
+      { name = "semver"; range = "~2.0.7"; }
+      { name = "tar"; range = "0"; }
+      { name = "which"; range = "1"; }
+    ];
+  }
   {
     baseName = "node-uuid";
     version = "1.4.0";
@@ -2425,6 +2753,110 @@
       { name = "abbrev"; range = "1"; }
     ];
   }
+  {
+    baseName = "nopt";
+    version = "2.1.1";
+    fullName = "nopt-~2.1.1";
+    hash = "a7a84f3fe51cb8fb97c678bc73130b53d6782ee90dc0e9b15ae39630ce2fa203";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "abbrev"; range = "1"; }
+    ];
+  }
+  {
+    baseName = "normalize-package-data";
+    version = "0.2.0";
+    fullName = "normalize-package-data-~0.2";
+    hash = "acde245885200d357f307740e7d3b3a169e1088bed51cbd81d76d6e7dfcf8fa8";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "semver"; range = "2"; }
+      { name = "github-url-from-git"; range = "~1.1.1"; }
+    ];
+  }
+  {
+    baseName = "npm";
+    version = "1.3.4";
+    fullName = "npm-*";
+    hash = "fcf0a1a2bfb920fb7fd4dd172df3ea02b7155247f509add164041645d8742225";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "semver"; range = "~2.0.8"; }
+      { name = "ini"; range = "~1.1.0"; }
+      { name = "slide"; range = "~1.1.4"; }
+      { name = "abbrev"; range = "~1.0.4"; }
+      { name = "graceful-fs"; range = "~2.0.0"; }
+      { name = "minimatch"; range = "~0.2.12"; }
+      { name = "nopt"; range = "~2.1.1"; }
+      { name = "rimraf"; range = "~2.2.0"; }
+      { name = "request"; range = "~2.21.0"; }
+      { name = "which"; range = "1"; }
+      { name = "tar"; range = "~0.1.17"; }
+      { name = "fstream"; range = "~0.1.23"; }
+      { name = "block-stream"; range = "*"; }
+      { name = "inherits"; range = "1"; }
+      { name = "mkdirp"; range = "~0.3.3"; }
+      { name = "read"; range = "~1.0.4"; }
+      { name = "lru-cache"; range = "~2.3.0"; }
+      { name = "node-gyp"; range = "~0.10.6"; }
+      { name = "fstream-npm"; range = "~0.1.3"; }
+      { name = "uid-number"; range = "0"; }
+      { name = "archy"; range = "0"; }
+      { name = "chownr"; range = "0"; }
+      { name = "npmlog"; range = "0.0.4"; }
+      { name = "ansi"; range = "~0.1.2"; }
+      { name = "npm-registry-client"; range = "~0.2.27"; }
+      { name = "read-package-json"; range = "~1.1.0"; }
+      { name = "read-installed"; range = "~0.2.2"; }
+      { name = "glob"; range = "~3.2.3"; }
+      { name = "init-package-json"; range = "0.0.10"; }
+      { name = "osenv"; range = "0"; }
+      { name = "lockfile"; range = "~0.4.0"; }
+      { name = "retry"; range = "~0.6.0"; }
+      { name = "once"; range = "~1.1.1"; }
+      { name = "npmconf"; range = "~0.1.1"; }
+      { name = "opener"; range = "~1.3.0"; }
+      { name = "chmodr"; range = "~0.1.0"; }
+      { name = "cmd-shim"; range = "~1.1.0"; }
+      { name = "sha"; range = "~1.0.1"; }
+      { name = "editor"; range = "0.0.4"; }
+      { name = "child-process-close"; range = "~0.1.1"; }
+      { name = "npm-user-validate"; range = "0.0.3"; }
+    ];
+  }
+  {
+    baseName = "npm-registry-client";
+    version = "0.2.27";
+    fullName = "npm-registry-client-~0.2.27";
+    hash = "9899d95fb9e71224ae49120621e245d20c2e05658e817442b2a30fcf8928441b";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "request"; range = "2 >=2.20.0"; }
+      { name = "graceful-fs"; range = "~2.0.0"; }
+      { name = "semver"; range = "~2.0.5"; }
+      { name = "slide"; range = "~1.1.3"; }
+      { name = "chownr"; range = "0"; }
+      { name = "mkdirp"; range = "~0.3.3"; }
+      { name = "rimraf"; range = "~2"; }
+      { name = "retry"; range = "0.6.0"; }
+      { name = "couch-login"; range = "~0.1.15"; }
+      { name = "npmlog"; range = ""; }
+    ];
+  }
+  {
+    baseName = "npm-user-validate";
+    version = "0.0.3";
+    fullName = "npm-user-validate-0.0.3";
+    hash = "3ba7b67338af6deff49c8c6588542aaea83f034cad0dfe34519b546c05f29402";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "npm2nix";
     version = "1.2.0";
@@ -2436,6 +2868,35 @@
       { name = "semver"; range = "1"; }
     ];
   }
+  {
+    baseName = "npmconf";
+    version = "0.1.1";
+    fullName = "npmconf-~0.1.1";
+    hash = "e4448bd02d4745549324fd0dbc333bcd9bf37de11e2ecc7bc02bf9655ddec2e9";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "config-chain"; range = "~1.1.1"; }
+      { name = "inherits"; range = "~1.0.0"; }
+      { name = "once"; range = "~1.1.1"; }
+      { name = "mkdirp"; range = "~0.3.3"; }
+      { name = "osenv"; range = "0.0.3"; }
+      { name = "nopt"; range = "2"; }
+      { name = "semver"; range = "2"; }
+      { name = "ini"; range = "~1.1.0"; }
+    ];
+  }
+  {
+    baseName = "npmlog";
+    version = "0.0.4";
+    fullName = "npmlog-";
+    hash = "16da9f0f239813f201156b81a5ebe552c9a3f78a405dbb24c2c1743fe3a0d579";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "ansi"; range = "~0.1.2"; }
+    ];
+  }
   {
     baseName = "npmlog";
     version = "0.0.4";
@@ -2447,6 +2908,17 @@
       { name = "ansi"; range = "~0.1.2"; }
     ];
   }
+  {
+    baseName = "npmlog";
+    version = "0.0.4";
+    fullName = "npmlog-0.0.4";
+    hash = "16da9f0f239813f201156b81a5ebe552c9a3f78a405dbb24c2c1743fe3a0d579";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "ansi"; range = "~0.1.2"; }
+    ];
+  }
   {
     baseName = "nssocket";
     version = "0.5.1";
@@ -2489,6 +2961,26 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "once";
+    version = "1.1.1";
+    fullName = "once-~1.1.1";
+    hash = "3fdc1a246f2522991fd9a6554a93c012c3192ea99918fdd893a2d4f2d546fe93";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "opener";
+    version = "1.3.0";
+    fullName = "opener-~1.3.0";
+    hash = "8ce1113b83487849625156d72483e4eef7b8eebf63a9e8d7732df15c240efa06";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "optimist";
     version = "0.6.0";
@@ -2586,6 +3078,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "osenv";
+    version = "0.0.3";
+    fullName = "osenv-0.0.3";
+    hash = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "owl-deepcopy";
     version = "0.0.2";
@@ -2742,6 +3244,27 @@
       { name = "winston"; range = "0.6.x"; }
     ];
   }
+  {
+    baseName = "promzard";
+    version = "0.2.0";
+    fullName = "promzard-~0.2.0";
+    hash = "e9dcdf4084876c4b751f2f5939f149071495f0d23bf80a9ec4a73cd84080184b";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "read"; range = "1"; }
+    ];
+  }
+  {
+    baseName = "proto-list";
+    version = "1.2.2";
+    fullName = "proto-list-~1.2.1";
+    hash = "1a1916d1a55ada8d8f3530d2073d57b6b9f0547b317686a7bc0492305d1d8e3b";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "ps-tree";
     version = "0.0.3";
@@ -2823,6 +3346,17 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "read";
+    version = "1.0.4";
+    fullName = "read-1";
+    hash = "8be269afeaa7cc62feb4672e8e61e5133152266dc5347b23cf5b05bc40789601";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "mute-stream"; range = "~0.0.2"; }
+    ];
+  }
   {
     baseName = "read";
     version = "1.0.4";
@@ -2834,6 +3368,70 @@
       { name = "mute-stream"; range = "~0.0.2"; }
     ];
   }
+  {
+    baseName = "read-installed";
+    version = "0.2.2";
+    fullName = "read-installed-~0.2.2";
+    hash = "1237a4eb7444063ef83be336ecd317ffeafd2fef8f9e81468a5d7545e1a80c23";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "semver"; range = "2"; }
+      { name = "slide"; range = "~1.1.3"; }
+      { name = "read-package-json"; range = "1"; }
+      { name = "graceful-fs"; range = "~1.2.0"; }
+    ];
+  }
+  {
+    baseName = "read-package-json";
+    version = "1.1.0";
+    fullName = "read-package-json-1";
+    hash = "f3d2f47ffcab7512bb5cfba1854e708534dcae073704c3c9baba36de19b89969";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "glob"; range = "~3.2.1"; }
+      { name = "lru-cache"; range = "2"; }
+      { name = "normalize-package-data"; range = "~0.2"; }
+      { name = "graceful-fs"; range = "~1.2"; }
+    ];
+  }
+  {
+    baseName = "read-package-json";
+    version = "1.1.0";
+    fullName = "read-package-json-~1.1.0";
+    hash = "f3d2f47ffcab7512bb5cfba1854e708534dcae073704c3c9baba36de19b89969";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "glob"; range = "~3.2.1"; }
+      { name = "lru-cache"; range = "2"; }
+      { name = "normalize-package-data"; range = "~0.2"; }
+      { name = "graceful-fs"; range = "~1.2"; }
+    ];
+  }
+  {
+    baseName = "read";
+    version = "1.0.4";
+    fullName = "read-~1.0.1";
+    hash = "8be269afeaa7cc62feb4672e8e61e5133152266dc5347b23cf5b05bc40789601";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "mute-stream"; range = "~0.0.2"; }
+    ];
+  }
+  {
+    baseName = "read";
+    version = "1.0.4";
+    fullName = "read-~1.0.4";
+    hash = "8be269afeaa7cc62feb4672e8e61e5133152266dc5347b23cf5b05bc40789601";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "mute-stream"; range = "~0.0.2"; }
+    ];
+  }
   {
     baseName = "readable-stream";
     version = "1.0.2";
@@ -2930,6 +3528,50 @@
       { name = "form-data"; range = "0.0.8"; }
     ];
   }
+  {
+    baseName = "request";
+    version = "2.22.0";
+    fullName = "request-2 >=2.14";
+    hash = "d0a7ebc001800143d05cedf616cc164a31425bcbfdb8eb533b59d8c123b1275c";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; range = "~0.6.0"; }
+      { name = "json-stringify-safe"; range = "~4.0.0"; }
+      { name = "forever-agent"; range = "~0.5.0"; }
+      { name = "tunnel-agent"; range = "~0.3.0"; }
+      { name = "http-signature"; range = "~0.10.0"; }
+      { name = "hawk"; range = "~0.13.0"; }
+      { name = "aws-sign"; range = "~0.3.0"; }
+      { name = "oauth-sign"; range = "~0.3.0"; }
+      { name = "cookie-jar"; range = "~0.3.0"; }
+      { name = "node-uuid"; range = "~1.4.0"; }
+      { name = "mime"; range = "~1.2.9"; }
+      { name = "form-data"; range = "0.0.8"; }
+    ];
+  }
+  {
+    baseName = "request";
+    version = "2.22.0";
+    fullName = "request-2 >=2.20.0";
+    hash = "d0a7ebc001800143d05cedf616cc164a31425bcbfdb8eb533b59d8c123b1275c";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; range = "~0.6.0"; }
+      { name = "json-stringify-safe"; range = "~4.0.0"; }
+      { name = "forever-agent"; range = "~0.5.0"; }
+      { name = "tunnel-agent"; range = "~0.3.0"; }
+      { name = "http-signature"; range = "~0.10.0"; }
+      { name = "hawk"; range = "~0.13.0"; }
+      { name = "aws-sign"; range = "~0.3.0"; }
+      { name = "oauth-sign"; range = "~0.3.0"; }
+      { name = "cookie-jar"; range = "~0.3.0"; }
+      { name = "node-uuid"; range = "~1.4.0"; }
+      { name = "mime"; range = "~1.2.9"; }
+      { name = "form-data"; range = "0.0.8"; }
+    ];
+  }
   {
     baseName = "request";
     version = "2.16.6";
@@ -2983,6 +3625,28 @@
       { name = "form-data"; range = "0.0.8"; }
     ];
   }
+  {
+    baseName = "request";
+    version = "2.21.0";
+    fullName = "request-~2.21.0";
+    hash = "fe31c3119bc4423f07aa7c9849cb642d5ad22bdf2a2700eab56fb83fa8ed429c";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; range = "~0.6.0"; }
+      { name = "json-stringify-safe"; range = "~4.0.0"; }
+      { name = "forever-agent"; range = "~0.5.0"; }
+      { name = "tunnel-agent"; range = "~0.3.0"; }
+      { name = "http-signature"; range = "~0.9.11"; }
+      { name = "hawk"; range = "~0.13.0"; }
+      { name = "aws-sign"; range = "~0.3.0"; }
+      { name = "oauth-sign"; range = "~0.3.0"; }
+      { name = "cookie-jar"; range = "~0.3.0"; }
+      { name = "node-uuid"; range = "~1.4.0"; }
+      { name = "mime"; range = "~1.2.9"; }
+      { name = "form-data"; range = "0.0.8"; }
+    ];
+  }
   {
     baseName = "restify";
     version = "2.4.1";
@@ -3010,6 +3674,26 @@
       { name = "dtrace-provider"; range = "0.2.8"; }
     ];
   }
+  {
+    baseName = "retry";
+    version = "0.6.0";
+    fullName = "retry-0.6.0";
+    hash = "983e676af24ff4dcbac396420fca3c195ce3b1de5f731f697888b4fe6b7bbd2a";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "retry";
+    version = "0.6.0";
+    fullName = "retry-~0.6.0";
+    hash = "983e676af24ff4dcbac396420fca3c195ce3b1de5f731f697888b4fe6b7bbd2a";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "revalidator";
     version = "0.1.5";
@@ -3041,6 +3725,17 @@
       { name = "graceful-fs"; range = "~1"; }
     ];
   }
+  {
+    baseName = "rimraf";
+    version = "2.2.0";
+    fullName = "rimraf-~2";
+    hash = "4d250a91e5da8f0e839647149268d3682c868a65e920477ff5baae26591ebeb2";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "graceful-fs"; range = "~1"; }
+    ];
+  }
   {
     baseName = "rimraf";
     version = "2.1.4";
@@ -3052,6 +3747,17 @@
       { name = "graceful-fs"; range = "~1"; }
     ];
   }
+  {
+    baseName = "rimraf";
+    version = "2.2.0";
+    fullName = "rimraf-~2.2.0";
+    hash = "4d250a91e5da8f0e839647149268d3682c868a65e920477ff5baae26591ebeb2";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "graceful-fs"; range = "~1"; }
+    ];
+  }
   {
     baseName = "s3http";
     version = "0.0.2";
@@ -3115,6 +3821,36 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "semver";
+    version = "2.0.10";
+    fullName = "semver-2";
+    hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "semver";
+    version = "2.0.10";
+    fullName = "semver-2.x";
+    hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "semver";
+    version = "2.0.10";
+    fullName = "semver-~2.0.5";
+    hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "semver";
     version = "2.0.10";
@@ -3125,6 +3861,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "semver";
+    version = "2.0.10";
+    fullName = "semver-~2.0.8";
+    hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "send";
     version = "0.1.3";
@@ -3177,6 +3923,17 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "sha";
+    version = "1.0.1";
+    fullName = "sha-~1.0.1";
+    hash = "b540d2ae52395b7c22c8ad1fa4e0cf430ccab917847ddea5308fa833cf85c5fb";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "graceful-fs"; range = "1.2"; }
+    ];
+  }
   {
     baseName = "shelljs";
     version = "0.1.4";
@@ -3227,6 +3984,26 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "slide";
+    version = "1.1.4";
+    fullName = "slide-~1.1.3";
+    hash = "db50179b7ceac3a1d79527a7c3db39ee1d5e936a07504e6aa542f9078aa33a6a";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "slide";
+    version = "1.1.4";
+    fullName = "slide-~1.1.4";
+    hash = "db50179b7ceac3a1d79527a7c3db39ee1d5e936a07504e6aa542f9078aa33a6a";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "smartdc";
     version = "7.0.0";
@@ -3468,6 +4245,19 @@
       { name = "fstream"; range = "~0.1.8"; }
     ];
   }
+  {
+    baseName = "tar";
+    version = "0.1.17";
+    fullName = "tar-~0.1.17";
+    hash = "577832975440eba0a9293244d53fa2c383e5c27ec2f68e3defde0cc23910b978";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "inherits"; range = "1.x"; }
+      { name = "block-stream"; range = "*"; }
+      { name = "fstream"; range = "~0.1.8"; }
+    ];
+  }
   {
     baseName = "temp";
     version = "0.5.1";
@@ -3570,6 +4360,16 @@
       { name = "optimist"; range = "~0.3.5"; }
     ];
   }
+  {
+    baseName = "uid-number";
+    version = "0.0.3";
+    fullName = "uid-number-0";
+    hash = "e8eab0de35bcb20a55f58a276b2f6cfe1c531fae5982d7a3af7286807dbbe42b";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "uid2";
     version = "0.0.2";
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 64e13d07696c..ac09384b1eee 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -60,4 +60,5 @@
 , "libyaml"
 , "i18next"
 , "stylus"
+, "npm"
 ]

From 2c71290da78b5b750f9fe5b615637a087e871253 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 14 Jul 2013 05:30:42 +0300
Subject: [PATCH 155/439] Fix perl packages go use mirror://cpan where possible

---
 pkgs/top-level/perl-packages.nix | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 64f677093b32..8a060381aa45 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -268,7 +268,7 @@ rec {
   BitVector = buildPerlPackage {
     name = "Bit-Vector-7.3";
     src = fetchurl {
-      url = http://cpan.metacpan.org/authors/id/S/ST/STBEY/Bit-Vector-7.3.tar.gz;
+      url = mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-7.3.tar.gz;
       sha256 = "0gcg1173i1bsx2qvyw77kw90xbf03b861jc42hvq744vzc5k6xjs";
     };
     propagatedBuildInputs = [CarpClan];
@@ -365,7 +365,7 @@ rec {
   CaptchaReCAPTCHA = buildPerlPackage rec {
     name = "Captcha-reCAPTCHA-0.97";
     src = fetchurl {
-      url = http://cpan.metacpan.org/authors/id/P/PH/PHRED/Captcha-reCAPTCHA-0.97.tar.gz;
+      url = mirror://cpan/authors/id/P/PH/PHRED/Captcha-reCAPTCHA-0.97.tar.gz;
       sha256 = "12f2yh89aji6mnkrqxjcllws5dlg545wvz0j7wamy149xyqi12wq";
     };
     propagatedBuildInputs = [HTMLTiny LWP];
@@ -1687,7 +1687,7 @@ rec {
   DateCalc = buildPerlPackage {
     name = "Date-Calc-6.3";
     src = fetchurl {
-      url = http://cpan.metacpan.org/authors/id/S/ST/STBEY/Date-Calc-6.3.tar.gz;
+      url = mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-6.3.tar.gz;
       sha256 = "14yvbgy9n8icwlm5zi86lskvxd6nsl42i1g9f5dwdaw9my463diy";
     };
     propagatedBuildInputs = [CarpClan BitVector];
@@ -2425,7 +2425,7 @@ rec {
   ExceptionBase = buildPerlPackage {
     name = "Exception-Base-0.25";
     src = fetchurl {
-      url = http://cpan.metacpan.org/authors/id/D/DE/DEXTER/Exception-Base-0.25.tar.gz;
+      url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.25.tar.gz;
       sha256 = "1s2is862xba2yy633wn2nklrya36yrlwxlbpqjrv8m31xj2c8khw";
     };
     buildInputs = [ TestUnitLite ];
@@ -3641,8 +3641,8 @@ rec {
   libintl_perl = buildPerlPackage rec {
     name = "libintl-perl-1.23";
     src = fetchurl {
-        url = http://cpan.metacpan.org/authors/id/G/GU/GUIDO/libintl-perl-1.23.tar.gz;
-        sha256 = "1ylz6yhjifblhmnva0k05ch12a4cdii5v0icah69ma1gdhsidnk0";
+      url = mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.23.tar.gz;
+      sha256 = "1ylz6yhjifblhmnva0k05ch12a4cdii5v0icah69ma1gdhsidnk0";
     };
   };
 
@@ -3745,8 +3745,8 @@ rec {
   ListUtilsBy = buildPerlPackage rec {
     name = "List-UtilsBy-0.09";
     src = fetchurl {
-        url = http://cpan.metacpan.org/authors/id/P/PE/PEVANS/List-UtilsBy-0.09.tar.gz;
-        sha256 = "1xcsgz8898h670zmwqd8azfn3a2y9nq7z8cva9dsyhzkk8ajmra1";
+      url = mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.09.tar.gz;
+      sha256 = "1xcsgz8898h670zmwqd8azfn3a2y9nq7z8cva9dsyhzkk8ajmra1";
     };
   };
 
@@ -4251,7 +4251,7 @@ rec {
   ModuleVersions = buildPerlPackage {
     name = "Module-Versions-0.02";
     src = fetchurl {
-      url = http://cpan.metacpan.org/authors/id/T/TH/THW/Module-Versions-0.02.zip;
+      url = mirror://cpan/authors/id/T/TH/THW/Module-Versions-0.02.zip;
       sha256 = "0g7qs6vqg91xpwg1cdy91m3kh9m1zbkzyz1qsy453b572xdscf0d";
     };
     buildInputs = [ pkgs.unzip ];
@@ -4511,8 +4511,8 @@ rec {
   MooseXSingleton = buildPerlPackage rec {
     name = "MooseX-Singleton-0.29";
     src = fetchurl {
-        url = http://cpan.metacpan.org/authors/id/K/KA/KAARE/MooseX-Singleton-0.29.tar.gz;
-        sha256 = "0103f0hi7fp3mc0y0ydnz4ghcnag5gwgn2160y2zp6rnydx2p2sc";
+      url = mirror://cpan/authors/id/K/KA/KAARE/MooseX-Singleton-0.29.tar.gz;
+      sha256 = "0103f0hi7fp3mc0y0ydnz4ghcnag5gwgn2160y2zp6rnydx2p2sc";
     };
     buildInputs = [ Moose TestFatal TestRequires ];
   };
@@ -4603,7 +4603,7 @@ rec {
   MooseXTypesLoadableClass = buildPerlPackage rec {
     name = "MooseX-Types-LoadableClass-0.008";
     src = fetchurl {
-      url = http://cpan.metacpan.org/authors/id/B/BO/BOBTFISH/MooseX-Types-LoadableClass-0.008.tar.gz;
+      url = mirror://cpan/authors/id/B/BO/BOBTFISH/MooseX-Types-LoadableClass-0.008.tar.gz;
       sha256 = "0wh4zxknqv98nrmsp6yg6mazjyl3vacrgywarzjg5gks78c84i8g";
     };
     propagatedBuildInputs = [ ClassLoad Moose MooseXTypes namespaceclean ];
@@ -5500,7 +5500,7 @@ rec {
   RSSParserLite = buildPerlPackage {
     name = "RSS-Parser-Lite-0.10";
     src = fetchurl {
-      url = http://cpan.metacpan.org/authors/id/E/EB/EBOSRUP/RSS-Parser-Lite-0.10.tar.gz;
+      url = mirror://cpan/authors/id/E/EB/EBOSRUP/RSS-Parser-Lite-0.10.tar.gz;
       sha256 = "1spvi0z62saz2cam8kwk2k561aavw2w42g3ykj38w1kmydvsk8z6";
     };
     propagatedBuildInputs = [ SOAPLite ];
@@ -6664,7 +6664,7 @@ rec {
   TestXPath = buildPerlModule {
     name = "Test-XPath-0.16";
     src = fetchurl {
-      url = http://cpan.metacpan.org/authors/id/D/DW/DWHEELER/Test-XPath-0.16.tar.gz;
+      url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-XPath-0.16.tar.gz;
       sha256 = "09s47d5jcrx35dz623gjiqn0qmjrv0wb54czr7h01wffw1w8akxi";
     };
     propagatedBuildInputs = [ XMLLibXML ];

From fba8b902da803e904e6175f3ad2a9fd329c74c42 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 14 Jul 2013 05:38:03 +0300
Subject: [PATCH 156/439] fix packages to use mirror://xorg

---
 pkgs/applications/misc/xfontsel/default.nix            | 2 +-
 pkgs/applications/misc/xlsfonts/default.nix            | 2 +-
 pkgs/applications/window-managers/xcompmgr/default.nix | 2 +-
 pkgs/tools/graphics/editres/default.nix                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix
index 3179e1f34401..b159dd282e23 100644
--- a/pkgs/applications/misc/xfontsel/default.nix
+++ b/pkgs/applications/misc/xfontsel/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "xfontsel-1.0.2";
 
   src = fetchurl {
-    url = "http://www.x.org/releases/individual/app/${name}.tar.bz2";
+    url = "mirror://xorg/individual/app/${name}.tar.bz2";
     sha256 = "1a86a08sf0wjrki9ydh7hr5qf6hrixc4ljlxizakjzmx20wvlrks";
   };
 
diff --git a/pkgs/applications/misc/xlsfonts/default.nix b/pkgs/applications/misc/xlsfonts/default.nix
index 8fe930ce9a50..879f5ae568cc 100644
--- a/pkgs/applications/misc/xlsfonts/default.nix
+++ b/pkgs/applications/misc/xlsfonts/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "xlsfonts-1.0.2";
 
   src = fetchurl {
-    url = "http://www.x.org/releases/individual/app/${name}.tar.bz2";
+    url = "mirror://xorg/individual/app/${name}.tar.bz2";
     sha256 = "070iym754g3mf9x6xczl4gdnpvlk6rdyl1ndwhpjl21vg2dm2vnc";
   };
 
diff --git a/pkgs/applications/window-managers/xcompmgr/default.nix b/pkgs/applications/window-managers/xcompmgr/default.nix
index 3e402b05b94c..930b612f6914 100644
--- a/pkgs/applications/window-managers/xcompmgr/default.nix
+++ b/pkgs/applications/window-managers/xcompmgr/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "xcompmgr-1.1.6";
   src = fetchurl {
-    url = "http://www.x.org/releases/individual/app/${name}.tar.bz2";
+    url = "mirror://xorg/individual/app/${name}.tar.bz2";
     sha256 = "c98949d36793b30ed1ed47495c87a05fa245ac0fc2857d2abc54979124687c02";
   };
   buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender libXext ];
diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix
index 50f81c3ea4de..64222185044d 100644
--- a/pkgs/tools/graphics/editres/default.nix
+++ b/pkgs/tools/graphics/editres/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "editres-1.0.6";
 
   src = fetchurl {
-    url = "http://xorg.freedesktop.org/releases/individual/app/${name}.tar.gz";
+    url = "mirror://xorg/individual/app/${name}.tar.gz";
     sha256 = "06kv7dmw6pzlqc46dbh8k9xpb6sn4ihh0bcpxq0zpvw2lm66dx45";
   };
 

From c8cc4128acfe874422ec543a4876cd5565336f5e Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sun, 14 Jul 2013 13:42:33 +1000
Subject: [PATCH 157/439] numpy: fix build on darwin

* remove unnecessary gcc flag
---
 pkgs/top-level/python-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 55059c111ef0..d468fbf6c71f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3064,6 +3064,10 @@ pythonPackages = python.modules // rec {
       sha256 = "1pawfmf7j7pd3mjzhmmw9hkglc2qdirrkvv29m5nsmpf2b3ip2vq";
     };
 
+    preConfigure = ''
+      sed -i 's/-faltivec//' numpy/distutils/system_info.py
+    '';
+
     # TODO: add ATLAS=${pkgs.atlas}
     installCommand = ''
       export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack}

From 0fa697405ccd8c57369a8293f5dab05151d985ec Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 13 Jul 2013 16:42:15 +0200
Subject: [PATCH 158/439] dmg2img: upgrade to 1.6.4

---
 pkgs/tools/misc/dmg2img/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix
index b9a15ac6a204..75a9a2037dbe 100644
--- a/pkgs/tools/misc/dmg2img/default.nix
+++ b/pkgs/tools/misc/dmg2img/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, bzip2, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "dmg2img-1.6.2";
+  name = "dmg2img-1.6.4";
 
   src = fetchurl {
     url = "http://vu1tur.eu.org/tools/${name}.tar.gz";
-    sha256 = "1ibxjsrl9g877qi3jjpv0zdgl4x8j1vnd4y27q17a8my1jkhh5cg";
+    sha256 = "1vcrkphrxdn6dlna8j47a5zaxvdr74msf1sqnc4ldskf35k87fyb";
   };
- 
+
   buildInputs = [zlib bzip2 openssl];
 
   installPhase = ''

From 0716e5b9e2ff3a49509d245330292f8928e85b05 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 14 Jul 2013 09:40:19 +0200
Subject: [PATCH 159/439] python-hetzner: Update to new version 0.3.0.

Changes are:

 - Ability to set the name of a server (Server.set_name()).
 - New sub-command (set-name) for hetznerctl to set server name.
 - Show server name in list command.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5fbe0ea553f6..741d2549258f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2128,12 +2128,12 @@ pythonPackages = python.modules // rec {
 
   hetzner = buildPythonPackage rec {
     name = "hetzner-${version}";
-    version = "0.2.1";
+    version = "0.3.0";
 
     src = fetchurl {
       url = "https://github.com/RedMoonStudios/hetzner/archive/"
           + "v${version}.tar.gz";
-      sha256 = "0im7frzmbd1v89251ci8ahrjhw578nmksqlfcdakim0jr23si4wh";
+      sha256 = "10ywn7jbrv86ippf3bpbf01a4jnalwkkd0k7kxc39a55mfbx5s7d";
     };
 
     # not there yet, but coming soon.

From 9566d6617114765a003cb84d9cd3139b2fadbf67 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jul 2013 14:46:51 +0400
Subject: [PATCH 160/439] Fix gtkspell

---
 pkgs/development/libraries/gtkspell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix
index 017c5be403af..030375938a68 100644
--- a/pkgs/development/libraries/gtkspell/default.nix
+++ b/pkgs/development/libraries/gtkspell/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gtk, aspell, pkgconfig}:
+{stdenv, fetchurl, gtk, aspell, pkgconfig, enchant, intltool}:
 
 stdenv.mkDerivation {
   name = "gtkspell-2.0.16";
@@ -8,5 +8,5 @@ stdenv.mkDerivation {
     sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg";
   };
   
-  buildInputs = [aspell pkgconfig gtk];
+  buildInputs = [aspell pkgconfig gtk enchant intltool];
 }

From 483755e9abaa581256d04ce902f014d033caf9de Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 14 Jul 2013 14:07:39 -0400
Subject: [PATCH 161/439] buildNodePacakge: Create man page symlinks when
 needed

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/web/nodejs/build-node-package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index 8a56e3e798b9..1e6d5cc6bcac 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -45,6 +45,10 @@ stdenv.mkDerivation ({
       find -L $out/node_modules/.bin/* -type f -print0 | \
         xargs -0 sed --follow-symlinks -i 's@#!/usr/bin/env node@#!${nodejs}/bin/node@'
     fi
+    if [ -e "$out/node_modules/${requireName}/man" ]; then
+      mkdir $out/share
+      ln -sv node_modules/${requireName}/man $out/share/man
+    fi
     runHook postInstall
   '';
 

From a895082e5663211dcf0d251b7da92915c7871993 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 14 Jul 2013 14:41:53 -0400
Subject: [PATCH 162/439] nodePackages: Update to npm2nix 2.0 format

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/node-packages-generated.nix | 9660 ++++++++++----------
 pkgs/top-level/node-packages.nix           |   36 +-
 2 files changed, 5094 insertions(+), 4602 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 4e1cc57a0a48..536bb2ef9445 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -1,4713 +1,5199 @@
 [
   {
-    baseName = "abbrev";
+    name = "abbrev";
+    spec = "1";
     version = "1.0.4";
-    fullName = "abbrev-1";
-    hash = "8dc0f480571a4a19e74f1abd4f31f6a70f94953d1ccafa16ed1a544a19a6f3a8";
-    patchLatest = false;
     topLevel = false;
     dependencies = [
     ];
+    patchLatest = false;
+    sha1 = "bd55ae5e413ba1722ee4caba1f6ea10414a59ecd";
+    tarball = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.4.tgz";
   }
   {
-    baseName = "abbrev";
+    name = "abbrev";
+    spec = "~1.0.4";
     version = "1.0.4";
-    fullName = "abbrev-~1.0.4";
-    hash = "8dc0f480571a4a19e74f1abd4f31f6a70f94953d1ccafa16ed1a544a19a6f3a8";
-    patchLatest = false;
     topLevel = false;
     dependencies = [
     ];
+    patchLatest = false;
+    sha1 = "bd55ae5e413ba1722ee4caba1f6ea10414a59ecd";
+    tarball = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.4.tgz";
   }
   {
-    baseName = "amdefine";
+    name = "amdefine";
+    spec = "*";
     version = "0.0.5";
-    fullName = "amdefine-*";
-    hash = "7d7a691c9742d4c9aaa8036b823823e45a676dec6897f2e072b90c7d37722fc1";
-    patchLatest = false;
     topLevel = true;
     dependencies = [
     ];
+    patchLatest = false;
+    sha1 = "86b6e9470f8cde955ef7daa3cf5d544ba81aa3db";
+    tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.5.tgz";
   }
   {
-    baseName = "amdefine";
+    name = "amdefine";
+    spec = ">=0.0.4";
     version = "0.0.5";
-    fullName = "amdefine->=0.0.4";
-    hash = "7d7a691c9742d4c9aaa8036b823823e45a676dec6897f2e072b90c7d37722fc1";
-    patchLatest = false;
     topLevel = false;
     dependencies = [
     ];
-  }
-  {
-    baseName = "ansi-remover";
-    version = "0.0.2";
-    fullName = "ansi-remover-*";
-    hash = "cda72261ea8d6b830892764d69eff8d926be852fc91ad3b8b5b258d606400bc7";
     patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
+    sha1 = "86b6e9470f8cde955ef7daa3cf5d544ba81aa3db";
+    tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.5.tgz";
   }
   {
-    baseName = "ansi";
+    name = "ansi";
+    spec = "~0.1.2";
     version = "0.1.2";
-    fullName = "ansi-~0.1.2";
-    hash = "6f2288b1db642eb822578f4ee70bf26bf97173cc7d3f10f496070fb96250006b";
-    patchLatest = false;
     topLevel = false;
     dependencies = [
     ];
-  }
-  {
-    baseName = "apparatus";
-    version = "0.0.7";
-    fullName = "apparatus->= 0.0.4";
-    hash = "77ce711505bf1c65222b5dd01e055284b25cf52ee3229fcae7fcfa3e5664826c";
     patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "sylvester"; range = ">= 0.0.8"; }
-    ];
+    sha1 = "2627e29498f06e2a1c2ece9c21e28fd494430827";
+    tarball = "http://registry.npmjs.org/ansi/-/ansi-0.1.2.tgz";
   }
   {
-    baseName = "archy";
+    name = "ansi-remover";
+    spec = "*";
     version = "0.0.2";
-    fullName = "archy-0";
-    hash = "355bafab4acbb86e4e94c00c55900215abe41ae72ab454be889c766e5889a6e5";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "asn1";
-    version = "0.1.11";
-    fullName = "asn1-0.1.11";
-    hash = "7206eadc8a9344e484bcce979e22a12c9fa64c1395aa0544b8b767808b268f43";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "assert";
-    version = "0.4.9";
-    fullName = "assert-*";
-    hash = "976a12385f7286d123734fabc7355bbeecd2532daccfada02909818b905abeeb";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "util"; range = ">= 0.4.9"; }
-    ];
-  }
-  {
-    baseName = "assert-plus";
-    version = "0.1.2";
-    fullName = "assert-plus-0.1.2";
-    hash = "bd62e853460024d1e35d3f76065f4c856a271e55ef1ce684f3033314b7377c61";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "async";
-    version = "0.2.9";
-    fullName = "async-*";
-    hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53";
-    patchLatest = false;
     topLevel = true;
     dependencies = [
     ];
-  }
-  {
-    baseName = "async";
-    version = "0.1.22";
-    fullName = "async-0.1.x";
-    hash = "6fd2750cd519a754b0e32ef3423e64768055129e00a95d9297005bda29fdef18";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "async";
-    version = "0.2.9";
-    fullName = "async-0.2.x";
-    hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "async";
-    version = "0.2.9";
-    fullName = "async-~0.2.6";
-    hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "async";
-    version = "0.2.9";
-    fullName = "async-~0.2.7";
-    hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "aws-sdk";
-    version = "1.3.2";
-    fullName = "aws-sdk-*";
-    hash = "6ad0b23bf6eba85609caed4a190ff0068cf0a0a94437b6cfab98fa6ea0c911fe";
-    patchLatest = true;
-    topLevel = true;
-    dependencies = [
-      { name = "xml2js"; range = "0.2.4"; }
-      { name = "xmlbuilder"; range = "*"; }
-    ];
-  }
-  {
-    baseName = "aws-sdk";
-    version = "1.3.2";
-    fullName = "aws-sdk->=1.2.0 <2";
-    hash = "6ad0b23bf6eba85609caed4a190ff0068cf0a0a94437b6cfab98fa6ea0c911fe";
-    patchLatest = true;
-    topLevel = false;
-    dependencies = [
-      { name = "xml2js"; range = "0.2.4"; }
-      { name = "xmlbuilder"; range = "*"; }
-    ];
-  }
-  {
-    baseName = "aws-sign";
-    version = "0.2.0";
-    fullName = "aws-sign-~0.2.0";
-    hash = "145962c6b9b4fe70f587fa745157522c2c6dac4c22bb6fdf3f6cb297f723647e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "aws-sign";
-    version = "0.3.0";
-    fullName = "aws-sign-~0.3.0";
-    hash = "5acca27ed2b1b9f081e4dd230e03808b6a038f8a4afa698db985320efe6dda5e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "backbone";
-    version = "1.0.0";
-    fullName = "backbone-*";
-    hash = "6c66edc5134bb531b33a7f140c75c4a65cdc21711eed64c29300a84cba84f3a7";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "underscore"; range = ">=1.4.3"; }
-    ];
-  }
-  {
-    baseName = "backoff";
-    version = "2.1.0";
-    fullName = "backoff-2.1.0";
-    hash = "d1f5bf32f2f5954f6259582ead30fc8a769db35bac9900c94593b77f915cee0d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "bcrypt";
-    version = "0.7.6";
-    fullName = "bcrypt-*";
-    hash = "e7964429b2bc8aea9b9fb66b914cb3a7952a77029ae13a5a4c4cdbf837d40b2a";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "bindings"; range = "1.0.0"; }
-    ];
-  }
-  {
-    baseName = "bindings";
-    version = "1.1.1";
-    fullName = "bindings-*";
-    hash = "6145f4ae35591a3c51bbcc20628070347353ab90b5313993eda1c1c6927e375b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "bindings";
-    version = "1.0.0";
-    fullName = "bindings-1.0.0";
-    hash = "cb211ac856d135af5ee864762fae9e554225a613ea1fd815c20b8fdd1679c9ed";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "block-stream";
-    version = "0.0.6";
-    fullName = "block-stream-*";
-    hash = "2fc365b42b8601c8ee150d453f6cc762a01054b7fb28bdfcfcbce7c97e93601b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "inherits"; range = "~1.0.0"; }
-    ];
-  }
-  {
-    baseName = "boom";
-    version = "0.3.8";
-    fullName = "boom-0.3.x";
-    hash = "0ea9787bd5c5df98a06a2c7b629d4768c712611032d9af162332e825f9131d8a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "hoek"; range = "0.7.x"; }
-    ];
-  }
-  {
-    baseName = "boom";
-    version = "0.4.2";
-    fullName = "boom-0.4.x";
-    hash = "294e022990269e7fa1e3015862d2d24847cc83c3e68d214dad5a2d0d3826a08f";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "hoek"; range = "0.9.x"; }
-    ];
-  }
-  {
-    baseName = "broadway";
-    version = "0.2.7";
-    fullName = "broadway-0.2.7";
-    hash = "b1ceb289fb1a6de82cddab0851fc905bb60e75167d0e37f32147f8985fa8d368";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "cliff"; range = "0.1.8"; }
-      { name = "eventemitter2"; range = "0.4.11"; }
-      { name = "nconf"; range = "0.6.7"; }
-      { name = "winston"; range = "0.6.2"; }
-      { name = "utile"; range = "0.1.7"; }
-    ];
-  }
-  {
-    baseName = "broadway";
-    version = "0.2.7";
-    fullName = "broadway-0.2.x";
-    hash = "b1ceb289fb1a6de82cddab0851fc905bb60e75167d0e37f32147f8985fa8d368";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "cliff"; range = "0.1.8"; }
-      { name = "eventemitter2"; range = "0.4.11"; }
-      { name = "nconf"; range = "0.6.7"; }
-      { name = "winston"; range = "0.6.2"; }
-      { name = "utile"; range = "0.1.7"; }
-    ];
-  }
-  {
-    baseName = "browserchannel";
-    version = "1.0.4";
-    fullName = "browserchannel-*";
-    hash = "516add6af10f887500c5eaae7347ce92c0101a6bea1a67d5221a674d07bc7999";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "hat"; range = "*"; }
-      { name = "connect"; range = "~2"; }
-      { name = "request"; range = "~2"; }
-    ];
-  }
-  {
-    baseName = "bson";
-    version = "0.1.8";
-    fullName = "bson-0.1.8";
-    hash = "a9cbdee757f213b93aca860fc06143b1f9e9a983130616732beab452681bae17";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "bson";
-    version = "0.1.9";
-    fullName = "bson-0.1.9";
-    hash = "8bb768566c4e8063883d07d2c7965ce8e5380892fd5e34448729c7f44c5f42c8";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "buffer-crc32";
-    version = "0.1.1";
-    fullName = "buffer-crc32-0.1.1";
-    hash = "9e35b724e4e1fd7112e97a6856e7d52b2644761c184f1ed391f6a576fbbb80e1";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "buffer-crc32";
-    version = "0.2.1";
-    fullName = "buffer-crc32-0.2.1";
-    hash = "b6ea96d57411e37c15e18fb8ca600656399912ce16355f9af3c662f765507f01";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "buffer-crc32";
-    version = "0.2.1";
-    fullName = "buffer-crc32-~0.2.1";
-    hash = "b6ea96d57411e37c15e18fb8ca600656399912ce16355f9af3c662f765507f01";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "buffertools";
-    version = "1.1.1";
-    fullName = "buffertools-*";
-    hash = "f5962aec81246077a46ee075072d40fa533c31ada7a0ec18e1ff3600af2d8f3f";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "buffertools";
-    version = "1.1.1";
-    fullName = "buffertools->=1.1.1 <2.0.0";
-    hash = "f5962aec81246077a46ee075072d40fa533c31ada7a0ec18e1ff3600af2d8f3f";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "bunyan";
-    version = "0.21.1";
-    fullName = "bunyan-0.21.1";
-    hash = "95dca2405dcbe5b700e15d7c89b2a64fb21a097fb7ada5c274979f2057adcbef";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "mv"; range = "0.0.5"; }
-      { name = "dtrace-provider"; range = "0.2.8"; }
-    ];
-  }
-  {
-    baseName = "bytes";
-    version = "0.2.0";
-    fullName = "bytes-0.2.0";
-    hash = "e70bd4dccc886a5cf1c925092b4acd7a262a9da3e1b51ccde10a3fcd0a328465";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "character-parser";
-    version = "1.0.2";
-    fullName = "character-parser-1.0.2";
-    hash = "751edecb1143ea951e9cef5c7e1ac71526c712cfab538d09cbb2e90e56d76865";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "child-process-close";
-    version = "0.1.1";
-    fullName = "child-process-close-~0.1.1";
-    hash = "b68574f217d23d11cd4a1e5f1f2be17bf93e2bd38940ae6b07c35b69ec8d456a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "chmodr";
-    version = "0.1.0";
-    fullName = "chmodr-~0.1.0";
-    hash = "2c0bda3df1766290f9fe21940ab455e92bc37d608f2030b0e0b7dfdda9cff9cd";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "chownr";
-    version = "0.0.1";
-    fullName = "chownr-0";
-    hash = "da1fbb894b4103a1a3c912fc780f6dcf7339865298f2fdc4e20afdf00a94b821";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "cli";
-    version = "0.4.4-2";
-    fullName = "cli-0.4.x";
-    hash = "27a0db02501285da601c47495d0cd837ddeb4577bfd507c5503d2ee8cd0caffb";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "glob"; range = ">= 3.1.4"; }
-    ];
-  }
-  {
-    baseName = "cliff";
-    version = "0.1.8";
-    fullName = "cliff-0.1.8";
-    hash = "702f7ce79168e38b982eb3141485bd99e3a6480dac42f579365dc522c3950588";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "colors"; range = "0.x.x"; }
-      { name = "eyes"; range = "0.1.x"; }
-      { name = "winston"; range = "0.6.x"; }
-    ];
-  }
-  {
-    baseName = "clone";
-    version = "0.1.5";
-    fullName = "clone-0.1.5";
-    hash = "9fd586470ccc3fa585dcccad730b5e6fa9c471b49acdb38d724c110777a287d9";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "clone";
-    version = "0.1.6";
-    fullName = "clone-0.1.6";
-    hash = "9849c9faa2549d982106d3b43862dc4ceb308563badcd3ff59e30655d54e897a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "cmd-shim";
-    version = "1.1.0";
-    fullName = "cmd-shim-~1.1.0";
-    hash = "ccc0d6f184b9f77ab9d723e4bcecd88b8fa1a480507eb45cdd67b182617fad33";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "mkdirp"; range = "~0.3.3"; }
-      { name = "graceful-fs"; range = "1.2"; }
-    ];
-  }
-  {
-    baseName = "coffee-script";
-    version = "1.6.3";
-    fullName = "coffee-script-*";
-    hash = "642d226d4fab1a8464e54347cec919b1c8771da55d88e3ceb15d826fcee84525";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "colors";
-    version = "0.6.0-1";
-    fullName = "colors-0.6.0-1";
-    hash = "ca97f462664d77f5ae813029d020d4610ec9fd3f9eef3875e551d3665be7ab7d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "colors";
-    version = "0.6.0-1";
-    fullName = "colors-0.6.x";
-    hash = "ca97f462664d77f5ae813029d020d4610ec9fd3f9eef3875e551d3665be7ab7d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "colors";
-    version = "0.6.0-1";
-    fullName = "colors-0.x.x";
-    hash = "ca97f462664d77f5ae813029d020d4610ec9fd3f9eef3875e551d3665be7ab7d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "combined-stream";
-    version = "0.0.4";
-    fullName = "combined-stream-~0.0.4";
-    hash = "2502ed7a4406db1a65b09cae3106221051d6af20d3f1d7e8cc38cfc72a36432c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "delayed-stream"; range = "0.0.5"; }
-    ];
-  }
-  {
-    baseName = "commander";
-    version = "0.5.1";
-    fullName = "commander-0.5.1";
-    hash = "91042851d0731b28a5e7c342e5cbce7723a7243d31ae378fa86c45ca9493a924";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "commander";
-    version = "0.6.1";
-    fullName = "commander-0.6.1";
-    hash = "7b7fdd1bc4d16f6776169a64f133d629efe2e3a7cd338b1d0884ee909abbd729";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "commander";
-    version = "1.2.0";
-    fullName = "commander-1.2.0";
-    hash = "caeda1cecf7c1b5bf505cdf8d34b984db6ebb307af3798f4af2efdb554d31a4b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "keypress"; range = "0.1.x"; }
-    ];
-  }
-  {
-    baseName = "config-chain";
-    version = "1.1.7";
-    fullName = "config-chain-~1.1.1";
-    hash = "a161af33500f1dc18e4da364ff9f3e0a516c08aa030859ea639480676b9c3f5c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "proto-list"; range = "~1.2.1"; }
-      { name = "ini"; range = "1"; }
-    ];
-  }
-  {
-    baseName = "connect";
-    version = "2.7.5";
-    fullName = "connect-2.7.5";
-    hash = "0c36efa44c6fee030b617a57e52c23f92e7e3949ed01405ee0cb9804403d137f";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "qs"; range = "0.5.1"; }
-      { name = "formidable"; range = "1.0.11"; }
-      { name = "cookie-signature"; range = "1.0.0"; }
-      { name = "buffer-crc32"; range = "0.1.1"; }
-      { name = "cookie"; range = "0.0.5"; }
-      { name = "send"; range = "0.1.0"; }
-      { name = "bytes"; range = "0.2.0"; }
-      { name = "fresh"; range = "0.1.0"; }
-      { name = "pause"; range = "0.0.1"; }
-      { name = "debug"; range = "*"; }
-    ];
-  }
-  {
-    baseName = "connect";
-    version = "2.8.4";
-    fullName = "connect-2.8.4";
-    hash = "e42ef0828b98bdcbbe32f3208ee40b0a92026f3b1fd04425854577454e26546f";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "qs"; range = "0.6.5"; }
-      { name = "formidable"; range = "1.0.14"; }
-      { name = "cookie-signature"; range = "1.0.1"; }
-      { name = "buffer-crc32"; range = "0.2.1"; }
-      { name = "cookie"; range = "0.1.0"; }
-      { name = "send"; range = "0.1.3"; }
-      { name = "bytes"; range = "0.2.0"; }
-      { name = "fresh"; range = "0.1.0"; }
-      { name = "pause"; range = "0.0.1"; }
-      { name = "uid2"; range = "0.0.2"; }
-      { name = "debug"; range = "*"; }
-      { name = "methods"; range = "0.0.1"; }
-    ];
-  }
-  {
-    baseName = "connect-flash";
-    version = "0.1.1";
-    fullName = "connect-flash-*";
-    hash = "3a0a9ac9d73695abcf67a88cb1bc433cc67c55aeca3b515eb922453c7ba0c393";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "connect-mongo";
-    version = "0.3.3";
-    fullName = "connect-mongo-*";
-    hash = "d3613f8e747b83ac1cc559366cba85c47fa391337166719ac87d98dd98bb2433";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "mongodb"; range = "1.2.x"; }
-    ];
-  }
-  {
-    baseName = "connect";
-    version = "2.8.4";
-    fullName = "connect-~2";
-    hash = "e42ef0828b98bdcbbe32f3208ee40b0a92026f3b1fd04425854577454e26546f";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "qs"; range = "0.6.5"; }
-      { name = "formidable"; range = "1.0.14"; }
-      { name = "cookie-signature"; range = "1.0.1"; }
-      { name = "buffer-crc32"; range = "0.2.1"; }
-      { name = "cookie"; range = "0.1.0"; }
-      { name = "send"; range = "0.1.3"; }
-      { name = "bytes"; range = "0.2.0"; }
-      { name = "fresh"; range = "0.1.0"; }
-      { name = "pause"; range = "0.0.1"; }
-      { name = "uid2"; range = "0.0.2"; }
-      { name = "debug"; range = "*"; }
-      { name = "methods"; range = "0.0.1"; }
-    ];
-  }
-  {
-    baseName = "console-browserify";
-    version = "0.1.6";
-    fullName = "console-browserify-0.1.x";
-    hash = "e774c881920562b0893e50844332f79fc5a08752d28791d942c35fcc3ef2d75d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "constantinople";
-    version = "1.0.1";
-    fullName = "constantinople-~1.0.1";
-    hash = "3740bec1b48ee60653c946ab295fecefb9c08b47e1a495330757b415c7cd402f";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "uglify-js"; range = "~2.3.6"; }
-    ];
-  }
-  {
-    baseName = "cookie";
-    version = "0.0.5";
-    fullName = "cookie-0.0.5";
-    hash = "17938b21dcd85f09994b85484abb5aeddc4e92c61d1b599b764bbaaa7ad6adee";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "cookie";
-    version = "0.1.0";
-    fullName = "cookie-0.1.0";
-    hash = "aff5d22a617d744319cc70e42fc4ab11bcbcf924244af565495fa799c0639650";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "cookie-jar";
-    version = "0.2.0";
-    fullName = "cookie-jar-~0.2.0";
-    hash = "eeb643c638f828e39dfc9f44ad8d8e5376930868fdcaf3818ff316806e65af6d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "cookie-jar";
-    version = "0.3.0";
-    fullName = "cookie-jar-~0.3.0";
-    hash = "c7bac7739b9ceb194f431a4a9ac1a0ba4ffd4a60492c61dd1925dbcdb9030746";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "cookie-signature";
-    version = "1.0.0";
-    fullName = "cookie-signature-1.0.0";
-    hash = "990a69fb94e6504390dd0fe935b9fe380f925e1a8360e200e97baa908fca86c6";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "cookie-signature";
-    version = "1.0.1";
-    fullName = "cookie-signature-1.0.1";
-    hash = "e2ea4f290fdcfe82d8fb76991fee4106d4ae1f5d5a2f8b8d91442e047c538c8e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "cookiejar";
-    version = "1.3.0";
-    fullName = "cookiejar-1.3.0";
-    hash = "3bf00caf0e2f9dcd03c7175dcf6c5d700fa6d6f6f7ed77875b986e3c1a606ba7";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "cookies";
-    version = "0.3.6";
-    fullName = "cookies->= 0.2.2";
-    hash = "e35b00cc06a33a3bc1d808daa7bc29f02674c02158c5dd812cf73f275bda8b83";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "couch-login";
-    version = "0.1.17";
-    fullName = "couch-login-~0.1.15";
-    hash = "49b941220d82f17077187b66f9fd88d2eb4a791b9f5beaac046290389c73d268";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "request"; range = "2 >=2.14"; }
-    ];
-  }
-  {
-    baseName = "cryptiles";
-    version = "0.1.3";
-    fullName = "cryptiles-0.1.x";
-    hash = "bac017be67d2b33c01a9b625726b3f8e1e1786711f3132a3cc6f85779ee1d103";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "boom"; range = "0.3.x"; }
-    ];
-  }
-  {
-    baseName = "cryptiles";
-    version = "0.2.2";
-    fullName = "cryptiles-0.2.x";
-    hash = "ed3c2d5d3c1322d5389cceb46778a6c39a62842f737047666d63abda5b39fab5";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "boom"; range = "0.4.x"; }
-    ];
-  }
-  {
-    baseName = "css-parse";
-    version = "1.0.4";
-    fullName = "css-parse-1.0.4";
-    hash = "3d7dcc526083cc1dc584d10c179100a199a82e93991c8bdc92b96ee4bfb7ccac";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "css-stringify";
-    version = "1.0.5";
-    fullName = "css-stringify-1.0.5";
-    hash = "ef45a473b200f24e4cb2f0a97da70b629261ae8a54482e49e1eabc3e4cc36c0e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "css";
-    version = "1.0.8";
-    fullName = "css-~1.0.8";
-    hash = "535bcca2a3635e315a5add3536d2b97fe5636bbee5d039e4fadd8cd422912b8b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "css-parse"; range = "1.0.4"; }
-      { name = "css-stringify"; range = "1.0.5"; }
-    ];
-  }
-  {
-    baseName = "cssom";
-    version = "0.2.5";
-    fullName = "cssom-0.2.x";
-    hash = "22594077e4241c81038cdaac23fcb5ed7f8329a1dc5645286fa55db45c8ac13b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "ctype";
-    version = "0.5.0";
-    fullName = "ctype-0.5.0";
-    hash = "50157e6c5e44d1c833bfc239a7a337ee08fd6f3c5a15f7ef5cee5571a86b0378";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "ctype";
-    version = "0.5.2";
-    fullName = "ctype-0.5.2";
-    hash = "4a7224a74f19dc6a1206fa1c04ae1a4ab795cd4ba842466e2f511fa714f82c60";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "cycle";
-    version = "1.0.2";
-    fullName = "cycle-1.0.x";
-    hash = "ee5dd9af8f0a59624bb32bb6a6f67c13710e180112dba5a578f3d427a3268748";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "debug";
-    version = "0.7.2";
-    fullName = "debug-*";
-    hash = "f9142856b1c2652a11e50f2aca068edbad7598f50d9e6d003b8ee85b2a333d63";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "debug";
-    version = "0.7.2";
-    fullName = "debug-~0.7.0";
-    hash = "f9142856b1c2652a11e50f2aca068edbad7598f50d9e6d003b8ee85b2a333d63";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "debug";
-    version = "0.7.2";
-    fullName = "debug-~0.7.2";
-    hash = "f9142856b1c2652a11e50f2aca068edbad7598f50d9e6d003b8ee85b2a333d63";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "deep-equal";
-    version = "0.0.0";
-    fullName = "deep-equal-*";
-    hash = "6a5666d4bfa5d2786a9f86ede2eaa8252f783edb9d78e69cba645f7cb6e153b8";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "deep-equal";
-    version = "0.0.0";
-    fullName = "deep-equal-0.0.0";
-    hash = "6a5666d4bfa5d2786a9f86ede2eaa8252f783edb9d78e69cba645f7cb6e153b8";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "delayed-stream";
-    version = "0.0.5";
-    fullName = "delayed-stream-0.0.5";
-    hash = "f40e440dac0f853577d5225d7bd4b2026ea1447a724f4ba1096e29983ee595dd";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "diff";
-    version = "1.0.2";
-    fullName = "diff-1.0.2";
-    hash = "5de1d8c3f2bfc447a7e664cadd4aca2ef4952a43256310cc51a36b30b5be3045";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "director";
-    version = "1.1.10";
-    fullName = "director-1.1.10";
-    hash = "292c96d0d5bf8276a498595c576a6cfc832247703f2b75f09ad37c19caa5fca6";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "dtrace-provider";
-    version = "0.2.8";
-    fullName = "dtrace-provider-0.2.8";
-    hash = "200941239983fa0953415cf28e96d9347c50218d31280604cfc9252e448e714c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "editor";
-    version = "0.0.4";
-    fullName = "editor-0.0.4";
-    hash = "2f66957e121e49c8b52a9c54ff24b718ab8bf571591177ff09121e603704b591";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "emitter-component";
-    version = "1.0.0";
-    fullName = "emitter-component-1.0.0";
-    hash = "1ffc29fc11b2e4ccbac6064443e65a606a21d826e313886932596bf11784dcdb";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "escape-html";
-    version = "1.0.0";
-    fullName = "escape-html-*";
-    hash = "c763095c6b27fddf666f34d48a4f09f95009a76a6d16d1799175ecd0c1912456";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "event-stream";
-    version = "0.5.3";
-    fullName = "event-stream-~0.5";
-    hash = "988f4ee3e8f86d6f5f267b56de88bf733e05fe6f1adc0e135090c308822e9e86";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "optimist"; range = "0.2"; }
-    ];
-  }
-  {
-    baseName = "eventemitter2";
-    version = "0.4.11";
-    fullName = "eventemitter2-0.4.11";
-    hash = "2825d48a2313f703dfb6829e8a3bc89fe6442272b7dbec9d9c51e4794da81a83";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "eventemitter2";
-    version = "0.4.12";
-    fullName = "eventemitter2-~0.4.11";
-    hash = "466b3aa03fe384b46c8384ec7cc42248117a70e9b48c0e20706889b97edcdeac";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "events.node";
-    version = "0.4.9";
-    fullName = "events.node->= 0.4.0";
-    hash = "aedaf9faa7a33f16e2bf1754ed988a836570d00064748a8c1c8ee48805b9f0b6";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "express";
-    version = "3.3.4";
-    fullName = "express-*";
-    hash = "96a3fc9c2250d13f9aa183660466590fe285a2dd19e6ebdc4b2340295ee1aa65";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "connect"; range = "2.8.4"; }
-      { name = "commander"; range = "1.2.0"; }
-      { name = "range-parser"; range = "0.0.4"; }
-      { name = "mkdirp"; range = "0.3.5"; }
-      { name = "cookie"; range = "0.1.0"; }
-      { name = "buffer-crc32"; range = "0.2.1"; }
-      { name = "fresh"; range = "0.1.0"; }
-      { name = "methods"; range = "0.0.1"; }
-      { name = "send"; range = "0.1.3"; }
-      { name = "cookie-signature"; range = "1.0.1"; }
-      { name = "debug"; range = "*"; }
-    ];
-  }
-  {
-    baseName = "express";
-    version = "3.1.2";
-    fullName = "express-~3.1.1";
-    hash = "d72eb1b799ddfe78afc369168881bfef866213baf5cd47a56902fd732dbbd2b6";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "connect"; range = "2.7.5"; }
-      { name = "commander"; range = "0.6.1"; }
-      { name = "range-parser"; range = "0.0.4"; }
-      { name = "mkdirp"; range = "~0.3.4"; }
-      { name = "cookie"; range = "0.0.5"; }
-      { name = "buffer-crc32"; range = "~0.2.1"; }
-      { name = "fresh"; range = "0.1.0"; }
-      { name = "methods"; range = "0.0.1"; }
-      { name = "send"; range = "0.1.0"; }
-      { name = "cookie-signature"; range = "1.0.0"; }
-      { name = "debug"; range = "*"; }
-    ];
-  }
-  {
-    baseName = "extend";
-    version = "1.1.3";
-    fullName = "extend-*";
-    hash = "0b27709829110f2e84926ebe3494b82df6e79ad49a618ad3444e4edf62b57a57";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "extsprintf";
-    version = "1.0.0";
-    fullName = "extsprintf-1.0.0";
-    hash = "9cae7f1f192e5f35746e13047ab4c13e8b5b686469feeaec301ba7d370df5670";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "extsprintf";
-    version = "1.0.2";
-    fullName = "extsprintf-1.0.2";
-    hash = "ea000cf3e51cba7fac7fb1e425ddb79bf46f3ce40955955bf35fd487184a04ab";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "eyes";
-    version = "0.1.8";
-    fullName = "eyes-0.1.x";
-    hash = "4fa6db8f2c9926fb39a211c622d7eb3a76efbc4878559f9bd155d647a6963735";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "faye-websocket";
-    version = "0.6.1";
-    fullName = "faye-websocket-*";
-    hash = "f99544759c7f0ae24f283d6e3e062d4ea816243985b88d00c8cd124ba617d7c5";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "websocket-driver"; range = ">=0.2.0"; }
-    ];
-  }
-  {
-    baseName = "faye-websocket";
-    version = "0.4.4";
-    fullName = "faye-websocket-0.4.4";
-    hash = "c682f6269bcaba0667ef4ae0ecb0b662e35ea6338b075e25ebce9e13019bc3a2";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "flatiron";
-    version = "0.3.5";
-    fullName = "flatiron-0.3.5";
-    hash = "8f1e074d3f678fe3d4720e27b260f95ee9d69deb2ab3059c6b9854531d8b247f";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "broadway"; range = "0.2.7"; }
-      { name = "optimist"; range = "0.3.5"; }
-      { name = "prompt"; range = "0.2.9"; }
-      { name = "director"; range = "1.1.10"; }
-      { name = "pkginfo"; range = "0.3.0"; }
-    ];
-  }
-  {
-    baseName = "forEachAsync";
-    version = "2.2.0";
-    fullName = "forEachAsync-~2.2";
-    hash = "43367e7aad92f59595f22ad3e586ba2b370fd03b7f55da381503494528693e05";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "sequence"; range = ">= 2.2.1"; }
-    ];
-  }
-  {
-    baseName = "forever";
-    version = "0.10.8";
-    fullName = "forever-*";
-    hash = "858a7405a72d55fea21a3f3396d34ad0cfb35f15dd6ded76e2856b828ff20cae";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "colors"; range = "0.6.0-1"; }
-      { name = "cliff"; range = "0.1.8"; }
-      { name = "flatiron"; range = "0.3.5"; }
-      { name = "forever-monitor"; range = "1.2.2"; }
-      { name = "nconf"; range = "0.6.7"; }
-      { name = "nssocket"; range = "~0.5.1"; }
-      { name = "optimist"; range = "0.4.0"; }
-      { name = "pkginfo"; range = "0.3.0"; }
-      { name = "timespan"; range = "2.0.1"; }
-      { name = "watch"; range = "0.7.0"; }
-      { name = "utile"; range = "0.1.7"; }
-      { name = "winston"; range = "0.7.1"; }
-    ];
-  }
-  {
-    baseName = "forever-agent";
-    version = "0.2.0";
-    fullName = "forever-agent-~0.2.0";
-    hash = "d6fac115c60bb3aa6b5b653ea6612e9c1c1d172e08c98251fcfd2d066c1fcda3";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "forever-agent";
-    version = "0.5.0";
-    fullName = "forever-agent-~0.5.0";
-    hash = "0a7eda1f87f3cfa7fad8ba655a642992033b38a1929becfa0bfcab8241b7d78b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "forever-monitor";
-    version = "1.2.2";
-    fullName = "forever-monitor-1.2.2";
-    hash = "ff2f10f179ec6003278a250f76dd53ebaaace37c3c2409478b7b36ecee650a0c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "broadway"; range = "0.2.x"; }
-      { name = "minimatch"; range = "0.0.x"; }
-      { name = "pkginfo"; range = "0.x.x"; }
-      { name = "ps-tree"; range = "0.0.x"; }
-      { name = "watch"; range = "0.5.x"; }
-      { name = "utile"; range = "0.1.x"; }
-    ];
-  }
-  {
-    baseName = "form-data";
-    version = "0.0.8";
-    fullName = "form-data-0.0.8";
-    hash = "cf7d5669259ec4c5474b9c2100127ba065a4757ff33b878a1d99509b8e448220";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "combined-stream"; range = "~0.0.4"; }
-      { name = "mime"; range = "~1.2.2"; }
-      { name = "async"; range = "~0.2.7"; }
-    ];
-  }
-  {
-    baseName = "form-data";
-    version = "0.0.10";
-    fullName = "form-data-~0.0.3";
-    hash = "d49669b81c27dd6c7e359ee9892880c6741dae6c325b617ab3eb5a78bf103822";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "combined-stream"; range = "~0.0.4"; }
-      { name = "mime"; range = "~1.2.2"; }
-      { name = "async"; range = "~0.2.7"; }
-    ];
-  }
-  {
-    baseName = "formidable";
-    version = "1.0.11";
-    fullName = "formidable-1.0.11";
-    hash = "39b345d14d69c27fe262e12f16900cef6be220510788866e0a12c9fedd03766e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "formidable";
-    version = "1.0.13";
-    fullName = "formidable-1.0.13";
-    hash = "c3c7c6ecdd4b1ad9ec9b1c273d8dd1db2bc12f9a699c233d3885fcded58ceec6";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "formidable";
-    version = "1.0.14";
-    fullName = "formidable-1.0.14";
-    hash = "b36e58f659fd0d7c734b4ab2c611fa6e40bd988c2237a29d25025460f18f7ea1";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "formidable";
-    version = "1.0.9";
-    fullName = "formidable-1.0.9";
-    hash = "3b54deef3897d910d1e6dedd81fa2f4a65b7e93b5dd5cf1c8c098b63260c214c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "fresh";
-    version = "0.1.0";
-    fullName = "fresh-0.1.0";
-    hash = "c402fbd25e26c0167bf288e1ba791716808bfaa5de32b76ae68e8e8a3d7e2b33";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "fstream";
-    version = "0.1.23";
-    fullName = "fstream-0";
-    hash = "1f3f03be2b18815b133e551b0cde8ab77148d0de31fdd61d90f21317f02c8342";
     patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "rimraf"; range = "2"; }
-      { name = "mkdirp"; range = "0.3"; }
-      { name = "graceful-fs"; range = "~2.0.0"; }
-      { name = "inherits"; range = "~1.0.0"; }
-    ];
+    sha1 = "7020086289f10e195d85d828de065ccdd50e6e66";
+    tarball = "http://registry.npmjs.org/ansi-remover/-/ansi-remover-0.0.2.tgz";
   }
   {
-    baseName = "fstream-ignore";
+    name = "apparatus";
+    spec = ">= 0.0.4";
     version = "0.0.7";
-    fullName = "fstream-ignore-~0.0.5";
-    hash = "1f009e5aac56314d31c5adc339990d1b814595a5020e828cda4a06da536425c5";
-    patchLatest = false;
     topLevel = false;
     dependencies = [
-      { name = "minimatch"; range = "~0.2.0"; }
-      { name = "fstream"; range = "~0.1.17"; }
-      { name = "inherits"; range = "2"; }
+      { name = "sylvester"; spec = ">= 0.0.8"; }
     ];
+    patchLatest = false;
+    sha1 = "033f355507b6851ebeb1bd9475ede23c802327fe";
+    tarball = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.7.tgz";
   }
   {
-    baseName = "fstream-npm";
-    version = "0.1.5";
-    fullName = "fstream-npm-~0.1.3";
-    hash = "23751124b295b9d9beefd7b4146b8e6d4fe0d4587cc70bc0b134c10da307b1b0";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "fstream-ignore"; range = "~0.0.5"; }
-      { name = "inherits"; range = "2"; }
-    ];
-  }
-  {
-    baseName = "fstream";
-    version = "0.1.23";
-    fullName = "fstream-~0.1.17";
-    hash = "1f3f03be2b18815b133e551b0cde8ab77148d0de31fdd61d90f21317f02c8342";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "rimraf"; range = "2"; }
-      { name = "mkdirp"; range = "0.3"; }
-      { name = "graceful-fs"; range = "~2.0.0"; }
-      { name = "inherits"; range = "~1.0.0"; }
-    ];
-  }
-  {
-    baseName = "fstream";
-    version = "0.1.23";
-    fullName = "fstream-~0.1.23";
-    hash = "1f3f03be2b18815b133e551b0cde8ab77148d0de31fdd61d90f21317f02c8342";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "rimraf"; range = "2"; }
-      { name = "mkdirp"; range = "0.3"; }
-      { name = "graceful-fs"; range = "~2.0.0"; }
-      { name = "inherits"; range = "~1.0.0"; }
-    ];
-  }
-  {
-    baseName = "fstream";
-    version = "0.1.23";
-    fullName = "fstream-~0.1.8";
-    hash = "1f3f03be2b18815b133e551b0cde8ab77148d0de31fdd61d90f21317f02c8342";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "rimraf"; range = "2"; }
-      { name = "mkdirp"; range = "0.3"; }
-      { name = "graceful-fs"; range = "~2.0.0"; }
-      { name = "inherits"; range = "~1.0.0"; }
-    ];
-  }
-  {
-    baseName = "github-url-from-git";
-    version = "1.1.1";
-    fullName = "github-url-from-git-~1.1.1";
-    hash = "7f02b5799b4d73af273a2f4c290118b0cfa999ba5888896b85ab1cbb0c2e207e";
-    patchLatest = false;
+    name = "archy";
+    spec = "0";
+    version = "0.0.2";
     topLevel = false;
     dependencies = [
     ];
-  }
-  {
-    baseName = "glob";
-    version = "3.2.3";
-    fullName = "glob-3";
-    hash = "82e04561e897c9b682c0568bafbc57b0ee2fc592579535bb0f5929cd1605c9c3";
     patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "minimatch"; range = "~0.2.11"; }
-      { name = "graceful-fs"; range = "~2.0.0"; }
-      { name = "inherits"; range = "2"; }
-    ];
+    sha1 = "910f43bf66141fc335564597abc189df44b3d35e";
+    tarball = "http://registry.npmjs.org/archy/-/archy-0.0.2.tgz";
   }
   {
-    baseName = "glob";
-    version = "3.2.1";
-    fullName = "glob-3.2.1";
-    hash = "a457c2115213ce2cb59582ddc3a25eb3ae7490af687e412111c0032f72966f51";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "minimatch"; range = "~0.2.11"; }
-      { name = "graceful-fs"; range = "~1.2.0"; }
-      { name = "inherits"; range = "1"; }
-    ];
-  }
-  {
-    baseName = "glob";
-    version = "3.2.3";
-    fullName = "glob->= 3.1.4";
-    hash = "82e04561e897c9b682c0568bafbc57b0ee2fc592579535bb0f5929cd1605c9c3";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "minimatch"; range = "~0.2.11"; }
-      { name = "graceful-fs"; range = "~2.0.0"; }
-      { name = "inherits"; range = "2"; }
-    ];
-  }
-  {
-    baseName = "glob";
-    version = "3.2.3";
-    fullName = "glob-~3.2.1";
-    hash = "82e04561e897c9b682c0568bafbc57b0ee2fc592579535bb0f5929cd1605c9c3";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "minimatch"; range = "~0.2.11"; }
-      { name = "graceful-fs"; range = "~2.0.0"; }
-      { name = "inherits"; range = "2"; }
-    ];
-  }
-  {
-    baseName = "glob";
-    version = "3.2.3";
-    fullName = "glob-~3.2.3";
-    hash = "82e04561e897c9b682c0568bafbc57b0ee2fc592579535bb0f5929cd1605c9c3";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "minimatch"; range = "~0.2.11"; }
-      { name = "graceful-fs"; range = "~2.0.0"; }
-      { name = "inherits"; range = "2"; }
-    ];
-  }
-  {
-    baseName = "graceful-fs";
-    version = "1.2.3";
-    fullName = "graceful-fs-1.2";
-    hash = "b8d9e0af2261259525a65281573e416b70b91788ea7f7b13f4598aaa7818255a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "graceful-fs";
-    version = "2.0.0";
-    fullName = "graceful-fs-2";
-    hash = "36f8fb1de88a8599cc828a0eb4c96f12c25437756e91e42aeadce00a7887241c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "graceful-fs";
-    version = "1.2.3";
-    fullName = "graceful-fs-~1";
-    hash = "b8d9e0af2261259525a65281573e416b70b91788ea7f7b13f4598aaa7818255a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "graceful-fs";
-    version = "1.2.3";
-    fullName = "graceful-fs-~1.2";
-    hash = "b8d9e0af2261259525a65281573e416b70b91788ea7f7b13f4598aaa7818255a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "graceful-fs";
-    version = "1.2.3";
-    fullName = "graceful-fs-~1.2.0";
-    hash = "b8d9e0af2261259525a65281573e416b70b91788ea7f7b13f4598aaa7818255a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "graceful-fs";
-    version = "2.0.0";
-    fullName = "graceful-fs-~2.0.0";
-    hash = "36f8fb1de88a8599cc828a0eb4c96f12c25437756e91e42aeadce00a7887241c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "growl";
-    version = "1.5.1";
-    fullName = "growl-1.5.x";
-    hash = "81ad61e3f06d087da4c680e5e83a878f164925d3ed5a7f44b734e6ecd79cb8b0";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "growl";
-    version = "1.7.0";
-    fullName = "growl-1.7.x";
-    hash = "52a6e9edae2fd5a66ddb87c52a398a17ee697eb0e8e1480e9506a6dcdbf3ffcf";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "gzippo";
-    version = "0.2.0";
-    fullName = "gzippo-*";
-    hash = "844f214312ef8ec2dee4543e6da383728ae081e96961f5ccb6786f0eed8474ab";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "send"; range = "*"; }
-    ];
-  }
-  {
-    baseName = "hat";
-    version = "0.0.3";
-    fullName = "hat-*";
-    hash = "7bf52b3b020ca333a42eb67411090912b21abb6ac746d587022a0955b16e5f5c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "hawk";
-    version = "0.10.2";
-    fullName = "hawk-~0.10.2";
-    hash = "a55c7f967a8e01b6307185abc796320b54a9d6126952e41281dca3c1841affb8";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "hoek"; range = "0.7.x"; }
-      { name = "boom"; range = "0.3.x"; }
-      { name = "cryptiles"; range = "0.1.x"; }
-      { name = "sntp"; range = "0.1.x"; }
-    ];
-  }
-  {
-    baseName = "hawk";
-    version = "0.13.1";
-    fullName = "hawk-~0.13.0";
-    hash = "659e5ada1e9dc44a634e07899937d5eaeaa1c06658f181ca187f7f6faa0c592a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "hoek"; range = "0.8.x"; }
-      { name = "boom"; range = "0.4.x"; }
-      { name = "cryptiles"; range = "0.2.x"; }
-      { name = "sntp"; range = "0.2.x"; }
-    ];
-  }
-  {
-    baseName = "hiredis";
+    name = "argparse";
+    spec = "0.1.15";
     version = "0.1.15";
-    fullName = "hiredis-*";
-    hash = "621bb738d1ef8335fe2f373d5446a4817a62bf8ab6e956fb6a7aa4932f8ccb08";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "bindings"; range = "*"; }
-    ];
-  }
-  {
-    baseName = "hoek";
-    version = "0.7.6";
-    fullName = "hoek-0.7.x";
-    hash = "135068c73cf7f0db625d95461991db113b9b4a09c6d118a80f4b33d1cad41d9b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "hoek";
-    version = "0.8.5";
-    fullName = "hoek-0.8.x";
-    hash = "637e524cd4b48b66db137d6fa93cbe254f112ce638ea9fd399bab73591ede965";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "hoek";
-    version = "0.9.1";
-    fullName = "hoek-0.9.x";
-    hash = "34480468d2e85781ecdd7134523b4d6fea978d333edd2bcb828edd33bbbe8a3f";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "hooks";
-    version = "0.2.1";
-    fullName = "hooks-0.2.1";
-    hash = "65b9c6940a0edc5324e9c7f2422cdf2700436a1d2e9008e2a9f5dcc732cd46bd";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "htdigest";
-    version = "1.0.7";
-    fullName = "htdigest-1.0.7";
-    hash = "10fb047addf1c4f1089a26389066d5ff8f5ffa1ccce272a701bb4c2a30d90c58";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "commander"; range = "0.5.1"; }
-    ];
-  }
-  {
-    baseName = "htpasswd";
-    version = "1.1.0";
-    fullName = "htpasswd-1.1.0";
-    hash = "cee9c0a525e717e3565ba6ffea8a64c480bc8a9e7800cb9bfc385d1a8e713ec9";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "commander"; range = "0.5.1"; }
-    ];
-  }
-  {
-    baseName = "http-auth";
-    version = "1.2.7";
-    fullName = "http-auth-1.2.7";
-    hash = "874dbb5907d03602f31eae959a0927a3112da8e868231d9a2119bb50d2fe63d2";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "node-uuid"; range = "1.2.0"; }
-      { name = "htpasswd"; range = "1.1.0"; }
-      { name = "htdigest"; range = "1.0.7"; }
-    ];
-  }
-  {
-    baseName = "http-signature";
-    version = "0.9.11";
-    fullName = "http-signature-0.9.11";
-    hash = "44b89f3c1917bf02723a5720f08fbe47448e0370a5d3498d1be860eaf28beb3b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "assert-plus"; range = "0.1.2"; }
-      { name = "asn1"; range = "0.1.11"; }
-      { name = "ctype"; range = "0.5.2"; }
-    ];
-  }
-  {
-    baseName = "http-signature";
-    version = "0.10.0";
-    fullName = "http-signature-~0.10.0";
-    hash = "badaa47893d7a6c352ffb0746d68dd225fbb057b7d7149ad87093276445bf95b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "assert-plus"; range = "0.1.2"; }
-      { name = "asn1"; range = "0.1.11"; }
-      { name = "ctype"; range = "0.5.2"; }
-    ];
-  }
-  {
-    baseName = "http-signature";
-    version = "0.9.11";
-    fullName = "http-signature-~0.9.11";
-    hash = "44b89f3c1917bf02723a5720f08fbe47448e0370a5d3498d1be860eaf28beb3b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "assert-plus"; range = "0.1.2"; }
-      { name = "asn1"; range = "0.1.11"; }
-      { name = "ctype"; range = "0.5.2"; }
-    ];
-  }
-  {
-    baseName = "i";
-    version = "0.3.1";
-    fullName = "i-0.3.x";
-    hash = "9dbd68b705366f5bdda60b9cf80149c89255d444649e21cc12556b14fb7ee784";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "i18next";
-    version = "1.6.8";
-    fullName = "i18next-*";
-    hash = "5c2652a8efaaefa0d268e4cd02dd79742eb3c5a74725621d6b0f5a856db4210a";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "cookies"; range = ">= 0.2.2"; }
-    ];
-  }
-  {
-    baseName = "inherits";
-    version = "1.0.0";
-    fullName = "inherits-1";
-    hash = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "inherits";
-    version = "1.0.0";
-    fullName = "inherits-1.x";
-    hash = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "inherits";
-    version = "2.0.0";
-    fullName = "inherits-2";
-    hash = "9c0e9ab9e025f0be599d62752764964416832d38d93a4143242ec4deb4de1ae0";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "inherits";
-    version = "1.0.0";
-    fullName = "inherits-~1.0.0";
-    hash = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "ini";
-    version = "1.1.0";
-    fullName = "ini-1";
-    hash = "307ecc5f8664773587a0d74165d1dbdb226754b638542596b7a1e2ed0a578a28";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "ini";
-    version = "1.1.0";
-    fullName = "ini-1.x.x";
-    hash = "307ecc5f8664773587a0d74165d1dbdb226754b638542596b7a1e2ed0a578a28";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "ini";
-    version = "1.1.0";
-    fullName = "ini-~1.1.0";
-    hash = "307ecc5f8664773587a0d74165d1dbdb226754b638542596b7a1e2ed0a578a28";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "init-package-json";
-    version = "0.0.10";
-    fullName = "init-package-json-0.0.10";
-    hash = "6efeef6f30253ee6b8cc9a22154096f42e1ea8621e79acce96b5425925229431";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "promzard"; range = "~0.2.0"; }
-      { name = "read"; range = "~1.0.1"; }
-      { name = "read-package-json"; range = "1"; }
-      { name = "semver"; range = "2.x"; }
-    ];
-  }
-  {
-    baseName = "is-promise";
-    version = "1.0.0";
-    fullName = "is-promise-~1";
-    hash = "65806ec461b83060a8857d2571c84bd66451db0683969ed3f9180f8a2c1a915f";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "jade";
-    version = "0.33.0";
-    fullName = "jade-*";
-    hash = "9c03589c5ca55fcf6b4583c1daefd052fb8ef46e91962bab4ee75f6135963e4f";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "commander"; range = "1.2.0"; }
-      { name = "mkdirp"; range = "0.3.x"; }
-      { name = "transformers"; range = "2.0.1"; }
-      { name = "character-parser"; range = "1.0.2"; }
-      { name = "monocle"; range = "0.1.48"; }
-      { name = "with"; range = "~1.1.0"; }
-      { name = "constantinople"; range = "~1.0.1"; }
-    ];
-  }
-  {
-    baseName = "jade";
-    version = "0.26.3";
-    fullName = "jade-0.26.3";
-    hash = "ea314287eb192b6987f7bb9d7010bf2c35ff6288f125fa00796ad93bdba14d0b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "commander"; range = "0.6.1"; }
-      { name = "mkdirp"; range = "0.3.0"; }
-    ];
-  }
-  {
-    baseName = "jayschema";
-    version = "0.1.5";
-    fullName = "jayschema-*";
-    hash = "66e17d82f0b24d882321d42da2f094ab2b14df8a3f558b88867800e672f5c80d";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "jshint";
-    version = "2.1.4";
-    fullName = "jshint-*";
-    hash = "ff5afb38e1e82801b670a18033dc29a903fe883ca6073459360178871f8d71db";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "shelljs"; range = "0.1.x"; }
-      { name = "underscore"; range = "1.4.x"; }
-      { name = "cli"; range = "0.4.x"; }
-      { name = "minimatch"; range = "0.x.x"; }
-      { name = "console-browserify"; range = "0.1.x"; }
-    ];
-  }
-  {
-    baseName = "json-schema";
-    version = "0.2.2";
-    fullName = "json-schema-0.2.2";
-    hash = "41b873a8fb542caf337ec17ad5593761e8db5ce8e33f4074b733b34ec656f0e8";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "json-stringify-safe";
-    version = "3.0.0";
-    fullName = "json-stringify-safe-~3.0.0";
-    hash = "77580345a4d3d5db0e530757c86a6bd032b69b31f509f58a8d1232abc14690c0";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "json-stringify-safe";
-    version = "4.0.0";
-    fullName = "json-stringify-safe-~4.0.0";
-    hash = "2461befc8dab37d1d83927ab4bf4aa68b162a35b5a85c1a90c70f86500091b60";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "jsontool";
-    version = "6.0.0";
-    fullName = "jsontool-*";
-    hash = "4a1e5d6d89571a561b3f7aea39d6ba6274bb8075d802b0a514e17abf186d781c";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "jsprim";
-    version = "0.3.0";
-    fullName = "jsprim-0.3.0";
-    hash = "0fd12872374ee55cc0c005a1590ef65def0e96de04734a753e0d1480c3ffc4bd";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "extsprintf"; range = "1.0.0"; }
-      { name = "json-schema"; range = "0.2.2"; }
-      { name = "verror"; range = "1.3.3"; }
-    ];
-  }
-  {
-    baseName = "keep-alive-agent";
-    version = "0.0.1";
-    fullName = "keep-alive-agent-0.0.1";
-    hash = "481f10eeb5b9759ad28d9556f30c1747a5e71fbbad55fb130b96eacc7ac1c7a1";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "kerberos";
-    version = "0.0.3";
-    fullName = "kerberos-0.0.3";
-    hash = "40300bf5e4ca224127b7e88586dce003c58e59cf4972f699fdc95079135a76fe";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "keypress";
-    version = "0.1.0";
-    fullName = "keypress-0.1.x";
-    hash = "2e43d67e9df19176f874e1a44693f2ea802df77e255d3fc272a0de8124f83be5";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "knox";
-    version = "0.8.4";
-    fullName = "knox-*";
-    hash = "14072716bf13af98ab908f9f370f18e2353e326a0a945c53e1ff82f70725f161";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "mime"; range = "*"; }
-      { name = "xml2js"; range = "0.2.x"; }
-      { name = "debug"; range = "~0.7.0"; }
-      { name = "stream-counter"; range = "~0.1.0"; }
-    ];
-  }
-  {
-    baseName = "kue";
-    version = "0.6.2";
-    fullName = "kue-*";
-    hash = "c52cb0ebc11226bff8d1fb8068cc4cc562c3970d1d24c201d8a8ed68847b9115";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "redis"; range = "0.7.2"; }
-      { name = "express"; range = "~3.1.1"; }
-      { name = "jade"; range = "0.26.3"; }
-      { name = "stylus"; range = "0.27.2"; }
-      { name = "nib"; range = "0.5.0"; }
-      { name = "reds"; range = "0.1.4"; }
-    ];
-  }
-  {
-    baseName = "lazy";
-    version = "1.0.11";
-    fullName = "lazy-~1.0.11";
-    hash = "05a9685292102599629d3212fbd04102ff71b0cf306cee9773ab1602c75a4ab0";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "libyaml";
-    version = "0.2.2";
-    fullName = "libyaml-*";
-    hash = "20bd05a1abc5ba18cc3b5de52bc44095fa59b03c6c3ffb6f46c55bd801cff3db";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "lockfile";
-    version = "0.4.0";
-    fullName = "lockfile-~0.4.0";
-    hash = "80b81e5d9e8af9f661cfa57f6cf88ec7f2cac90196dae8ca4b382a812694d68e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "lru-cache";
-    version = "2.3.0";
-    fullName = "lru-cache-2";
-    hash = "fbb1a14e0314095b7999a3a7489c92983f3d95b188857af697487ac8a778e942";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "lru-cache";
-    version = "2.2.0";
-    fullName = "lru-cache-2.2.0";
-    hash = "bdfb66f74cc4097f3bfd6062b2edbb7790d709f414c7d0f3419241840b1bffed";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "lru-cache";
-    version = "2.3.0";
-    fullName = "lru-cache-2.3.0";
-    hash = "fbb1a14e0314095b7999a3a7489c92983f3d95b188857af697487ac8a778e942";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "lru-cache";
-    version = "1.0.6";
-    fullName = "lru-cache-~1.0.2";
-    hash = "f3a419d4989d9db292a7207f04b6108eed6d8316553d888a462cccd4c9e8855e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "lru-cache";
-    version = "2.3.0";
-    fullName = "lru-cache-~2.3.0";
-    hash = "fbb1a14e0314095b7999a3a7489c92983f3d95b188857af697487ac8a778e942";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "methods";
-    version = "0.0.1";
-    fullName = "methods-0.0.1";
-    hash = "2f7e32954dff5991dd8220e8f5dcdd32aeec5ec56ce9f7235872444af51b3adb";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mime";
-    version = "1.2.9";
-    fullName = "mime-*";
-    hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mime";
-    version = "1.2.5";
-    fullName = "mime-1.2.5";
-    hash = "ccf05a6c47146e8acb9d0671eee09d2eb077cf9ddd1f7e8eccf49dbf969d6c72";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mime";
-    version = "1.2.6";
-    fullName = "mime-1.2.6";
-    hash = "7460134d6b4686d64fd1e7b878d34e2bdd258ad29b6665cf62e6d92659e81591";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mime";
-    version = "1.2.9";
-    fullName = "mime-1.2.9";
-    hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mime";
-    version = "1.2.9";
-    fullName = "mime-~1.2.2";
-    hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mime";
-    version = "1.2.9";
-    fullName = "mime-~1.2.7";
-    hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mime";
-    version = "1.2.9";
-    fullName = "mime-~1.2.9";
-    hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "minimatch";
-    version = "0.2.12";
-    fullName = "minimatch-0";
-    hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "lru-cache"; range = "2"; }
-      { name = "sigmund"; range = "~1.0.0"; }
-    ];
-  }
-  {
-    baseName = "minimatch";
-    version = "0.0.5";
-    fullName = "minimatch-0.0.x";
-    hash = "063694baa9f9ab077e687ff59031f461998ef38fda656ec7c3475931177ccf36";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "lru-cache"; range = "~1.0.2"; }
-    ];
-  }
-  {
-    baseName = "minimatch";
-    version = "0.2.12";
-    fullName = "minimatch-0.x.x";
-    hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "lru-cache"; range = "2"; }
-      { name = "sigmund"; range = "~1.0.0"; }
-    ];
-  }
-  {
-    baseName = "minimatch";
-    version = "0.2.12";
-    fullName = "minimatch->=0.2.4";
-    hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "lru-cache"; range = "2"; }
-      { name = "sigmund"; range = "~1.0.0"; }
-    ];
-  }
-  {
-    baseName = "minimatch";
-    version = "0.2.12";
-    fullName = "minimatch-~0.2.0";
-    hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "lru-cache"; range = "2"; }
-      { name = "sigmund"; range = "~1.0.0"; }
-    ];
-  }
-  {
-    baseName = "minimatch";
-    version = "0.2.12";
-    fullName = "minimatch-~0.2.11";
-    hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "lru-cache"; range = "2"; }
-      { name = "sigmund"; range = "~1.0.0"; }
-    ];
-  }
-  {
-    baseName = "minimatch";
-    version = "0.2.12";
-    fullName = "minimatch-~0.2.12";
-    hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "lru-cache"; range = "2"; }
-      { name = "sigmund"; range = "~1.0.0"; }
-    ];
-  }
-  {
-    baseName = "minimist";
-    version = "0.0.1";
-    fullName = "minimist-~0.0.1";
-    hash = "4afcfc7d9ed3d2ff113bf93d777507e2ff7ddfef7ed282e4573ab5dd8422b0d3";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mkdirp";
-    version = "0.3.5";
-    fullName = "mkdirp-*";
-    hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mkdirp";
-    version = "0.3.5";
-    fullName = "mkdirp-0";
-    hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mkdirp";
-    version = "0.3.5";
-    fullName = "mkdirp-0.3";
-    hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mkdirp";
-    version = "0.3.0";
-    fullName = "mkdirp-0.3.0";
-    hash = "708366e3a89c976ae8418056f2c5f784147b9310e8093f9bb7246d2f55f7c27d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mkdirp";
-    version = "0.3.5";
-    fullName = "mkdirp-0.3.5";
-    hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mkdirp";
-    version = "0.3.5";
-    fullName = "mkdirp-0.3.x";
-    hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mkdirp";
-    version = "0.3.5";
-    fullName = "mkdirp-0.x.x";
-    hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mkdirp";
-    version = "0.3.5";
-    fullName = "mkdirp-~0.3.3";
-    hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mkdirp";
-    version = "0.3.5";
-    fullName = "mkdirp-~0.3.4";
-    hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mocha";
-    version = "1.12.0";
-    fullName = "mocha-*";
-    hash = "657b833347df35fc39cd1fb0e420f2713db57c4430cbebd10e2f6b37548e4f20";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "commander"; range = "0.6.1"; }
-      { name = "growl"; range = "1.7.x"; }
-      { name = "jade"; range = "0.26.3"; }
-      { name = "diff"; range = "1.0.2"; }
-      { name = "debug"; range = "*"; }
-      { name = "mkdirp"; range = "0.3.5"; }
-      { name = "ms"; range = "0.3.0"; }
-      { name = "glob"; range = "3.2.1"; }
-    ];
-  }
-  {
-    baseName = "mocha";
-    version = "1.3.2";
-    fullName = "mocha-~1.3.2";
-    hash = "38bb1638122140c4c8986e02dd0c23105abedaca2ad8d2c8f3bc64bbfa7f6f53";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "commander"; range = "0.6.1"; }
-      { name = "growl"; range = "1.5.x"; }
-      { name = "jade"; range = "0.26.3"; }
-      { name = "diff"; range = "1.0.2"; }
-      { name = "debug"; range = "*"; }
-    ];
-  }
-  {
-    baseName = "mongodb";
-    version = "1.2.14";
-    fullName = "mongodb-1.2.x";
-    hash = "011e76d49fb99a58659db12e55d340c4731184dd635b769717db374db3f701a0";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "bson"; range = "0.1.8"; }
-    ];
-  }
-  {
-    baseName = "mongodb";
-    version = "1.3.11";
-    fullName = "mongodb-1.3.11";
-    hash = "cd00f9c0fafd280d30f9e604c76aa7eb59748521f5b0438c15ced90533376a62";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "bson"; range = "0.1.9"; }
-      { name = "kerberos"; range = "0.0.3"; }
-    ];
-  }
-  {
-    baseName = "mongoose";
-    version = "3.6.14";
-    fullName = "mongoose-*";
-    hash = "eab35fb10f1da7a24a4b3c3c0edfea6941031e8d9e9b6120c683b736329a5781";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "hooks"; range = "0.2.1"; }
-      { name = "mongodb"; range = "1.3.11"; }
-      { name = "ms"; range = "0.1.0"; }
-      { name = "sliced"; range = "0.0.3"; }
-      { name = "muri"; range = "0.3.1"; }
-      { name = "mpromise"; range = "0.2.1"; }
-      { name = "mpath"; range = "0.1.1"; }
-      { name = "regexp-clone"; range = "0.0.1"; }
-    ];
-  }
-  {
-    baseName = "mongoose-schema-extend";
-    version = "0.1.3";
-    fullName = "mongoose-schema-extend-*";
-    hash = "f91e0851475ea525544bc65578e6ca55de345bc4c3332cc732fd3a66e1af1b1b";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "owl-deepcopy"; range = "~0.0.1"; }
-      { name = "mocha"; range = "~1.3.2"; }
-    ];
-  }
-  {
-    baseName = "monocle";
-    version = "0.1.48";
-    fullName = "monocle-0.1.48";
-    hash = "3a94a890f37ff135ea82f640d8e693f10a11bca3d30c3ec7456a9f97683f15d5";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "readdirp"; range = "~0.2.3"; }
-    ];
-  }
-  {
-    baseName = "mpath";
-    version = "0.1.1";
-    fullName = "mpath-0.1.1";
-    hash = "23e83ac6c4b3d67cc34dc1ba05d1085a3d9ef8243caa756b1ca4af12b4370751";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mpromise";
-    version = "0.2.1";
-    fullName = "mpromise-0.2.1";
-    hash = "56d035a66b1a19a8ad64e99354355e128b18394f69d545597bb5a25fe80147bf";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "sliced"; range = "0.0.4"; }
-    ];
-  }
-  {
-    baseName = "ms";
-    version = "0.1.0";
-    fullName = "ms-0.1.0";
-    hash = "474bcdb7965551c5a111be2fcdb5e4607491c70a601d04d818ec7e1e1c2ff88b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "ms";
-    version = "0.3.0";
-    fullName = "ms-0.3.0";
-    hash = "f72eab0186a6dabbbea7118f83d4e2c01119e427f6671096a0c7ed522abe07f2";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "muri";
-    version = "0.3.1";
-    fullName = "muri-0.3.1";
-    hash = "5e1b7ac7790350f6043fc8fa1b18f85818fefe0adda18d0c058460413757f959";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mute-stream";
-    version = "0.0.3";
-    fullName = "mute-stream-~0.0.2";
-    hash = "7bb2401ad9afaa6f04bc1d2d9411a6e41d7a6198de929d4522e95eeae78b1082";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mv";
-    version = "0.0.5";
-    fullName = "mv-0.0.5";
-    hash = "6ddbf4770ffd02170a8fc492cee418ad92ce2f1e2eb4c549febac1f60e6533b9";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "natural";
-    version = "0.0.69";
-    fullName = "natural-0.0.69";
-    hash = "1cd394575cbeba7963378fc572a85a3279c4359b75740f9062dddb5b64d6c402";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "sylvester"; range = ">= 0.0.12"; }
-      { name = "apparatus"; range = ">= 0.0.4"; }
-      { name = "underscore"; range = "*"; }
-    ];
-  }
-  {
-    baseName = "nconf";
-    version = "0.6.7";
-    fullName = "nconf-*";
-    hash = "1ec390b8fa439e1160e432edc0f9ccec544b8216dfaba3db7002d38351ccfa1c";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "async"; range = "0.1.x"; }
-      { name = "ini"; range = "1.x.x"; }
-      { name = "optimist"; range = "0.3.x"; }
-      { name = "pkginfo"; range = "0.2.x"; }
-    ];
-  }
-  {
-    baseName = "nconf";
-    version = "0.6.7";
-    fullName = "nconf-0.6.7";
-    hash = "1ec390b8fa439e1160e432edc0f9ccec544b8216dfaba3db7002d38351ccfa1c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "async"; range = "0.1.x"; }
-      { name = "ini"; range = "1.x.x"; }
-      { name = "optimist"; range = "0.3.x"; }
-      { name = "pkginfo"; range = "0.2.x"; }
-    ];
-  }
-  {
-    baseName = "ncp";
-    version = "0.2.7";
-    fullName = "ncp-0.2.x";
-    hash = "9bae6495de613c5adb418348224512b9dc42f2b74c7a2fabecf02f8b7d08343d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "negotiator";
-    version = "0.2.5";
-    fullName = "negotiator-0.2.5";
-    hash = "37f567acba03ef7748802c4f6b41ca7e57a3fb556c4435cda515028c73d76542";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "nib";
-    version = "0.5.0";
-    fullName = "nib-0.5.0";
-    hash = "9e3ebce2cfb055b8eadcb2fcac3e49570e429a5262ce5a59844857fbcb27f4c7";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "nijs";
-    version = "0.0.9";
-    fullName = "nijs-*";
-    hash = "fdcc60b869d3308549818608593c5a9eab75574a5e85df66e35f6f896a4d3544";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "optparse"; range = ">= 1.0.3"; }
-    ];
-  }
-  {
-    baseName = "node-expat";
-    version = "2.0.0";
-    fullName = "node-expat-*";
-    hash = "9d5b7efd708fc546f5c17e98f4ee322abafaaa02fbb6c281f651d10d9523c83f";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "node-gyp";
-    version = "0.10.6";
-    fullName = "node-gyp-*";
-    hash = "1b1fc060c1a84eb0f52c495d7d13e3a7f03b2753b74dc6c1c801c5b8d563c5b0";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "glob"; range = "3"; }
-      { name = "graceful-fs"; range = "2"; }
-      { name = "fstream"; range = "0"; }
-      { name = "minimatch"; range = "0"; }
-      { name = "mkdirp"; range = "0"; }
-      { name = "nopt"; range = "2"; }
-      { name = "npmlog"; range = "0"; }
-      { name = "osenv"; range = "0"; }
-      { name = "request"; range = "2"; }
-      { name = "rimraf"; range = "2"; }
-      { name = "semver"; range = "~2.0.7"; }
-      { name = "tar"; range = "0"; }
-      { name = "which"; range = "1"; }
-    ];
-  }
-  {
-    baseName = "node-gyp";
-    version = "0.10.6";
-    fullName = "node-gyp-~0.10.6";
-    hash = "1b1fc060c1a84eb0f52c495d7d13e3a7f03b2753b74dc6c1c801c5b8d563c5b0";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "glob"; range = "3"; }
-      { name = "graceful-fs"; range = "2"; }
-      { name = "fstream"; range = "0"; }
-      { name = "minimatch"; range = "0"; }
-      { name = "mkdirp"; range = "0"; }
-      { name = "nopt"; range = "2"; }
-      { name = "npmlog"; range = "0"; }
-      { name = "osenv"; range = "0"; }
-      { name = "request"; range = "2"; }
-      { name = "rimraf"; range = "2"; }
-      { name = "semver"; range = "~2.0.7"; }
-      { name = "tar"; range = "0"; }
-      { name = "which"; range = "1"; }
-    ];
-  }
-  {
-    baseName = "node-uuid";
-    version = "1.4.0";
-    fullName = "node-uuid-*";
-    hash = "87a1944b5334351ddd1d3e44d2e423ebfc027e858111efb72324054092cfd1bc";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "node-uuid";
-    version = "1.2.0";
-    fullName = "node-uuid-1.2.0";
-    hash = "96d3ce178ea0825d27a855630de74243a577dc988512512eea572829b208a3d2";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "node-uuid";
-    version = "1.3.3";
-    fullName = "node-uuid-1.3.3";
-    hash = "a3fbccc904944a9c8eadc59e55aaac908cc458569f539b50077d9672a84587a8";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "node-uuid";
-    version = "1.4.0";
-    fullName = "node-uuid-1.4.0";
-    hash = "87a1944b5334351ddd1d3e44d2e423ebfc027e858111efb72324054092cfd1bc";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "node-uuid";
-    version = "1.4.0";
-    fullName = "node-uuid-~1.4.0";
-    hash = "87a1944b5334351ddd1d3e44d2e423ebfc027e858111efb72324054092cfd1bc";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "nodemon";
-    version = "0.7.8";
-    fullName = "nodemon-*";
-    hash = "123a54f51297e5186061846a5dae5117c2a218a8a477364055828a0c2ea39bed";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "nopt";
-    version = "2.1.1";
-    fullName = "nopt-2";
-    hash = "a7a84f3fe51cb8fb97c678bc73130b53d6782ee90dc0e9b15ae39630ce2fa203";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "abbrev"; range = "1"; }
-    ];
-  }
-  {
-    baseName = "nopt";
-    version = "2.0.0";
-    fullName = "nopt-2.0.0";
-    hash = "112e9bea8b745a2e5a59d239e6f6f02e720e080ab8cdca89b6b8f0143ae718b5";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "abbrev"; range = "1"; }
-    ];
-  }
-  {
-    baseName = "nopt";
-    version = "2.1.1";
-    fullName = "nopt-~2.1.1";
-    hash = "a7a84f3fe51cb8fb97c678bc73130b53d6782ee90dc0e9b15ae39630ce2fa203";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "abbrev"; range = "1"; }
-    ];
-  }
-  {
-    baseName = "normalize-package-data";
-    version = "0.2.0";
-    fullName = "normalize-package-data-~0.2";
-    hash = "acde245885200d357f307740e7d3b3a169e1088bed51cbd81d76d6e7dfcf8fa8";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "semver"; range = "2"; }
-      { name = "github-url-from-git"; range = "~1.1.1"; }
-    ];
-  }
-  {
-    baseName = "npm";
-    version = "1.3.4";
-    fullName = "npm-*";
-    hash = "fcf0a1a2bfb920fb7fd4dd172df3ea02b7155247f509add164041645d8742225";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "semver"; range = "~2.0.8"; }
-      { name = "ini"; range = "~1.1.0"; }
-      { name = "slide"; range = "~1.1.4"; }
-      { name = "abbrev"; range = "~1.0.4"; }
-      { name = "graceful-fs"; range = "~2.0.0"; }
-      { name = "minimatch"; range = "~0.2.12"; }
-      { name = "nopt"; range = "~2.1.1"; }
-      { name = "rimraf"; range = "~2.2.0"; }
-      { name = "request"; range = "~2.21.0"; }
-      { name = "which"; range = "1"; }
-      { name = "tar"; range = "~0.1.17"; }
-      { name = "fstream"; range = "~0.1.23"; }
-      { name = "block-stream"; range = "*"; }
-      { name = "inherits"; range = "1"; }
-      { name = "mkdirp"; range = "~0.3.3"; }
-      { name = "read"; range = "~1.0.4"; }
-      { name = "lru-cache"; range = "~2.3.0"; }
-      { name = "node-gyp"; range = "~0.10.6"; }
-      { name = "fstream-npm"; range = "~0.1.3"; }
-      { name = "uid-number"; range = "0"; }
-      { name = "archy"; range = "0"; }
-      { name = "chownr"; range = "0"; }
-      { name = "npmlog"; range = "0.0.4"; }
-      { name = "ansi"; range = "~0.1.2"; }
-      { name = "npm-registry-client"; range = "~0.2.27"; }
-      { name = "read-package-json"; range = "~1.1.0"; }
-      { name = "read-installed"; range = "~0.2.2"; }
-      { name = "glob"; range = "~3.2.3"; }
-      { name = "init-package-json"; range = "0.0.10"; }
-      { name = "osenv"; range = "0"; }
-      { name = "lockfile"; range = "~0.4.0"; }
-      { name = "retry"; range = "~0.6.0"; }
-      { name = "once"; range = "~1.1.1"; }
-      { name = "npmconf"; range = "~0.1.1"; }
-      { name = "opener"; range = "~1.3.0"; }
-      { name = "chmodr"; range = "~0.1.0"; }
-      { name = "cmd-shim"; range = "~1.1.0"; }
-      { name = "sha"; range = "~1.0.1"; }
-      { name = "editor"; range = "0.0.4"; }
-      { name = "child-process-close"; range = "~0.1.1"; }
-      { name = "npm-user-validate"; range = "0.0.3"; }
-    ];
-  }
-  {
-    baseName = "npm-registry-client";
-    version = "0.2.27";
-    fullName = "npm-registry-client-~0.2.27";
-    hash = "9899d95fb9e71224ae49120621e245d20c2e05658e817442b2a30fcf8928441b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "request"; range = "2 >=2.20.0"; }
-      { name = "graceful-fs"; range = "~2.0.0"; }
-      { name = "semver"; range = "~2.0.5"; }
-      { name = "slide"; range = "~1.1.3"; }
-      { name = "chownr"; range = "0"; }
-      { name = "mkdirp"; range = "~0.3.3"; }
-      { name = "rimraf"; range = "~2"; }
-      { name = "retry"; range = "0.6.0"; }
-      { name = "couch-login"; range = "~0.1.15"; }
-      { name = "npmlog"; range = ""; }
-    ];
-  }
-  {
-    baseName = "npm-user-validate";
-    version = "0.0.3";
-    fullName = "npm-user-validate-0.0.3";
-    hash = "3ba7b67338af6deff49c8c6588542aaea83f034cad0dfe34519b546c05f29402";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "npm2nix";
-    version = "1.2.0";
-    fullName = "npm2nix-*";
-    hash = "b79bd319e4030704bb41078dbbec0db9eebb984966c6bd3cad55ba4c76ec622c";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "semver"; range = "1"; }
-    ];
-  }
-  {
-    baseName = "npmconf";
-    version = "0.1.1";
-    fullName = "npmconf-~0.1.1";
-    hash = "e4448bd02d4745549324fd0dbc333bcd9bf37de11e2ecc7bc02bf9655ddec2e9";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "config-chain"; range = "~1.1.1"; }
-      { name = "inherits"; range = "~1.0.0"; }
-      { name = "once"; range = "~1.1.1"; }
-      { name = "mkdirp"; range = "~0.3.3"; }
-      { name = "osenv"; range = "0.0.3"; }
-      { name = "nopt"; range = "2"; }
-      { name = "semver"; range = "2"; }
-      { name = "ini"; range = "~1.1.0"; }
-    ];
-  }
-  {
-    baseName = "npmlog";
-    version = "0.0.4";
-    fullName = "npmlog-";
-    hash = "16da9f0f239813f201156b81a5ebe552c9a3f78a405dbb24c2c1743fe3a0d579";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "ansi"; range = "~0.1.2"; }
-    ];
-  }
-  {
-    baseName = "npmlog";
-    version = "0.0.4";
-    fullName = "npmlog-0";
-    hash = "16da9f0f239813f201156b81a5ebe552c9a3f78a405dbb24c2c1743fe3a0d579";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "ansi"; range = "~0.1.2"; }
-    ];
-  }
-  {
-    baseName = "npmlog";
-    version = "0.0.4";
-    fullName = "npmlog-0.0.4";
-    hash = "16da9f0f239813f201156b81a5ebe552c9a3f78a405dbb24c2c1743fe3a0d579";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "ansi"; range = "~0.1.2"; }
-    ];
-  }
-  {
-    baseName = "nssocket";
-    version = "0.5.1";
-    fullName = "nssocket-~0.5.1";
-    hash = "aaf06b612cd99bf9e5790b2bf9b0f1963c2b605eaf3529b905c1fbdc1dee5333";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "eventemitter2"; range = "~0.4.11"; }
-      { name = "lazy"; range = "~1.0.11"; }
-    ];
-  }
-  {
-    baseName = "oauth-sign";
-    version = "0.2.0";
-    fullName = "oauth-sign-~0.2.0";
-    hash = "ef91b4266c71c68478dd7c50767085210006ebfb9e9263c72d42f47972991580";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "oauth-sign";
-    version = "0.3.0";
-    fullName = "oauth-sign-~0.3.0";
-    hash = "a202acb9ea84ef53e6a82a6ee5113328cd4bfd68d6ba04d15f1da933660b087e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "once";
-    version = "1.1.1";
-    fullName = "once-1.1.1";
-    hash = "3fdc1a246f2522991fd9a6554a93c012c3192ea99918fdd893a2d4f2d546fe93";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "once";
-    version = "1.1.1";
-    fullName = "once-~1.1.1";
-    hash = "3fdc1a246f2522991fd9a6554a93c012c3192ea99918fdd893a2d4f2d546fe93";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "opener";
-    version = "1.3.0";
-    fullName = "opener-~1.3.0";
-    hash = "8ce1113b83487849625156d72483e4eef7b8eebf63a9e8d7732df15c240efa06";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "optimist";
-    version = "0.6.0";
-    fullName = "optimist-*";
-    hash = "a75df1152906f1b66583c957cbffba34aaead644547d4a0300b713281279d4cf";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "wordwrap"; range = "~0.0.2"; }
-      { name = "minimist"; range = "~0.0.1"; }
-    ];
-  }
-  {
-    baseName = "optimist";
-    version = "0.2.8";
-    fullName = "optimist-0.2";
-    hash = "5ee9f3bbd03239903831ccc33c6c365251550cbfd88d9fb92011feac4376cf84";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "wordwrap"; range = ">=0.0.1 <0.1.0"; }
-    ];
-  }
-  {
-    baseName = "optimist";
-    version = "0.3.5";
-    fullName = "optimist-0.3.5";
-    hash = "a407715c9745c9242923f282a70d55947e21f5c4800c99b09d2eb6e48735a09d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "wordwrap"; range = "~0.0.2"; }
-    ];
-  }
-  {
-    baseName = "optimist";
-    version = "0.3.7";
-    fullName = "optimist-0.3.x";
-    hash = "ba534aa013072a9650a18da311de8025d73b58b71dcea7c7ade4d8e8f274dd33";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "wordwrap"; range = "~0.0.2"; }
-    ];
-  }
-  {
-    baseName = "optimist";
-    version = "0.4.0";
-    fullName = "optimist-0.4.0";
-    hash = "bbbd3c9e8c1e8f59e7097271a78fa628c6dc76de894a02fc625872b72bc99555";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "wordwrap"; range = "~0.0.2"; }
-    ];
-  }
-  {
-    baseName = "optimist";
-    version = "0.3.7";
-    fullName = "optimist-~0.3.5";
-    hash = "ba534aa013072a9650a18da311de8025d73b58b71dcea7c7ade4d8e8f274dd33";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "wordwrap"; range = "~0.0.2"; }
-    ];
-  }
-  {
-    baseName = "optparse";
-    version = "1.0.4";
-    fullName = "optparse-*";
-    hash = "8413ed6a2318ffecdb428181a6966013d1853ff62644afcbcff682c1efc9367a";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "optparse";
-    version = "1.0.4";
-    fullName = "optparse->= 1.0.3";
-    hash = "8413ed6a2318ffecdb428181a6966013d1853ff62644afcbcff682c1efc9367a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "osenv";
-    version = "0.0.3";
-    fullName = "osenv-0";
-    hash = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "osenv";
-    version = "0.0.3";
-    fullName = "osenv-0.0.3";
-    hash = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "owl-deepcopy";
-    version = "0.0.2";
-    fullName = "owl-deepcopy-~0.0.1";
-    hash = "69f76104c1f4610a4905ef7a184026850660b5e1fcaac9beb8ad0d6e4d54b58b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "passport";
-    version = "0.1.17";
-    fullName = "passport-*";
-    hash = "65c15a1666abc16a86d586233f40b89b68b50bf88107809878742973af8b516e";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "pkginfo"; range = "0.2.x"; }
-      { name = "pause"; range = "0.0.1"; }
-    ];
-  }
-  {
-    baseName = "passport-http";
-    version = "0.2.2";
-    fullName = "passport-http-*";
-    hash = "3a333781016b3e20462fde18ebeb1d9794c6353564ee646b3008ce2540504d1f";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "pkginfo"; range = "0.2.x"; }
-      { name = "passport"; range = "~0.1.3"; }
-    ];
-  }
-  {
-    baseName = "passport-local";
-    version = "0.1.6";
-    fullName = "passport-local-*";
-    hash = "de7dbe29a63fc648686425ba4ef23b99195372ae322037977864db08657e262d";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "pkginfo"; range = "0.2.x"; }
-      { name = "passport"; range = "~0.1.1"; }
-    ];
-  }
-  {
-    baseName = "passport";
-    version = "0.1.17";
-    fullName = "passport-~0.1.1";
-    hash = "65c15a1666abc16a86d586233f40b89b68b50bf88107809878742973af8b516e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "pkginfo"; range = "0.2.x"; }
-      { name = "pause"; range = "0.0.1"; }
-    ];
-  }
-  {
-    baseName = "passport";
-    version = "0.1.17";
-    fullName = "passport-~0.1.3";
-    hash = "65c15a1666abc16a86d586233f40b89b68b50bf88107809878742973af8b516e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "pkginfo"; range = "0.2.x"; }
-      { name = "pause"; range = "0.0.1"; }
-    ];
-  }
-  {
-    baseName = "pause";
-    version = "0.0.1";
-    fullName = "pause-0.0.1";
-    hash = "d37b84046db0c28c9768be649e8f02bd991ede34b276b5dba7bade23b523235e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "pkginfo";
-    version = "0.2.3";
-    fullName = "pkginfo-0.2.x";
-    hash = "0685c2cd94db8515a95b8127d1ab4e2a82d37deb4f808b41c9e0c033e34fe77f";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "pkginfo";
-    version = "0.3.0";
-    fullName = "pkginfo-0.3.0";
-    hash = "e55f5e0f767cabc55b638808736f952d6d74157938a87192106ce83c66a195a5";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "pkginfo";
-    version = "0.3.0";
-    fullName = "pkginfo-0.3.x";
-    hash = "e55f5e0f767cabc55b638808736f952d6d74157938a87192106ce83c66a195a5";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "pkginfo";
-    version = "0.3.0";
-    fullName = "pkginfo-0.x.x";
-    hash = "e55f5e0f767cabc55b638808736f952d6d74157938a87192106ce83c66a195a5";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "posix-getopt";
-    version = "1.0.0";
-    fullName = "posix-getopt-1.0.0";
-    hash = "134cea188854422ab047db9ebfcb7e2610f0a239fe27382b55c10894c4f5ba9d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "promise";
-    version = "2.0.0";
-    fullName = "promise-~2.0";
-    hash = "ccc3f345cd6facd0bcb0e599320e1da06b447ee573982b04f6b615a3da1ba7df";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "is-promise"; range = "~1"; }
-    ];
-  }
-  {
-    baseName = "prompt";
-    version = "0.2.9";
-    fullName = "prompt-0.2.9";
-    hash = "2444c21920d4169c51cae11fafed129c09df11f4bdda8e7ad76ea626a8828878";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "pkginfo"; range = "0.x.x"; }
-      { name = "read"; range = "1.0.x"; }
-      { name = "revalidator"; range = "0.1.x"; }
-      { name = "utile"; range = "0.1.x"; }
-      { name = "winston"; range = "0.6.x"; }
-    ];
-  }
-  {
-    baseName = "promzard";
-    version = "0.2.0";
-    fullName = "promzard-~0.2.0";
-    hash = "e9dcdf4084876c4b751f2f5939f149071495f0d23bf80a9ec4a73cd84080184b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "read"; range = "1"; }
-    ];
-  }
-  {
-    baseName = "proto-list";
-    version = "1.2.2";
-    fullName = "proto-list-~1.2.1";
-    hash = "1a1916d1a55ada8d8f3530d2073d57b6b9f0547b317686a7bc0492305d1d8e3b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "ps-tree";
-    version = "0.0.3";
-    fullName = "ps-tree-0.0.x";
-    hash = "d6af58e1062457f3aa92306c8eb970f32d2d52b93ecca4920c7409afd419a78d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "event-stream"; range = "~0.5"; }
-    ];
-  }
-  {
-    baseName = "qs";
-    version = "0.5.1";
-    fullName = "qs-0.5.1";
-    hash = "85bf27180b586499902d4e2bea83974b337924c870f6b790a23e6bfeb982c2e5";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "qs";
-    version = "0.5.5";
-    fullName = "qs-0.5.5";
-    hash = "8ed820b83bf4aff299422dc406c7a52793e05f510803cc1cc2da7de1528837f1";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "qs";
-    version = "0.6.5";
-    fullName = "qs-0.6.5";
-    hash = "293e5dfd16bfe0aee8b3fe130abb951ac9c8c084d1103f7d81c4e5c312b2940d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "qs";
-    version = "0.5.6";
-    fullName = "qs-~0.5.4";
-    hash = "3c7b49a51d52e5c8b988c2a53f8605d03a18d5e29b55b4f187c6a0fc714d00e9";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "qs";
-    version = "0.6.5";
-    fullName = "qs-~0.6.0";
-    hash = "293e5dfd16bfe0aee8b3fe130abb951ac9c8c084d1103f7d81c4e5c312b2940d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "range-parser";
-    version = "0.0.4";
-    fullName = "range-parser-0.0.4";
-    hash = "8e1bcce3544330b51644ea0cb4d25f0daa4b43008a75da27e285635f4ac4b1ce";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "rbytes";
-    version = "1.0.0";
-    fullName = "rbytes-*";
-    hash = "ccacb9951421c0a219f63b5d356098adffa43e42367be78afb94a433f84593e7";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "read";
-    version = "1.0.4";
-    fullName = "read-1";
-    hash = "8be269afeaa7cc62feb4672e8e61e5133152266dc5347b23cf5b05bc40789601";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "mute-stream"; range = "~0.0.2"; }
-    ];
-  }
-  {
-    baseName = "read";
-    version = "1.0.4";
-    fullName = "read-1.0.x";
-    hash = "8be269afeaa7cc62feb4672e8e61e5133152266dc5347b23cf5b05bc40789601";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "mute-stream"; range = "~0.0.2"; }
-    ];
-  }
-  {
-    baseName = "read-installed";
-    version = "0.2.2";
-    fullName = "read-installed-~0.2.2";
-    hash = "1237a4eb7444063ef83be336ecd317ffeafd2fef8f9e81468a5d7545e1a80c23";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "semver"; range = "2"; }
-      { name = "slide"; range = "~1.1.3"; }
-      { name = "read-package-json"; range = "1"; }
-      { name = "graceful-fs"; range = "~1.2.0"; }
-    ];
-  }
-  {
-    baseName = "read-package-json";
-    version = "1.1.0";
-    fullName = "read-package-json-1";
-    hash = "f3d2f47ffcab7512bb5cfba1854e708534dcae073704c3c9baba36de19b89969";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "glob"; range = "~3.2.1"; }
-      { name = "lru-cache"; range = "2"; }
-      { name = "normalize-package-data"; range = "~0.2"; }
-      { name = "graceful-fs"; range = "~1.2"; }
-    ];
-  }
-  {
-    baseName = "read-package-json";
-    version = "1.1.0";
-    fullName = "read-package-json-~1.1.0";
-    hash = "f3d2f47ffcab7512bb5cfba1854e708534dcae073704c3c9baba36de19b89969";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "glob"; range = "~3.2.1"; }
-      { name = "lru-cache"; range = "2"; }
-      { name = "normalize-package-data"; range = "~0.2"; }
-      { name = "graceful-fs"; range = "~1.2"; }
-    ];
-  }
-  {
-    baseName = "read";
-    version = "1.0.4";
-    fullName = "read-~1.0.1";
-    hash = "8be269afeaa7cc62feb4672e8e61e5133152266dc5347b23cf5b05bc40789601";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "mute-stream"; range = "~0.0.2"; }
-    ];
-  }
-  {
-    baseName = "read";
-    version = "1.0.4";
-    fullName = "read-~1.0.4";
-    hash = "8be269afeaa7cc62feb4672e8e61e5133152266dc5347b23cf5b05bc40789601";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "mute-stream"; range = "~0.0.2"; }
-    ];
-  }
-  {
-    baseName = "readable-stream";
-    version = "1.0.2";
-    fullName = "readable-stream-~1.0.2";
-    hash = "45a918b25f0799f87d7144dbbb7d2b5974dc079fcb1a2149a305d080f1155754";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "readdirp";
-    version = "0.2.5";
-    fullName = "readdirp-~0.2.3";
-    hash = "22d8e0e38c0d358c951221d0051d1e9e1eafeaf2136ac7fe0aa3bfd36238052c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "minimatch"; range = ">=0.2.4"; }
-    ];
-  }
-  {
-    baseName = "redis";
-    version = "0.8.4";
-    fullName = "redis-*";
-    hash = "077932b14c6b0a4985b7a41cf20e4495463c693c7b9932ebc46e0144918ff3c3";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "redis";
-    version = "0.7.2";
-    fullName = "redis-0.7.2";
-    hash = "d56d99e15dd35f6fabf545d9e91545553d60eaeb32ecf5caa1f357458df161ab";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "hiredis"; range = "*"; }
-    ];
-  }
-  {
-    baseName = "redis";
-    version = "0.8.4";
-    fullName = "redis->= 0.6.6";
-    hash = "077932b14c6b0a4985b7a41cf20e4495463c693c7b9932ebc46e0144918ff3c3";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "reds";
-    version = "0.1.4";
-    fullName = "reds-0.1.4";
-    hash = "3166c2f0f82efc624dac4e9058bc0ffa3bb864499785a746c461b813b90640ac";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "natural"; range = "0.0.69"; }
-      { name = "redis"; range = ">= 0.6.6"; }
-    ];
-  }
-  {
-    baseName = "regexp-clone";
-    version = "0.0.1";
-    fullName = "regexp-clone-0.0.1";
-    hash = "e11276212cce9fa15aa07276b800f750ec7d9c25e76ace7cf07f3e713d6d79e0";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "request";
-    version = "2.22.0";
-    fullName = "request-2";
-    hash = "d0a7ebc001800143d05cedf616cc164a31425bcbfdb8eb533b59d8c123b1275c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "qs"; range = "~0.6.0"; }
-      { name = "json-stringify-safe"; range = "~4.0.0"; }
-      { name = "forever-agent"; range = "~0.5.0"; }
-      { name = "tunnel-agent"; range = "~0.3.0"; }
-      { name = "http-signature"; range = "~0.10.0"; }
-      { name = "hawk"; range = "~0.13.0"; }
-      { name = "aws-sign"; range = "~0.3.0"; }
-      { name = "oauth-sign"; range = "~0.3.0"; }
-      { name = "cookie-jar"; range = "~0.3.0"; }
-      { name = "node-uuid"; range = "~1.4.0"; }
-      { name = "mime"; range = "~1.2.9"; }
-      { name = "form-data"; range = "0.0.8"; }
-    ];
-  }
-  {
-    baseName = "request";
-    version = "2.22.0";
-    fullName = "request-2 >=2.14";
-    hash = "d0a7ebc001800143d05cedf616cc164a31425bcbfdb8eb533b59d8c123b1275c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "qs"; range = "~0.6.0"; }
-      { name = "json-stringify-safe"; range = "~4.0.0"; }
-      { name = "forever-agent"; range = "~0.5.0"; }
-      { name = "tunnel-agent"; range = "~0.3.0"; }
-      { name = "http-signature"; range = "~0.10.0"; }
-      { name = "hawk"; range = "~0.13.0"; }
-      { name = "aws-sign"; range = "~0.3.0"; }
-      { name = "oauth-sign"; range = "~0.3.0"; }
-      { name = "cookie-jar"; range = "~0.3.0"; }
-      { name = "node-uuid"; range = "~1.4.0"; }
-      { name = "mime"; range = "~1.2.9"; }
-      { name = "form-data"; range = "0.0.8"; }
-    ];
-  }
-  {
-    baseName = "request";
-    version = "2.22.0";
-    fullName = "request-2 >=2.20.0";
-    hash = "d0a7ebc001800143d05cedf616cc164a31425bcbfdb8eb533b59d8c123b1275c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "qs"; range = "~0.6.0"; }
-      { name = "json-stringify-safe"; range = "~4.0.0"; }
-      { name = "forever-agent"; range = "~0.5.0"; }
-      { name = "tunnel-agent"; range = "~0.3.0"; }
-      { name = "http-signature"; range = "~0.10.0"; }
-      { name = "hawk"; range = "~0.13.0"; }
-      { name = "aws-sign"; range = "~0.3.0"; }
-      { name = "oauth-sign"; range = "~0.3.0"; }
-      { name = "cookie-jar"; range = "~0.3.0"; }
-      { name = "node-uuid"; range = "~1.4.0"; }
-      { name = "mime"; range = "~1.2.9"; }
-      { name = "form-data"; range = "0.0.8"; }
-    ];
-  }
-  {
-    baseName = "request";
-    version = "2.16.6";
-    fullName = "request-2.16.x";
-    hash = "9424cb952b4c5723678d0c5a6daf3ea6fa76ccad4cbd175f0a489dc54c6e1453";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "form-data"; range = "~0.0.3"; }
-      { name = "mime"; range = "~1.2.7"; }
-      { name = "hawk"; range = "~0.10.2"; }
-      { name = "node-uuid"; range = "~1.4.0"; }
-      { name = "cookie-jar"; range = "~0.2.0"; }
-      { name = "aws-sign"; range = "~0.2.0"; }
-      { name = "oauth-sign"; range = "~0.2.0"; }
-      { name = "forever-agent"; range = "~0.2.0"; }
-      { name = "tunnel-agent"; range = "~0.2.0"; }
-      { name = "json-stringify-safe"; range = "~3.0.0"; }
-      { name = "qs"; range = "~0.5.4"; }
-    ];
-  }
-  {
-    baseName = "request";
-    version = "2.9.203";
-    fullName = "request-2.9.x";
-    hash = "2af8f83a63c7227383fbdd6114e470e0921af86a037c4e82f42883120f35f836";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "request";
-    version = "2.22.0";
-    fullName = "request-~2";
-    hash = "d0a7ebc001800143d05cedf616cc164a31425bcbfdb8eb533b59d8c123b1275c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "qs"; range = "~0.6.0"; }
-      { name = "json-stringify-safe"; range = "~4.0.0"; }
-      { name = "forever-agent"; range = "~0.5.0"; }
-      { name = "tunnel-agent"; range = "~0.3.0"; }
-      { name = "http-signature"; range = "~0.10.0"; }
-      { name = "hawk"; range = "~0.13.0"; }
-      { name = "aws-sign"; range = "~0.3.0"; }
-      { name = "oauth-sign"; range = "~0.3.0"; }
-      { name = "cookie-jar"; range = "~0.3.0"; }
-      { name = "node-uuid"; range = "~1.4.0"; }
-      { name = "mime"; range = "~1.2.9"; }
-      { name = "form-data"; range = "0.0.8"; }
-    ];
-  }
-  {
-    baseName = "request";
-    version = "2.21.0";
-    fullName = "request-~2.21.0";
-    hash = "fe31c3119bc4423f07aa7c9849cb642d5ad22bdf2a2700eab56fb83fa8ed429c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "qs"; range = "~0.6.0"; }
-      { name = "json-stringify-safe"; range = "~4.0.0"; }
-      { name = "forever-agent"; range = "~0.5.0"; }
-      { name = "tunnel-agent"; range = "~0.3.0"; }
-      { name = "http-signature"; range = "~0.9.11"; }
-      { name = "hawk"; range = "~0.13.0"; }
-      { name = "aws-sign"; range = "~0.3.0"; }
-      { name = "oauth-sign"; range = "~0.3.0"; }
-      { name = "cookie-jar"; range = "~0.3.0"; }
-      { name = "node-uuid"; range = "~1.4.0"; }
-      { name = "mime"; range = "~1.2.9"; }
-      { name = "form-data"; range = "0.0.8"; }
-    ];
-  }
-  {
-    baseName = "restify";
-    version = "2.4.1";
-    fullName = "restify-2.4.1";
-    hash = "b46ed86ef17f1896a4dd961de8cc8ec96b57b7f44ef7421f3804764289f5b563";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "assert-plus"; range = "0.1.2"; }
-      { name = "backoff"; range = "2.1.0"; }
-      { name = "bunyan"; range = "0.21.1"; }
-      { name = "deep-equal"; range = "0.0.0"; }
-      { name = "formidable"; range = "1.0.13"; }
-      { name = "http-signature"; range = "0.9.11"; }
-      { name = "keep-alive-agent"; range = "0.0.1"; }
-      { name = "lru-cache"; range = "2.3.0"; }
-      { name = "mime"; range = "1.2.9"; }
-      { name = "negotiator"; range = "0.2.5"; }
-      { name = "node-uuid"; range = "1.4.0"; }
-      { name = "once"; range = "1.1.1"; }
-      { name = "qs"; range = "0.5.5"; }
-      { name = "semver"; range = "1.1.4"; }
-      { name = "spdy"; range = "1.7.1"; }
-      { name = "verror"; range = "1.3.6"; }
-      { name = "dtrace-provider"; range = "0.2.8"; }
-    ];
-  }
-  {
-    baseName = "retry";
-    version = "0.6.0";
-    fullName = "retry-0.6.0";
-    hash = "983e676af24ff4dcbac396420fca3c195ce3b1de5f731f697888b4fe6b7bbd2a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "retry";
-    version = "0.6.0";
-    fullName = "retry-~0.6.0";
-    hash = "983e676af24ff4dcbac396420fca3c195ce3b1de5f731f697888b4fe6b7bbd2a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "revalidator";
-    version = "0.1.5";
-    fullName = "revalidator-0.1.x";
-    hash = "54938a414b54882f9459e93b9bfd5d267c41985c1191a9a913c713e369ec639e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "rimraf";
-    version = "1.0.9";
-    fullName = "rimraf-1.x.x";
-    hash = "3ef93e5f75d1fc4778b8f5409e07c72510ee2f86c926abe4e9acff9825f14c5b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "rimraf";
-    version = "2.2.0";
-    fullName = "rimraf-2";
-    hash = "4d250a91e5da8f0e839647149268d3682c868a65e920477ff5baae26591ebeb2";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "graceful-fs"; range = "~1"; }
-    ];
-  }
-  {
-    baseName = "rimraf";
-    version = "2.2.0";
-    fullName = "rimraf-~2";
-    hash = "4d250a91e5da8f0e839647149268d3682c868a65e920477ff5baae26591ebeb2";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "graceful-fs"; range = "~1"; }
-    ];
-  }
-  {
-    baseName = "rimraf";
-    version = "2.1.4";
-    fullName = "rimraf-~2.1.4";
-    hash = "093154365aab3c09aea8e83dda7c5a7fd785c787ebbf1fcdc415cb5f74d1acac";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "graceful-fs"; range = "~1"; }
-    ];
-  }
-  {
-    baseName = "rimraf";
-    version = "2.2.0";
-    fullName = "rimraf-~2.2.0";
-    hash = "4d250a91e5da8f0e839647149268d3682c868a65e920477ff5baae26591ebeb2";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "graceful-fs"; range = "~1"; }
-    ];
-  }
-  {
-    baseName = "s3http";
-    version = "0.0.2";
-    fullName = "s3http-*";
-    hash = "03cbaa20c8920371c94333d6424c3d3b09824d1c6e30a9e1567805f53d1cd16d";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "aws-sdk"; range = ">=1.2.0 <2"; }
-      { name = "commander"; range = "0.5.1"; }
-      { name = "http-auth"; range = "1.2.7"; }
-    ];
-  }
-  {
-    baseName = "sax";
-    version = "0.5.4";
-    fullName = "sax-0.5.x";
-    hash = "5c4f074b559f56a7170663142e4ccbcf8cbef229ad7eb787b6c6e0b79ddb936a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "sax";
-    version = "0.5.4";
-    fullName = "sax->=0.4.2";
-    hash = "5c4f074b559f56a7170663142e4ccbcf8cbef229ad7eb787b6c6e0b79ddb936a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "semver";
-    version = "2.0.10";
-    fullName = "semver-*";
-    hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "semver";
-    version = "1.1.4";
-    fullName = "semver-1";
-    hash = "59c0180521d0d4cee57caa5f6ef190500b04099bfa5786edb3e21e364ae8e989";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "semver";
-    version = "1.1.4";
-    fullName = "semver-1.1.4";
-    hash = "59c0180521d0d4cee57caa5f6ef190500b04099bfa5786edb3e21e364ae8e989";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "semver";
-    version = "2.0.10";
-    fullName = "semver-2";
-    hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "semver";
-    version = "2.0.10";
-    fullName = "semver-2.x";
-    hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "semver";
-    version = "2.0.10";
-    fullName = "semver-~2.0.5";
-    hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "semver";
-    version = "2.0.10";
-    fullName = "semver-~2.0.7";
-    hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "semver";
-    version = "2.0.10";
-    fullName = "semver-~2.0.8";
-    hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "send";
-    version = "0.1.3";
-    fullName = "send-*";
-    hash = "45d768e247b184ec2d78aef495d4986b62675daa2d40add4f993cc122bba557f";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "debug"; range = "*"; }
-      { name = "mime"; range = "~1.2.9"; }
-      { name = "fresh"; range = "0.1.0"; }
-      { name = "range-parser"; range = "0.0.4"; }
-    ];
-  }
-  {
-    baseName = "send";
-    version = "0.1.0";
-    fullName = "send-0.1.0";
-    hash = "28b5a6ec41b5072521eb792cc901b92cdbb6b743c578d7008727dbbd3eb717de";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "debug"; range = "*"; }
-      { name = "mime"; range = "1.2.6"; }
-      { name = "fresh"; range = "0.1.0"; }
-      { name = "range-parser"; range = "0.0.4"; }
-    ];
-  }
-  {
-    baseName = "send";
-    version = "0.1.3";
-    fullName = "send-0.1.3";
-    hash = "45d768e247b184ec2d78aef495d4986b62675daa2d40add4f993cc122bba557f";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "debug"; range = "*"; }
-      { name = "mime"; range = "~1.2.9"; }
-      { name = "fresh"; range = "0.1.0"; }
-      { name = "range-parser"; range = "0.0.4"; }
-    ];
-  }
-  {
-    baseName = "sequence";
-    version = "2.2.1";
-    fullName = "sequence->= 2.2.1";
-    hash = "f14e1262b6a234acc3f50fdd5bd28c02f0cc8cbf882922b5af994babf4206b62";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "sha";
-    version = "1.0.1";
-    fullName = "sha-~1.0.1";
-    hash = "b540d2ae52395b7c22c8ad1fa4e0cf430ccab917847ddea5308fa833cf85c5fb";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "graceful-fs"; range = "1.2"; }
-    ];
-  }
-  {
-    baseName = "shelljs";
-    version = "0.1.4";
-    fullName = "shelljs-0.1.x";
-    hash = "21a6f3dc5eaeb1c10efbe62e31aeb6762241f707fb1fdcda4766c8bccde3eaf0";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "should";
-    version = "1.2.2";
-    fullName = "should-*";
-    hash = "af7916b687bf54b95bd8ff2837f430ab2758f1db22b5cde5b4ae30dac472f330";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "sigmund";
-    version = "1.0.0";
-    fullName = "sigmund-~1.0.0";
-    hash = "ddf823295db284ac4720b9d40f381d7375dc0b05881b98269346b33fe9835e25";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "sliced";
-    version = "0.0.3";
-    fullName = "sliced-0.0.3";
-    hash = "ce5765e669217d4c9500d79d6ffaf8d22b6507e826fd1dc0bb05bb746ab6227c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "sliced";
-    version = "0.0.4";
-    fullName = "sliced-0.0.4";
-    hash = "b9320aec8a9c5796d34b4c95b1289912548fcc8682fe9fed09749847b7dc0d85";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "slide";
-    version = "1.1.4";
-    fullName = "slide-~1.1.3";
-    hash = "db50179b7ceac3a1d79527a7c3db39ee1d5e936a07504e6aa542f9078aa33a6a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "slide";
-    version = "1.1.4";
-    fullName = "slide-~1.1.4";
-    hash = "db50179b7ceac3a1d79527a7c3db39ee1d5e936a07504e6aa542f9078aa33a6a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "smartdc";
-    version = "7.0.0";
-    fullName = "smartdc-*";
-    hash = "add769b05ecef4ea657d7bc473d96ee3e67b8ad8bc77077120bd5ae1efe94911";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "assert-plus"; range = "0.1.2"; }
-      { name = "lru-cache"; range = "2.2.0"; }
-      { name = "nopt"; range = "2.0.0"; }
-      { name = "restify"; range = "2.4.1"; }
-      { name = "bunyan"; range = "0.21.1"; }
-      { name = "clone"; range = "0.1.6"; }
-      { name = "smartdc-auth"; range = "1.0.0"; }
-    ];
-  }
-  {
-    baseName = "smartdc-auth";
-    version = "1.0.0";
-    fullName = "smartdc-auth-1.0.0";
-    hash = "7611510ac66507398f6e371b25068c7ad193ecd69a3031fdfca0e3c652cfdcbf";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "assert-plus"; range = "0.1.2"; }
-      { name = "clone"; range = "0.1.5"; }
-      { name = "ssh-agent"; range = "0.2.1"; }
-      { name = "once"; range = "1.1.1"; }
-      { name = "vasync"; range = "1.3.3"; }
-    ];
-  }
-  {
-    baseName = "sntp";
-    version = "0.1.4";
-    fullName = "sntp-0.1.x";
-    hash = "5fc290630e8a4599dfb1ee4ed67fdc3c94fc97c6c0cbbc188691669ff55dcb4f";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "hoek"; range = "0.7.x"; }
-    ];
-  }
-  {
-    baseName = "sntp";
-    version = "0.2.4";
-    fullName = "sntp-0.2.x";
-    hash = "1f91a8d60fd48751e4b169885f530012ce2a8223ed29006abcee175f2b10d779";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "hoek"; range = "0.9.x"; }
-    ];
-  }
-  {
-    baseName = "sockjs";
-    version = "0.3.7";
-    fullName = "sockjs-*";
-    hash = "711a6c41e6a7b2a9cd0dc44abc7407f09729d400be450d94887391997b07a1a5";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "node-uuid"; range = "1.3.3"; }
-      { name = "faye-websocket"; range = "0.4.4"; }
-    ];
-  }
-  {
-    baseName = "source-map";
-    version = "0.1.25";
-    fullName = "source-map-*";
-    hash = "3ef1ff114aa3504871ad8b16a38ac744b293c6d8f37b0b6e673b44592a08626d";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "amdefine"; range = ">=0.0.4"; }
-    ];
-  }
-  {
-    baseName = "source-map";
-    version = "0.1.25";
-    fullName = "source-map-~0.1.7";
-    hash = "3ef1ff114aa3504871ad8b16a38ac744b293c6d8f37b0b6e673b44592a08626d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "amdefine"; range = ">=0.0.4"; }
-    ];
-  }
-  {
-    baseName = "spdy";
-    version = "1.7.1";
-    fullName = "spdy-1.7.1";
-    hash = "d90516bb6b6cf39fb52face8ec332be98de116ce84d7d400fbb19529a30fa678";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "ssh-agent";
-    version = "0.2.1";
-    fullName = "ssh-agent-0.2.1";
-    hash = "b420d5816d4a8a242a8d1454f064954eab8fec9856310e867a2e7f1b2432f934";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "ctype"; range = "0.5.0"; }
-      { name = "posix-getopt"; range = "1.0.0"; }
-    ];
-  }
-  {
-    baseName = "stack-trace";
-    version = "0.0.6";
-    fullName = "stack-trace-0.0.x";
-    hash = "398b3307d34c25b9249049229cd4a340ce8587dc3e3ab5cec830af19031c10a4";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "stream-counter";
-    version = "0.1.0";
-    fullName = "stream-counter-~0.1.0";
-    hash = "8c51bd894bf905ec607654a1d7d3fe4fdc4763ccec4d37723cb8d0a0fd7cb69c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "readable-stream"; range = "~1.0.2"; }
-    ];
-  }
-  {
-    baseName = "stream-splitter-transform";
-    version = "0.0.3";
-    fullName = "stream-splitter-transform-*";
-    hash = "613ca5994f2fe645cbb21dcac24f034ed8546d6cc49097d8ee0b4501e6d9a887";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "buffertools"; range = ">=1.1.1 <2.0.0"; }
-    ];
-  }
-  {
-    baseName = "stylus";
-    version = "0.34.1";
-    fullName = "stylus-*";
-    hash = "efbcf5f35d84264609be85b122513af30e922687a4f5c961928febf0f27e3d9e";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "cssom"; range = "0.2.x"; }
-      { name = "mkdirp"; range = "0.3.x"; }
-      { name = "debug"; range = "*"; }
-    ];
-  }
-  {
-    baseName = "stylus";
-    version = "0.27.2";
-    fullName = "stylus-0.27.2";
-    hash = "8e18cc51592e04e42096e324d3409a132dbb3b40b0a606a746c4c57268bb63ea";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "cssom"; range = "0.2.x"; }
-      { name = "mkdirp"; range = "0.3.x"; }
-      { name = "debug"; range = "*"; }
-    ];
-  }
-  {
-    baseName = "superagent";
-    version = "0.15.1";
-    fullName = "superagent-0.15.1";
-    hash = "8306a3c7476e9f9d61ffe33117ffcf2a4fba6c9fcc59a2b8eee059f57d7d5614";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "qs"; range = "0.6.5"; }
-      { name = "formidable"; range = "1.0.9"; }
-      { name = "mime"; range = "1.2.5"; }
-      { name = "emitter-component"; range = "1.0.0"; }
-      { name = "methods"; range = "0.0.1"; }
-      { name = "cookiejar"; range = "1.3.0"; }
-      { name = "debug"; range = "~0.7.2"; }
-    ];
-  }
-  {
-    baseName = "supertest";
-    version = "0.7.1";
-    fullName = "supertest-*";
-    hash = "85246177740d16565f6ed4a932f0c85aca55c897ae352e3bb404da0cdad60a16";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "superagent"; range = "0.15.1"; }
-      { name = "methods"; range = "0.0.1"; }
-    ];
-  }
-  {
-    baseName = "swig";
-    version = "0.14.0";
-    fullName = "swig-*";
-    hash = "9eeafb591606008c7ab33501ebfdb6ed80830cca5736513c6c5874ded65cfb3f";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "underscore"; range = ">=1.1.7"; }
-    ];
-  }
-  {
-    baseName = "sylvester";
-    version = "0.0.21";
-    fullName = "sylvester->= 0.0.12";
-    hash = "8b97514fbb01de0f73b9104091bb79e835d227eb4c2ca88a843696b22f347022";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "sylvester";
-    version = "0.0.21";
-    fullName = "sylvester->= 0.0.8";
-    hash = "8b97514fbb01de0f73b9104091bb79e835d227eb4c2ca88a843696b22f347022";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "tar";
-    version = "0.1.17";
-    fullName = "tar-0";
-    hash = "577832975440eba0a9293244d53fa2c383e5c27ec2f68e3defde0cc23910b978";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "inherits"; range = "1.x"; }
-      { name = "block-stream"; range = "*"; }
-      { name = "fstream"; range = "~0.1.8"; }
-    ];
-  }
-  {
-    baseName = "tar";
-    version = "0.1.17";
-    fullName = "tar-~0.1.17";
-    hash = "577832975440eba0a9293244d53fa2c383e5c27ec2f68e3defde0cc23910b978";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "inherits"; range = "1.x"; }
-      { name = "block-stream"; range = "*"; }
-      { name = "fstream"; range = "~0.1.8"; }
-    ];
-  }
-  {
-    baseName = "temp";
-    version = "0.5.1";
-    fullName = "temp-*";
-    hash = "04bb3c0bde8f3ffab53bc4935b5c1ca306735e4da8844c1dc25e74b0ae8f6540";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "rimraf"; range = "~2.1.4"; }
-    ];
-  }
-  {
-    baseName = "timespan";
-    version = "2.0.1";
-    fullName = "timespan-2.0.1";
-    hash = "2c9693ac1c16e4bf0061904f487ab5fbf13f3d35817de1575dbfd9eaf85d452c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "timezone";
-    version = "0.0.22";
-    fullName = "timezone-*";
-    hash = "5bb9d42f401ae3084ab7dba7e0ecf1158995a987242311c86062177ad89561c3";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "transformers";
-    version = "2.0.1";
-    fullName = "transformers-2.0.1";
-    hash = "503430f608716eb2d55764c27f1417e363049aadd08988ad9e26ecb2daa33cb9";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "promise"; range = "~2.0"; }
-      { name = "css"; range = "~1.0.8"; }
-      { name = "uglify-js"; range = "~2.2.5"; }
-    ];
-  }
-  {
-    baseName = "tunnel-agent";
-    version = "0.2.0";
-    fullName = "tunnel-agent-~0.2.0";
-    hash = "d5c7fe6b4cd377ac54ff994f3b53b368fb4c0edafceddcf0e575402aa2451808";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "tunnel-agent";
-    version = "0.3.0";
-    fullName = "tunnel-agent-~0.3.0";
-    hash = "5b23c1d29e85143e213ba5aca118419ab42d25774da92e816074a73f423bcabd";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "uglify-js";
-    version = "2.3.6";
-    fullName = "uglify-js-2.3.6";
-    hash = "a361bc8092c8400d99d73d071c46fcfceb7156a557effd82abd8ca8a5c5ad09e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "async"; range = "~0.2.6"; }
-      { name = "source-map"; range = "~0.1.7"; }
-      { name = "optimist"; range = "~0.3.5"; }
-    ];
-  }
-  {
-    baseName = "uglify-js";
-    version = "2.2.5";
-    fullName = "uglify-js-~2.2.5";
-    hash = "f9d166cda4c881a396b53f8b8892b17bb1bc09ffb531ba1fa16e7bf9022a2ca2";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "source-map"; range = "~0.1.7"; }
-      { name = "optimist"; range = "~0.3.5"; }
-    ];
-  }
-  {
-    baseName = "uglify-js";
-    version = "2.3.6";
-    fullName = "uglify-js-~2.3.6";
-    hash = "a361bc8092c8400d99d73d071c46fcfceb7156a557effd82abd8ca8a5c5ad09e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "async"; range = "~0.2.6"; }
-      { name = "source-map"; range = "~0.1.7"; }
-      { name = "optimist"; range = "~0.3.5"; }
-    ];
-  }
-  {
-    baseName = "uid-number";
-    version = "0.0.3";
-    fullName = "uid-number-0";
-    hash = "e8eab0de35bcb20a55f58a276b2f6cfe1c531fae5982d7a3af7286807dbbe42b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "uid2";
-    version = "0.0.2";
-    fullName = "uid2-0.0.2";
-    hash = "8a3b12223830ed536ce022271a4059cedfbb21d0f63149742347c4f7fc0ed442";
-    patchLatest = false;
     topLevel = false;
     dependencies = [
+      { name = "underscore"; spec = "~1.4.3"; }
+      { name = "underscore.string"; spec = "~2.3.1"; }
     ];
-  }
-  {
-    baseName = "underscore";
-    version = "1.5.1";
-    fullName = "underscore-*";
-    hash = "40e2c86742d4af529cbb58f8cb68de128a18a32a78ab3b8bfa9f9a9544003018";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "underscore";
-    version = "1.4.4";
-    fullName = "underscore-1.4.x";
-    hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3";
     patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
+    sha1 = "28a1f72c43113e763220e5708414301c8840f0a1";
+    tarball = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz";
   }
   {
-    baseName = "underscore";
-    version = "1.5.1";
-    fullName = "underscore->=1.1.7";
-    hash = "40e2c86742d4af529cbb58f8cb68de128a18a32a78ab3b8bfa9f9a9544003018";
-    patchLatest = false;
+    name = "asn1";
+    spec = "0.1.11";
+    version = "0.1.11";
     topLevel = false;
     dependencies = [
     ];
-  }
-  {
-    baseName = "underscore";
-    version = "1.5.1";
-    fullName = "underscore->=1.4.3";
-    hash = "40e2c86742d4af529cbb58f8cb68de128a18a32a78ab3b8bfa9f9a9544003018";
     patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
+    sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+    tarball = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
   }
   {
-    baseName = "util";
+    name = "assert";
+    spec = "*";
     version = "0.4.9";
-    fullName = "util->= 0.4.9";
-    hash = "30ecc26c9e749650562c1ef20bc3f1a0d8d7c109134b510be34526d1ceae90e5";
-    patchLatest = false;
-    topLevel = false;
+    topLevel = true;
     dependencies = [
-      { name = "events.node"; range = ">= 0.4.0"; }
+      { name = "util"; spec = ">= 0.4.9"; }
     ];
+    patchLatest = false;
+    sha1 = "45faff1a58f718508118873dead940c8b51db939";
+    tarball = "http://registry.npmjs.org/assert/-/assert-0.4.9.tgz";
   }
   {
-    baseName = "utile";
-    version = "0.1.7";
-    fullName = "utile-0.1.7";
-    hash = "5e5dc150fa657729c288a211389cdf47419b73f4f8b4304a0c84dc584bf804b5";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "async"; range = "0.1.x"; }
-      { name = "deep-equal"; range = "*"; }
-      { name = "i"; range = "0.3.x"; }
-      { name = "mkdirp"; range = "0.x.x"; }
-      { name = "ncp"; range = "0.2.x"; }
-      { name = "rimraf"; range = "1.x.x"; }
-    ];
-  }
-  {
-    baseName = "utile";
-    version = "0.1.7";
-    fullName = "utile-0.1.x";
-    hash = "5e5dc150fa657729c288a211389cdf47419b73f4f8b4304a0c84dc584bf804b5";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "async"; range = "0.1.x"; }
-      { name = "deep-equal"; range = "*"; }
-      { name = "i"; range = "0.3.x"; }
-      { name = "mkdirp"; range = "0.x.x"; }
-      { name = "ncp"; range = "0.2.x"; }
-      { name = "rimraf"; range = "1.x.x"; }
-    ];
-  }
-  {
-    baseName = "vasync";
-    version = "1.3.3";
-    fullName = "vasync-1.3.3";
-    hash = "603d15b81e25b6a634d7ff2025487b3460a60d0d7e1a1ed02e66faff5ef7b699";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "jsprim"; range = "0.3.0"; }
-      { name = "verror"; range = "1.1.0"; }
-    ];
-  }
-  {
-    baseName = "verror";
-    version = "1.1.0";
-    fullName = "verror-1.1.0";
-    hash = "ac0fc2dfbcdfc3440c281cf272d902ec74bf2abdf2f9c9eb5c0c3505dc6646d7";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "extsprintf"; range = "1.0.0"; }
-    ];
-  }
-  {
-    baseName = "verror";
-    version = "1.3.3";
-    fullName = "verror-1.3.3";
-    hash = "9b3e9307cb5a788c1a4c6706ed32582893ffcd64dc55a14a153be1ea15bb916a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "extsprintf"; range = "1.0.0"; }
-    ];
-  }
-  {
-    baseName = "verror";
-    version = "1.3.6";
-    fullName = "verror-1.3.6";
-    hash = "96135dd5fef7b75bfe26513658ca3fc1ab38e17a9bec522fc5ec6e54b6b63f89";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "extsprintf"; range = "1.0.2"; }
-    ];
-  }
-  {
-    baseName = "view-helpers";
+    name = "assert-plus";
+    spec = "0.1.2";
     version = "0.1.2";
-    fullName = "view-helpers-*";
-    hash = "b9605b3acd8da98a68a34840061b7dde70eac65529667666014b38b03d198439";
+    topLevel = false;
+    dependencies = [
+    ];
     patchLatest = false;
+    sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8";
+    tarball = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz";
+  }
+  {
+    name = "async";
+    spec = "*";
+    version = "0.2.9";
     topLevel = true;
     dependencies = [
     ];
+    patchLatest = false;
+    sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
+    tarball = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
   }
   {
-    baseName = "walk";
-    version = "2.2.1";
-    fullName = "walk-*";
-    hash = "ed78c4a01a936c69c43eac60dde1a54a918fed66681671bf4cfdfa090b49a8ad";
+    name = "async";
+    spec = "0.1.x";
+    version = "0.1.22";
+    topLevel = false;
+    dependencies = [
+    ];
     patchLatest = false;
+    sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
+    tarball = "http://registry.npmjs.org/async/-/async-0.1.22.tgz";
+  }
+  {
+    name = "async";
+    spec = "0.2.x";
+    version = "0.2.9";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
+    tarball = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
+  }
+  {
+    name = "async";
+    spec = "~0.2.6";
+    version = "0.2.9";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
+    tarball = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
+  }
+  {
+    name = "async";
+    spec = "~0.2.7";
+    version = "0.2.9";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
+    tarball = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
+  }
+  {
+    name = "aws-sdk";
+    spec = "*";
+    version = "1.3.2";
     topLevel = true;
     dependencies = [
-      { name = "forEachAsync"; range = "~2.2"; }
+      { name = "xml2js"; spec = "0.2.4"; }
+      { name = "xmlbuilder"; spec = "*"; }
     ];
+    patchLatest = true;
+    sha1 = "23a6cca1eb4a3c50ac67fb354ec9a5725d31a1f4";
+    tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.3.2.tgz";
   }
   {
-    baseName = "watch";
-    version = "0.5.1";
-    fullName = "watch-0.5.x";
-    hash = "1c7497c12e6ad97e194b3527ee6fa919e8f9045e588d9f810592dfec58f1d965";
-    patchLatest = false;
+    name = "aws-sdk";
+    spec = ">=1.2.0 <2";
+    version = "1.3.2";
+    topLevel = false;
+    dependencies = [
+      { name = "xml2js"; spec = "0.2.4"; }
+      { name = "xmlbuilder"; spec = "*"; }
+    ];
+    patchLatest = true;
+    sha1 = "23a6cca1eb4a3c50ac67fb354ec9a5725d31a1f4";
+    tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.3.2.tgz";
+  }
+  {
+    name = "aws-sign";
+    spec = "~0.2.0";
+    version = "0.2.0";
     topLevel = false;
     dependencies = [
     ];
+    patchLatest = false;
+    sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5";
+    tarball = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz";
   }
   {
-    baseName = "watch";
-    version = "0.7.0";
-    fullName = "watch-0.7.0";
-    hash = "8cebd59e96b3c8a25dce0de0204d29cb94f8bd99c7e0c6772f07eb309fd22c54";
-    patchLatest = false;
+    name = "aws-sign";
+    spec = "~0.3.0";
+    version = "0.3.0";
     topLevel = false;
     dependencies = [
     ];
+    patchLatest = false;
+    sha1 = "3d81ca69b474b1e16518728b51c24ff0bbedc6e9";
+    tarball = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz";
   }
   {
-    baseName = "websocket-driver";
-    version = "0.2.2";
-    fullName = "websocket-driver->=0.2.0";
-    hash = "2a5da351b8f716ef2595899b1e6911f739a420df64e65bfba2adf1fab42fe423";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "which";
-    version = "1.0.5";
-    fullName = "which-1";
-    hash = "e26f39d7b152c700636472ab4da57bfb9af17972c49a9e2a06f9ff347d8fad42";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "winston";
-    version = "0.7.2";
-    fullName = "winston-*";
-    hash = "562d3a3d8dc0ba580bfdfb167e16297940d3386ac4b82e65ad09f4859c4af181";
-    patchLatest = false;
+    name = "backbone";
+    spec = "*";
+    version = "1.0.0";
     topLevel = true;
     dependencies = [
-      { name = "async"; range = "0.2.x"; }
-      { name = "colors"; range = "0.6.x"; }
-      { name = "cycle"; range = "1.0.x"; }
-      { name = "eyes"; range = "0.1.x"; }
-      { name = "pkginfo"; range = "0.3.x"; }
-      { name = "request"; range = "2.16.x"; }
-      { name = "stack-trace"; range = "0.0.x"; }
+      { name = "underscore"; spec = ">=1.4.3"; }
     ];
+    patchLatest = false;
+    sha1 = "5e146e1efa8a5361462e578377c39ed0f16b0b4c";
+    tarball = "http://registry.npmjs.org/backbone/-/backbone-1.0.0.tgz";
   }
   {
-    baseName = "winston";
-    version = "0.6.2";
-    fullName = "winston-0.6.2";
-    hash = "bfe4e73f8b42e1521a1c5dbdc50150fc80d508148376c4dfc925caa6516b2a81";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "async"; range = "0.1.x"; }
-      { name = "colors"; range = "0.x.x"; }
-      { name = "cycle"; range = "1.0.x"; }
-      { name = "eyes"; range = "0.1.x"; }
-      { name = "pkginfo"; range = "0.2.x"; }
-      { name = "request"; range = "2.9.x"; }
-      { name = "stack-trace"; range = "0.0.x"; }
-    ];
-  }
-  {
-    baseName = "winston";
-    version = "0.6.2";
-    fullName = "winston-0.6.x";
-    hash = "bfe4e73f8b42e1521a1c5dbdc50150fc80d508148376c4dfc925caa6516b2a81";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "async"; range = "0.1.x"; }
-      { name = "colors"; range = "0.x.x"; }
-      { name = "cycle"; range = "1.0.x"; }
-      { name = "eyes"; range = "0.1.x"; }
-      { name = "pkginfo"; range = "0.2.x"; }
-      { name = "request"; range = "2.9.x"; }
-      { name = "stack-trace"; range = "0.0.x"; }
-    ];
-  }
-  {
-    baseName = "winston";
-    version = "0.7.1";
-    fullName = "winston-0.7.1";
-    hash = "8504626efcd7b629a69500b0ab70b964fbabb53d6ebb506fdf3e1ecc6f2ca294";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "async"; range = "0.2.x"; }
-      { name = "colors"; range = "0.6.x"; }
-      { name = "cycle"; range = "1.0.x"; }
-      { name = "eyes"; range = "0.1.x"; }
-      { name = "pkginfo"; range = "0.3.x"; }
-      { name = "request"; range = "2.16.x"; }
-      { name = "stack-trace"; range = "0.0.x"; }
-    ];
-  }
-  {
-    baseName = "with";
-    version = "1.1.0";
-    fullName = "with-~1.1.0";
-    hash = "884c829a32f2b9d79d62bc455fd363cc307cf8b5284b822b550221c319ee6db4";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "uglify-js"; range = "2.3.6"; }
-    ];
-  }
-  {
-    baseName = "wordwrap";
-    version = "0.0.2";
-    fullName = "wordwrap->=0.0.1 <0.1.0";
-    hash = "66a2fa688509738922c3ad62a6159fe3c93268bd3bca2bff24df4bc02cc31582";
-    patchLatest = false;
+    name = "backoff";
+    spec = "2.1.0";
+    version = "2.1.0";
     topLevel = false;
     dependencies = [
     ];
+    patchLatest = false;
+    sha1 = "19b4e9f9fb75c122ad7bb1c6c376d6085d43ea09";
+    tarball = "http://registry.npmjs.org/backoff/-/backoff-2.1.0.tgz";
   }
   {
-    baseName = "wordwrap";
-    version = "0.0.2";
-    fullName = "wordwrap-~0.0.2";
-    hash = "66a2fa688509738922c3ad62a6159fe3c93268bd3bca2bff24df4bc02cc31582";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "wu";
-    version = "0.1.8";
-    fullName = "wu-*";
-    hash = "2400d0ca7da862a9063a6a8d914bb4e585f81a5121b0fda8e40b1f6e782c72c6";
-    patchLatest = false;
+    name = "bcrypt";
+    spec = "*";
+    version = "0.7.6";
     topLevel = true;
     dependencies = [
+      { name = "bindings"; spec = "1.0.0"; }
     ];
+    patchLatest = false;
+    sha1 = "97eae4472baf2352699f5fd1662e77e63d0cd0aa";
+    tarball = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.6.tgz";
   }
   {
-    baseName = "xml2js";
-    version = "0.2.4";
-    fullName = "xml2js-0.2.4";
-    hash = "8daebb075fc7c564d84221a0cef7825ac824db8e312f873daee59a6adf38da28";
-    patchLatest = false;
+    name = "bindings";
+    spec = "*";
+    version = "1.1.1";
     topLevel = false;
     dependencies = [
-      { name = "sax"; range = ">=0.4.2"; }
     ];
+    patchLatest = false;
+    sha1 = "951f7ae010302ffc50b265b124032017ed2bf6f3";
+    tarball = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz";
   }
   {
-    baseName = "xml2js";
-    version = "0.2.8";
-    fullName = "xml2js-0.2.x";
-    hash = "faa75fc23ae6346002555df236250c3612cf76dfac104aff131a5ab5de49b8de";
-    patchLatest = false;
+    name = "bindings";
+    spec = "1.0.0";
+    version = "1.0.0";
     topLevel = false;
     dependencies = [
-      { name = "sax"; range = "0.5.x"; }
     ];
+    patchLatest = false;
+    sha1 = "c3ccde60e9de6807c6f1aa4ef4843af29191c828";
+    tarball = "http://registry.npmjs.org/bindings/-/bindings-1.0.0.tgz";
   }
   {
-    baseName = "xmlbuilder";
+    name = "block-stream";
+    spec = "*";
+    version = "0.0.6";
+    topLevel = false;
+    dependencies = [
+      { name = "inherits"; spec = "~1.0.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "f7027aea2ecc357153fa3bad6caeaf25f391aa4f";
+    tarball = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.6.tgz";
+  }
+  {
+    name = "boom";
+    spec = "0.3.x";
+    version = "0.3.8";
+    topLevel = false;
+    dependencies = [
+      { name = "hoek"; spec = "0.7.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea";
+    tarball = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz";
+  }
+  {
+    name = "boom";
+    spec = "0.4.x";
     version = "0.4.2";
-    fullName = "xmlbuilder-*";
-    hash = "3137e5bf9db1f114767f8ba56be753f2a9f512e38a2df64d7677ae3c9318a0fe";
+    topLevel = false;
+    dependencies = [
+      { name = "hoek"; spec = "0.9.x"; }
+    ];
     patchLatest = false;
+    sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
+    tarball = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
+  }
+  {
+    name = "broadway";
+    spec = "0.2.7";
+    version = "0.2.7";
+    topLevel = false;
+    dependencies = [
+      { name = "cliff"; spec = "0.1.8"; }
+      { name = "eventemitter2"; spec = "0.4.11"; }
+      { name = "nconf"; spec = "0.6.7"; }
+      { name = "winston"; spec = "0.6.2"; }
+      { name = "utile"; spec = "0.1.7"; }
+    ];
+    patchLatest = false;
+    sha1 = "3ba2f4b3de163e95e38a4950b61fd5f882a90762";
+    tarball = "http://registry.npmjs.org/broadway/-/broadway-0.2.7.tgz";
+  }
+  {
+    name = "broadway";
+    spec = "0.2.x";
+    version = "0.2.7";
+    topLevel = false;
+    dependencies = [
+      { name = "cliff"; spec = "0.1.8"; }
+      { name = "eventemitter2"; spec = "0.4.11"; }
+      { name = "nconf"; spec = "0.6.7"; }
+      { name = "winston"; spec = "0.6.2"; }
+      { name = "utile"; spec = "0.1.7"; }
+    ];
+    patchLatest = false;
+    sha1 = "3ba2f4b3de163e95e38a4950b61fd5f882a90762";
+    tarball = "http://registry.npmjs.org/broadway/-/broadway-0.2.7.tgz";
+  }
+  {
+    name = "browserchannel";
+    spec = "*";
+    version = "1.0.4";
+    topLevel = true;
+    dependencies = [
+      { name = "hat"; spec = "*"; }
+      { name = "connect"; spec = "~2"; }
+      { name = "request"; spec = "~2"; }
+    ];
+    patchLatest = false;
+    sha1 = "077c1d59d7872d84932172d373c5f8f45698e975";
+    tarball = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.4.tgz";
+  }
+  {
+    name = "bson";
+    spec = "0.1.8";
+    version = "0.1.8";
     topLevel = false;
     dependencies = [
     ];
+    patchLatest = false;
+    sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81";
+    tarball = "http://registry.npmjs.org/bson/-/bson-0.1.8.tgz";
+  }
+  {
+    name = "bson";
+    spec = "0.1.9";
+    version = "0.1.9";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "7528f81ed770e6d630ca8c2ccdf5394a4096db14";
+    tarball = "http://registry.npmjs.org/bson/-/bson-0.1.9.tgz";
+  }
+  {
+    name = "buffer-crc32";
+    spec = "0.1.1";
+    version = "0.1.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526";
+    tarball = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz";
+  }
+  {
+    name = "buffer-crc32";
+    spec = "0.2.1";
+    version = "0.2.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c";
+    tarball = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz";
+  }
+  {
+    name = "buffer-crc32";
+    spec = "~0.2.1";
+    version = "0.2.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c";
+    tarball = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz";
+  }
+  {
+    name = "buffertools";
+    spec = "*";
+    version = "1.1.1";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "1071a5f40fe76c39d7a4fe2ea030324d09d6ec9d";
+    tarball = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz";
+  }
+  {
+    name = "buffertools";
+    spec = ">=1.1.1 <2.0.0";
+    version = "1.1.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "1071a5f40fe76c39d7a4fe2ea030324d09d6ec9d";
+    tarball = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz";
+  }
+  {
+    name = "bunyan";
+    spec = "0.21.1";
+    version = "0.21.1";
+    topLevel = false;
+    dependencies = [
+      { name = "mv"; spec = "0.0.5"; }
+      { name = "dtrace-provider"; spec = "0.2.8"; }
+    ];
+    patchLatest = false;
+    sha1 = "ea00a0d5223572e31e1e71efba2237cb1915942a";
+    tarball = "http://registry.npmjs.org/bunyan/-/bunyan-0.21.1.tgz";
+  }
+  {
+    name = "bytes";
+    spec = "0.2.0";
+    version = "0.2.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0";
+    tarball = "http://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz";
+  }
+  {
+    name = "character-parser";
+    spec = "1.0.2";
+    version = "1.0.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "55384d6afcf8c6b9dd483e8347646a790e4545e7";
+    tarball = "http://registry.npmjs.org/character-parser/-/character-parser-1.0.2.tgz";
+  }
+  {
+    name = "child-process-close";
+    spec = "~0.1.1";
+    version = "0.1.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "c153ede7a5eb65ac69e78a38973b1a286377f75f";
+    tarball = "http://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz";
+  }
+  {
+    name = "chmodr";
+    spec = "~0.1.0";
+    version = "0.1.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "e09215a1d51542db2a2576969765bcf6125583eb";
+    tarball = "http://registry.npmjs.org/chmodr/-/chmodr-0.1.0.tgz";
+  }
+  {
+    name = "chownr";
+    spec = "0";
+    version = "0.0.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "51d18189d9092d5f8afd623f3288bfd1c6bf1a62";
+    tarball = "http://registry.npmjs.org/chownr/-/chownr-0.0.1.tgz";
+  }
+  {
+    name = "cli";
+    spec = "0.4.x";
+    version = "0.4.4";
+    topLevel = false;
+    dependencies = [
+      { name = "glob"; spec = ">= 3.1.4"; }
+    ];
+    patchLatest = false;
+    sha1 = "13ceb30872e7c9addc383e5519fb2949ab61ba43";
+    tarball = "http://registry.npmjs.org/cli/-/cli-0.4.4.tgz";
+  }
+  {
+    name = "cliff";
+    spec = "0.1.8";
+    version = "0.1.8";
+    topLevel = false;
+    dependencies = [
+      { name = "colors"; spec = "0.x.x"; }
+      { name = "eyes"; spec = "0.1.x"; }
+      { name = "winston"; spec = "0.6.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "43ca8ad9fe3943489693ab62dce0cae22509d272";
+    tarball = "http://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz";
+  }
+  {
+    name = "clone";
+    spec = "0.1.5";
+    version = "0.1.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "46f29143d0766d663dbd7f80b7520a15783d2042";
+    tarball = "http://registry.npmjs.org/clone/-/clone-0.1.5.tgz";
+  }
+  {
+    name = "clone";
+    spec = "0.1.6";
+    version = "0.1.6";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "4af2296d4a23a64168c2f5fb0a2aa65e80517000";
+    tarball = "http://registry.npmjs.org/clone/-/clone-0.1.6.tgz";
+  }
+  {
+    name = "cmd-shim";
+    spec = "~1.1.0";
+    version = "1.1.0";
+    topLevel = false;
+    dependencies = [
+      { name = "mkdirp"; spec = "~0.3.3"; }
+      { name = "graceful-fs"; spec = "1.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "e69fe26e9a8b9040c7b61dc8ad6b04d7dbabe767";
+    tarball = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.0.tgz";
+  }
+  {
+    name = "coffee-script";
+    spec = "*";
+    version = "1.6.3";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
+    tarball = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
+  }
+  {
+    name = "colors";
+    spec = "0.6.0-1";
+    version = "0.6.0-1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "6dbb68ceb8bc60f2b313dcc5ce1599f06d19e67a";
+    tarball = "http://registry.npmjs.org/colors/-/colors-0.6.0-1.tgz";
+  }
+  {
+    name = "colors";
+    spec = "0.6.x";
+    version = "0.6.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "07ec10d8ac4f5a2e78f8d820e3e7832b3b463cad";
+    tarball = "http://registry.npmjs.org/colors/-/colors-0.6.0.tgz";
+  }
+  {
+    name = "colors";
+    spec = "0.x.x";
+    version = "0.6.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "07ec10d8ac4f5a2e78f8d820e3e7832b3b463cad";
+    tarball = "http://registry.npmjs.org/colors/-/colors-0.6.0.tgz";
+  }
+  {
+    name = "combined-stream";
+    spec = "~0.0.4";
+    version = "0.0.4";
+    topLevel = false;
+    dependencies = [
+      { name = "delayed-stream"; spec = "0.0.5"; }
+    ];
+    patchLatest = false;
+    sha1 = "2d1a43347dbe9515a4a2796732e5b88473840b22";
+    tarball = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz";
+  }
+  {
+    name = "commander";
+    spec = "0.5.1";
+    version = "0.5.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "08477afb326d1adf9d4ee73af7170c70caa14f95";
+    tarball = "http://registry.npmjs.org/commander/-/commander-0.5.1.tgz";
+  }
+  {
+    name = "commander";
+    spec = "0.6.1";
+    version = "0.6.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
+    tarball = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
+  }
+  {
+    name = "commander";
+    spec = "1.2.0";
+    version = "1.2.0";
+    topLevel = false;
+    dependencies = [
+      { name = "keypress"; spec = "0.1.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "fd5713bfa153c7d6cc599378a5ab4c45c535029e";
+    tarball = "http://registry.npmjs.org/commander/-/commander-1.2.0.tgz";
+  }
+  {
+    name = "config-chain";
+    spec = "~1.1.1";
+    version = "1.1.7";
+    topLevel = false;
+    dependencies = [
+      { name = "proto-list"; spec = "~1.2.1"; }
+      { name = "ini"; spec = "1"; }
+    ];
+    patchLatest = false;
+    sha1 = "99fcaaaf343a557782a142d201747bb8142bbf9a";
+    tarball = "http://registry.npmjs.org/config-chain/-/config-chain-1.1.7.tgz";
+  }
+  {
+    name = "connect";
+    spec = "2.7.5";
+    version = "2.7.5";
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; spec = "0.5.1"; }
+      { name = "formidable"; spec = "1.0.11"; }
+      { name = "cookie-signature"; spec = "1.0.0"; }
+      { name = "buffer-crc32"; spec = "0.1.1"; }
+      { name = "cookie"; spec = "0.0.5"; }
+      { name = "send"; spec = "0.1.0"; }
+      { name = "bytes"; spec = "0.2.0"; }
+      { name = "fresh"; spec = "0.1.0"; }
+      { name = "pause"; spec = "0.0.1"; }
+      { name = "debug"; spec = "*"; }
+    ];
+    patchLatest = false;
+    sha1 = "139111b4b03f0533a524927a88a646ae467b2c02";
+    tarball = "http://registry.npmjs.org/connect/-/connect-2.7.5.tgz";
+  }
+  {
+    name = "connect";
+    spec = "2.8.4";
+    version = "2.8.4";
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; spec = "0.6.5"; }
+      { name = "formidable"; spec = "1.0.14"; }
+      { name = "cookie-signature"; spec = "1.0.1"; }
+      { name = "buffer-crc32"; spec = "0.2.1"; }
+      { name = "cookie"; spec = "0.1.0"; }
+      { name = "send"; spec = "0.1.3"; }
+      { name = "bytes"; spec = "0.2.0"; }
+      { name = "fresh"; spec = "0.1.0"; }
+      { name = "pause"; spec = "0.0.1"; }
+      { name = "uid2"; spec = "0.0.2"; }
+      { name = "debug"; spec = "*"; }
+      { name = "methods"; spec = "0.0.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "ead3eb0e7c5e79bf25e246371d85849cbbbbc656";
+    tarball = "http://registry.npmjs.org/connect/-/connect-2.8.4.tgz";
+  }
+  {
+    name = "connect";
+    spec = "~2";
+    version = "2.8.4";
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; spec = "0.6.5"; }
+      { name = "formidable"; spec = "1.0.14"; }
+      { name = "cookie-signature"; spec = "1.0.1"; }
+      { name = "buffer-crc32"; spec = "0.2.1"; }
+      { name = "cookie"; spec = "0.1.0"; }
+      { name = "send"; spec = "0.1.3"; }
+      { name = "bytes"; spec = "0.2.0"; }
+      { name = "fresh"; spec = "0.1.0"; }
+      { name = "pause"; spec = "0.0.1"; }
+      { name = "uid2"; spec = "0.0.2"; }
+      { name = "debug"; spec = "*"; }
+      { name = "methods"; spec = "0.0.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "ead3eb0e7c5e79bf25e246371d85849cbbbbc656";
+    tarball = "http://registry.npmjs.org/connect/-/connect-2.8.4.tgz";
+  }
+  {
+    name = "connect-flash";
+    spec = "*";
+    version = "0.1.1";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "d8630f26d95a7f851f9956b1e8cc6732f3b6aa30";
+    tarball = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz";
+  }
+  {
+    name = "connect-mongo";
+    spec = "*";
+    version = "0.3.3";
+    topLevel = true;
+    dependencies = [
+      { name = "mongodb"; spec = "1.2.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "aeaa1ca8c947599131bd90e1a024cdb789fe0100";
+    tarball = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.3.3.tgz";
+  }
+  {
+    name = "console-browserify";
+    spec = "0.1.x";
+    version = "0.1.6";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "d128a3c0bb88350eb5626c6e7c71a6f0fd48983c";
+    tarball = "http://registry.npmjs.org/console-browserify/-/console-browserify-0.1.6.tgz";
+  }
+  {
+    name = "constantinople";
+    spec = "~1.0.1";
+    version = "1.0.1";
+    topLevel = false;
+    dependencies = [
+      { name = "uglify-js"; spec = "~2.3.6"; }
+    ];
+    patchLatest = false;
+    sha1 = "038727385eb70567ffb5a825abc44870b56f4de9";
+    tarball = "http://registry.npmjs.org/constantinople/-/constantinople-1.0.1.tgz";
+  }
+  {
+    name = "cookie";
+    spec = "0.0.5";
+    version = "0.0.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
+    tarball = "http://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz";
+  }
+  {
+    name = "cookie";
+    spec = "0.1.0";
+    version = "0.1.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "90eb469ddce905c866de687efc43131d8801f9d0";
+    tarball = "http://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz";
+  }
+  {
+    name = "cookie-jar";
+    spec = "~0.2.0";
+    version = "0.2.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "64ecc06ac978db795e4b5290cbe48ba3781400fa";
+    tarball = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz";
+  }
+  {
+    name = "cookie-jar";
+    spec = "~0.3.0";
+    version = "0.3.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "bc9a27d4e2b97e186cd57c9e2063cb99fa68cccc";
+    tarball = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz";
+  }
+  {
+    name = "cookie-signature";
+    spec = "1.0.0";
+    version = "1.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "0044f332ac623df851c914e88eacc57f0c9704fe";
+    tarball = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.0.tgz";
+  }
+  {
+    name = "cookie-signature";
+    spec = "1.0.1";
+    version = "1.0.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb";
+    tarball = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz";
+  }
+  {
+    name = "cookiejar";
+    spec = "1.3.0";
+    version = "1.3.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "dd00b35679021e99cbd4e855b9ad041913474765";
+    tarball = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.0.tgz";
+  }
+  {
+    name = "cookies";
+    spec = ">= 0.2.2";
+    version = "0.3.6";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "1b5e4bd66fc732ea2e8b5087a8fb3718b4ec8597";
+    tarball = "http://registry.npmjs.org/cookies/-/cookies-0.3.6.tgz";
+  }
+  {
+    name = "couch-login";
+    spec = "~0.1.15";
+    version = "0.1.17";
+    topLevel = false;
+    dependencies = [
+      { name = "request"; spec = "2 >=2.14"; }
+    ];
+    patchLatest = false;
+    sha1 = "ab3ac31dd56e1061ea5f7faa838c7bda32a2b2ed";
+    tarball = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.17.tgz";
+  }
+  {
+    name = "cryptiles";
+    spec = "0.1.x";
+    version = "0.1.3";
+    topLevel = false;
+    dependencies = [
+      { name = "boom"; spec = "0.3.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c";
+    tarball = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz";
+  }
+  {
+    name = "cryptiles";
+    spec = "0.2.x";
+    version = "0.2.2";
+    topLevel = false;
+    dependencies = [
+      { name = "boom"; spec = "0.4.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
+    tarball = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
+  }
+  {
+    name = "css";
+    spec = "~1.0.8";
+    version = "1.0.8";
+    topLevel = false;
+    dependencies = [
+      { name = "css-parse"; spec = "1.0.4"; }
+      { name = "css-stringify"; spec = "1.0.5"; }
+    ];
+    patchLatest = false;
+    sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7";
+    tarball = "http://registry.npmjs.org/css/-/css-1.0.8.tgz";
+  }
+  {
+    name = "css-parse";
+    spec = "1.0.4";
+    version = "1.0.4";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd";
+    tarball = "http://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz";
+  }
+  {
+    name = "css-stringify";
+    spec = "1.0.5";
+    version = "1.0.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031";
+    tarball = "http://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz";
+  }
+  {
+    name = "cssom";
+    spec = "0.2.x";
+    version = "0.2.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "2682709b5902e7212df529116ff788cd5b254894";
+    tarball = "http://registry.npmjs.org/cssom/-/cssom-0.2.5.tgz";
+  }
+  {
+    name = "ctype";
+    spec = "0.5.0";
+    version = "0.5.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "672673ec67587eb495c1ed694da1abb964ff65e3";
+    tarball = "http://registry.npmjs.org/ctype/-/ctype-0.5.0.tgz";
+  }
+  {
+    name = "ctype";
+    spec = "0.5.2";
+    version = "0.5.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d";
+    tarball = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz";
+  }
+  {
+    name = "cycle";
+    spec = "1.0.x";
+    version = "1.0.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "269aca6f1b8d2baeefc8ccbc888b459f322c4e60";
+    tarball = "http://registry.npmjs.org/cycle/-/cycle-1.0.2.tgz";
+  }
+  {
+    name = "debug";
+    spec = "*";
+    version = "0.7.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "056692c86670977f115de82917918b8e8b9a10f0";
+    tarball = "http://registry.npmjs.org/debug/-/debug-0.7.2.tgz";
+  }
+  {
+    name = "debug";
+    spec = "~0.7.0";
+    version = "0.7.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "056692c86670977f115de82917918b8e8b9a10f0";
+    tarball = "http://registry.npmjs.org/debug/-/debug-0.7.2.tgz";
+  }
+  {
+    name = "debug";
+    spec = "~0.7.2";
+    version = "0.7.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "056692c86670977f115de82917918b8e8b9a10f0";
+    tarball = "http://registry.npmjs.org/debug/-/debug-0.7.2.tgz";
+  }
+  {
+    name = "deep-equal";
+    spec = "*";
+    version = "0.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83";
+    tarball = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
+  }
+  {
+    name = "deep-equal";
+    spec = "0.0.0";
+    version = "0.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83";
+    tarball = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
+  }
+  {
+    name = "delayed-stream";
+    spec = "0.0.5";
+    version = "0.0.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
+    tarball = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
+  }
+  {
+    name = "diff";
+    spec = "1.0.2";
+    version = "1.0.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "4ae73f1aee8d6fcf484f1a1ce77ce651d9b7f0c9";
+    tarball = "http://registry.npmjs.org/diff/-/diff-1.0.2.tgz";
+  }
+  {
+    name = "director";
+    spec = "1.1.10";
+    version = "1.1.10";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "e6c1d64f2f079216f19ea83b566035dde9901179";
+    tarball = "http://registry.npmjs.org/director/-/director-1.1.10.tgz";
+  }
+  {
+    name = "dtrace-provider";
+    spec = "0.2.8";
+    version = "0.2.8";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "e243f19219aa95fbf0d8f2ffb07f5bd64e94fe20";
+    tarball = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.8.tgz";
+  }
+  {
+    name = "editor";
+    spec = "0.0.4";
+    version = "0.0.4";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "478920f77bca6c1c1749d5e3edde4bd5966efda8";
+    tarball = "http://registry.npmjs.org/editor/-/editor-0.0.4.tgz";
+  }
+  {
+    name = "emitter-component";
+    spec = "1.0.0";
+    version = "1.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "f04dd18fc3dc3e9a74cbc0f310b088666e4c016f";
+    tarball = "http://registry.npmjs.org/emitter-component/-/emitter-component-1.0.0.tgz";
+  }
+  {
+    name = "escape-html";
+    spec = "*";
+    version = "1.0.0";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "fedcd79564444ddaf2bd85b22c9961b3a3a38bf5";
+    tarball = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.0.tgz";
+  }
+  {
+    name = "event-stream";
+    spec = "~0.5";
+    version = "0.5.3";
+    topLevel = false;
+    dependencies = [
+      { name = "optimist"; spec = "0.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c";
+    tarball = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz";
+  }
+  {
+    name = "eventemitter2";
+    spec = "0.4.11";
+    version = "0.4.11";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "8bbf2b6ac7b31e2eea0c8d8f533ef41f849a9e2c";
+    tarball = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.11.tgz";
+  }
+  {
+    name = "eventemitter2";
+    spec = "~0.4.11";
+    version = "0.4.12";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "6cf14249fdc8799be7416e871e73fd2bb89e35e0";
+    tarball = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.12.tgz";
+  }
+  {
+    name = "events.node";
+    spec = ">= 0.4.0";
+    version = "0.4.9";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4";
+    tarball = "http://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz";
+  }
+  {
+    name = "express";
+    spec = "*";
+    version = "3.3.4";
+    topLevel = true;
+    dependencies = [
+      { name = "connect"; spec = "2.8.4"; }
+      { name = "commander"; spec = "1.2.0"; }
+      { name = "range-parser"; spec = "0.0.4"; }
+      { name = "mkdirp"; spec = "0.3.5"; }
+      { name = "cookie"; spec = "0.1.0"; }
+      { name = "buffer-crc32"; spec = "0.2.1"; }
+      { name = "fresh"; spec = "0.1.0"; }
+      { name = "methods"; spec = "0.0.1"; }
+      { name = "send"; spec = "0.1.3"; }
+      { name = "cookie-signature"; spec = "1.0.1"; }
+      { name = "debug"; spec = "*"; }
+    ];
+    patchLatest = false;
+    sha1 = "9abf22017213a8f6f54a421ce22b8ec27b7def62";
+    tarball = "http://registry.npmjs.org/express/-/express-3.3.4.tgz";
+  }
+  {
+    name = "express";
+    spec = "~3.1.1";
+    version = "3.1.2";
+    topLevel = false;
+    dependencies = [
+      { name = "connect"; spec = "2.7.5"; }
+      { name = "commander"; spec = "0.6.1"; }
+      { name = "range-parser"; spec = "0.0.4"; }
+      { name = "mkdirp"; spec = "~0.3.4"; }
+      { name = "cookie"; spec = "0.0.5"; }
+      { name = "buffer-crc32"; spec = "~0.2.1"; }
+      { name = "fresh"; spec = "0.1.0"; }
+      { name = "methods"; spec = "0.0.1"; }
+      { name = "send"; spec = "0.1.0"; }
+      { name = "cookie-signature"; spec = "1.0.0"; }
+      { name = "debug"; spec = "*"; }
+    ];
+    patchLatest = false;
+    sha1 = "52a02c8db8f22bbfa0d7478d847cd45161f985f7";
+    tarball = "http://registry.npmjs.org/express/-/express-3.1.2.tgz";
+  }
+  {
+    name = "extend";
+    spec = "*";
+    version = "1.1.3";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "5ae3d12e33009879dfb574e911a2da1e3da29ef4";
+    tarball = "http://registry.npmjs.org/extend/-/extend-1.1.3.tgz";
+  }
+  {
+    name = "extsprintf";
+    spec = "1.0.0";
+    version = "1.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86";
+    tarball = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz";
+  }
+  {
+    name = "extsprintf";
+    spec = "1.0.2";
+    version = "1.0.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "e1080e0658e300b06294990cc70e1502235fd550";
+    tarball = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
+  }
+  {
+    name = "eyes";
+    spec = "0.1.x";
+    version = "0.1.8";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
+    tarball = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
+  }
+  {
+    name = "faye-websocket";
+    spec = "*";
+    version = "0.6.1";
+    topLevel = true;
+    dependencies = [
+      { name = "websocket-driver"; spec = ">=0.2.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "43a54b2ab807761d7ec335d12f48eb69ec4ab61c";
+    tarball = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.6.1.tgz";
+  }
+  {
+    name = "faye-websocket";
+    spec = "0.4.4";
+    version = "0.4.4";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "c14c5b3bf14d7417ffbfd990c0a7495cd9f337bc";
+    tarball = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz";
+  }
+  {
+    name = "flatiron";
+    spec = "0.3.5";
+    version = "0.3.5";
+    topLevel = false;
+    dependencies = [
+      { name = "broadway"; spec = "0.2.7"; }
+      { name = "optimist"; spec = "0.3.5"; }
+      { name = "prompt"; spec = "0.2.9"; }
+      { name = "director"; spec = "1.1.10"; }
+      { name = "pkginfo"; spec = "0.3.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "a91fe730f6a7fc1ea655a0ca48eaa977bef64625";
+    tarball = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.5.tgz";
+  }
+  {
+    name = "forEachAsync";
+    spec = "~2.2";
+    version = "2.2.0";
+    topLevel = false;
+    dependencies = [
+      { name = "sequence"; spec = ">= 2.2.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "093b32ce868cb69f5166dcf331fae074adc71cee";
+    tarball = "http://registry.npmjs.org/forEachAsync/-/forEachAsync-2.2.0.tgz";
+  }
+  {
+    name = "forever";
+    spec = "*";
+    version = "0.10.8";
+    topLevel = true;
+    dependencies = [
+      { name = "colors"; spec = "0.6.0-1"; }
+      { name = "cliff"; spec = "0.1.8"; }
+      { name = "flatiron"; spec = "0.3.5"; }
+      { name = "forever-monitor"; spec = "1.2.2"; }
+      { name = "nconf"; spec = "0.6.7"; }
+      { name = "nssocket"; spec = "~0.5.1"; }
+      { name = "optimist"; spec = "0.4.0"; }
+      { name = "pkginfo"; spec = "0.3.0"; }
+      { name = "timespan"; spec = "2.0.1"; }
+      { name = "watch"; spec = "0.7.0"; }
+      { name = "utile"; spec = "0.1.7"; }
+      { name = "winston"; spec = "0.7.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "a78137a46fb8ca4adbf2f497d98816a526bb1f82";
+    tarball = "http://registry.npmjs.org/forever/-/forever-0.10.8.tgz";
+  }
+  {
+    name = "forever-agent";
+    spec = "~0.2.0";
+    version = "0.2.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f";
+    tarball = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz";
+  }
+  {
+    name = "forever-agent";
+    spec = "~0.5.0";
+    version = "0.5.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "0c1647a74f3af12d76a07a99490ade7c7249c8f0";
+    tarball = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.0.tgz";
+  }
+  {
+    name = "forever-monitor";
+    spec = "1.2.2";
+    version = "1.2.2";
+    topLevel = false;
+    dependencies = [
+      { name = "broadway"; spec = "0.2.x"; }
+      { name = "minimatch"; spec = "0.0.x"; }
+      { name = "pkginfo"; spec = "0.x.x"; }
+      { name = "ps-tree"; spec = "0.0.x"; }
+      { name = "watch"; spec = "0.5.x"; }
+      { name = "utile"; spec = "0.1.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "c1ad6c6ab837a89fa2d47bb439727ca968235684";
+    tarball = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.2.tgz";
+  }
+  {
+    name = "form-data";
+    spec = "0.0.8";
+    version = "0.0.8";
+    topLevel = false;
+    dependencies = [
+      { name = "combined-stream"; spec = "~0.0.4"; }
+      { name = "mime"; spec = "~1.2.2"; }
+      { name = "async"; spec = "~0.2.7"; }
+    ];
+    patchLatest = false;
+    sha1 = "0890cd1005c5ccecc0b9d24a88052c92442d0db5";
+    tarball = "http://registry.npmjs.org/form-data/-/form-data-0.0.8.tgz";
+  }
+  {
+    name = "form-data";
+    spec = "~0.0.3";
+    version = "0.0.10";
+    topLevel = false;
+    dependencies = [
+      { name = "combined-stream"; spec = "~0.0.4"; }
+      { name = "mime"; spec = "~1.2.2"; }
+      { name = "async"; spec = "~0.2.7"; }
+    ];
+    patchLatest = false;
+    sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed";
+    tarball = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz";
+  }
+  {
+    name = "formidable";
+    spec = "1.0.11";
+    version = "1.0.11";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30";
+    tarball = "http://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz";
+  }
+  {
+    name = "formidable";
+    spec = "1.0.13";
+    version = "1.0.13";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "70caf0f9d69692a77e04021ddab4f46b01c82aea";
+    tarball = "http://registry.npmjs.org/formidable/-/formidable-1.0.13.tgz";
+  }
+  {
+    name = "formidable";
+    spec = "1.0.14";
+    version = "1.0.14";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a";
+    tarball = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz";
+  }
+  {
+    name = "formidable";
+    spec = "1.0.9";
+    version = "1.0.9";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "419e3bccead3e8874d539f5b3e72a4c503b31a98";
+    tarball = "http://registry.npmjs.org/formidable/-/formidable-1.0.9.tgz";
+  }
+  {
+    name = "fresh";
+    spec = "0.1.0";
+    version = "0.1.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850";
+    tarball = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
+  }
+  {
+    name = "fstream";
+    spec = "0";
+    version = "0.1.23";
+    topLevel = false;
+    dependencies = [
+      { name = "rimraf"; spec = "2"; }
+      { name = "mkdirp"; spec = "0.3"; }
+      { name = "graceful-fs"; spec = "~2.0.0"; }
+      { name = "inherits"; spec = "~1.0.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "e1ac8d0945a7f27789e71f00a6d86575d14fc4ec";
+    tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.23.tgz";
+  }
+  {
+    name = "fstream";
+    spec = "~0.1.17";
+    version = "0.1.23";
+    topLevel = false;
+    dependencies = [
+      { name = "rimraf"; spec = "2"; }
+      { name = "mkdirp"; spec = "0.3"; }
+      { name = "graceful-fs"; spec = "~2.0.0"; }
+      { name = "inherits"; spec = "~1.0.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "e1ac8d0945a7f27789e71f00a6d86575d14fc4ec";
+    tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.23.tgz";
+  }
+  {
+    name = "fstream";
+    spec = "~0.1.23";
+    version = "0.1.23";
+    topLevel = false;
+    dependencies = [
+      { name = "rimraf"; spec = "2"; }
+      { name = "mkdirp"; spec = "0.3"; }
+      { name = "graceful-fs"; spec = "~2.0.0"; }
+      { name = "inherits"; spec = "~1.0.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "e1ac8d0945a7f27789e71f00a6d86575d14fc4ec";
+    tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.23.tgz";
+  }
+  {
+    name = "fstream";
+    spec = "~0.1.8";
+    version = "0.1.23";
+    topLevel = false;
+    dependencies = [
+      { name = "rimraf"; spec = "2"; }
+      { name = "mkdirp"; spec = "0.3"; }
+      { name = "graceful-fs"; spec = "~2.0.0"; }
+      { name = "inherits"; spec = "~1.0.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "e1ac8d0945a7f27789e71f00a6d86575d14fc4ec";
+    tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.23.tgz";
+  }
+  {
+    name = "fstream-ignore";
+    spec = "~0.0.5";
+    version = "0.0.7";
+    topLevel = false;
+    dependencies = [
+      { name = "minimatch"; spec = "~0.2.0"; }
+      { name = "fstream"; spec = "~0.1.17"; }
+      { name = "inherits"; spec = "2"; }
+    ];
+    patchLatest = false;
+    sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63";
+    tarball = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz";
+  }
+  {
+    name = "fstream-npm";
+    spec = "~0.1.3";
+    version = "0.1.5";
+    topLevel = false;
+    dependencies = [
+      { name = "fstream-ignore"; spec = "~0.0.5"; }
+      { name = "inherits"; spec = "2"; }
+    ];
+    patchLatest = false;
+    sha1 = "8f9fdd38c0940f91f7b6ebda4b6611be88f97ec9";
+    tarball = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.5.tgz";
+  }
+  {
+    name = "github-url-from-git";
+    spec = "~1.1.1";
+    version = "1.1.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "1f89623453123ef9623956e264c60bf4c3cf5ccf";
+    tarball = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz";
+  }
+  {
+    name = "glob";
+    spec = "3";
+    version = "3.2.3";
+    topLevel = false;
+    dependencies = [
+      { name = "minimatch"; spec = "~0.2.11"; }
+      { name = "graceful-fs"; spec = "~2.0.0"; }
+      { name = "inherits"; spec = "2"; }
+    ];
+    patchLatest = false;
+    sha1 = "e313eeb249c7affaa5c475286b0e115b59839467";
+    tarball = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
+  }
+  {
+    name = "glob";
+    spec = "3.2.1";
+    version = "3.2.1";
+    topLevel = false;
+    dependencies = [
+      { name = "minimatch"; spec = "~0.2.11"; }
+      { name = "graceful-fs"; spec = "~1.2.0"; }
+      { name = "inherits"; spec = "1"; }
+    ];
+    patchLatest = false;
+    sha1 = "57af70ec73ba2323bfe3f29a067765db64c5d758";
+    tarball = "http://registry.npmjs.org/glob/-/glob-3.2.1.tgz";
+  }
+  {
+    name = "glob";
+    spec = ">= 3.1.4";
+    version = "3.2.3";
+    topLevel = false;
+    dependencies = [
+      { name = "minimatch"; spec = "~0.2.11"; }
+      { name = "graceful-fs"; spec = "~2.0.0"; }
+      { name = "inherits"; spec = "2"; }
+    ];
+    patchLatest = false;
+    sha1 = "e313eeb249c7affaa5c475286b0e115b59839467";
+    tarball = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
+  }
+  {
+    name = "glob";
+    spec = "~3.2.1";
+    version = "3.2.3";
+    topLevel = false;
+    dependencies = [
+      { name = "minimatch"; spec = "~0.2.11"; }
+      { name = "graceful-fs"; spec = "~2.0.0"; }
+      { name = "inherits"; spec = "2"; }
+    ];
+    patchLatest = false;
+    sha1 = "e313eeb249c7affaa5c475286b0e115b59839467";
+    tarball = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
+  }
+  {
+    name = "glob";
+    spec = "~3.2.3";
+    version = "3.2.3";
+    topLevel = false;
+    dependencies = [
+      { name = "minimatch"; spec = "~0.2.11"; }
+      { name = "graceful-fs"; spec = "~2.0.0"; }
+      { name = "inherits"; spec = "2"; }
+    ];
+    patchLatest = false;
+    sha1 = "e313eeb249c7affaa5c475286b0e115b59839467";
+    tarball = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
+  }
+  {
+    name = "graceful-fs";
+    spec = "1.2";
+    version = "1.2.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
+    tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+  }
+  {
+    name = "graceful-fs";
+    spec = "2";
+    version = "2.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "c9a206f6f5f4b94e1046dfaaccfe9e12d0ab8cef";
+    tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.0.tgz";
+  }
+  {
+    name = "graceful-fs";
+    spec = "~1";
+    version = "1.2.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
+    tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+  }
+  {
+    name = "graceful-fs";
+    spec = "~1.2";
+    version = "1.2.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
+    tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+  }
+  {
+    name = "graceful-fs";
+    spec = "~1.2.0";
+    version = "1.2.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
+    tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+  }
+  {
+    name = "graceful-fs";
+    spec = "~2.0.0";
+    version = "2.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "c9a206f6f5f4b94e1046dfaaccfe9e12d0ab8cef";
+    tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.0.tgz";
+  }
+  {
+    name = "growl";
+    spec = "1.5.x";
+    version = "1.5.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "1decd1f22a4b30dae7d363799ec624cf40cc0070";
+    tarball = "http://registry.npmjs.org/growl/-/growl-1.5.1.tgz";
+  }
+  {
+    name = "growl";
+    spec = "1.7.x";
+    version = "1.7.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "de2d66136d002e112ba70f3f10c31cf7c350b2da";
+    tarball = "http://registry.npmjs.org/growl/-/growl-1.7.0.tgz";
+  }
+  {
+    name = "gzippo";
+    spec = "*";
+    version = "0.2.0";
+    topLevel = true;
+    dependencies = [
+      { name = "send"; spec = "*"; }
+    ];
+    patchLatest = false;
+    sha1 = "ffc594c482190c56531ed2d4a5864d0b0b7d2733";
+    tarball = "http://registry.npmjs.org/gzippo/-/gzippo-0.2.0.tgz";
+  }
+  {
+    name = "hat";
+    spec = "*";
+    version = "0.0.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "bb014a9e64b3788aed8005917413d4ff3d502d8a";
+    tarball = "http://registry.npmjs.org/hat/-/hat-0.0.3.tgz";
+  }
+  {
+    name = "hawk";
+    spec = "~0.10.2";
+    version = "0.10.2";
+    topLevel = false;
+    dependencies = [
+      { name = "hoek"; spec = "0.7.x"; }
+      { name = "boom"; spec = "0.3.x"; }
+      { name = "cryptiles"; spec = "0.1.x"; }
+      { name = "sntp"; spec = "0.1.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2";
+    tarball = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz";
+  }
+  {
+    name = "hawk";
+    spec = "~0.13.0";
+    version = "0.13.1";
+    topLevel = false;
+    dependencies = [
+      { name = "hoek"; spec = "0.8.x"; }
+      { name = "boom"; spec = "0.4.x"; }
+      { name = "cryptiles"; spec = "0.2.x"; }
+      { name = "sntp"; spec = "0.2.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "3617958821f58311e4d7f6de291fca662b412ef4";
+    tarball = "http://registry.npmjs.org/hawk/-/hawk-0.13.1.tgz";
+  }
+  {
+    name = "hiredis";
+    spec = "*";
+    version = "0.1.15";
+    topLevel = false;
+    dependencies = [
+      { name = "bindings"; spec = "*"; }
+    ];
+    patchLatest = false;
+    sha1 = "00eb2205c85dcf50de838203e513896dc304dd49";
+    tarball = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.15.tgz";
+  }
+  {
+    name = "hoek";
+    spec = "0.7.x";
+    version = "0.7.6";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a";
+    tarball = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz";
+  }
+  {
+    name = "hoek";
+    spec = "0.8.x";
+    version = "0.8.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "1e9fd770ef7ebe0274adfcb5b0806a025a5e4e9f";
+    tarball = "http://registry.npmjs.org/hoek/-/hoek-0.8.5.tgz";
+  }
+  {
+    name = "hoek";
+    spec = "0.9.x";
+    version = "0.9.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
+    tarball = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
+  }
+  {
+    name = "hooks";
+    spec = "0.2.1";
+    version = "0.2.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b";
+    tarball = "http://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz";
+  }
+  {
+    name = "htdigest";
+    spec = "1.0.7";
+    version = "1.0.7";
+    topLevel = false;
+    dependencies = [
+      { name = "commander"; spec = "0.5.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "0c55ba3a018855e134fd82f7a4aa6235167181b2";
+    tarball = "http://registry.npmjs.org/htdigest/-/htdigest-1.0.7.tgz";
+  }
+  {
+    name = "htpasswd";
+    spec = "1.1.0";
+    version = "1.1.0";
+    topLevel = false;
+    dependencies = [
+      { name = "commander"; spec = "0.5.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "4e9e6a2203405005aa1ae7dee80d3b6d6a8d93d6";
+    tarball = "http://registry.npmjs.org/htpasswd/-/htpasswd-1.1.0.tgz";
+  }
+  {
+    name = "http-auth";
+    spec = "1.2.7";
+    version = "1.2.7";
+    topLevel = false;
+    dependencies = [
+      { name = "node-uuid"; spec = "1.2.0"; }
+      { name = "htpasswd"; spec = "1.1.0"; }
+      { name = "htdigest"; spec = "1.0.7"; }
+    ];
+    patchLatest = false;
+    sha1 = "d15b9c08646c9fdcc4f92edb9888f57cb6cf9ca7";
+    tarball = "http://registry.npmjs.org/http-auth/-/http-auth-1.2.7.tgz";
+  }
+  {
+    name = "http-signature";
+    spec = "0.9.11";
+    version = "0.9.11";
+    topLevel = false;
+    dependencies = [
+      { name = "assert-plus"; spec = "0.1.2"; }
+      { name = "asn1"; spec = "0.1.11"; }
+      { name = "ctype"; spec = "0.5.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "9e882714572315e6790a5d0a7955efff1f19e653";
+    tarball = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz";
+  }
+  {
+    name = "http-signature";
+    spec = "~0.10.0";
+    version = "0.10.0";
+    topLevel = false;
+    dependencies = [
+      { name = "assert-plus"; spec = "0.1.2"; }
+      { name = "asn1"; spec = "0.1.11"; }
+      { name = "ctype"; spec = "0.5.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582";
+    tarball = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz";
+  }
+  {
+    name = "http-signature";
+    spec = "~0.9.11";
+    version = "0.9.11";
+    topLevel = false;
+    dependencies = [
+      { name = "assert-plus"; spec = "0.1.2"; }
+      { name = "asn1"; spec = "0.1.11"; }
+      { name = "ctype"; spec = "0.5.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "9e882714572315e6790a5d0a7955efff1f19e653";
+    tarball = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz";
+  }
+  {
+    name = "i";
+    spec = "0.3.x";
+    version = "0.3.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "6ecf7847caed3168b17b86ccc390d7b805be0ee4";
+    tarball = "http://registry.npmjs.org/i/-/i-0.3.1.tgz";
+  }
+  {
+    name = "i18next";
+    spec = "*";
+    version = "1.6.8";
+    topLevel = true;
+    dependencies = [
+      { name = "cookies"; spec = ">= 0.2.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "9c5806d50d374d09ad76e13da4c6d7357e8c555b";
+    tarball = "http://registry.npmjs.org/i18next/-/i18next-1.6.8.tgz";
+  }
+  {
+    name = "inherits";
+    spec = "1";
+    version = "1.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48";
+    tarball = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz";
+  }
+  {
+    name = "inherits";
+    spec = "1.x";
+    version = "1.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48";
+    tarball = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz";
+  }
+  {
+    name = "inherits";
+    spec = "2";
+    version = "2.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "76c81b3b1c10ddee3a60bf2c247162bc369f8ba8";
+    tarball = "http://registry.npmjs.org/inherits/-/inherits-2.0.0.tgz";
+  }
+  {
+    name = "inherits";
+    spec = "~1.0.0";
+    version = "1.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48";
+    tarball = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz";
+  }
+  {
+    name = "ini";
+    spec = "1";
+    version = "1.1.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281";
+    tarball = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz";
+  }
+  {
+    name = "ini";
+    spec = "1.x.x";
+    version = "1.1.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281";
+    tarball = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz";
+  }
+  {
+    name = "ini";
+    spec = "~1.1.0";
+    version = "1.1.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281";
+    tarball = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz";
+  }
+  {
+    name = "init-package-json";
+    spec = "0.0.10";
+    version = "0.0.10";
+    topLevel = false;
+    dependencies = [
+      { name = "promzard"; spec = "~0.2.0"; }
+      { name = "read"; spec = "~1.0.1"; }
+      { name = "read-package-json"; spec = "1"; }
+      { name = "semver"; spec = "2.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "7baf10535227e0878105a04e44b78f132475da6a";
+    tarball = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.10.tgz";
+  }
+  {
+    name = "is-promise";
+    spec = "~1";
+    version = "1.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "b998d17551f16f69f7bd4828f58f018cc81e064f";
+    tarball = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.0.tgz";
+  }
+  {
+    name = "jade";
+    spec = "*";
+    version = "0.33.0";
+    topLevel = true;
+    dependencies = [
+      { name = "commander"; spec = "1.2.0"; }
+      { name = "mkdirp"; spec = "0.3.x"; }
+      { name = "transformers"; spec = "2.0.1"; }
+      { name = "character-parser"; spec = "1.0.2"; }
+      { name = "monocle"; spec = "0.1.48"; }
+      { name = "with"; spec = "~1.1.0"; }
+      { name = "constantinople"; spec = "~1.0.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "1b0bb45f9dd4ce57723605177713d80bccd4e429";
+    tarball = "http://registry.npmjs.org/jade/-/jade-0.33.0.tgz";
+  }
+  {
+    name = "jade";
+    spec = "0.26.3";
+    version = "0.26.3";
+    topLevel = false;
+    dependencies = [
+      { name = "commander"; spec = "0.6.1"; }
+      { name = "mkdirp"; spec = "0.3.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c";
+    tarball = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
+  }
+  {
+    name = "jayschema";
+    spec = "*";
+    version = "0.1.5";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "348a83baaec3b5fb9901c7efe7e64cdd1a8f46e2";
+    tarball = "http://registry.npmjs.org/jayschema/-/jayschema-0.1.5.tgz";
+  }
+  {
+    name = "jshint";
+    spec = "*";
+    version = "2.1.4";
+    topLevel = true;
+    dependencies = [
+      { name = "shelljs"; spec = "0.1.x"; }
+      { name = "underscore"; spec = "1.4.x"; }
+      { name = "cli"; spec = "0.4.x"; }
+      { name = "minimatch"; spec = "0.x.x"; }
+      { name = "console-browserify"; spec = "0.1.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "8d5be86628eea91c073c8700dd6e4c90afd9ab38";
+    tarball = "http://registry.npmjs.org/jshint/-/jshint-2.1.4.tgz";
+  }
+  {
+    name = "json-schema";
+    spec = "0.2.2";
+    version = "0.2.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "50354f19f603917c695f70b85afa77c3b0f23506";
+    tarball = "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz";
+  }
+  {
+    name = "json-stringify-safe";
+    spec = "~3.0.0";
+    version = "3.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3";
+    tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz";
+  }
+  {
+    name = "json-stringify-safe";
+    spec = "~4.0.0";
+    version = "4.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "77c271aaea54302e68efeaccb56abbf06a9b1a54";
+    tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-4.0.0.tgz";
+  }
+  {
+    name = "jsontool";
+    spec = "*";
+    version = "6.0.0";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "dc2a535b2aa8a10b0b7359c76fa8920cdb92ce6d";
+    tarball = "http://registry.npmjs.org/jsontool/-/jsontool-6.0.0.tgz";
+  }
+  {
+    name = "jsprim";
+    spec = "0.3.0";
+    version = "0.3.0";
+    topLevel = false;
+    dependencies = [
+      { name = "extsprintf"; spec = "1.0.0"; }
+      { name = "json-schema"; spec = "0.2.2"; }
+      { name = "verror"; spec = "1.3.3"; }
+    ];
+    patchLatest = false;
+    sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1";
+    tarball = "http://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz";
+  }
+  {
+    name = "keep-alive-agent";
+    spec = "0.0.1";
+    version = "0.0.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "44847ca394ce8d6b521ae85816bd64509942b385";
+    tarball = "http://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz";
+  }
+  {
+    name = "kerberos";
+    spec = "0.0.3";
+    version = "0.0.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "de3c44078eca649501babab04938c948b1252d1b";
+    tarball = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.3.tgz";
+  }
+  {
+    name = "keypress";
+    spec = "0.1.x";
+    version = "0.1.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
+    tarball = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
+  }
+  {
+    name = "knox";
+    spec = "*";
+    version = "0.8.4";
+    topLevel = true;
+    dependencies = [
+      { name = "mime"; spec = "*"; }
+      { name = "xml2js"; spec = "0.2.x"; }
+      { name = "debug"; spec = "~0.7.0"; }
+      { name = "stream-counter"; spec = "~0.1.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "4e1e98e9942120c3e7fd36286ee4a249b00ac370";
+    tarball = "http://registry.npmjs.org/knox/-/knox-0.8.4.tgz";
+  }
+  {
+    name = "kue";
+    spec = "*";
+    version = "0.6.2";
+    topLevel = true;
+    dependencies = [
+      { name = "redis"; spec = "0.7.2"; }
+      { name = "express"; spec = "~3.1.1"; }
+      { name = "jade"; spec = "0.26.3"; }
+      { name = "stylus"; spec = "0.27.2"; }
+      { name = "nib"; spec = "0.5.0"; }
+      { name = "reds"; spec = "0.1.4"; }
+    ];
+    patchLatest = false;
+    sha1 = "9a6a95081842cf4ee3da5c61770bc23616a943f2";
+    tarball = "http://registry.npmjs.org/kue/-/kue-0.6.2.tgz";
+  }
+  {
+    name = "lazy";
+    spec = "~1.0.11";
+    version = "1.0.11";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "daa068206282542c088288e975c297c1ae77b690";
+    tarball = "http://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz";
+  }
+  {
+    name = "libyaml";
+    spec = "*";
+    version = "0.2.2";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "a22d5f699911b6b622d6dc323fb62320c877c9c8";
+    tarball = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.2.tgz";
+  }
+  {
+    name = "lockfile";
+    spec = "~0.4.0";
+    version = "0.4.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "0f815a7ee7c3d603ddec6fbfa8a212b5645d54c5";
+    tarball = "http://registry.npmjs.org/lockfile/-/lockfile-0.4.0.tgz";
+  }
+  {
+    name = "lru-cache";
+    spec = "2";
+    version = "2.3.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "1cee12d5a9f28ed1ee37e9c332b8888e6b85412a";
+    tarball = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz";
+  }
+  {
+    name = "lru-cache";
+    spec = "2.2.0";
+    version = "2.2.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08";
+    tarball = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz";
+  }
+  {
+    name = "lru-cache";
+    spec = "2.3.0";
+    version = "2.3.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "1cee12d5a9f28ed1ee37e9c332b8888e6b85412a";
+    tarball = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz";
+  }
+  {
+    name = "lru-cache";
+    spec = "~1.0.2";
+    version = "1.0.6";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "aa50f97047422ac72543bda177a9c9d018d98452";
+    tarball = "http://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz";
+  }
+  {
+    name = "lru-cache";
+    spec = "~2.3.0";
+    version = "2.3.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "1cee12d5a9f28ed1ee37e9c332b8888e6b85412a";
+    tarball = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz";
+  }
+  {
+    name = "methods";
+    spec = "0.0.1";
+    version = "0.0.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c";
+    tarball = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
+  }
+  {
+    name = "mime";
+    spec = "*";
+    version = "1.2.9";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09";
+    tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz";
+  }
+  {
+    name = "mime";
+    spec = "1.2.5";
+    version = "1.2.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "9eed073022a8bf5e16c8566c6867b8832bfbfa13";
+    tarball = "http://registry.npmjs.org/mime/-/mime-1.2.5.tgz";
+  }
+  {
+    name = "mime";
+    spec = "1.2.6";
+    version = "1.2.6";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
+    tarball = "http://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
+  }
+  {
+    name = "mime";
+    spec = "1.2.9";
+    version = "1.2.9";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09";
+    tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz";
+  }
+  {
+    name = "mime";
+    spec = "~1.2.2";
+    version = "1.2.9";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09";
+    tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz";
+  }
+  {
+    name = "mime";
+    spec = "~1.2.7";
+    version = "1.2.9";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09";
+    tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz";
+  }
+  {
+    name = "mime";
+    spec = "~1.2.9";
+    version = "1.2.9";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09";
+    tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz";
+  }
+  {
+    name = "minimatch";
+    spec = "0";
+    version = "0.2.12";
+    topLevel = false;
+    dependencies = [
+      { name = "lru-cache"; spec = "2"; }
+      { name = "sigmund"; spec = "~1.0.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb";
+    tarball = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz";
+  }
+  {
+    name = "minimatch";
+    spec = "0.0.x";
+    version = "0.0.5";
+    topLevel = false;
+    dependencies = [
+      { name = "lru-cache"; spec = "~1.0.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "96bb490bbd3ba6836bbfac111adf75301b1584de";
+    tarball = "http://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz";
+  }
+  {
+    name = "minimatch";
+    spec = "0.x.x";
+    version = "0.2.12";
+    topLevel = false;
+    dependencies = [
+      { name = "lru-cache"; spec = "2"; }
+      { name = "sigmund"; spec = "~1.0.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb";
+    tarball = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz";
+  }
+  {
+    name = "minimatch";
+    spec = ">=0.2.4";
+    version = "0.2.12";
+    topLevel = false;
+    dependencies = [
+      { name = "lru-cache"; spec = "2"; }
+      { name = "sigmund"; spec = "~1.0.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb";
+    tarball = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz";
+  }
+  {
+    name = "minimatch";
+    spec = "~0.2.0";
+    version = "0.2.12";
+    topLevel = false;
+    dependencies = [
+      { name = "lru-cache"; spec = "2"; }
+      { name = "sigmund"; spec = "~1.0.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb";
+    tarball = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz";
+  }
+  {
+    name = "minimatch";
+    spec = "~0.2.11";
+    version = "0.2.12";
+    topLevel = false;
+    dependencies = [
+      { name = "lru-cache"; spec = "2"; }
+      { name = "sigmund"; spec = "~1.0.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb";
+    tarball = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz";
+  }
+  {
+    name = "minimatch";
+    spec = "~0.2.12";
+    version = "0.2.12";
+    topLevel = false;
+    dependencies = [
+      { name = "lru-cache"; spec = "2"; }
+      { name = "sigmund"; spec = "~1.0.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb";
+    tarball = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz";
+  }
+  {
+    name = "minimist";
+    spec = "~0.0.1";
+    version = "0.0.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "fa2439fbf7da8525c51b2a74e2815b380abc8ab6";
+    tarball = "http://registry.npmjs.org/minimist/-/minimist-0.0.1.tgz";
+  }
+  {
+    name = "mkdirp";
+    spec = "*";
+    version = "0.3.5";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+    tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+  }
+  {
+    name = "mkdirp";
+    spec = "0";
+    version = "0.3.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+    tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+  }
+  {
+    name = "mkdirp";
+    spec = "0.3";
+    version = "0.3.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+    tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+  }
+  {
+    name = "mkdirp";
+    spec = "0.3.0";
+    version = "0.3.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e";
+    tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
+  }
+  {
+    name = "mkdirp";
+    spec = "0.3.5";
+    version = "0.3.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+    tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+  }
+  {
+    name = "mkdirp";
+    spec = "0.3.x";
+    version = "0.3.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+    tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+  }
+  {
+    name = "mkdirp";
+    spec = "0.x.x";
+    version = "0.3.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+    tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+  }
+  {
+    name = "mkdirp";
+    spec = "~0.3.3";
+    version = "0.3.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+    tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+  }
+  {
+    name = "mkdirp";
+    spec = "~0.3.4";
+    version = "0.3.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+    tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+  }
+  {
+    name = "mocha";
+    spec = "*";
+    version = "1.12.0";
+    topLevel = true;
+    dependencies = [
+      { name = "commander"; spec = "0.6.1"; }
+      { name = "growl"; spec = "1.7.x"; }
+      { name = "jade"; spec = "0.26.3"; }
+      { name = "diff"; spec = "1.0.2"; }
+      { name = "debug"; spec = "*"; }
+      { name = "mkdirp"; spec = "0.3.5"; }
+      { name = "ms"; spec = "0.3.0"; }
+      { name = "glob"; spec = "3.2.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "95fc936622ce156b8b19ff8def466ac2f3a3f29e";
+    tarball = "http://registry.npmjs.org/mocha/-/mocha-1.12.0.tgz";
+  }
+  {
+    name = "mocha";
+    spec = "~1.3.2";
+    version = "1.3.2";
+    topLevel = false;
+    dependencies = [
+      { name = "commander"; spec = "0.6.1"; }
+      { name = "growl"; spec = "1.5.x"; }
+      { name = "jade"; spec = "0.26.3"; }
+      { name = "diff"; spec = "1.0.2"; }
+      { name = "debug"; spec = "*"; }
+    ];
+    patchLatest = false;
+    sha1 = "ab97b4f1e5942b9fe4d4436b8bd9eeda0eb01e13";
+    tarball = "http://registry.npmjs.org/mocha/-/mocha-1.3.2.tgz";
+  }
+  {
+    name = "mongodb";
+    spec = "1.2.x";
+    version = "1.2.14";
+    topLevel = false;
+    dependencies = [
+      { name = "bson"; spec = "0.1.8"; }
+    ];
+    patchLatest = false;
+    sha1 = "269665552066437308d0942036646e6795c3a9a3";
+    tarball = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz";
+  }
+  {
+    name = "mongodb";
+    spec = "1.3.11";
+    version = "1.3.11";
+    topLevel = false;
+    dependencies = [
+      { name = "bson"; spec = "0.1.9"; }
+      { name = "kerberos"; spec = "0.0.3"; }
+    ];
+    patchLatest = false;
+    sha1 = "dba6f669dd30612b3d07fc13e2181b9d2b105da2";
+    tarball = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.11.tgz";
+  }
+  {
+    name = "mongoose";
+    spec = "*";
+    version = "3.6.14";
+    topLevel = true;
+    dependencies = [
+      { name = "hooks"; spec = "0.2.1"; }
+      { name = "mongodb"; spec = "1.3.11"; }
+      { name = "ms"; spec = "0.1.0"; }
+      { name = "sliced"; spec = "0.0.3"; }
+      { name = "muri"; spec = "0.3.1"; }
+      { name = "mpromise"; spec = "0.2.1"; }
+      { name = "mpath"; spec = "0.1.1"; }
+      { name = "regexp-clone"; spec = "0.0.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "acf28354ba4f792ded931ccd0dfe038a65757832";
+    tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.14.tgz";
+  }
+  {
+    name = "mongoose-schema-extend";
+    spec = "*";
+    version = "0.1.3";
+    topLevel = true;
+    dependencies = [
+      { name = "owl-deepcopy"; spec = "~0.0.1"; }
+      { name = "mocha"; spec = "~1.3.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "8ee39f48c7a0beb4aad555c25cbac59fe7bd6502";
+    tarball = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.3.tgz";
+  }
+  {
+    name = "monocle";
+    spec = "0.1.48";
+    version = "0.1.48";
+    topLevel = false;
+    dependencies = [
+      { name = "readdirp"; spec = "~0.2.3"; }
+    ];
+    patchLatest = false;
+    sha1 = "b96730f5ca900fa75a56041eb6db10aad980a383";
+    tarball = "http://registry.npmjs.org/monocle/-/monocle-0.1.48.tgz";
+  }
+  {
+    name = "mpath";
+    spec = "0.1.1";
+    version = "0.1.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46";
+    tarball = "http://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz";
+  }
+  {
+    name = "mpromise";
+    spec = "0.2.1";
+    version = "0.2.1";
+    topLevel = false;
+    dependencies = [
+      { name = "sliced"; spec = "0.0.4"; }
+    ];
+    patchLatest = false;
+    sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8";
+    tarball = "http://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz";
+  }
+  {
+    name = "ms";
+    spec = "0.1.0";
+    version = "0.1.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2";
+    tarball = "http://registry.npmjs.org/ms/-/ms-0.1.0.tgz";
+  }
+  {
+    name = "ms";
+    spec = "0.3.0";
+    version = "0.3.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "03edc348d613e66a56486cfdac53bcbe899cbd61";
+    tarball = "http://registry.npmjs.org/ms/-/ms-0.3.0.tgz";
+  }
+  {
+    name = "muri";
+    spec = "0.3.1";
+    version = "0.3.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "861889c5c857f1a43700bee85d50731f61727c9a";
+    tarball = "http://registry.npmjs.org/muri/-/muri-0.3.1.tgz";
+  }
+  {
+    name = "mute-stream";
+    spec = "~0.0.2";
+    version = "0.0.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "f09c090d333b3063f615cbbcca71b349893f0152";
+    tarball = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.3.tgz";
+  }
+  {
+    name = "mv";
+    spec = "0.0.5";
+    version = "0.0.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "15eac759479884df1131d6de56bce20b654f5391";
+    tarball = "http://registry.npmjs.org/mv/-/mv-0.0.5.tgz";
+  }
+  {
+    name = "natural";
+    spec = "0.0.69";
+    version = "0.0.69";
+    topLevel = false;
+    dependencies = [
+      { name = "sylvester"; spec = ">= 0.0.12"; }
+      { name = "apparatus"; spec = ">= 0.0.4"; }
+      { name = "underscore"; spec = "*"; }
+    ];
+    patchLatest = false;
+    sha1 = "60d9ce23797a54ec211600eb721cc66779b954d3";
+    tarball = "http://registry.npmjs.org/natural/-/natural-0.0.69.tgz";
+  }
+  {
+    name = "nconf";
+    spec = "*";
+    version = "0.6.7";
+    topLevel = true;
+    dependencies = [
+      { name = "async"; spec = "0.1.x"; }
+      { name = "ini"; spec = "1.x.x"; }
+      { name = "optimist"; spec = "0.3.x"; }
+      { name = "pkginfo"; spec = "0.2.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "f2ffce75f4573857429c719d9f6ed0a9a231a47c";
+    tarball = "http://registry.npmjs.org/nconf/-/nconf-0.6.7.tgz";
+  }
+  {
+    name = "nconf";
+    spec = "0.6.7";
+    version = "0.6.7";
+    topLevel = false;
+    dependencies = [
+      { name = "async"; spec = "0.1.x"; }
+      { name = "ini"; spec = "1.x.x"; }
+      { name = "optimist"; spec = "0.3.x"; }
+      { name = "pkginfo"; spec = "0.2.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "f2ffce75f4573857429c719d9f6ed0a9a231a47c";
+    tarball = "http://registry.npmjs.org/nconf/-/nconf-0.6.7.tgz";
+  }
+  {
+    name = "ncp";
+    spec = "0.2.x";
+    version = "0.2.7";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "46fac2b7dda2560a4cb7e628677bd5f64eac5be1";
+    tarball = "http://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz";
+  }
+  {
+    name = "negotiator";
+    spec = "0.2.5";
+    version = "0.2.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "12ec7b4a9f3b4c894c31d8c4ec015925ba547eec";
+    tarball = "http://registry.npmjs.org/negotiator/-/negotiator-0.2.5.tgz";
+  }
+  {
+    name = "nib";
+    spec = "0.5.0";
+    version = "0.5.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "ad0a7dfa2bca8680c8cb8adaa6ab68c80e5221e5";
+    tarball = "http://registry.npmjs.org/nib/-/nib-0.5.0.tgz";
+  }
+  {
+    name = "nijs";
+    spec = "*";
+    version = "0.0.9";
+    topLevel = true;
+    dependencies = [
+      { name = "optparse"; spec = ">= 1.0.3"; }
+    ];
+    patchLatest = false;
+    sha1 = "26f0165431664b3518c2576f78397f27054e03aa";
+    tarball = "http://registry.npmjs.org/nijs/-/nijs-0.0.9.tgz";
+  }
+  {
+    name = "node-expat";
+    spec = "*";
+    version = "2.0.0";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "a10271b3463484fa4b59895df61693a1de4ac735";
+    tarball = "http://registry.npmjs.org/node-expat/-/node-expat-2.0.0.tgz";
+  }
+  {
+    name = "node-gyp";
+    spec = "*";
+    version = "0.10.6";
+    topLevel = true;
+    dependencies = [
+      { name = "glob"; spec = "3"; }
+      { name = "graceful-fs"; spec = "2"; }
+      { name = "fstream"; spec = "0"; }
+      { name = "minimatch"; spec = "0"; }
+      { name = "mkdirp"; spec = "0"; }
+      { name = "nopt"; spec = "2"; }
+      { name = "npmlog"; spec = "0"; }
+      { name = "osenv"; spec = "0"; }
+      { name = "request"; spec = "2"; }
+      { name = "rimraf"; spec = "2"; }
+      { name = "semver"; spec = "~2.0.7"; }
+      { name = "tar"; spec = "0"; }
+      { name = "which"; spec = "1"; }
+    ];
+    patchLatest = false;
+    sha1 = "2b81f9c1b9cd3cc8fd56fe776744814e394d3427";
+    tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.6.tgz";
+  }
+  {
+    name = "node-gyp";
+    spec = "~0.10.6";
+    version = "0.10.6";
+    topLevel = false;
+    dependencies = [
+      { name = "glob"; spec = "3"; }
+      { name = "graceful-fs"; spec = "2"; }
+      { name = "fstream"; spec = "0"; }
+      { name = "minimatch"; spec = "0"; }
+      { name = "mkdirp"; spec = "0"; }
+      { name = "nopt"; spec = "2"; }
+      { name = "npmlog"; spec = "0"; }
+      { name = "osenv"; spec = "0"; }
+      { name = "request"; spec = "2"; }
+      { name = "rimraf"; spec = "2"; }
+      { name = "semver"; spec = "~2.0.7"; }
+      { name = "tar"; spec = "0"; }
+      { name = "which"; spec = "1"; }
+    ];
+    patchLatest = false;
+    sha1 = "2b81f9c1b9cd3cc8fd56fe776744814e394d3427";
+    tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.6.tgz";
+  }
+  {
+    name = "node-uuid";
+    spec = "*";
+    version = "1.4.0";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "07f9b2337572ff6275c775e1d48513f3a45d7a65";
+    tarball = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz";
+  }
+  {
+    name = "node-uuid";
+    spec = "1.2.0";
+    version = "1.2.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "81a9fe32934719852499b58b2523d2cd5fdfd65b";
+    tarball = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.2.0.tgz";
+  }
+  {
+    name = "node-uuid";
+    spec = "1.3.3";
+    version = "1.3.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "d3db4d7b56810d9e4032342766282af07391729b";
+    tarball = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz";
+  }
+  {
+    name = "node-uuid";
+    spec = "1.4.0";
+    version = "1.4.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "07f9b2337572ff6275c775e1d48513f3a45d7a65";
+    tarball = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz";
+  }
+  {
+    name = "node-uuid";
+    spec = "~1.4.0";
+    version = "1.4.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "07f9b2337572ff6275c775e1d48513f3a45d7a65";
+    tarball = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz";
+  }
+  {
+    name = "nodemon";
+    spec = "*";
+    version = "0.7.8";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "c0667a000f208dbf6a4dad08a5186595a9889590";
+    tarball = "http://registry.npmjs.org/nodemon/-/nodemon-0.7.8.tgz";
+  }
+  {
+    name = "nopt";
+    spec = "2";
+    version = "2.1.1";
+    topLevel = false;
+    dependencies = [
+      { name = "abbrev"; spec = "1"; }
+    ];
+    patchLatest = false;
+    sha1 = "91eb7c4b017e7c00adcad1fd6d63944d0fdb75c1";
+    tarball = "http://registry.npmjs.org/nopt/-/nopt-2.1.1.tgz";
+  }
+  {
+    name = "nopt";
+    spec = "2.0.0";
+    version = "2.0.0";
+    topLevel = false;
+    dependencies = [
+      { name = "abbrev"; spec = "1"; }
+    ];
+    patchLatest = false;
+    sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d";
+    tarball = "http://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz";
+  }
+  {
+    name = "nopt";
+    spec = "~2.1.1";
+    version = "2.1.1";
+    topLevel = false;
+    dependencies = [
+      { name = "abbrev"; spec = "1"; }
+    ];
+    patchLatest = false;
+    sha1 = "91eb7c4b017e7c00adcad1fd6d63944d0fdb75c1";
+    tarball = "http://registry.npmjs.org/nopt/-/nopt-2.1.1.tgz";
+  }
+  {
+    name = "normalize-package-data";
+    spec = "~0.2";
+    version = "0.2.0";
+    topLevel = false;
+    dependencies = [
+      { name = "semver"; spec = "2"; }
+      { name = "github-url-from-git"; spec = "~1.1.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "b9349e2db3242912e6ab3d180823309b63a74a92";
+    tarball = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.0.tgz";
+  }
+  {
+    name = "npm";
+    spec = "*";
+    version = "1.3.4";
+    topLevel = true;
+    dependencies = [
+      { name = "semver"; spec = "~2.0.8"; }
+      { name = "ini"; spec = "~1.1.0"; }
+      { name = "slide"; spec = "~1.1.4"; }
+      { name = "abbrev"; spec = "~1.0.4"; }
+      { name = "graceful-fs"; spec = "~2.0.0"; }
+      { name = "minimatch"; spec = "~0.2.12"; }
+      { name = "nopt"; spec = "~2.1.1"; }
+      { name = "rimraf"; spec = "~2.2.0"; }
+      { name = "request"; spec = "~2.21.0"; }
+      { name = "which"; spec = "1"; }
+      { name = "tar"; spec = "~0.1.17"; }
+      { name = "fstream"; spec = "~0.1.23"; }
+      { name = "block-stream"; spec = "*"; }
+      { name = "inherits"; spec = "1"; }
+      { name = "mkdirp"; spec = "~0.3.3"; }
+      { name = "read"; spec = "~1.0.4"; }
+      { name = "lru-cache"; spec = "~2.3.0"; }
+      { name = "node-gyp"; spec = "~0.10.6"; }
+      { name = "fstream-npm"; spec = "~0.1.3"; }
+      { name = "uid-number"; spec = "0"; }
+      { name = "archy"; spec = "0"; }
+      { name = "chownr"; spec = "0"; }
+      { name = "npmlog"; spec = "0.0.4"; }
+      { name = "ansi"; spec = "~0.1.2"; }
+      { name = "npm-registry-client"; spec = "~0.2.27"; }
+      { name = "read-package-json"; spec = "~1.1.0"; }
+      { name = "read-installed"; spec = "~0.2.2"; }
+      { name = "glob"; spec = "~3.2.3"; }
+      { name = "init-package-json"; spec = "0.0.10"; }
+      { name = "osenv"; spec = "0"; }
+      { name = "lockfile"; spec = "~0.4.0"; }
+      { name = "retry"; spec = "~0.6.0"; }
+      { name = "once"; spec = "~1.1.1"; }
+      { name = "npmconf"; spec = "~0.1.1"; }
+      { name = "opener"; spec = "~1.3.0"; }
+      { name = "chmodr"; spec = "~0.1.0"; }
+      { name = "cmd-shim"; spec = "~1.1.0"; }
+      { name = "sha"; spec = "~1.0.1"; }
+      { name = "editor"; spec = "0.0.4"; }
+      { name = "child-process-close"; spec = "~0.1.1"; }
+      { name = "npm-user-validate"; spec = "0.0.3"; }
+    ];
+    patchLatest = false;
+    sha1 = "1dacc91458f2197c362d774d2cbf111680f86ec2";
+    tarball = "http://registry.npmjs.org/npm/-/npm-1.3.4.tgz";
+  }
+  {
+    name = "npm-registry-client";
+    spec = "0.2.27";
+    version = "0.2.27";
+    topLevel = false;
+    dependencies = [
+      { name = "request"; spec = "2 >=2.20.0"; }
+      { name = "graceful-fs"; spec = "~2.0.0"; }
+      { name = "semver"; spec = "~2.0.5"; }
+      { name = "slide"; spec = "~1.1.3"; }
+      { name = "chownr"; spec = "0"; }
+      { name = "mkdirp"; spec = "~0.3.3"; }
+      { name = "rimraf"; spec = "~2"; }
+      { name = "retry"; spec = "0.6.0"; }
+      { name = "couch-login"; spec = "~0.1.15"; }
+      { name = "npmlog"; spec = ""; }
+    ];
+    patchLatest = false;
+    sha1 = "8f338189d32769267886a07ad7b7fd2267446adf";
+    tarball = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz";
+  }
+  {
+    name = "npm-registry-client";
+    spec = "~0.2.27";
+    version = "0.2.27";
+    topLevel = false;
+    dependencies = [
+      { name = "request"; spec = "2 >=2.20.0"; }
+      { name = "graceful-fs"; spec = "~2.0.0"; }
+      { name = "semver"; spec = "~2.0.5"; }
+      { name = "slide"; spec = "~1.1.3"; }
+      { name = "chownr"; spec = "0"; }
+      { name = "mkdirp"; spec = "~0.3.3"; }
+      { name = "rimraf"; spec = "~2"; }
+      { name = "retry"; spec = "0.6.0"; }
+      { name = "couch-login"; spec = "~0.1.15"; }
+      { name = "npmlog"; spec = ""; }
+    ];
+    patchLatest = false;
+    sha1 = "8f338189d32769267886a07ad7b7fd2267446adf";
+    tarball = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz";
+  }
+  {
+    name = "npm-user-validate";
+    spec = "0.0.3";
+    version = "0.0.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "818eca4312d13da648f9bc1d7f80bb4f151e0c2e";
+    tarball = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz";
+  }
+  {
+    name = "npm2nix";
+    spec = "*";
+    version = "2.0.0";
+    topLevel = true;
+    dependencies = [
+      { name = "semver"; spec = ">=2.0.10 <3.0.0"; }
+      { name = "argparse"; spec = "0.1.15"; }
+      { name = "npm-registry-client"; spec = "0.2.27"; }
+      { name = "npmconf"; spec = "0.1.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "9e1ff781524ee313bf64e3b5f390e90ced87ae6d";
+    tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-2.0.0.tgz";
+  }
+  {
+    name = "npmconf";
+    spec = "0.1.1";
+    version = "0.1.1";
+    topLevel = false;
+    dependencies = [
+      { name = "config-chain"; spec = "~1.1.1"; }
+      { name = "inherits"; spec = "~1.0.0"; }
+      { name = "once"; spec = "~1.1.1"; }
+      { name = "mkdirp"; spec = "~0.3.3"; }
+      { name = "osenv"; spec = "0.0.3"; }
+      { name = "nopt"; spec = "2"; }
+      { name = "semver"; spec = "2"; }
+      { name = "ini"; spec = "~1.1.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "7a254182591ca22d77b2faecc0d17e0f9bdf25a1";
+    tarball = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz";
+  }
+  {
+    name = "npmconf";
+    spec = "~0.1.1";
+    version = "0.1.1";
+    topLevel = false;
+    dependencies = [
+      { name = "config-chain"; spec = "~1.1.1"; }
+      { name = "inherits"; spec = "~1.0.0"; }
+      { name = "once"; spec = "~1.1.1"; }
+      { name = "mkdirp"; spec = "~0.3.3"; }
+      { name = "osenv"; spec = "0.0.3"; }
+      { name = "nopt"; spec = "2"; }
+      { name = "semver"; spec = "2"; }
+      { name = "ini"; spec = "~1.1.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "7a254182591ca22d77b2faecc0d17e0f9bdf25a1";
+    tarball = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz";
+  }
+  {
+    name = "npmlog";
+    spec = "";
+    version = "0.0.4";
+    topLevel = false;
+    dependencies = [
+      { name = "ansi"; spec = "~0.1.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "a12a7418606b7e0183a2851d97a8729b9a0f3837";
+    tarball = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.4.tgz";
+  }
+  {
+    name = "npmlog";
+    spec = "0";
+    version = "0.0.4";
+    topLevel = false;
+    dependencies = [
+      { name = "ansi"; spec = "~0.1.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "a12a7418606b7e0183a2851d97a8729b9a0f3837";
+    tarball = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.4.tgz";
+  }
+  {
+    name = "npmlog";
+    spec = "0.0.4";
+    version = "0.0.4";
+    topLevel = false;
+    dependencies = [
+      { name = "ansi"; spec = "~0.1.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "a12a7418606b7e0183a2851d97a8729b9a0f3837";
+    tarball = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.4.tgz";
+  }
+  {
+    name = "nssocket";
+    spec = "~0.5.1";
+    version = "0.5.1";
+    topLevel = false;
+    dependencies = [
+      { name = "eventemitter2"; spec = "~0.4.11"; }
+      { name = "lazy"; spec = "~1.0.11"; }
+    ];
+    patchLatest = false;
+    sha1 = "11f0428335ad8d89ff9cf96ab2852a23b1b33b71";
+    tarball = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.1.tgz";
+  }
+  {
+    name = "oauth-sign";
+    spec = "~0.2.0";
+    version = "0.2.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2";
+    tarball = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz";
+  }
+  {
+    name = "oauth-sign";
+    spec = "~0.3.0";
+    version = "0.3.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
+    tarball = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
+  }
+  {
+    name = "once";
+    spec = "1.1.1";
+    version = "1.1.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7";
+    tarball = "http://registry.npmjs.org/once/-/once-1.1.1.tgz";
+  }
+  {
+    name = "once";
+    spec = "~1.1.1";
+    version = "1.1.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7";
+    tarball = "http://registry.npmjs.org/once/-/once-1.1.1.tgz";
+  }
+  {
+    name = "opener";
+    spec = "~1.3.0";
+    version = "1.3.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "130ba662213fa842edb4cd0361d31a15301a43e2";
+    tarball = "http://registry.npmjs.org/opener/-/opener-1.3.0.tgz";
+  }
+  {
+    name = "optimist";
+    spec = "*";
+    version = "0.6.0";
+    topLevel = true;
+    dependencies = [
+      { name = "wordwrap"; spec = "~0.0.2"; }
+      { name = "minimist"; spec = "~0.0.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200";
+    tarball = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
+  }
+  {
+    name = "optimist";
+    spec = "0.2";
+    version = "0.2.8";
+    topLevel = false;
+    dependencies = [
+      { name = "wordwrap"; spec = ">=0.0.1 <0.1.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "e981ab7e268b457948593b55674c099a815cac31";
+    tarball = "http://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz";
+  }
+  {
+    name = "optimist";
+    spec = "0.3.5";
+    version = "0.3.5";
+    topLevel = false;
+    dependencies = [
+      { name = "wordwrap"; spec = "~0.0.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "03654b52417030312d109f39b159825b60309304";
+    tarball = "http://registry.npmjs.org/optimist/-/optimist-0.3.5.tgz";
+  }
+  {
+    name = "optimist";
+    spec = "0.3.x";
+    version = "0.3.7";
+    topLevel = false;
+    dependencies = [
+      { name = "wordwrap"; spec = "~0.0.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
+    tarball = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
+  }
+  {
+    name = "optimist";
+    spec = "0.4.0";
+    version = "0.4.0";
+    topLevel = false;
+    dependencies = [
+      { name = "wordwrap"; spec = "~0.0.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "cb8ec37f2fe3aa9864cb67a275250e7e19620a25";
+    tarball = "http://registry.npmjs.org/optimist/-/optimist-0.4.0.tgz";
+  }
+  {
+    name = "optimist";
+    spec = "~0.3.5";
+    version = "0.3.7";
+    topLevel = false;
+    dependencies = [
+      { name = "wordwrap"; spec = "~0.0.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
+    tarball = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
+  }
+  {
+    name = "optparse";
+    spec = "*";
+    version = "1.0.4";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "c062579d2d05d243c221a304a71e0c979623ccf1";
+    tarball = "http://registry.npmjs.org/optparse/-/optparse-1.0.4.tgz";
+  }
+  {
+    name = "optparse";
+    spec = ">= 1.0.3";
+    version = "1.0.4";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "c062579d2d05d243c221a304a71e0c979623ccf1";
+    tarball = "http://registry.npmjs.org/optparse/-/optparse-1.0.4.tgz";
+  }
+  {
+    name = "osenv";
+    spec = "0";
+    version = "0.0.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
+    tarball = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz";
+  }
+  {
+    name = "osenv";
+    spec = "0.0.3";
+    version = "0.0.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
+    tarball = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz";
+  }
+  {
+    name = "owl-deepcopy";
+    spec = "~0.0.1";
+    version = "0.0.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "056c40e1af73dff6e2c7afae983d2a7760fdff88";
+    tarball = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.2.tgz";
+  }
+  {
+    name = "passport";
+    spec = "*";
+    version = "0.1.17";
+    topLevel = true;
+    dependencies = [
+      { name = "pkginfo"; spec = "0.2.x"; }
+      { name = "pause"; spec = "0.0.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc";
+    tarball = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz";
+  }
+  {
+    name = "passport";
+    spec = "~0.1.1";
+    version = "0.1.17";
+    topLevel = false;
+    dependencies = [
+      { name = "pkginfo"; spec = "0.2.x"; }
+      { name = "pause"; spec = "0.0.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc";
+    tarball = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz";
+  }
+  {
+    name = "passport";
+    spec = "~0.1.3";
+    version = "0.1.17";
+    topLevel = false;
+    dependencies = [
+      { name = "pkginfo"; spec = "0.2.x"; }
+      { name = "pause"; spec = "0.0.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc";
+    tarball = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz";
+  }
+  {
+    name = "passport-http";
+    spec = "*";
+    version = "0.2.2";
+    topLevel = true;
+    dependencies = [
+      { name = "pkginfo"; spec = "0.2.x"; }
+      { name = "passport"; spec = "~0.1.3"; }
+    ];
+    patchLatest = false;
+    sha1 = "2501314c0ff4a831e8a51ccfdb1b68f5c7cbc9f6";
+    tarball = "http://registry.npmjs.org/passport-http/-/passport-http-0.2.2.tgz";
+  }
+  {
+    name = "passport-local";
+    spec = "*";
+    version = "0.1.6";
+    topLevel = true;
+    dependencies = [
+      { name = "pkginfo"; spec = "0.2.x"; }
+      { name = "passport"; spec = "~0.1.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "fb0cf828048db931b67d19985c7aa06dd377a9db";
+    tarball = "http://registry.npmjs.org/passport-local/-/passport-local-0.1.6.tgz";
+  }
+  {
+    name = "pause";
+    spec = "0.0.1";
+    version = "0.0.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
+    tarball = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
+  }
+  {
+    name = "pkginfo";
+    spec = "0.2.x";
+    version = "0.2.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8";
+    tarball = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz";
+  }
+  {
+    name = "pkginfo";
+    spec = "0.3.0";
+    version = "0.3.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "726411401039fe9b009eea86614295d5f3a54276";
+    tarball = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
+  }
+  {
+    name = "pkginfo";
+    spec = "0.3.x";
+    version = "0.3.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "726411401039fe9b009eea86614295d5f3a54276";
+    tarball = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
+  }
+  {
+    name = "pkginfo";
+    spec = "0.x.x";
+    version = "0.3.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "726411401039fe9b009eea86614295d5f3a54276";
+    tarball = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
+  }
+  {
+    name = "posix-getopt";
+    spec = "1.0.0";
+    version = "1.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "42a90eca6119014c78bc4b9b70463d294db1aa87";
+    tarball = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.0.0.tgz";
+  }
+  {
+    name = "promise";
+    spec = "~2.0";
+    version = "2.0.0";
+    topLevel = false;
+    dependencies = [
+      { name = "is-promise"; spec = "~1"; }
+    ];
+    patchLatest = false;
+    sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e";
+    tarball = "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz";
+  }
+  {
+    name = "prompt";
+    spec = "0.2.9";
+    version = "0.2.9";
+    topLevel = false;
+    dependencies = [
+      { name = "pkginfo"; spec = "0.x.x"; }
+      { name = "read"; spec = "1.0.x"; }
+      { name = "revalidator"; spec = "0.1.x"; }
+      { name = "utile"; spec = "0.1.x"; }
+      { name = "winston"; spec = "0.6.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "fdd01e3f9654d0c44fbb8671f8d3f6ca009e3c16";
+    tarball = "http://registry.npmjs.org/prompt/-/prompt-0.2.9.tgz";
+  }
+  {
+    name = "promzard";
+    spec = "~0.2.0";
+    version = "0.2.0";
+    topLevel = false;
+    dependencies = [
+      { name = "read"; spec = "1"; }
+    ];
+    patchLatest = false;
+    sha1 = "766f33807faadeeecacf8057024fe5f753cfa3c1";
+    tarball = "http://registry.npmjs.org/promzard/-/promzard-0.2.0.tgz";
+  }
+  {
+    name = "proto-list";
+    spec = "~1.2.1";
+    version = "1.2.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "48b88798261ec2c4a785720cdfec6200d57d3326";
+    tarball = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.2.tgz";
+  }
+  {
+    name = "ps-tree";
+    spec = "0.0.x";
+    version = "0.0.3";
+    topLevel = false;
+    dependencies = [
+      { name = "event-stream"; spec = "~0.5"; }
+    ];
+    patchLatest = false;
+    sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc";
+    tarball = "http://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz";
+  }
+  {
+    name = "qs";
+    spec = "0.5.1";
+    version = "0.5.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0";
+    tarball = "http://registry.npmjs.org/qs/-/qs-0.5.1.tgz";
+  }
+  {
+    name = "qs";
+    spec = "0.5.5";
+    version = "0.5.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "b07f0d7ffe3efc6fc2fcde6c66a20775641423f3";
+    tarball = "http://registry.npmjs.org/qs/-/qs-0.5.5.tgz";
+  }
+  {
+    name = "qs";
+    spec = "0.6.5";
+    version = "0.6.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef";
+    tarball = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz";
+  }
+  {
+    name = "qs";
+    spec = "~0.5.4";
+    version = "0.5.6";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "31b1ad058567651c526921506b9a8793911a0384";
+    tarball = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz";
+  }
+  {
+    name = "qs";
+    spec = "~0.6.0";
+    version = "0.6.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef";
+    tarball = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz";
+  }
+  {
+    name = "range-parser";
+    spec = "0.0.4";
+    version = "0.0.4";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
+    tarball = "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
+  }
+  {
+    name = "rbytes";
+    spec = "*";
+    version = "1.0.0";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "4eeb85c457f710d8147329d5eed5cd02c798fa4d";
+    tarball = "http://registry.npmjs.org/rbytes/-/rbytes-1.0.0.tgz";
+  }
+  {
+    name = "read";
+    spec = "1";
+    version = "1.0.4";
+    topLevel = false;
+    dependencies = [
+      { name = "mute-stream"; spec = "~0.0.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "c2374be81787fc8633602a1b98232569d52fc655";
+    tarball = "http://registry.npmjs.org/read/-/read-1.0.4.tgz";
+  }
+  {
+    name = "read";
+    spec = "1.0.x";
+    version = "1.0.4";
+    topLevel = false;
+    dependencies = [
+      { name = "mute-stream"; spec = "~0.0.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "c2374be81787fc8633602a1b98232569d52fc655";
+    tarball = "http://registry.npmjs.org/read/-/read-1.0.4.tgz";
+  }
+  {
+    name = "read";
+    spec = "~1.0.1";
+    version = "1.0.4";
+    topLevel = false;
+    dependencies = [
+      { name = "mute-stream"; spec = "~0.0.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "c2374be81787fc8633602a1b98232569d52fc655";
+    tarball = "http://registry.npmjs.org/read/-/read-1.0.4.tgz";
+  }
+  {
+    name = "read";
+    spec = "~1.0.4";
+    version = "1.0.4";
+    topLevel = false;
+    dependencies = [
+      { name = "mute-stream"; spec = "~0.0.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "c2374be81787fc8633602a1b98232569d52fc655";
+    tarball = "http://registry.npmjs.org/read/-/read-1.0.4.tgz";
+  }
+  {
+    name = "read-installed";
+    spec = "~0.2.2";
+    version = "0.2.2";
+    topLevel = false;
+    dependencies = [
+      { name = "semver"; spec = "2"; }
+      { name = "slide"; spec = "~1.1.3"; }
+      { name = "read-package-json"; spec = "1"; }
+      { name = "graceful-fs"; spec = "~1.2.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "f570ac84fb29c75f16faa3940a8c1e602c8eecab";
+    tarball = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.2.tgz";
+  }
+  {
+    name = "read-package-json";
+    spec = "1";
+    version = "1.1.0";
+    topLevel = false;
+    dependencies = [
+      { name = "glob"; spec = "~3.2.1"; }
+      { name = "lru-cache"; spec = "2"; }
+      { name = "normalize-package-data"; spec = "~0.2"; }
+      { name = "graceful-fs"; spec = "~1.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "6447ac4d10788c76d0682cf2086eaa809076aafc";
+    tarball = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.0.tgz";
+  }
+  {
+    name = "read-package-json";
+    spec = "~1.1.0";
+    version = "1.1.0";
+    topLevel = false;
+    dependencies = [
+      { name = "glob"; spec = "~3.2.1"; }
+      { name = "lru-cache"; spec = "2"; }
+      { name = "normalize-package-data"; spec = "~0.2"; }
+      { name = "graceful-fs"; spec = "~1.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "6447ac4d10788c76d0682cf2086eaa809076aafc";
+    tarball = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.0.tgz";
+  }
+  {
+    name = "readable-stream";
+    spec = "~1.0.2";
+    version = "1.0.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "213ce36864fc1f0d4e98e03b9eb92c64042299d4";
+    tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.2.tgz";
+  }
+  {
+    name = "readdirp";
+    spec = "~0.2.3";
+    version = "0.2.5";
+    topLevel = false;
+    dependencies = [
+      { name = "minimatch"; spec = ">=0.2.4"; }
+    ];
+    patchLatest = false;
+    sha1 = "c4c276e52977ae25db5191fe51d008550f15d9bb";
+    tarball = "http://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz";
+  }
+  {
+    name = "redis";
+    spec = "*";
+    version = "0.8.4";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "14609f26414e211c31e3cd07dc79b04bf9ff1980";
+    tarball = "http://registry.npmjs.org/redis/-/redis-0.8.4.tgz";
+  }
+  {
+    name = "redis";
+    spec = "0.7.2";
+    version = "0.7.2";
+    topLevel = false;
+    dependencies = [
+      { name = "hiredis"; spec = "*"; }
+    ];
+    patchLatest = false;
+    sha1 = "fa557fef4985ab3e3384fdc5be6e2541a0bb49af";
+    tarball = "http://registry.npmjs.org/redis/-/redis-0.7.2.tgz";
+  }
+  {
+    name = "redis";
+    spec = ">= 0.6.6";
+    version = "0.8.4";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "14609f26414e211c31e3cd07dc79b04bf9ff1980";
+    tarball = "http://registry.npmjs.org/redis/-/redis-0.8.4.tgz";
+  }
+  {
+    name = "reds";
+    spec = "0.1.4";
+    version = "0.1.4";
+    topLevel = false;
+    dependencies = [
+      { name = "natural"; spec = "0.0.69"; }
+      { name = "redis"; spec = ">= 0.6.6"; }
+    ];
+    patchLatest = false;
+    sha1 = "a97819180c30f6ecd01cad03cecb574eaabb4bee";
+    tarball = "http://registry.npmjs.org/reds/-/reds-0.1.4.tgz";
+  }
+  {
+    name = "regexp-clone";
+    spec = "0.0.1";
+    version = "0.0.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "a7c2e09891fdbf38fbb10d376fb73003e68ac589";
+    tarball = "http://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz";
+  }
+  {
+    name = "request";
+    spec = "2";
+    version = "2.22.0";
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; spec = "~0.6.0"; }
+      { name = "json-stringify-safe"; spec = "~4.0.0"; }
+      { name = "forever-agent"; spec = "~0.5.0"; }
+      { name = "tunnel-agent"; spec = "~0.3.0"; }
+      { name = "http-signature"; spec = "~0.10.0"; }
+      { name = "hawk"; spec = "~0.13.0"; }
+      { name = "aws-sign"; spec = "~0.3.0"; }
+      { name = "oauth-sign"; spec = "~0.3.0"; }
+      { name = "cookie-jar"; spec = "~0.3.0"; }
+      { name = "node-uuid"; spec = "~1.4.0"; }
+      { name = "mime"; spec = "~1.2.9"; }
+      { name = "form-data"; spec = "0.0.8"; }
+    ];
+    patchLatest = false;
+    sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592";
+    tarball = "http://registry.npmjs.org/request/-/request-2.22.0.tgz";
+  }
+  {
+    name = "request";
+    spec = "2 >=2.14";
+    version = "2.22.0";
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; spec = "~0.6.0"; }
+      { name = "json-stringify-safe"; spec = "~4.0.0"; }
+      { name = "forever-agent"; spec = "~0.5.0"; }
+      { name = "tunnel-agent"; spec = "~0.3.0"; }
+      { name = "http-signature"; spec = "~0.10.0"; }
+      { name = "hawk"; spec = "~0.13.0"; }
+      { name = "aws-sign"; spec = "~0.3.0"; }
+      { name = "oauth-sign"; spec = "~0.3.0"; }
+      { name = "cookie-jar"; spec = "~0.3.0"; }
+      { name = "node-uuid"; spec = "~1.4.0"; }
+      { name = "mime"; spec = "~1.2.9"; }
+      { name = "form-data"; spec = "0.0.8"; }
+    ];
+    patchLatest = false;
+    sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592";
+    tarball = "http://registry.npmjs.org/request/-/request-2.22.0.tgz";
+  }
+  {
+    name = "request";
+    spec = "2 >=2.20.0";
+    version = "2.22.0";
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; spec = "~0.6.0"; }
+      { name = "json-stringify-safe"; spec = "~4.0.0"; }
+      { name = "forever-agent"; spec = "~0.5.0"; }
+      { name = "tunnel-agent"; spec = "~0.3.0"; }
+      { name = "http-signature"; spec = "~0.10.0"; }
+      { name = "hawk"; spec = "~0.13.0"; }
+      { name = "aws-sign"; spec = "~0.3.0"; }
+      { name = "oauth-sign"; spec = "~0.3.0"; }
+      { name = "cookie-jar"; spec = "~0.3.0"; }
+      { name = "node-uuid"; spec = "~1.4.0"; }
+      { name = "mime"; spec = "~1.2.9"; }
+      { name = "form-data"; spec = "0.0.8"; }
+    ];
+    patchLatest = false;
+    sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592";
+    tarball = "http://registry.npmjs.org/request/-/request-2.22.0.tgz";
+  }
+  {
+    name = "request";
+    spec = "2.16.x";
+    version = "2.16.6";
+    topLevel = false;
+    dependencies = [
+      { name = "form-data"; spec = "~0.0.3"; }
+      { name = "mime"; spec = "~1.2.7"; }
+      { name = "hawk"; spec = "~0.10.2"; }
+      { name = "node-uuid"; spec = "~1.4.0"; }
+      { name = "cookie-jar"; spec = "~0.2.0"; }
+      { name = "aws-sign"; spec = "~0.2.0"; }
+      { name = "oauth-sign"; spec = "~0.2.0"; }
+      { name = "forever-agent"; spec = "~0.2.0"; }
+      { name = "tunnel-agent"; spec = "~0.2.0"; }
+      { name = "json-stringify-safe"; spec = "~3.0.0"; }
+      { name = "qs"; spec = "~0.5.4"; }
+    ];
+    patchLatest = false;
+    sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad";
+    tarball = "http://registry.npmjs.org/request/-/request-2.16.6.tgz";
+  }
+  {
+    name = "request";
+    spec = "2.9.x";
+    version = "2.9.203";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
+    tarball = "http://registry.npmjs.org/request/-/request-2.9.203.tgz";
+  }
+  {
+    name = "request";
+    spec = "~2";
+    version = "2.22.0";
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; spec = "~0.6.0"; }
+      { name = "json-stringify-safe"; spec = "~4.0.0"; }
+      { name = "forever-agent"; spec = "~0.5.0"; }
+      { name = "tunnel-agent"; spec = "~0.3.0"; }
+      { name = "http-signature"; spec = "~0.10.0"; }
+      { name = "hawk"; spec = "~0.13.0"; }
+      { name = "aws-sign"; spec = "~0.3.0"; }
+      { name = "oauth-sign"; spec = "~0.3.0"; }
+      { name = "cookie-jar"; spec = "~0.3.0"; }
+      { name = "node-uuid"; spec = "~1.4.0"; }
+      { name = "mime"; spec = "~1.2.9"; }
+      { name = "form-data"; spec = "0.0.8"; }
+    ];
+    patchLatest = false;
+    sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592";
+    tarball = "http://registry.npmjs.org/request/-/request-2.22.0.tgz";
+  }
+  {
+    name = "request";
+    spec = "~2.21.0";
+    version = "2.21.0";
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; spec = "~0.6.0"; }
+      { name = "json-stringify-safe"; spec = "~4.0.0"; }
+      { name = "forever-agent"; spec = "~0.5.0"; }
+      { name = "tunnel-agent"; spec = "~0.3.0"; }
+      { name = "http-signature"; spec = "~0.9.11"; }
+      { name = "hawk"; spec = "~0.13.0"; }
+      { name = "aws-sign"; spec = "~0.3.0"; }
+      { name = "oauth-sign"; spec = "~0.3.0"; }
+      { name = "cookie-jar"; spec = "~0.3.0"; }
+      { name = "node-uuid"; spec = "~1.4.0"; }
+      { name = "mime"; spec = "~1.2.9"; }
+      { name = "form-data"; spec = "0.0.8"; }
+    ];
+    patchLatest = false;
+    sha1 = "5728ab9c45e5a87c99daccd530298b6673a868d7";
+    tarball = "http://registry.npmjs.org/request/-/request-2.21.0.tgz";
+  }
+  {
+    name = "restify";
+    spec = "2.4.1";
+    version = "2.4.1";
+    topLevel = false;
+    dependencies = [
+      { name = "assert-plus"; spec = "0.1.2"; }
+      { name = "backoff"; spec = "2.1.0"; }
+      { name = "bunyan"; spec = "0.21.1"; }
+      { name = "deep-equal"; spec = "0.0.0"; }
+      { name = "formidable"; spec = "1.0.13"; }
+      { name = "http-signature"; spec = "0.9.11"; }
+      { name = "keep-alive-agent"; spec = "0.0.1"; }
+      { name = "lru-cache"; spec = "2.3.0"; }
+      { name = "mime"; spec = "1.2.9"; }
+      { name = "negotiator"; spec = "0.2.5"; }
+      { name = "node-uuid"; spec = "1.4.0"; }
+      { name = "once"; spec = "1.1.1"; }
+      { name = "qs"; spec = "0.5.5"; }
+      { name = "semver"; spec = "1.1.4"; }
+      { name = "spdy"; spec = "1.7.1"; }
+      { name = "verror"; spec = "1.3.6"; }
+      { name = "dtrace-provider"; spec = "0.2.8"; }
+    ];
+    patchLatest = false;
+    sha1 = "35790a052bd0927e7f6a06cc3d079e56fabc9371";
+    tarball = "http://registry.npmjs.org/restify/-/restify-2.4.1.tgz";
+  }
+  {
+    name = "retry";
+    spec = "0.6.0";
+    version = "0.6.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537";
+    tarball = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz";
+  }
+  {
+    name = "retry";
+    spec = "~0.6.0";
+    version = "0.6.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537";
+    tarball = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz";
+  }
+  {
+    name = "revalidator";
+    spec = "0.1.x";
+    version = "0.1.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "205bc02e4186e63e82a0837498f29ba287be3861";
+    tarball = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.5.tgz";
+  }
+  {
+    name = "rimraf";
+    spec = "1.x.x";
+    version = "1.0.9";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "be4801ff76c2ba6f1c50c78e9700eb1d21f239f1";
+    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz";
+  }
+  {
+    name = "rimraf";
+    spec = "2";
+    version = "2.2.0";
+    topLevel = false;
+    dependencies = [
+      { name = "graceful-fs"; spec = "~1"; }
+    ];
+    patchLatest = false;
+    sha1 = "70797542e81a935849443d7b69bec612ca74c96e";
+    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.0.tgz";
+  }
+  {
+    name = "rimraf";
+    spec = "~2";
+    version = "2.2.0";
+    topLevel = false;
+    dependencies = [
+      { name = "graceful-fs"; spec = "~1"; }
+    ];
+    patchLatest = false;
+    sha1 = "70797542e81a935849443d7b69bec612ca74c96e";
+    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.0.tgz";
+  }
+  {
+    name = "rimraf";
+    spec = "~2.1.4";
+    version = "2.1.4";
+    topLevel = false;
+    dependencies = [
+      { name = "graceful-fs"; spec = "~1"; }
+    ];
+    patchLatest = false;
+    sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2";
+    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
+  }
+  {
+    name = "rimraf";
+    spec = "~2.2.0";
+    version = "2.2.0";
+    topLevel = false;
+    dependencies = [
+      { name = "graceful-fs"; spec = "~1"; }
+    ];
+    patchLatest = false;
+    sha1 = "70797542e81a935849443d7b69bec612ca74c96e";
+    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.0.tgz";
+  }
+  {
+    name = "s3http";
+    spec = "*";
+    version = "0.0.2";
+    topLevel = true;
+    dependencies = [
+      { name = "aws-sdk"; spec = ">=1.2.0 <2"; }
+      { name = "commander"; spec = "0.5.1"; }
+      { name = "http-auth"; spec = "1.2.7"; }
+    ];
+    patchLatest = false;
+    sha1 = "e0c8bdee66981c6ddef2dfc41bb1fe51765984e5";
+    tarball = "http://registry.npmjs.org/s3http/-/s3http-0.0.2.tgz";
+  }
+  {
+    name = "sax";
+    spec = "0.5.x";
+    version = "0.5.4";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "a3a4e1a9cf182bb547156c5232a49a1c3732ff7d";
+    tarball = "http://registry.npmjs.org/sax/-/sax-0.5.4.tgz";
+  }
+  {
+    name = "sax";
+    spec = ">=0.4.2";
+    version = "0.5.4";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "a3a4e1a9cf182bb547156c5232a49a1c3732ff7d";
+    tarball = "http://registry.npmjs.org/sax/-/sax-0.5.4.tgz";
+  }
+  {
+    name = "semver";
+    spec = "*";
+    version = "2.0.10";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz";
+  }
+  {
+    name = "semver";
+    spec = "1.1.4";
+    version = "1.1.4";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540";
+    tarball = "http://registry.npmjs.org/semver/-/semver-1.1.4.tgz";
+  }
+  {
+    name = "semver";
+    spec = "2";
+    version = "2.0.10";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz";
+  }
+  {
+    name = "semver";
+    spec = "2.x";
+    version = "2.0.10";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz";
+  }
+  {
+    name = "semver";
+    spec = ">=2.0.10 <3.0.0";
+    version = "2.0.10";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz";
+  }
+  {
+    name = "semver";
+    spec = "~2.0.5";
+    version = "2.0.10";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz";
+  }
+  {
+    name = "semver";
+    spec = "~2.0.7";
+    version = "2.0.10";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz";
+  }
+  {
+    name = "semver";
+    spec = "~2.0.8";
+    version = "2.0.10";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz";
+  }
+  {
+    name = "send";
+    spec = "*";
+    version = "0.1.3";
+    topLevel = false;
+    dependencies = [
+      { name = "debug"; spec = "*"; }
+      { name = "mime"; spec = "~1.2.9"; }
+      { name = "fresh"; spec = "0.1.0"; }
+      { name = "range-parser"; spec = "0.0.4"; }
+    ];
+    patchLatest = false;
+    sha1 = "a7875daa6802d31e2ce32fdad98d3664c51ecea3";
+    tarball = "http://registry.npmjs.org/send/-/send-0.1.3.tgz";
+  }
+  {
+    name = "send";
+    spec = "0.1.0";
+    version = "0.1.0";
+    topLevel = false;
+    dependencies = [
+      { name = "debug"; spec = "*"; }
+      { name = "mime"; spec = "1.2.6"; }
+      { name = "fresh"; spec = "0.1.0"; }
+      { name = "range-parser"; spec = "0.0.4"; }
+    ];
+    patchLatest = false;
+    sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640";
+    tarball = "http://registry.npmjs.org/send/-/send-0.1.0.tgz";
+  }
+  {
+    name = "send";
+    spec = "0.1.3";
+    version = "0.1.3";
+    topLevel = false;
+    dependencies = [
+      { name = "debug"; spec = "*"; }
+      { name = "mime"; spec = "~1.2.9"; }
+      { name = "fresh"; spec = "0.1.0"; }
+      { name = "range-parser"; spec = "0.0.4"; }
+    ];
+    patchLatest = false;
+    sha1 = "a7875daa6802d31e2ce32fdad98d3664c51ecea3";
+    tarball = "http://registry.npmjs.org/send/-/send-0.1.3.tgz";
+  }
+  {
+    name = "sequence";
+    spec = ">= 2.2.1";
+    version = "2.2.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "7f5617895d44351c0a047e764467690490a16b03";
+    tarball = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
+  }
+  {
+    name = "sha";
+    spec = "~1.0.1";
+    version = "1.0.1";
+    topLevel = false;
+    dependencies = [
+      { name = "graceful-fs"; spec = "1.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "9b87a92113103e7406f7e7ef00006f3fa1975122";
+    tarball = "http://registry.npmjs.org/sha/-/sha-1.0.1.tgz";
+  }
+  {
+    name = "shelljs";
+    spec = "0.1.x";
+    version = "0.1.4";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "dfbbe78d56c3c0168d2fb79e10ecd1dbcb07ec0e";
+    tarball = "http://registry.npmjs.org/shelljs/-/shelljs-0.1.4.tgz";
+  }
+  {
+    name = "should";
+    spec = "*";
+    version = "1.2.2";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "0f03f775066d9ea2632690c917b12824fcc1d582";
+    tarball = "http://registry.npmjs.org/should/-/should-1.2.2.tgz";
+  }
+  {
+    name = "sigmund";
+    spec = "~1.0.0";
+    version = "1.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296";
+    tarball = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz";
+  }
+  {
+    name = "sliced";
+    spec = "0.0.3";
+    version = "0.0.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "4f0bac2171eb17162c3ba6df81f5cf040f7c7e50";
+    tarball = "http://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz";
+  }
+  {
+    name = "sliced";
+    spec = "0.0.4";
+    version = "0.0.4";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee";
+    tarball = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz";
+  }
+  {
+    name = "slide";
+    spec = "~1.1.3";
+    version = "1.1.4";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "2b23f1949b369ed61d22bd6570ff0320302fc8df";
+    tarball = "http://registry.npmjs.org/slide/-/slide-1.1.4.tgz";
+  }
+  {
+    name = "slide";
+    spec = "~1.1.4";
+    version = "1.1.4";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "2b23f1949b369ed61d22bd6570ff0320302fc8df";
+    tarball = "http://registry.npmjs.org/slide/-/slide-1.1.4.tgz";
+  }
+  {
+    name = "smartdc";
+    spec = "*";
+    version = "7.0.0";
+    topLevel = true;
+    dependencies = [
+      { name = "assert-plus"; spec = "0.1.2"; }
+      { name = "lru-cache"; spec = "2.2.0"; }
+      { name = "nopt"; spec = "2.0.0"; }
+      { name = "restify"; spec = "2.4.1"; }
+      { name = "bunyan"; spec = "0.21.1"; }
+      { name = "clone"; spec = "0.1.6"; }
+      { name = "smartdc-auth"; spec = "1.0.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "367ce274e10e3400e19ec62697f9b5ecb3f25c39";
+    tarball = "http://registry.npmjs.org/smartdc/-/smartdc-7.0.0.tgz";
+  }
+  {
+    name = "smartdc-auth";
+    spec = "1.0.0";
+    version = "1.0.0";
+    topLevel = false;
+    dependencies = [
+      { name = "assert-plus"; spec = "0.1.2"; }
+      { name = "clone"; spec = "0.1.5"; }
+      { name = "ssh-agent"; spec = "0.2.1"; }
+      { name = "once"; spec = "1.1.1"; }
+      { name = "vasync"; spec = "1.3.3"; }
+    ];
+    patchLatest = false;
+    sha1 = "9b8569b914f25da53816fe158f80b6571470f270";
+    tarball = "http://registry.npmjs.org/smartdc-auth/-/smartdc-auth-1.0.0.tgz";
+  }
+  {
+    name = "sntp";
+    spec = "0.1.x";
+    version = "0.1.4";
+    topLevel = false;
+    dependencies = [
+      { name = "hoek"; spec = "0.7.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84";
+    tarball = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz";
+  }
+  {
+    name = "sntp";
+    spec = "0.2.x";
+    version = "0.2.4";
+    topLevel = false;
+    dependencies = [
+      { name = "hoek"; spec = "0.9.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
+    tarball = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
+  }
+  {
+    name = "sockjs";
+    spec = "*";
+    version = "0.3.7";
+    topLevel = true;
+    dependencies = [
+      { name = "node-uuid"; spec = "1.3.3"; }
+      { name = "faye-websocket"; spec = "0.4.4"; }
+    ];
+    patchLatest = false;
+    sha1 = "2950e0586d8a9d3044958a831ade68db197749cb";
+    tarball = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.7.tgz";
+  }
+  {
+    name = "source-map";
+    spec = "*";
+    version = "0.1.25";
+    topLevel = true;
+    dependencies = [
+      { name = "amdefine"; spec = ">=0.0.4"; }
+    ];
+    patchLatest = false;
+    sha1 = "5851545c1f4a40243829065c20e6f40b023fba1a";
+    tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.25.tgz";
+  }
+  {
+    name = "source-map";
+    spec = "~0.1.7";
+    version = "0.1.25";
+    topLevel = false;
+    dependencies = [
+      { name = "amdefine"; spec = ">=0.0.4"; }
+    ];
+    patchLatest = false;
+    sha1 = "5851545c1f4a40243829065c20e6f40b023fba1a";
+    tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.25.tgz";
+  }
+  {
+    name = "spdy";
+    spec = "1.7.1";
+    version = "1.7.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "4fde77e602b20c4ecc39ee8619373dd9bf669152";
+    tarball = "http://registry.npmjs.org/spdy/-/spdy-1.7.1.tgz";
+  }
+  {
+    name = "ssh-agent";
+    spec = "0.2.1";
+    version = "0.2.1";
+    topLevel = false;
+    dependencies = [
+      { name = "ctype"; spec = "0.5.0"; }
+      { name = "posix-getopt"; spec = "1.0.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "3044e9eaeca88a9e6971dd7deb19bdcc20012929";
+    tarball = "http://registry.npmjs.org/ssh-agent/-/ssh-agent-0.2.1.tgz";
+  }
+  {
+    name = "stack-trace";
+    spec = "0.0.x";
+    version = "0.0.6";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "1e719bd6a2629ff09c189e17a9ef902a94fc5db0";
+    tarball = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.6.tgz";
+  }
+  {
+    name = "stream-counter";
+    spec = "~0.1.0";
+    version = "0.1.0";
+    topLevel = false;
+    dependencies = [
+      { name = "readable-stream"; spec = "~1.0.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "a035e429361fb57f361606e17fcd8a8b9677327b";
+    tarball = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.1.0.tgz";
+  }
+  {
+    name = "stream-splitter-transform";
+    spec = "*";
+    version = "0.0.3";
+    topLevel = true;
+    dependencies = [
+      { name = "buffertools"; spec = ">=1.1.1 <2.0.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "5ccd3bd497ffee4c2fc7c1cc9d7b697b54c42eef";
+    tarball = "http://registry.npmjs.org/stream-splitter-transform/-/stream-splitter-transform-0.0.3.tgz";
+  }
+  {
+    name = "stylus";
+    spec = "*";
+    version = "0.34.1";
+    topLevel = true;
+    dependencies = [
+      { name = "cssom"; spec = "0.2.x"; }
+      { name = "mkdirp"; spec = "0.3.x"; }
+      { name = "debug"; spec = "*"; }
+    ];
+    patchLatest = false;
+    sha1 = "937d8502a3be4e617d5ad493f204c70a93d95b14";
+    tarball = "http://registry.npmjs.org/stylus/-/stylus-0.34.1.tgz";
+  }
+  {
+    name = "stylus";
+    spec = "0.27.2";
+    version = "0.27.2";
+    topLevel = false;
+    dependencies = [
+      { name = "cssom"; spec = "0.2.x"; }
+      { name = "mkdirp"; spec = "0.3.x"; }
+      { name = "debug"; spec = "*"; }
+    ];
+    patchLatest = false;
+    sha1 = "1121f7f8cd152b0f8a4aa6a24a9adea10c825117";
+    tarball = "http://registry.npmjs.org/stylus/-/stylus-0.27.2.tgz";
+  }
+  {
+    name = "superagent";
+    spec = "0.15.1";
+    version = "0.15.1";
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; spec = "0.6.5"; }
+      { name = "formidable"; spec = "1.0.9"; }
+      { name = "mime"; spec = "1.2.5"; }
+      { name = "emitter-component"; spec = "1.0.0"; }
+      { name = "methods"; spec = "0.0.1"; }
+      { name = "cookiejar"; spec = "1.3.0"; }
+      { name = "debug"; spec = "~0.7.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "f0df9954c2b90f29e4ae54ad308e4a2b432cc56a";
+    tarball = "http://registry.npmjs.org/superagent/-/superagent-0.15.1.tgz";
+  }
+  {
+    name = "supertest";
+    spec = "*";
+    version = "0.7.1";
+    topLevel = true;
+    dependencies = [
+      { name = "superagent"; spec = "0.15.1"; }
+      { name = "methods"; spec = "0.0.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "349a65a8bfb5207250658f71761279ad3a671d88";
+    tarball = "http://registry.npmjs.org/supertest/-/supertest-0.7.1.tgz";
+  }
+  {
+    name = "swig";
+    spec = "*";
+    version = "0.14.0";
+    topLevel = true;
+    dependencies = [
+      { name = "underscore"; spec = ">=1.1.7"; }
+    ];
+    patchLatest = false;
+    sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f";
+    tarball = "http://registry.npmjs.org/swig/-/swig-0.14.0.tgz";
+  }
+  {
+    name = "sylvester";
+    spec = ">= 0.0.12";
+    version = "0.0.21";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "2987b1ce2bd2f38b0dce2a34388884bfa4400ea7";
+    tarball = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz";
+  }
+  {
+    name = "sylvester";
+    spec = ">= 0.0.8";
+    version = "0.0.21";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "2987b1ce2bd2f38b0dce2a34388884bfa4400ea7";
+    tarball = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz";
+  }
+  {
+    name = "tar";
+    spec = "0";
+    version = "0.1.17";
+    topLevel = false;
+    dependencies = [
+      { name = "inherits"; spec = "1.x"; }
+      { name = "block-stream"; spec = "*"; }
+      { name = "fstream"; spec = "~0.1.8"; }
+    ];
+    patchLatest = false;
+    sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc";
+    tarball = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
+  }
+  {
+    name = "tar";
+    spec = "~0.1.17";
+    version = "0.1.17";
+    topLevel = false;
+    dependencies = [
+      { name = "inherits"; spec = "1.x"; }
+      { name = "block-stream"; spec = "*"; }
+      { name = "fstream"; spec = "~0.1.8"; }
+    ];
+    patchLatest = false;
+    sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc";
+    tarball = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
+  }
+  {
+    name = "temp";
+    spec = "*";
+    version = "0.5.1";
+    topLevel = true;
+    dependencies = [
+      { name = "rimraf"; spec = "~2.1.4"; }
+    ];
+    patchLatest = false;
+    sha1 = "77ab19c79aa7b593cbe4fac2441768cad987b8df";
+    tarball = "http://registry.npmjs.org/temp/-/temp-0.5.1.tgz";
+  }
+  {
+    name = "timespan";
+    spec = "2.0.1";
+    version = "2.0.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "479b45875937e14d0f4be1625f2abd08d801f68a";
+    tarball = "http://registry.npmjs.org/timespan/-/timespan-2.0.1.tgz";
+  }
+  {
+    name = "timezone";
+    spec = "*";
+    version = "0.0.22";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "933c3d1950224957a349183e124147dd99e182f5";
+    tarball = "http://registry.npmjs.org/timezone/-/timezone-0.0.22.tgz";
+  }
+  {
+    name = "transformers";
+    spec = "2.0.1";
+    version = "2.0.1";
+    topLevel = false;
+    dependencies = [
+      { name = "promise"; spec = "~2.0"; }
+      { name = "css"; spec = "~1.0.8"; }
+      { name = "uglify-js"; spec = "~2.2.5"; }
+    ];
+    patchLatest = false;
+    sha1 = "352131dfceb93a7532dc7535a4f142510435a394";
+    tarball = "http://registry.npmjs.org/transformers/-/transformers-2.0.1.tgz";
+  }
+  {
+    name = "tunnel-agent";
+    spec = "~0.2.0";
+    version = "0.2.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "6853c2afb1b2109e45629e492bde35f459ea69e8";
+    tarball = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz";
+  }
+  {
+    name = "tunnel-agent";
+    spec = "~0.3.0";
+    version = "0.3.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
+    tarball = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
+  }
+  {
+    name = "uglify-js";
+    spec = "2.3.6";
+    version = "2.3.6";
+    topLevel = false;
+    dependencies = [
+      { name = "async"; spec = "~0.2.6"; }
+      { name = "source-map"; spec = "~0.1.7"; }
+      { name = "optimist"; spec = "~0.3.5"; }
+    ];
+    patchLatest = false;
+    sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
+    tarball = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
+  }
+  {
+    name = "uglify-js";
+    spec = "~2.2.5";
+    version = "2.2.5";
+    topLevel = false;
+    dependencies = [
+      { name = "source-map"; spec = "~0.1.7"; }
+      { name = "optimist"; spec = "~0.3.5"; }
+    ];
+    patchLatest = false;
+    sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7";
+    tarball = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz";
+  }
+  {
+    name = "uglify-js";
+    spec = "~2.3.6";
+    version = "2.3.6";
+    topLevel = false;
+    dependencies = [
+      { name = "async"; spec = "~0.2.6"; }
+      { name = "source-map"; spec = "~0.1.7"; }
+      { name = "optimist"; spec = "~0.3.5"; }
+    ];
+    patchLatest = false;
+    sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
+    tarball = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
+  }
+  {
+    name = "uid-number";
+    spec = "0";
+    version = "0.0.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc";
+    tarball = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz";
+  }
+  {
+    name = "uid2";
+    spec = "0.0.2";
+    version = "0.0.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "107fb155c82c1136620797ed4c88cf2b08f6aab8";
+    tarball = "http://registry.npmjs.org/uid2/-/uid2-0.0.2.tgz";
+  }
+  {
+    name = "underscore";
+    spec = "*";
+    version = "1.5.1";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "d2bde817d176ffade894ab71458e682a14b86dc9";
+    tarball = "http://registry.npmjs.org/underscore/-/underscore-1.5.1.tgz";
+  }
+  {
+    name = "underscore";
+    spec = "1.4.x";
+    version = "1.4.4";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "61a6a32010622afa07963bf325203cf12239d604";
+    tarball = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
+  }
+  {
+    name = "underscore";
+    spec = ">=1.1.7";
+    version = "1.5.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "d2bde817d176ffade894ab71458e682a14b86dc9";
+    tarball = "http://registry.npmjs.org/underscore/-/underscore-1.5.1.tgz";
+  }
+  {
+    name = "underscore";
+    spec = ">=1.4.3";
+    version = "1.5.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "d2bde817d176ffade894ab71458e682a14b86dc9";
+    tarball = "http://registry.npmjs.org/underscore/-/underscore-1.5.1.tgz";
+  }
+  {
+    name = "underscore";
+    spec = "~1.4.3";
+    version = "1.4.4";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "61a6a32010622afa07963bf325203cf12239d604";
+    tarball = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
+  }
+  {
+    name = "underscore.string";
+    spec = "~2.3.1";
+    version = "2.3.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "c10835dc04c2677cd49e1d77d26c0d3b22cc5709";
+    tarball = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.2.tgz";
+  }
+  {
+    name = "util";
+    spec = ">= 0.4.9";
+    version = "0.4.9";
+    topLevel = false;
+    dependencies = [
+      { name = "events.node"; spec = ">= 0.4.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "d95d5830d2328ec17dee3c80bfc50c33562b75a3";
+    tarball = "http://registry.npmjs.org/util/-/util-0.4.9.tgz";
+  }
+  {
+    name = "utile";
+    spec = "0.1.7";
+    version = "0.1.7";
+    topLevel = false;
+    dependencies = [
+      { name = "async"; spec = "0.1.x"; }
+      { name = "deep-equal"; spec = "*"; }
+      { name = "i"; spec = "0.3.x"; }
+      { name = "mkdirp"; spec = "0.x.x"; }
+      { name = "ncp"; spec = "0.2.x"; }
+      { name = "rimraf"; spec = "1.x.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69";
+    tarball = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz";
+  }
+  {
+    name = "utile";
+    spec = "0.1.x";
+    version = "0.1.7";
+    topLevel = false;
+    dependencies = [
+      { name = "async"; spec = "0.1.x"; }
+      { name = "deep-equal"; spec = "*"; }
+      { name = "i"; spec = "0.3.x"; }
+      { name = "mkdirp"; spec = "0.x.x"; }
+      { name = "ncp"; spec = "0.2.x"; }
+      { name = "rimraf"; spec = "1.x.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69";
+    tarball = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz";
+  }
+  {
+    name = "vasync";
+    spec = "1.3.3";
+    version = "1.3.3";
+    topLevel = false;
+    dependencies = [
+      { name = "jsprim"; spec = "0.3.0"; }
+      { name = "verror"; spec = "1.1.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "84917680717020b67e043902e63bc143174c8728";
+    tarball = "http://registry.npmjs.org/vasync/-/vasync-1.3.3.tgz";
+  }
+  {
+    name = "verror";
+    spec = "1.1.0";
+    version = "1.1.0";
+    topLevel = false;
+    dependencies = [
+      { name = "extsprintf"; spec = "1.0.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "2a4b4eb14a207051e75a6f94ee51315bf173a1b0";
+    tarball = "http://registry.npmjs.org/verror/-/verror-1.1.0.tgz";
+  }
+  {
+    name = "verror";
+    spec = "1.3.3";
+    version = "1.3.3";
+    topLevel = false;
+    dependencies = [
+      { name = "extsprintf"; spec = "1.0.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd";
+    tarball = "http://registry.npmjs.org/verror/-/verror-1.3.3.tgz";
+  }
+  {
+    name = "verror";
+    spec = "1.3.6";
+    version = "1.3.6";
+    topLevel = false;
+    dependencies = [
+      { name = "extsprintf"; spec = "1.0.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c";
+    tarball = "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
+  }
+  {
+    name = "view-helpers";
+    spec = "*";
+    version = "0.1.2";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "20643e9f50d00cf46da754dc934d791d4f6e3bb2";
+    tarball = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.2.tgz";
+  }
+  {
+    name = "walk";
+    spec = "*";
+    version = "2.2.1";
+    topLevel = true;
+    dependencies = [
+      { name = "forEachAsync"; spec = "~2.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "5ada1f8e49e47d4b7445d8be7a2e1e631ab43016";
+    tarball = "http://registry.npmjs.org/walk/-/walk-2.2.1.tgz";
+  }
+  {
+    name = "watch";
+    spec = "0.5.x";
+    version = "0.5.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "50ea3a056358c98073e0bca59956de4afd20b213";
+    tarball = "http://registry.npmjs.org/watch/-/watch-0.5.1.tgz";
+  }
+  {
+    name = "watch";
+    spec = "0.7.0";
+    version = "0.7.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "3d6e715648af867ec7f1149302b526479e726856";
+    tarball = "http://registry.npmjs.org/watch/-/watch-0.7.0.tgz";
+  }
+  {
+    name = "websocket-driver";
+    spec = ">=0.2.0";
+    version = "0.2.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "998bc1855d8cd0d1e9aa8f8056b83b46ac3e81ef";
+    tarball = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.2.2.tgz";
+  }
+  {
+    name = "which";
+    spec = "1";
+    version = "1.0.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "5630d6819dda692f1464462e7956cb42c0842739";
+    tarball = "http://registry.npmjs.org/which/-/which-1.0.5.tgz";
+  }
+  {
+    name = "winston";
+    spec = "*";
+    version = "0.7.2";
+    topLevel = true;
+    dependencies = [
+      { name = "async"; spec = "0.2.x"; }
+      { name = "colors"; spec = "0.6.x"; }
+      { name = "cycle"; spec = "1.0.x"; }
+      { name = "eyes"; spec = "0.1.x"; }
+      { name = "pkginfo"; spec = "0.3.x"; }
+      { name = "request"; spec = "2.16.x"; }
+      { name = "stack-trace"; spec = "0.0.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb";
+    tarball = "http://registry.npmjs.org/winston/-/winston-0.7.2.tgz";
+  }
+  {
+    name = "winston";
+    spec = "0.6.2";
+    version = "0.6.2";
+    topLevel = false;
+    dependencies = [
+      { name = "async"; spec = "0.1.x"; }
+      { name = "colors"; spec = "0.x.x"; }
+      { name = "cycle"; spec = "1.0.x"; }
+      { name = "eyes"; spec = "0.1.x"; }
+      { name = "pkginfo"; spec = "0.2.x"; }
+      { name = "request"; spec = "2.9.x"; }
+      { name = "stack-trace"; spec = "0.0.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2";
+    tarball = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
+  }
+  {
+    name = "winston";
+    spec = "0.6.x";
+    version = "0.6.2";
+    topLevel = false;
+    dependencies = [
+      { name = "async"; spec = "0.1.x"; }
+      { name = "colors"; spec = "0.x.x"; }
+      { name = "cycle"; spec = "1.0.x"; }
+      { name = "eyes"; spec = "0.1.x"; }
+      { name = "pkginfo"; spec = "0.2.x"; }
+      { name = "request"; spec = "2.9.x"; }
+      { name = "stack-trace"; spec = "0.0.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2";
+    tarball = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
+  }
+  {
+    name = "winston";
+    spec = "0.7.1";
+    version = "0.7.1";
+    topLevel = false;
+    dependencies = [
+      { name = "async"; spec = "0.2.x"; }
+      { name = "colors"; spec = "0.6.x"; }
+      { name = "cycle"; spec = "1.0.x"; }
+      { name = "eyes"; spec = "0.1.x"; }
+      { name = "pkginfo"; spec = "0.3.x"; }
+      { name = "request"; spec = "2.16.x"; }
+      { name = "stack-trace"; spec = "0.0.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "e291ab24eddbf79ea40ff532619277a0d30b0eb3";
+    tarball = "http://registry.npmjs.org/winston/-/winston-0.7.1.tgz";
+  }
+  {
+    name = "with";
+    spec = "~1.1.0";
+    version = "1.1.0";
+    topLevel = false;
+    dependencies = [
+      { name = "uglify-js"; spec = "2.3.6"; }
+    ];
+    patchLatest = false;
+    sha1 = "7f722ce4050ab55310777327b014194c544c66dd";
+    tarball = "http://registry.npmjs.org/with/-/with-1.1.0.tgz";
+  }
+  {
+    name = "wordwrap";
+    spec = ">=0.0.1 <0.1.0";
+    version = "0.0.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+    tarball = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+  }
+  {
+    name = "wordwrap";
+    spec = "~0.0.2";
+    version = "0.0.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+    tarball = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+  }
+  {
+    name = "wu";
+    spec = "*";
+    version = "0.1.8";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "619bcdf64974a487894a25755ae095c5208b4a22";
+    tarball = "http://registry.npmjs.org/wu/-/wu-0.1.8.tgz";
+  }
+  {
+    name = "xml2js";
+    spec = "0.2.4";
+    version = "0.2.4";
+    topLevel = false;
+    dependencies = [
+      { name = "sax"; spec = ">=0.4.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "9a5b577fa1e6cdf8923d5e1372f7a3188436e44d";
+    tarball = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz";
+  }
+  {
+    name = "xml2js";
+    spec = "0.2.x";
+    version = "0.2.8";
+    topLevel = false;
+    dependencies = [
+      { name = "sax"; spec = "0.5.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2";
+    tarball = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz";
+  }
+  {
+    name = "xmlbuilder";
+    spec = "*";
+    version = "0.4.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83";
+    tarball = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz";
   }
 ]
diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index a23b776d1120..206dd1c87ce8 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -7,23 +7,29 @@ let
     let
       all = pkgs.lib.fold (pkg: { top-level, full }: {
         top-level = top-level ++ pkgs.lib.optional pkg.topLevel {
-          name = pkg.baseName;
-          value = builtins.getAttr pkg.fullName self.full;
+          name = pkg.name;
+          value = builtins.getAttr pkg.spec (builtins.getAttr pkg.name self.full);
         };
-        full = [ {
-          name = pkg.fullName;
-          value = pkgs.lib.makeOverridable buildNodePackage rec {
-            name = "${pkg.baseName}-${pkg.version}";
-            src = (if pkg.patchLatest then patchLatest else fetchurl) {
-              url = "http://registry.npmjs.org/${pkg.baseName}/-/${name}.tgz";
-              sha256 = pkg.hash;
+        full = full // builtins.listToAttrs [ {
+          inherit (pkg) name;
+          value = (if builtins.hasAttr pkg.name full
+            then builtins.getAttr pkg.name full
+            else {}
+          ) // builtins.listToAttrs [ {
+            name = pkg.spec;
+            value = pkgs.lib.makeOverridable buildNodePackage {
+              name = "${pkg.name}-${pkg.version}";
+              src = (if pkg.patchLatest then patchLatest else fetchurl) {
+                url = pkg.tarball;
+                sha1 = pkg.sha1 or "";
+                sha256 = pkg.sha256 or "";
+              };
+              deps = map (dep: builtins.getAttr dep.spec (builtins.getAttr dep.name self.full)) pkg.dependencies;
             };
-            deps = map (dep: builtins.getAttr "${dep.name}-${dep.range}" self.full) pkg.dependencies;
-            buildInputs = if builtins.hasAttr name nativeDeps then builtins.getAttr name nativeDeps else [];
-          };
-        } ] ++ full;
-      } ) { top-level = []; full = []; } generated;
-    in builtins.listToAttrs all.top-level // { full = builtins.listToAttrs all.full; };
+          } ];
+        } ];
+      } ) { top-level = []; full = {}; } generated;
+    in builtins.listToAttrs all.top-level // { inherit (all) full; };
 in {
   inherit importGeneratedPackages;
 

From e4019400087ca6050c8c8587f1a4e4d1c8e74556 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Jul 2013 21:05:29 +0200
Subject: [PATCH 163/439] haskell-abstract-deque: disable test suite to avoid
 bug in GHC 7.4.2

---
 pkgs/development/libraries/haskell/abstract-deque/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix
index 6a97c6372e0a..263cd049a3da 100644
--- a/pkgs/development/libraries/haskell/abstract-deque/default.nix
+++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "12g4y3j59nkjw9ja247m8ydhj6a033lzfbqkp4a5slrqdxfdlvyb";
   buildDepends = [ HUnit random testFramework testFrameworkHunit ];
   testDepends = [ HUnit random testFramework testFrameworkHunit ];
+  doCheck = false;
   meta = {
     homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
     description = "Abstract, parameterized interface to mutable Deques";

From 07c3591ddb5cd2c979a7a6ed6fa7184f66a41bb4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Jul 2013 20:19:41 +0200
Subject: [PATCH 164/439] haskell-SDL: update to version 0.6.5

---
 pkgs/development/libraries/haskell/SDL/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix
index 62731657e82a..2fd9c3e0fb6f 100644
--- a/pkgs/development/libraries/haskell/SDL/default.nix
+++ b/pkgs/development/libraries/haskell/SDL/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "SDL";
-  version = "0.6.4";
-  sha256 = "1zrfx2nw0k8lfkr6vnwsp5wr3yz62v0bq60p4sdzj7gm01bz92g0";
+  version = "0.6.5";
+  sha256 = "1vlf1bvp4cbgr31qk6aqikhgn9jbgj7lrvnjzv3ibykm1hhd6vdb";
   extraLibraries = [ SDL ];
   meta = {
     description = "Binding to libSDL";

From 26dd59b8b4cbf74965c4c11b78e2e5b0ca038d1d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Jul 2013 20:19:41 +0200
Subject: [PATCH 165/439] haskell-acid-state: update to version 0.11.4

---
 pkgs/development/libraries/haskell/acid-state/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix
index ed31aaed000e..28d8def56cf4 100644
--- a/pkgs/development/libraries/haskell/acid-state/default.nix
+++ b/pkgs/development/libraries/haskell/acid-state/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "acid-state";
-  version = "0.11.3";
-  sha256 = "0808wcr2n9r3z94ljlzalzkfr7ri327vm5s8xif42n9dw600xi0j";
+  version = "0.11.4";
+  sha256 = "1z9jswg5c2wp9k2lfp0yx7mvw6iiyizm72s552lgjn8i3slq8481";
   buildDepends = [
     cereal extensibleExceptions filepath mtl network safecopy stm
   ];

From 1ae62db2e0acd4f83c98f3a05e8f0471d4a6572e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Jul 2013 20:19:41 +0200
Subject: [PATCH 166/439] haskell-bindings-posix: update to version 1.2.3

---
 pkgs/development/libraries/haskell/bindings-posix/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/bindings-posix/default.nix b/pkgs/development/libraries/haskell/bindings-posix/default.nix
index 23994140d6c0..1475be900391 100644
--- a/pkgs/development/libraries/haskell/bindings-posix/default.nix
+++ b/pkgs/development/libraries/haskell/bindings-posix/default.nix
@@ -1,10 +1,11 @@
-{ cabal, bindingsDSL }:
+{ cabal, bindingsDSL, pthread }:
 
 cabal.mkDerivation (self: {
   pname = "bindings-posix";
   version = "1.2.3";
   sha256 = "0nj18lfpn8hmlaa7cmvdkjnk8fi2f6ysjbigkx7zbrpqnvbi63ba";
   buildDepends = [ bindingsDSL ];
+  extraLibraries = [ pthread ];
   meta = {
     description = "Low level bindings to posix";
     license = self.stdenv.lib.licenses.bsd3;

From b193bd0db30b16bc96d6e9a582ea3ba1cdf51a9e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Jul 2013 20:19:41 +0200
Subject: [PATCH 167/439] haskell-comonad: update to version 3.1

---
 pkgs/development/libraries/haskell/comonad/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix
index 86a8a5c2c308..472e4e315c1c 100644
--- a/pkgs/development/libraries/haskell/comonad/default.nix
+++ b/pkgs/development/libraries/haskell/comonad/default.nix
@@ -1,10 +1,10 @@
-{ cabal, doctest, filepath, semigroups, transformers }:
+{ cabal, doctest, filepath, semigroups, tagged, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "comonad";
-  version = "3.0.3";
-  sha256 = "1wngwa1cdww5c631dcil0c7mgkqx9bj7m5i63p7d9ymhpyx9sw2l";
-  buildDepends = [ semigroups transformers ];
+  version = "3.1";
+  sha256 = "0sl9b3f1vwpjdvnrxv7b8n512w05pv4in6qx3l4sbksdp1zjvcyv";
+  buildDepends = [ semigroups tagged transformers ];
   testDepends = [ doctest filepath ];
   meta = {
     homepage = "http://github.com/ekmett/comonad/";

From 3602951e6fecd6118822e67320f1350a4dc50c27 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Jul 2013 20:19:41 +0200
Subject: [PATCH 168/439] haskell-comonads-fd: update to version 3.0.3

---
 pkgs/development/libraries/haskell/comonads-fd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix
index 08032cb60ab8..aac28ff08711 100644
--- a/pkgs/development/libraries/haskell/comonads-fd/default.nix
+++ b/pkgs/development/libraries/haskell/comonads-fd/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "comonads-fd";
-  version = "3.0.2";
-  sha256 = "1gzgld895b11j556nc5pj7nbafx746b1z49bx4z38l9wq6qzbvqa";
+  version = "3.0.3";
+  sha256 = "06x545yq5xc3kphjipkgjrgrfvvkjpy0wji9d5fw44ca91nzglww";
   buildDepends = [
     comonad comonadTransformers mtl semigroups transformers
   ];

From 7923a212f70a716ae5b31b441df585c7f9f6b73a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Jul 2013 20:19:41 +0200
Subject: [PATCH 169/439] haskell-monad-par-extras: update to version 0.3.3

---
 .../libraries/haskell/monad-par-extras/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/monad-par-extras/default.nix b/pkgs/development/libraries/haskell/monad-par-extras/default.nix
index fb8773372212..6b9ca0e75534 100644
--- a/pkgs/development/libraries/haskell/monad-par-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monad-par-extras/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-par-extras";
-  version = "0.3.2";
-  sha256 = "1k0j3n803z4lv5impz6xd1nzav35dl5f68nlw2ppgg1bbfpvdv6b";
+  version = "0.3.3";
+  sha256 = "0bl4bd6jzdc5zm20q1g67ppkfh6j6yn8fwj6msjayj621cck67p2";
   buildDepends = [
     abstractPar cereal deepseq mtl random transformers
   ];

From bdcc7b7d1822c5cebfc59f662211c1633c73f8b4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Jul 2013 20:19:41 +0200
Subject: [PATCH 170/439] haskell-pipes-concurrency: update to version 1.2.1

---
 .../libraries/haskell/pipes-concurrency/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
index d931845f16e8..970321bf2862 100644
--- a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-concurrency";
-  version = "1.2.0";
-  sha256 = "058v9d3wf9n1d25rhdq5vj60p8mll5yv2zn2k1092bg7qisip1fq";
+  version = "1.2.1";
+  sha256 = "036cn6pafqpf2811iigablks3zk747bnzji9ykrgwhpja427vlbl";
   buildDepends = [ pipes stm ];
   meta = {
     description = "Concurrency for the pipes ecosystem";

From dca0df536458648bfec84841b4e99fec63842c6c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Jul 2013 20:19:41 +0200
Subject: [PATCH 171/439] haskell-shelly: update to version 1.3.0.7

---
 pkgs/development/libraries/haskell/shelly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index 61342c09084d..dc9367b44639 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "1.3.0.6";
-  sha256 = "0sm55f02cm89m8szhf9zb2jww86amzd6wdk44b3cqr7aza08clvj";
+  version = "1.3.0.7";
+  sha256 = "08ydsvgc8n0bvk5vcz3a3rpdbnranlbv8y84imkkh7i0p3nqyg2m";
   buildDepends = [
     mtl systemFileio systemFilepath text time unixCompat
   ];

From 0bdc4a1a94d2867ee040f6905fba592f337e2a21 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Jul 2013 20:19:41 +0200
Subject: [PATCH 172/439] haskell-th-orphans: update to version 0.7

---
 pkgs/development/libraries/haskell/th-orphans/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix
index da14adfe339b..d7b7c42b6c88 100644
--- a/pkgs/development/libraries/haskell/th-orphans/default.nix
+++ b/pkgs/development/libraries/haskell/th-orphans/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "th-orphans";
-  version = "0.6";
-  sha256 = "1ablf4c8vp9kzvr75ngl5yz3ip5klk6zmq7bcqcvks758b9c6qgj";
+  version = "0.7";
+  sha256 = "0fb0wkpvb8wc12gpgm90jfsgcm4p1wf8p0m5xjk64zkcjrdxjr80";
   buildDepends = [ thLift ];
   noHaddock = true;
   meta = {

From 913685d0ac1d3f5f3dafdd983dd1025774299fa6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Jul 2013 21:11:29 +0200
Subject: [PATCH 173/439] haskell-snap: jailbreak to fix build with recent
 versions of comonad

---
 pkgs/development/libraries/haskell/snap/snap.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index 80cdf575d70b..966a298fd3b6 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -19,6 +19,7 @@ cabal.mkDerivation (self: {
     snapCore snapServer stm syb text time transformers
     unorderedContainers vector vectorAlgorithms xmlhtml
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://snapframework.com/";
     description = "Top-level package for the Snap Web Framework";

From b71c382f6fdb2d7f23c0729efa878d784ea0897e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Jul 2013 21:22:57 +0200
Subject: [PATCH 174/439] haskell-bindings-posix: fix bogus change committed
 earlier

---
 pkgs/development/libraries/haskell/bindings-posix/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/bindings-posix/default.nix b/pkgs/development/libraries/haskell/bindings-posix/default.nix
index 1475be900391..23994140d6c0 100644
--- a/pkgs/development/libraries/haskell/bindings-posix/default.nix
+++ b/pkgs/development/libraries/haskell/bindings-posix/default.nix
@@ -1,11 +1,10 @@
-{ cabal, bindingsDSL, pthread }:
+{ cabal, bindingsDSL }:
 
 cabal.mkDerivation (self: {
   pname = "bindings-posix";
   version = "1.2.3";
   sha256 = "0nj18lfpn8hmlaa7cmvdkjnk8fi2f6ysjbigkx7zbrpqnvbi63ba";
   buildDepends = [ bindingsDSL ];
-  extraLibraries = [ pthread ];
   meta = {
     description = "Low level bindings to posix";
     license = self.stdenv.lib.licenses.bsd3;

From 2741391fda1d8081be600024636f592b1a840f59 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Jul 2013 21:32:33 +0200
Subject: [PATCH 175/439] Partially revert commit
 075796e0531506fa106be1d2f47a9c866b70b99c.

The commit downgraded the german language dictionary from version 20030222-1 to
20120607 (and broke the build in the process). That change was probably not
intended?
---
 pkgs/development/libraries/aspell/dictionaries.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index 100960ef8e88..bf7a9de9a2a2 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -29,11 +29,11 @@ let
 in {
 
   de = buildDict {
-    shortName = "de-20120607";
+    shortName = "de-20030222-1";
     fullName = "German";
     src = fetchurl {
-      url = https://www.j3e.de/ispell/igerman98/dict/igerman98-20120607.tar.bz2;
-      sha256 = "1m9jzxwrh0hwsrjs6l98v88miia45y643nbayzjjria2harq7yy5";
+      url = mirror://gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2;
+      sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s";
     };
   };
     

From 84d43394c691437b23c67c790b2d84f5686d0fe1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Jul 2013 21:32:47 +0200
Subject: [PATCH 176/439] pkgs/development/libraries/aspell/dictionaries.nix:
 strip trailing whitespace

---
 .../libraries/aspell/dictionaries.nix          | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index bf7a9de9a2a2..131da4112e8f 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -36,7 +36,7 @@ in {
       sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s";
     };
   };
-    
+
   en = buildDict {
     shortName = "en-7.1-0";
     fullName = "English";
@@ -45,7 +45,7 @@ in {
       sha256 = "02ldfiny4iakgfgy4sdrzjqdzi7l1rmb6y30lv31kfy5x31g77gz";
     };
   };
-    
+
   es = buildDict {
     shortName = "es-1.11-2";
     fullName = "Spanish";
@@ -54,7 +54,7 @@ in {
       sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd";
     };
   };
-    
+
   eo = buildDict {
     shortName = "eo-2.1.20000225a-2";
     fullName = "Esperanto";
@@ -72,7 +72,7 @@ in {
       sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr";
     };
   };
-    
+
   it = buildDict {
     shortName = "it-2.2_20050523-0";
     fullName = "Italian";
@@ -81,7 +81,7 @@ in {
       sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v";
     };
   };
-    
+
   la = buildDict {
     shortName = "la-20020503-0";
     fullName = "Latin";
@@ -90,7 +90,7 @@ in {
       sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl";
     };
   };
-    
+
   nl = buildDict {
     shortName = "nl-0.50-2";
     fullName = "Dutch";
@@ -103,7 +103,7 @@ in {
       echo "add nl.rws" > $out/lib/aspell/nederlands.multi
     '';
   };
-    
+
   pl = buildDict {
     shortName = "pl-6.0_20061121-0";
     fullName = "Polish";
@@ -112,7 +112,7 @@ in {
       sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1";
     };
   };
-     
+
   ru = buildDict {
     shortName = "ru-0.99f7-1";
     fullName = "Russian";
@@ -121,5 +121,5 @@ in {
       sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw";
     };
   };
-    
+
 }

From dc988c815b4aa703f20d8160dc1ca3a95338efc2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Jul 2013 21:51:37 +0200
Subject: [PATCH 177/439] haskell-src-meta: jailbreak to fix build with recent
 versions of th-orphans

---
 pkgs/development/libraries/haskell/haskell-src-meta/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
index 7b6ccb696338..98dfff8505a2 100644
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.6.0.2";
   sha256 = "1msqnsavghsc5bil3mm9swpi9a54pki4162jdfwwvlzvdmfvk9hp";
   buildDepends = [ haskellSrcExts syb thOrphans uniplate ];
+  jailbreak = true;
   meta = {
     description = "Parse source to template-haskell abstract syntax";
     license = self.stdenv.lib.licenses.bsd3;

From 206706503a7ebf99229888f3fae5d819cc23a9e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 10 Jul 2013 18:57:03 +0200
Subject: [PATCH 178/439] cromfs: update to 1.5.10.1.

---
 pkgs/tools/archivers/cromfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix
index 3512d62223f4..fdba02d12b72 100644
--- a/pkgs/tools/archivers/cromfs/default.nix
+++ b/pkgs/tools/archivers/cromfs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, fuse, perl }:
 
 stdenv.mkDerivation rec {
-  name = "cromfs-1.5.10";
+  name = "cromfs-1.5.10.1";
   
   src = fetchurl {
     url = "http://bisqwit.iki.fi/src/arch/${name}.tar.bz2";
-    sha256 = "1w079zb5scv6bj919ndr0fkiirq2bkyjrnmwqrr9yzwbyinzg73j";
+    sha256 = "0fg6vnbxr5jk4gqj31yqc9fj1gp3bj955qhxav28nvc6sbql7ac2";
   };
 
   patchPhase = ''sed -i 's@/bin/bash@/bin/sh@g' configure'';

From 6a13cd01ac76465f7ce6397075ea8edeab434a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 14 Jul 2013 22:27:16 +0200
Subject: [PATCH 179/439] libva: update (fix h264encode)

---
 pkgs/development/libraries/libva/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 5b35d2b24ad4..6c13297b38cb 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }:
 
 stdenv.mkDerivation rec {
-  name = "libva-1.1.1";
+  name = "libva-1.2.1";
   
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
-    sha256 = "0kfdcrzcr82g15l0vvmm6rqr0f0604d4dgrza78gn6bfx7rppby0";
+    sha1 = "f716a4cadd670b14f44a2e833f96a2c509956339";
   };
 
   buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ];

From ec786d59d84e589b9d9124c16227829dbcc11409 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Jul 2013 23:49:28 +0200
Subject: [PATCH 180/439] firefox-wrapper: remove the 'lowPrio' attribute that
 was accidentally added in an earlier commit

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a656cdf1c419..4d273a7e3d98 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7536,7 +7536,7 @@ let
     libpng = libpng.override { apngSupport = true; };
   };
 
-  firefoxWrapper = lowPrio (wrapFirefox { browser = firefoxPkgs.firefox; });
+  firefoxWrapper = wrapFirefox { browser = firefoxPkgs.firefox; };
 
   flac = callPackage ../applications/audio/flac { };
 

From a01ab33e03fce3b89f6a8fff343c96d7e8e0b34b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 15 Jul 2013 01:10:20 +0200
Subject: [PATCH 181/439] chromium: Enable pulseaudio by default.

If no config.pulseaudio is explicitely set to false, build with pulse
support, because even if there is no pulse server available, chromium
will fall back to using ALSA.

And we definitely want to avoid that users have to build chromium for
themselves just for the sake of having pulse support. Thanks to @devhell
for actually helping me discovering this (I for myself do always rebuild
Chromium, so I won't notice those kind of things).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d273a7e3d98..f942843eef04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7181,7 +7181,7 @@ let
   chromium = lowPrio (callPackage ../applications/networking/browsers/chromium {
     channel = "stable";
     gconf = gnome.GConf;
-    pulseSupport = config.pulseaudio or false;
+    pulseSupport = config.pulseaudio or true;
   });
 
   chromiumBeta = lowPrio (chromium.override { channel = "beta"; });

From 8e9f501fd747ad4b8b395ffd52c6af018da2f5cf Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Sun, 14 Jul 2013 23:38:20 -0400
Subject: [PATCH 182/439] Update tarsnap to version 1.0.34.

---
 pkgs/tools/backup/tarsnap/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index bcf03356c683..052b1416e074 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, zlib, e2fsprogs }:
 
 stdenv.mkDerivation {
-  name = "tarsnap-1.0.33";
+  name = "tarsnap-1.0.34";
 
   src = fetchurl {
-    url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.33.tgz";
-    sha256 = "0z8bmra3xms9vcgvkiy9fy1j97192z6w7n658j6zr5cniid8438c";
+    url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.34.tgz";
+    sha256 = "049q0mbz9i4m87n1r78zf62mcxd04wm49rjqpiy5yzy4z8m1gh0l";
   };
 
   buildInputs = [ openssl zlib e2fsprogs ];

From 3538f7c54933f5a6b4641fb72bba5ffc87df1479 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Sun, 14 Jul 2013 23:41:55 -0400
Subject: [PATCH 183/439] Update download link for ssreflect.

---
 pkgs/applications/science/logic/ssreflect/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/ssreflect/default.nix b/pkgs/applications/science/logic/ssreflect/default.nix
index ba831cc62f51..6377db9c8955 100644
--- a/pkgs/applications/science/logic/ssreflect/default.nix
+++ b/pkgs/applications/science/logic/ssreflect/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/31453/${name}-coq8.4.tar.gz";
+    url = "http://ssr.msr-inria.inria.fr/FTP/${name}-coq8.4.tar.gz";
     sha256 = "1ysx29xw09i86lq0d92z9cnyx133jfgq4qddy3501000fn7xwi7h";
   };
 

From c1d9a58f0dbfb7e0be2fd6abcf146545dd1fd00e Mon Sep 17 00:00:00 2001
From: bbenoist <return_0@live.com>
Date: Mon, 15 Jul 2013 11:15:34 +0200
Subject: [PATCH 184/439] qtcreator: Update to version 2.8.0

See <http://blog.qt.digia.com/blog/2013/07/11/qt-creator-2-8-0-released/>
for more informations.
---
 pkgs/development/qtcreator/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index add0c08e95ae..97f238302ecc 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, qt48 }:
 
 let
-  baseVersion = "2.7";
-  revision = "1";
+  baseVersion = "2.8";
+  revision = "0";
   version = "${baseVersion}.${revision}";
   qt4_for_qtcreator = qt48.override {
     developerBuild = true;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-${version}-src.tar.gz";
-    sha256 = "04vn7y3dkk9vi1rsmsxby57mvc2h9n5q842hayq2mdlsax4qnhjv";
+    sha256 = "7ac5d9a36c2f561f74d77378d4eae95a78c7752b323e1df924d6e895e99f45d2";
   };
 
   buildInputs = [ qt4_for_qtcreator ];

From 41932dd1357619c82249fc0b78a417262015a34a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <sander@conference-compass.com>
Date: Mon, 15 Jul 2013 11:32:12 +0200
Subject: [PATCH 185/439] Do not make assumptions on the scheme name, but let
 xcodebuild decide about it

---
 pkgs/development/mobile/xcodeenv/build-app.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
index ac6bbc7f282d..ade629759f09 100644
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -23,7 +23,6 @@ let
   # Set some default values here
   
   _target = if target == null then name else target;
-  _scheme = if scheme == null then name else scheme;
 
   _configuration = if configuration == null
     then
@@ -75,7 +74,7 @@ stdenv.mkDerivation {
       ''}
 
     # Do the building
-    xcodebuild -target ${_target} -configuration ${_configuration} -scheme ${_scheme} -sdk ${_sdk} -arch ${_arch} ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName"'' else ""}
+    xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} -arch ${_arch} ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName"'' else ""}
     
     ${stdenv.lib.optionalString release ''
       ${stdenv.lib.optionalString generateIPA ''

From 2cf1cbf2fe540e5805d768d2641ffa599f4d8f8a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 15 Jul 2013 13:25:42 +0200
Subject: [PATCH 186/439] Added gridfs-stream node package + updated nodejs
 packages

---
 pkgs/top-level/node-packages-generated.nix | 69 +++++++++++++---------
 pkgs/top-level/node-packages.json          |  1 +
 2 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 536bb2ef9445..5adb589d522c 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -1697,6 +1697,17 @@
     sha1 = "c9a206f6f5f4b94e1046dfaaccfe9e12d0ab8cef";
     tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.0.tgz";
   }
+  {
+    name = "gridfs-stream";
+    spec = "*";
+    version = "0.4.0";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "f76f791e0d1b22649e11beeacddf8e62bd89ca2a";
+    tarball = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.4.0.tgz";
+  }
   {
     name = "growl";
     spec = "1.5.x";
@@ -2753,14 +2764,14 @@
   }
   {
     name = "mute-stream";
-    spec = "~0.0.2";
-    version = "0.0.3";
+    spec = "~0.0.4";
+    version = "0.0.4";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "f09c090d333b3063f615cbbcca71b349893f0152";
-    tarball = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.3.tgz";
+    sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e";
+    tarball = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz";
   }
   {
     name = "mv";
@@ -3700,50 +3711,50 @@
   {
     name = "read";
     spec = "1";
-    version = "1.0.4";
+    version = "1.0.5";
     topLevel = false;
     dependencies = [
-      { name = "mute-stream"; spec = "~0.0.2"; }
+      { name = "mute-stream"; spec = "~0.0.4"; }
     ];
     patchLatest = false;
-    sha1 = "c2374be81787fc8633602a1b98232569d52fc655";
-    tarball = "http://registry.npmjs.org/read/-/read-1.0.4.tgz";
+    sha1 = "007a3d169478aa710a491727e453effb92e76203";
+    tarball = "http://registry.npmjs.org/read/-/read-1.0.5.tgz";
   }
   {
     name = "read";
     spec = "1.0.x";
-    version = "1.0.4";
+    version = "1.0.5";
     topLevel = false;
     dependencies = [
-      { name = "mute-stream"; spec = "~0.0.2"; }
+      { name = "mute-stream"; spec = "~0.0.4"; }
     ];
     patchLatest = false;
-    sha1 = "c2374be81787fc8633602a1b98232569d52fc655";
-    tarball = "http://registry.npmjs.org/read/-/read-1.0.4.tgz";
+    sha1 = "007a3d169478aa710a491727e453effb92e76203";
+    tarball = "http://registry.npmjs.org/read/-/read-1.0.5.tgz";
   }
   {
     name = "read";
     spec = "~1.0.1";
-    version = "1.0.4";
+    version = "1.0.5";
     topLevel = false;
     dependencies = [
-      { name = "mute-stream"; spec = "~0.0.2"; }
+      { name = "mute-stream"; spec = "~0.0.4"; }
     ];
     patchLatest = false;
-    sha1 = "c2374be81787fc8633602a1b98232569d52fc655";
-    tarball = "http://registry.npmjs.org/read/-/read-1.0.4.tgz";
+    sha1 = "007a3d169478aa710a491727e453effb92e76203";
+    tarball = "http://registry.npmjs.org/read/-/read-1.0.5.tgz";
   }
   {
     name = "read";
     spec = "~1.0.4";
-    version = "1.0.4";
+    version = "1.0.5";
     topLevel = false;
     dependencies = [
-      { name = "mute-stream"; spec = "~0.0.2"; }
+      { name = "mute-stream"; spec = "~0.0.4"; }
     ];
     patchLatest = false;
-    sha1 = "c2374be81787fc8633602a1b98232569d52fc655";
-    tarball = "http://registry.npmjs.org/read/-/read-1.0.4.tgz";
+    sha1 = "007a3d169478aa710a491727e453effb92e76203";
+    tarball = "http://registry.npmjs.org/read/-/read-1.0.5.tgz";
   }
   {
     name = "read-installed";
@@ -4094,26 +4105,26 @@
   {
     name = "rimraf";
     spec = "2";
-    version = "2.2.0";
+    version = "2.2.1";
     topLevel = false;
     dependencies = [
       { name = "graceful-fs"; spec = "~1"; }
     ];
     patchLatest = false;
-    sha1 = "70797542e81a935849443d7b69bec612ca74c96e";
-    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.0.tgz";
+    sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5";
+    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz";
   }
   {
     name = "rimraf";
     spec = "~2";
-    version = "2.2.0";
+    version = "2.2.1";
     topLevel = false;
     dependencies = [
       { name = "graceful-fs"; spec = "~1"; }
     ];
     patchLatest = false;
-    sha1 = "70797542e81a935849443d7b69bec612ca74c96e";
-    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.0.tgz";
+    sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5";
+    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz";
   }
   {
     name = "rimraf";
@@ -4130,14 +4141,14 @@
   {
     name = "rimraf";
     spec = "~2.2.0";
-    version = "2.2.0";
+    version = "2.2.1";
     topLevel = false;
     dependencies = [
       { name = "graceful-fs"; spec = "~1"; }
     ];
     patchLatest = false;
-    sha1 = "70797542e81a935849443d7b69bec612ca74c96e";
-    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.0.tgz";
+    sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5";
+    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz";
   }
   {
     name = "s3http";
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index ac09384b1eee..08b4f36b4821 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -61,4 +61,5 @@
 , "i18next"
 , "stylus"
 , "npm"
+, "gridfs-stream"
 ]

From 59aca269757b21e241fe8f3ed3d2a7d31e430994 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jul 2013 12:28:45 +0200
Subject: [PATCH 187/439] * Use 'or'.

---
 pkgs/build-support/vm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 66998b341309..987da5585195 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -291,7 +291,7 @@ rec {
     args = ["-e" (vmRunCommand qemuCommandLinux)];
     origArgs = attrs.args;
     origBuilder = attrs.builder;
-    QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 512)}";
+    QEMU_OPTS = "-m ${toString (attrs.memSize or 512)}";
   });
 
 

From 66b2ff107455bdd7d7cf27363770445c0371cd1a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jul 2013 13:01:38 +0200
Subject: [PATCH 188/439] linux: Update to 3.4.53

---
 pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 90df69dcf16c..34a36bb276d6 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -246,7 +246,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.4.51";
+    version = "3.4.53";
     testing = false;
 
     preConfigure = ''
@@ -255,7 +255,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "02msq95m2f73bw0y0sf2gsvg6yd7gfr6n1f2id77604mc6svb69s";
+      sha256 = "1imrs9shy8gbiylz2rlm9l312r1z0clnky5l965113ciarz65qjz";
     };
 
     config = configWithPlatform stdenv.platform;

From 46a2dfe96010feec3b8ad156c2062fdf1eea654e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jul 2013 14:28:49 +0200
Subject: [PATCH 189/439] Set the default Linux kernel to 3.4

3.4 is the most recent long-term stable branch, which will be
maintained until October 2014 at least.

Issue #501.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5122bce693fb..535b29c2ea76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6549,7 +6549,7 @@ let
 
   # The current default kernel / kernel modules.
   linux = linuxPackages.kernel;
-  linuxPackages = linuxPackages_3_2;
+  linuxPackages = linuxPackages_3_4;
 
   # A function to build a manually-configured kernel
   linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix {

From 93ff42ae9c33b2f507c766ac5b2398cfd287ef30 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 15 Jul 2013 14:48:34 +0200
Subject: [PATCH 190/439] dovecot: Add version 2.2.4 as attribute dovecot22

I also added a patch that makes dovecot search for
plugins in /var/lib/dovecot/modules. This way, you
can add plugins from several packages without running
into circular dependencies. The module dir needs to
be populated before the dovecot service is started,
for example. This is currently not done in NixOS, so
you need to implement your own service in order to
get the plugins working.

The module patch has not been added to the old 2.1.x
package.
---
 .../mail/dovecot/2.2.x-module_dir.patch       | 114 ++++++++++++++++++
 pkgs/servers/mail/dovecot/2.2.x.nix           |  41 +++++++
 pkgs/top-level/all-packages.nix               |   6 +-
 3 files changed, 160 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
 create mode 100644 pkgs/servers/mail/dovecot/2.2.x.nix

diff --git a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
new file mode 100644
index 000000000000..cce63fe250c6
--- /dev/null
+++ b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
@@ -0,0 +1,114 @@
+diff -ur dovecot-2.2.2-orig/src/auth/main.c dovecot-2.2.2/src/auth/main.c
+--- dovecot-2.2.2-orig/src/auth/main.c	2013-03-13 15:26:46.000000000 +0100
++++ dovecot-2.2.2/src/auth/main.c	2013-05-20 20:23:58.126024535 +0200
+@@ -193,7 +193,7 @@
+ 	mod_set.debug = global_auth_settings->debug;
+ 	mod_set.filter_callback = auth_module_filter;
+ 
+-	modules = module_dir_load(AUTH_MODULE_DIR, NULL, &mod_set);
++	modules = module_dir_load("/var/lib/dovecot/modules/auth", NULL, &mod_set);
+ 	module_dir_init(modules);
+ 
+ 	if (!worker)
+@@ -223,7 +223,7 @@
+ 	mod_set.debug = global_auth_settings->debug;
+ 	mod_set.ignore_missing = TRUE;
+ 
+-	modules = module_dir_load_missing(modules, AUTH_MODULE_DIR, names,
++	modules = module_dir_load_missing(modules, "/var/lib/dovecot/modules/auth", names,
+ 					  &mod_set);
+ 	module_dir_init(modules);
+ }
+diff -ur dovecot-2.2.2-orig/src/config/all-settings.c dovecot-2.2.2/src/config/all-settings.c
+--- dovecot-2.2.2-orig/src/config/all-settings.c	2013-05-15 12:20:55.000000000 +0200
++++ dovecot-2.2.2/src/config/all-settings.c	2013-05-21 00:31:46.624073562 +0200
+@@ -766,7 +766,7 @@
+ 	.last_valid_gid = 0,
+ 
+ 	.mail_plugins = "",
+-	.mail_plugin_dir = MODULEDIR,
++	.mail_plugin_dir = "/var/lib/dovecot/modules",
+ 
+ 	.mail_log_prefix = "%s(%u): ",
+ 
+@@ -3274,7 +3274,7 @@
+ 	.base_dir = PKG_RUNDIR,
+ 	.libexec_dir = PKG_LIBEXECDIR,
+ 	.mail_plugins = "",
+-	.mail_plugin_dir = MODULEDIR,
++	.mail_plugin_dir = "/var/lib/dovecot/modules",
+ 	.doveadm_socket_path = "doveadm-server",
+ 	.doveadm_worker_count = 0,
+ 	.doveadm_port = 0,
+diff -ur dovecot-2.2.2-orig/src/config/config-parser.c dovecot-2.2.2/src/config/config-parser.c
+--- dovecot-2.2.2-orig/src/config/config-parser.c	2013-02-04 22:05:42.000000000 +0100
++++ dovecot-2.2.2/src/config/config-parser.c	2013-05-20 20:23:58.106024534 +0200
+@@ -990,7 +990,7 @@
+ 
+ 	memset(&mod_set, 0, sizeof(mod_set));
+ 	mod_set.abi_version = DOVECOT_ABI_VERSION;
+-	modules = module_dir_load(CONFIG_MODULE_DIR, NULL, &mod_set);
++	modules = module_dir_load("/var/lib/dovecot/modules/settings", NULL, &mod_set);
+ 	module_dir_init(modules);
+ 
+ 	i_array_init(&new_roots, 64);
+diff -ur dovecot-2.2.2-orig/src/dict/main.c dovecot-2.2.2/src/dict/main.c
+--- dovecot-2.2.2-orig/src/dict/main.c	2013-02-04 22:05:42.000000000 +0100
++++ dovecot-2.2.2/src/dict/main.c	2013-05-20 20:23:58.101024534 +0200
+@@ -61,7 +61,7 @@
+ 	mod_set.abi_version = DOVECOT_ABI_VERSION;
+ 	mod_set.require_init_funcs = TRUE;
+ 
+-	modules = module_dir_load(DICT_MODULE_DIR, NULL, &mod_set);
++	modules = module_dir_load("/var/lib/dovecot/modules/dict", NULL, &mod_set);
+ 	module_dir_init(modules);
+ 
+ 	/* Register only after loading modules. They may contain SQL drivers,
+diff -ur dovecot-2.2.2-orig/src/doveadm/doveadm-settings.c dovecot-2.2.2/src/doveadm/doveadm-settings.c
+--- dovecot-2.2.2-orig/src/doveadm/doveadm-settings.c	2013-04-07 19:13:06.000000000 +0200
++++ dovecot-2.2.2/src/doveadm/doveadm-settings.c	2013-05-20 20:23:58.399024539 +0200
+@@ -76,7 +76,7 @@
+ 	.base_dir = PKG_RUNDIR,
+ 	.libexec_dir = PKG_LIBEXECDIR,
+ 	.mail_plugins = "",
+-	.mail_plugin_dir = MODULEDIR,
++	.mail_plugin_dir = "/var/lib/dovecot/modules",
+ 	.doveadm_socket_path = "doveadm-server",
+ 	.doveadm_worker_count = 0,
+ 	.doveadm_port = 0,
+diff -ur dovecot-2.2.2-orig/src/lib-fs/fs-api.c dovecot-2.2.2/src/lib-fs/fs-api.c
+--- dovecot-2.2.2-orig/src/lib-fs/fs-api.c	2013-04-18 16:07:26.000000000 +0200
++++ dovecot-2.2.2/src/lib-fs/fs-api.c	2013-05-20 20:23:58.099024534 +0200
+@@ -82,7 +82,7 @@
+ 	mod_set.abi_version = DOVECOT_ABI_VERSION;
+ 	mod_set.ignore_missing = TRUE;
+ 
+-	fs_modules = module_dir_load_missing(fs_modules, MODULE_DIR,
++	fs_modules = module_dir_load_missing(fs_modules, "/var/lib/dovecot/modules",
+ 					     module_name, &mod_set);
+ 	module_dir_init(fs_modules);
+ 
+diff -ur dovecot-2.2.2-orig/src/lib-ssl-iostream/iostream-ssl.c dovecot-2.2.2/src/lib-ssl-iostream/iostream-ssl.c
+--- dovecot-2.2.2-orig/src/lib-ssl-iostream/iostream-ssl.c	2013-04-09 22:45:19.000000000 +0200
++++ dovecot-2.2.2/src/lib-ssl-iostream/iostream-ssl.c	2013-05-20 20:23:58.089024534 +0200
+@@ -28,7 +28,7 @@
+ 	memset(&mod_set, 0, sizeof(mod_set));
+ 	mod_set.abi_version = DOVECOT_ABI_VERSION;
+ 	mod_set.setting_name = "<built-in lib-ssl-iostream lookup>";
+-	ssl_module = module_dir_load(MODULE_DIR, plugin_name, &mod_set);
++	ssl_module = module_dir_load("/var/lib/dovecot/modules", plugin_name, &mod_set);
+ 
+ 	ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs");
+ 	if (ssl_vfuncs == NULL) {
+diff -ur dovecot-2.2.2-orig/src/lib-storage/mail-storage-settings.c dovecot-2.2.2/src/lib-storage/mail-storage-settings.c
+--- dovecot-2.2.2-orig/src/lib-storage/mail-storage-settings.c	2013-05-15 12:20:00.000000000 +0200
++++ dovecot-2.2.2/src/lib-storage/mail-storage-settings.c	2013-05-20 20:23:57.858024531 +0200
+@@ -260,7 +260,7 @@
+ 	.last_valid_gid = 0,
+ 
+ 	.mail_plugins = "",
+-	.mail_plugin_dir = MODULEDIR,
++	.mail_plugin_dir = "/var/lib/dovecot/modules",
+ 
+ 	.mail_log_prefix = "%s(%u): ",
+ 
diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix
new file mode 100644
index 000000000000..15c3b65b7543
--- /dev/null
+++ b/pkgs/servers/mail/dovecot/2.2.x.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, perl, systemd, openssl, pam, bzip2, zlib, openldap
+, inotifyTools }:
+
+stdenv.mkDerivation rec {
+  name = "dovecot-2.2.4";
+
+  buildInputs = [perl systemd openssl pam bzip2 zlib openldap inotifyTools];
+
+  src = fetchurl {
+    url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
+    sha256 = "1i5x7l03q854h4j210cpzair4vak95saccp9gb5p4xx7ndggm3q1";
+  };
+
+  preConfigure = ''
+    substituteInPlace src/config/settings-get.pl --replace \
+      "/usr/bin/env perl" "${perl}/bin/perl"
+  '';
+
+  patches = [
+    # Make dovecot look for plugins in /var/lib/dovecot/modules
+    # so we can symlink plugins from several packages there
+    # The symlinking needs to be done in NixOS, as part of the
+    # dovecot service start-up
+    ./2.2.x-module_dir.patch
+  ];
+
+  configureFlags = [
+    # It will hardcode this for /var/lib/dovecot.
+    # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211
+    "--localstatedir=/var"
+    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+    "--with-ldap"
+  ];
+
+  meta = {
+    homepage = "http://dovecot.org/";
+    description = "Open source IMAP and POP3 email server written with security primarily in mind";
+    maintainers = with stdenv.lib.maintainers; [viric simons rickynils];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 535b29c2ea76..24492ca7d86a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5857,7 +5857,11 @@ let
 
   dictdWordnet = callPackage ../servers/dict/dictd-wordnet.nix {};
 
-  dovecot = callPackage ../servers/mail/dovecot { };
+  dovecot = dovecot21;
+
+  dovecot21 = callPackage ../servers/mail/dovecot { };
+
+  dovecot22 = callPackage ../servers/mail/dovecot/2.2.x.nix { };
 
   ejabberd = callPackage ../servers/xmpp/ejabberd { };
 

From 0dc36983e91996adea3d881989e79df684a95a36 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 15 Jul 2013 15:05:03 +0200
Subject: [PATCH 191/439] New package: opensmtpd, an SMTP server from the
 OpenBSD project.

---
 pkgs/servers/mail/opensmtpd/default.nix | 33 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/servers/mail/opensmtpd/default.nix

diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
new file mode 100644
index 000000000000..8f18cb468613
--- /dev/null
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, libevent, zlib, openssl, db4, bison, pam }:
+
+stdenv.mkDerivation rec {
+  name = "opensmtpd-${version}";
+  version = "201306271531p1";
+
+  buildInputs = [ libevent zlib openssl db4 bison pam ];
+
+  src = fetchurl {
+    url = "http://www.opensmtpd.org/archives/${name}.tar.gz";
+    sha256 = "0b06vzv566nai9j506rl3cwkk5favqxg23hsn08490ynn23im0sc";
+  };  
+
+  configureFlags = [ 
+    "--with-mantype=doc"
+    "--with-pam"
+    "--without-bsd-auth"
+    "--with-sock-dir=/run"
+    "--with-privsep-user=smtpd"
+    "--with-queue-user=smtpq"
+  ];  
+
+  meta = {
+    homepage = "http://www.postfix.org/";
+    description = ''
+      A free implementation of the server-side SMTP protocol as defined by
+      RFC 5321, with some additional standard extensions.
+    '';
+    license = stdenv.lib.licenses.isc;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.rickynils ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24492ca7d86a..00f1d2463db6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5926,6 +5926,8 @@ let
 
   nginx = callPackage ../servers/http/nginx { };
 
+  opensmtpd = callPackage ../servers/mail/opensmtpd { };
+
   petidomo = callPackage ../servers/mail/petidomo { };
 
   popa3d = callPackage ../servers/mail/popa3d { };

From 56c5f338455cefa50e8b23cc307c1fdac9c77cf1 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 15 Jul 2013 15:15:35 +0200
Subject: [PATCH 192/439] New package: dovecot_pigeonhole, a sieve plugin for
 dovecot

---
 .../mail/dovecot-pigeonhole/default.nix       | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/servers/mail/dovecot-pigeonhole/default.nix

diff --git a/pkgs/servers/mail/dovecot-pigeonhole/default.nix b/pkgs/servers/mail/dovecot-pigeonhole/default.nix
new file mode 100644
index 000000000000..844219925b17
--- /dev/null
+++ b/pkgs/servers/mail/dovecot-pigeonhole/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchurl, dovecot22, openssl}:
+
+stdenv.mkDerivation rec {
+  name = "dovecot-pigeonhole-${version}";
+  version = "0.4.1";
+
+  src = fetchurl {
+    url = "http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz";
+    sha256 = "0vk9khwijl8qbjlm1q36a5dvpilrminp756n87c452kc3cfgc71n";
+  };  
+
+  buildInputs = [ dovecot22 openssl ];
+
+  preConfigure = ''
+    substituteInPlace src/managesieve/managesieve-settings.c --replace \
+      ".executable = \"managesieve\"" \
+      ".executable = \"$out/libexec/dovecot/managesieve\""
+    substituteInPlace src/managesieve-login/managesieve-login-settings.c --replace \
+      ".executable = \"managesieve-login\"" \
+      ".executable = \"$out/libexec/dovecot/managesieve-login\""
+  ''; 
+
+  configureFlags = [ 
+    "--with-dovecot=${dovecot22}/lib/dovecot"
+    "--without-dovecot-install-dirs"
+    "--with-moduledir=$(out)/lib/dovecot"
+  ];  
+
+  meta = with stdenv.lib; {
+    homepage = http://pigeonhole.dovecot.org/;
+    description = "A sieve plugin for the Dovecot IMAP server.";
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.rickynils ];
+  };  
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00f1d2463db6..48fe5e5be1af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5863,6 +5863,8 @@ let
 
   dovecot22 = callPackage ../servers/mail/dovecot/2.2.x.nix { };
 
+  dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { };
+
   ejabberd = callPackage ../servers/xmpp/ejabberd { };
 
   elasticmq = callPackage ../servers/elasticmq { };

From 5dbe2627a212b5ddaf73e24e2fc329fb4c365604 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 15 Jul 2013 16:01:09 +0200
Subject: [PATCH 193/439] linux-3.9: upgrade to 3.9.10 (EOL)

---
 pkgs/os-specific/linux/kernel/linux-3.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix
index c0441982dd39..b3909900c66a 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix
@@ -258,7 +258,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.9.9";
+    version = "3.9.10";
     testing = false;
 
     preConfigure = ''
@@ -267,7 +267,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "1zrw65m8kvxjkqfj708s418qdm87x0axjm0mr6c2zas5fnla981k";
+      sha256 = "1c187jmdkz6nqfgf4sz9f4da6wzbn2mf99qcjr56nz8sr2zmk2wv";
     };
 
     config = configWithPlatform stdenv.platform;

From c382681b1bbf3e81528f8136f8ac1092c164e35d Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 15 Jul 2013 17:03:55 +0200
Subject: [PATCH 194/439] nvidia binary driver: patch for linux 3.10

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index b5d8abab2410..c7fc5c44c22e 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -8,14 +8,18 @@
 
 with stdenv.lib;
 
-let versionNumber = "319.32"; in
+let versionNumber = "319.32";
+    kernel310patch = fetchurl {
+                       url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia";
+                       sha256 = "0nhzg6jdk9sf1vzj519gqi8a2n9xydhz2bcz472pss2cfgbc1ahb";
+                     };
 
-stdenv.mkDerivation {
+in stdenv.mkDerivation {
   name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}";
 
   builder = ./builder.sh;
 
-  patches = [ ./version-test.patch ];
+  patches = [ ./version-test.patch kernel310patch ];
 
   src =
     if stdenv.system == "i686-linux" then

From ebc424c3abfa72464c5f6777f2d522bf6d0f3790 Mon Sep 17 00:00:00 2001
From: bbenoist <return_0@live.com>
Date: Mon, 15 Jul 2013 16:32:42 +0200
Subject: [PATCH 195/439] cmake: Update to 2.8.11.2

The changelog is available at:
http://www.cmake.org/files/v2.8/CMakeChangeLog-2.8.11

I had to create a new patch from scratch, that's why it contains a lot
of differences. CMake developers has rewritten the files
(Modules/Platform/Linux.cmake and Modules/Platform/UnixPaths.cmake) to
comply to their coding style requirements and a lot of elements has
switched from upper to lower case.

Also, the previous patch partially consisted of commenting some
instructions mixed with line removals whereas mine is directlty
removing them in order to avoid useless evaluations and parsing in
resulting files.
---
 .../tools/build-managers/cmake/default.nix    |   4 +-
 .../build-managers/cmake/search-path.patch    | 103 +++++++++---------
 2 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index d66149a95096..fe8d92bafbff 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -7,7 +7,7 @@ with stdenv.lib;
 let
   os = stdenv.lib.optionalString;
   majorVersion = "2.8";
-  minorVersion = "9";
+  minorVersion = "11.2";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "1yg68ng732cfm5c0h91chqwhg06zdh45bybm353kd1myk5rwqgfw";
+    sha256 = "0qh5dhd7ff08n2h569j7g9m92gb3bz14wvhwjhwl7lgx794cnamk";
   };
 
   patches =
diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch
index ef8a9eef7c18..06f9d8ddca68 100644
--- a/pkgs/development/tools/build-managers/cmake/search-path.patch
+++ b/pkgs/development/tools/build-managers/cmake/search-path.patch
@@ -1,53 +1,54 @@
-diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/Linux.cmake cmake-2.8.5/Modules/Platform/Linux.cmake
---- cmake-2.8.5-orig/Modules/Platform/Linux.cmake	2011-07-08 14:21:44.000000000 +0200
-+++ cmake-2.8.5/Modules/Platform/Linux.cmake	2011-07-21 19:45:00.000000000 +0200
-@@ -36,13 +36,13 @@
+diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/Linux.cmake cmake-2.8.11.2/Modules/Platform/Linux.cmake
+--- cmake-2.8.11.2-orig/Modules/Platform/Linux.cmake	2013-07-02 15:41:40.000000000 +0200
++++ cmake-2.8.11.2/Modules/Platform/Linux.cmake	2013-07-15 11:43:30.557888066 +0200
+@@ -36,13 +36,8 @@
    # checking the platform every time.  This option is advanced enough
    # that only package maintainers should need to adjust it.  They are
    # capable of providing a setting on the command line.
--  IF(EXISTS "/etc/debian_version")
--    SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
+-  if(EXISTS "/etc/debian_version")
+-    set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
 -      "Install .so files without execute permission.")
--  ELSE(EXISTS "/etc/debian_version")
-+  #IF(EXISTS "/etc/debian_version")
-+  #  SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
-+  #    "Install .so files without execute permission.")
-+  #ELSE(EXISTS "/etc/debian_version")
-     SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
-       "Install .so files without execute permission.")
--  ENDIF(EXISTS "/etc/debian_version")
-+  #ENDIF(EXISTS "/etc/debian_version")
- ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
+-  else()
+-    set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
+-      "Install .so files without execute permission.")
+-  endif()
++  set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
++    "Install .so files without execute permission.")
+ endif()
  
  # Match multiarch library directory names.
-@@ -52,6 +52,6 @@
+@@ -50,8 +45,3 @@
  
- # Debian has lib64 paths only for compatibility so they should not be
- # searched.
--IF(EXISTS "/etc/debian_version")
--  SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
--ENDIF(EXISTS "/etc/debian_version")
-+#IF(EXISTS "/etc/debian_version")
-+#  SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
-+#ENDIF(EXISTS "/etc/debian_version")
-diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/Modules/Platform/UnixPaths.cmake
---- cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake	2011-07-08 14:21:44.000000000 +0200
-+++ cmake-2.8.5/Modules/Platform/UnixPaths.cmake	2011-07-21 19:50:52.000000000 +0200
-@@ -33,55 +33,18 @@
+ include(Platform/UnixPaths)
+ 
+-# Debian has lib64 paths only for compatibility so they should not be
+-# searched.
+-if(EXISTS "/etc/debian_version")
+-  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+-endif()
+diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.11.2/Modules/Platform/UnixPaths.cmake
+--- cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake	2013-07-02 15:41:40.000000000 +0200
++++ cmake-2.8.11.2/Modules/Platform/UnixPaths.cmake	2013-07-15 11:42:02.949204549 +0200
+@@ -31,58 +31,13 @@
+ 
+ # List common installation prefixes.  These will be used for all
  # search types.
- LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
-   # Standard
+-list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+-  # Standard
 -  /usr/local /usr /
--
++list(APPEND CMAKE_SYSTEM_PREFIX_PATH "@glibc@")
+ 
 -  # CMake install location
 -  "${_CMAKE_INSTALL_DIR}"
--
++list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "@glibc@/lib")
+ 
 -  # Project install destination.
 -  "${CMAKE_INSTALL_PREFIX}"
 -  )
--
++list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES "@glibc@/include")
+ 
 -# List common include file locations not under the common prefixes.
--LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
 -  # Windows API on Cygwin
 -  /usr/include/w32api
 -
@@ -56,11 +57,11 @@ diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/M
 -
 -  # Other
 -  /usr/pkg/include
--  /opt/csw/include /opt/include  
+-  /opt/csw/include /opt/include
 -  /usr/openwin/include
 -  )
 -
--LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
 -  # Windows API on Cygwin
 -  /usr/lib/w32api
 -
@@ -69,27 +70,25 @@ diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/M
 -
 -  # Other
 -  /usr/pkg/lib
--  /opt/csw/lib /opt/lib 
+-  /opt/csw/lib /opt/lib
 -  /usr/openwin/lib
 -  )
 -
--LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
 -  /usr/pkg/bin
-+  "@glibc@"
-   )
- 
- LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+-  )
+-
+-list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
 -  /lib /usr/lib /usr/lib32 /usr/lib64
-+  "@glibc@/lib"
-   )
- 
- LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
+-  )
+-
+-list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
 -  /usr/include
-+  "@glibc@/include"
-   )
- LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
+-  )
+-list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
 -  /usr/include
-+  "@glibc@/include"
-   )
+-  )
++list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "@glibc@/include")
  
  # Enable use of lib64 search path variants by default.
+ set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)

From 62bbba81734f43ded19650910ce31778802564ff Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Tue, 16 Jul 2013 14:13:47 +0400
Subject: [PATCH 196/439] AVaRICE: translates between GDB's remote debug
 protocol and the AVR JTAG ICE protocol

---
 .../tools/misc/avarice/default.nix            | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/tools/misc/avarice/default.nix

diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix
new file mode 100644
index 000000000000..d15c0bc59a81
--- /dev/null
+++ b/pkgs/development/tools/misc/avarice/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, perl, libusb }:
+
+stdenv.mkDerivation rec {
+
+  name="avarice-2.13";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/avarice/${name}.tar.bz2";
+    sha256 = "0jhh1h1k5b41v2ycq8kn43nkrkh0b9l7xjmw38rak871g3z3hix1";
+  };
+
+  buildInputs = [ pkgconfig perl libusb ];
+
+  meta = {
+    license = stdenv.lib.licenses.gpl2;
+    description = "AVaRICE translates between GDB's remote debug protocol and the AVR JTAG ICE protocol";
+    homepage = http://sourceforge.net/projects/avarice/files/avarice/;
+    maintainers = [ stdenv.lib.maintainers.smironov ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f942843eef04..059d57c39d74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3281,6 +3281,8 @@ let
 
   avrdude = callPackage ../development/tools/misc/avrdude { };
 
+  avarice = callPackage ../development/tools/misc/avarice { };
+
   bam = callPackage ../development/tools/build-managers/bam {};
 
   binutils = callPackage ../development/tools/misc/binutils {

From 4cc4ed6d2d0f9de630c8dedfca61de34af8e41e6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jul 2013 13:44:43 +0200
Subject: [PATCH 197/439] linux-3.7: Remove

It's EOL.
---
 pkgs/os-specific/linux/kernel/linux-3.7.nix | 280 --------------------
 pkgs/top-level/all-packages.nix             |  14 -
 2 files changed, 294 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.7.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix
deleted file mode 100644
index 2b31ec282ca8..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.7.nix
+++ /dev/null
@@ -1,280 +0,0 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools
-, ... }:
-
-let
-  configWithPlatform = kernelPlatform :
-    ''
-      # Power management and debugging for powertop.
-      DEBUG_KERNEL y
-      PM_ADVANCED_DEBUG y
-      PM_RUNTIME y
-      TIMER_STATS y
-      USB_SUSPEND y
-      BACKTRACE_SELF_TEST n
-      CPU_NOTIFIER_ERROR_INJECT? n
-      DEBUG_DEVRES n
-      DEBUG_NX_TEST n
-      DEBUG_STACK_USAGE n
-      DEBUG_STACKOVERFLOW n
-      RCU_TORTURE_TEST n
-      SCHEDSTATS n
-
-      # Support drivers that need external firmware.
-      STANDALONE n
-
-      # Make /proc/config.gz available.
-      IKCONFIG_PROC y
-
-      # Optimize with -O2, not -Os.
-      CC_OPTIMIZE_FOR_SIZE n
-
-      # Enable the kernel's built-in memory tester.
-      MEMTEST y
-
-      # Include the CFQ I/O scheduler in the kernel, rather than as a
-      # module, so that the initrd gets a good I/O scheduler.
-      IOSCHED_CFQ y
-      BLK_CGROUP y # required by CFQ
-
-      # Enable NUMA.
-      NUMA? y
-
-      # Disable some expensive (?) features.
-      FTRACE n
-      KPROBES n
-      PM_TRACE_RTC n
-
-      # Enable various subsystems.
-      ACCESSIBILITY y # Accessibility support
-      AUXDISPLAY y # Auxiliary Display support
-      DONGLE y # Serial dongle support
-      HIPPI? y
-      MTD_COMPLEX_MAPPINGS y # needed for many devices
-      SCSI_LOWLEVEL y # enable lots of SCSI devices
-      SCSI_LOWLEVEL_PCMCIA y
-      SPI y # needed for many devices
-      SPI_MASTER y
-      WAN y
-
-      # Networking options.
-      IP_PNP n
-      IPV6_PRIVACY y
-      NETFILTER_ADVANCED y
-      IP_VS_PROTO_TCP y
-      IP_VS_PROTO_UDP y
-      IP_VS_PROTO_ESP y
-      IP_VS_PROTO_AH y
-      IP_DCCP_CCID3 n # experimental
-      CLS_U32_PERF y
-      CLS_U32_MARK y
-
-      # Wireless networking.
-      IPW2100_MONITOR y # support promiscuous mode
-      IPW2200_MONITOR? y # support promiscuous mode
-      HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
-      HOSTAP_FIRMWARE_NVRAM y
-      ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
-      ATH9K_AHB y # Ditto, AHB bus
-      B43_PHY_HT y
-      BCMA_HOST_PCI y
-      CFG80211_WEXT y # Without it, ipw2200 drivers don't build
-
-      # Some settings to make sure that fbcondecor works - in particular,
-      # disable tileblitting and the drivers that need it.
-
-      # Enable various FB devices.
-      FB y
-      FB_EFI y
-      FB_NVIDIA_I2C y # Enable DDC Support
-      FB_RIVA_I2C y
-      FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
-      FB_ATY_GX y # Mach64 GX support
-      FB_SAVAGE_I2C y
-      FB_SAVAGE_ACCEL y
-      FB_SIS_300 y
-      FB_SIS_315 y
-      FB_3DFX_ACCEL y
-      FB_GEODE y
-
-      # Video configuration
-      # Enable KMS for devices whose X.org driver supports it.
-      DRM_I915_KMS y
-      DRM_RADEON_KMS y
-      # Hybrid graphics support
-      VGA_SWITCHEROO y
-
-      # Sound.
-      SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
-      SND_HDA_INPUT_BEEP y # Support digital beep via input layer
-      SND_USB_CAIAQ_INPUT y
-      PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
-
-      # USB serial devices.
-      USB_SERIAL_GENERIC y # USB Generic Serial Driver
-      USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
-      USB_SERIAL_KEYSPAN_USA28 y
-      USB_SERIAL_KEYSPAN_USA28X y
-      USB_SERIAL_KEYSPAN_USA28XA y
-      USB_SERIAL_KEYSPAN_USA28XB y
-      USB_SERIAL_KEYSPAN_USA19 y
-      USB_SERIAL_KEYSPAN_USA18X y
-      USB_SERIAL_KEYSPAN_USA19W y
-      USB_SERIAL_KEYSPAN_USA19QW y
-      USB_SERIAL_KEYSPAN_USA19QI y
-      USB_SERIAL_KEYSPAN_USA49W y
-      USB_SERIAL_KEYSPAN_USA49WLC y
-
-      # Filesystem options - in particular, enable extended attributes and
-      # ACLs for all filesystems that support them.
-      EXT2_FS_XATTR y # Ext2 extended attributes
-      EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
-      EXT2_FS_SECURITY y # Ext2 Security Labels
-      EXT2_FS_XIP y # Ext2 execute in place support
-      EXT4_FS_POSIX_ACL y
-      EXT4_FS_SECURITY y
-      REISERFS_FS_XATTR y
-      REISERFS_FS_POSIX_ACL y
-      REISERFS_FS_SECURITY y
-      JFS_POSIX_ACL y
-      JFS_SECURITY y
-      XFS_QUOTA y
-      XFS_POSIX_ACL y
-      XFS_RT y # XFS Realtime subvolume support
-      OCFS2_DEBUG_MASKLOG n
-      BTRFS_FS_POSIX_ACL y
-      UBIFS_FS_XATTR? y
-      UBIFS_FS_ADVANCED_COMPR y
-      NFSD_V2_ACL y
-      NFSD_V3 y
-      NFSD_V3_ACL y
-      NFSD_V4 y
-      NFS_FSCACHE y
-      CIFS_XATTR y
-      CIFS_POSIX y
-      CIFS_FSCACHE y
-
-      # Security related features.
-      STRICT_DEVMEM y # Filter access to /dev/mem
-      SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
-
-      # Misc. options.
-      8139TOO_8129 y
-      8139TOO_PIO n # PIO is slower
-      AIC79XX_DEBUG_ENABLE n
-      AIC7XXX_DEBUG_ENABLE n
-      AIC94XX_DEBUG n
-      AUDIT_LOGINUID_IMMUTABLE y
-      B43_PCMCIA y
-      BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
-      BLK_DEV_IDEACPI y # IDE ACPI support
-      BLK_DEV_INTEGRITY y
-      BSD_PROCESS_ACCT_V3 y
-      BT_HCIUART_BCSP y
-      BT_HCIUART_H4 y # UART (H4) protocol support
-      BT_HCIUART_LL y
-      BT_RFCOMM m
-      BT_RFCOMM_TTY y # RFCOMM TTY support
-      CRASH_DUMP n
-      DMAR? n # experimental
-      DVB_DYNAMIC_MINORS? y # we use udev
-      EFI_STUB y # EFI bootloader in the bzImage itself
-      FHANDLE y # used by systemd
-      FUSION y # Fusion MPT device support
-      IDE_GD_ATAPI y # ATAPI floppy support
-      IRDA_ULTRA y # Ultra (connectionless) protocol
-      JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
-      JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
-      JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
-      JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
-      LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
-      LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
-      LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
-      LOGO n # not needed
-      MEDIA_ATTACH? y
-      MEGARAID_NEWGEN y
-      MICROCODE_AMD y
-      MODVERSIONS y
-      MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
-      MTRR_SANITIZER y
-      NET_FC y # Fibre Channel driver support
-      PPP_MULTILINK y # PPP multilink support
-      REGULATOR y # Voltage and Current Regulator Support
-      RC_DEVICES y # Enable IR devices
-      SCSI_LOGGING y # SCSI logging facility
-      SERIAL_8250 y # 8250/16550 and compatible serial support
-      SLIP_COMPRESSED y # CSLIP compressed headers
-      SLIP_SMART y
-      THERMAL_HWMON y # Hardware monitoring support
-      USB_DEBUG n
-      USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
-      USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
-      X86_CHECK_BIOS_CORRUPTION y
-      X86_MCE y
-      XEN_DOM0 y
-
-      # Linux Containers
-      RT_GROUP_SCHED? y
-      CGROUP_DEVICE? y
-      MEMCG? y
-      MEMCG_SWAP? y
-      DEVPTS_MULTIPLE_INSTANCES? y
-
-      # Enable staging drivers.  These are somewhat experimental, but
-      # they generally don't hurt.
-      STAGING y
-
-      # PROC_EVENTS requires that the netlink connector is not built
-      # as a module.  This is required by libcgroup's cgrulesengd.
-      CONNECTOR y
-      PROC_EVENTS y
-
-      # Tracing
-      FTRACE y
-      FUNCTION_TRACER y
-      FTRACE_SYSCALLS y
-      SCHED_TRACER y
-
-      # Devtmpfs support.
-      DEVTMPFS y
-
-      # Media support
-      MEDIA_CAMERA_SUPPORT? y
-      MEDIA_RC_SUPPORT? y
-      MEDIA_USB_SUPPORT y
-
-      # Easier debug of NFS issues
-      SUNRPC_DEBUG y
-
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
-in
-
-import ./generic.nix (
-
-  rec {
-    version = "3.7.10";
-    testing = false;
-
-    preConfigure = ''
-      substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
-    '';
-
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "1l8b40z95ahc2v9babmhrbi8jn2bhwkapq0libq0z21iipqsya4v";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-    features.efiBootStub = true;
-    features.needsCifsUtils = true;
-    features.canDisableNetfilterConntrackHelpers = true;
-    features.netfilterRPFilter = true;
-  }
-
-  // removeAttrs args ["extraConfig"]
-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48fe5e5be1af..38b1a230cc86 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6371,19 +6371,6 @@ let
       ];
   };
 
-  linux_3_7 = makeOverridable (import ../os-specific/linux/kernel/linux-3.7.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
-    kernelPatches =
-      [
-        kernelPatches.sec_perm_2_6_24
-        # kernelPatches.aufs3_7
-      ] ++ lib.optionals (platform.kernelArch == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
   linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
   };
@@ -6548,7 +6535,6 @@ let
   linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen);
   linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4);
   linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi);
-  linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 linuxPackages_3_7);
   linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8);
   linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9);
   linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);

From 01294254a03a271e9e52db09af4b568e4e8ad78a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jul 2013 13:44:55 +0200
Subject: [PATCH 198/439] nix-generate-from-cpan: Handle META.json

Fixes #761.
---
 maintainers/scripts/nix-generate-from-cpan.pl | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl
index 1eb6c51a16af..1d9f926ec556 100755
--- a/maintainers/scripts/nix-generate-from-cpan.pl
+++ b/maintainers/scripts/nix-generate-from-cpan.pl
@@ -51,15 +51,21 @@ print STDERR "unpacked to: $pkg_path\n";
 my $meta;
 if (-e "$pkg_path/META.yml") {
     eval {
-	$meta = YAML::XS::LoadFile("$pkg_path/META.yml");
+        $meta = YAML::XS::LoadFile("$pkg_path/META.yml");
     };
     if ($@) {
-	system("iconv -f windows-1252 -t utf-8 '$pkg_path/META.yml' > '$pkg_path/META.yml.tmp'");
-	$meta = YAML::XS::LoadFile("$pkg_path/META.yml.tmp");
+        system("iconv -f windows-1252 -t utf-8 '$pkg_path/META.yml' > '$pkg_path/META.yml.tmp'");
+        $meta = YAML::XS::LoadFile("$pkg_path/META.yml.tmp");
     }
+} elsif (-e "$pkg_path/META.json") {
+    local $/;
+    open(my $fh, '<', "$pkg_path/META.json") or die;
+    $meta = decode_json(<$fh>);
+} else {
+    warn "package has no META.yml or META.json\n";
 }
 
-print STDERR "metadata: ", encode_json($meta), "\n";
+print STDERR "metadata: ", encode_json($meta), "\n" if defined $meta;
 
 # Map a module to the attribute corresponding to its package
 # (e.g. HTML::HeadParser will be mapped to HTMLParser, because that
@@ -120,11 +126,13 @@ my $homepage = $meta->{resources}->{homepage};
 print STDERR "homepage: $homepage\n" if defined $homepage;
 
 my $description = $meta->{abstract};
-$description = uc(substr($description, 0, 1)) . substr($description, 1); # capitalise first letter
-$description =~ s/\.$//; # remove period at the end
-$description =~ s/\s*$//;
-$description =~ s/^\s*//;
-print STDERR "description: $description\n";
+if (defined $description) {
+    $description = uc(substr($description, 0, 1)) . substr($description, 1); # capitalise first letter
+    $description =~ s/\.$//; # remove period at the end
+    $description =~ s/\s*$//;
+    $description =~ s/^\s*//;
+    print STDERR "description: $description\n";
+}
 
 my $license = $meta->{license};
 if (defined $license) {
@@ -156,7 +164,7 @@ EOF
 print <<EOF if defined $homepage;
       homepage = $homepage;
 EOF
-print <<EOF;
+print <<EOF if defined $description;
       description = "$description";
 EOF
 print <<EOF if defined $license;

From 0de17d61118097b36101dc7de12c3f0a00d5a0de Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 16 Jul 2013 09:31:19 -0400
Subject: [PATCH 199/439] Revert "cmake: Update to 2.8.11.2"

This breaks some packages (notably liblapack) due to a broken macro
(CTEST_CUSTOM_POST_TEST). See NixOS/nixpkgs#762

This reverts commit ebc424c3abfa72464c5f6777f2d522bf6d0f3790.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../tools/build-managers/cmake/default.nix    |   4 +-
 .../build-managers/cmake/search-path.patch    | 103 +++++++++---------
 2 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index fe8d92bafbff..d66149a95096 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -7,7 +7,7 @@ with stdenv.lib;
 let
   os = stdenv.lib.optionalString;
   majorVersion = "2.8";
-  minorVersion = "11.2";
+  minorVersion = "9";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "0qh5dhd7ff08n2h569j7g9m92gb3bz14wvhwjhwl7lgx794cnamk";
+    sha256 = "1yg68ng732cfm5c0h91chqwhg06zdh45bybm353kd1myk5rwqgfw";
   };
 
   patches =
diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch
index 06f9d8ddca68..ef8a9eef7c18 100644
--- a/pkgs/development/tools/build-managers/cmake/search-path.patch
+++ b/pkgs/development/tools/build-managers/cmake/search-path.patch
@@ -1,54 +1,53 @@
-diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/Linux.cmake cmake-2.8.11.2/Modules/Platform/Linux.cmake
---- cmake-2.8.11.2-orig/Modules/Platform/Linux.cmake	2013-07-02 15:41:40.000000000 +0200
-+++ cmake-2.8.11.2/Modules/Platform/Linux.cmake	2013-07-15 11:43:30.557888066 +0200
-@@ -36,13 +36,8 @@
+diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/Linux.cmake cmake-2.8.5/Modules/Platform/Linux.cmake
+--- cmake-2.8.5-orig/Modules/Platform/Linux.cmake	2011-07-08 14:21:44.000000000 +0200
++++ cmake-2.8.5/Modules/Platform/Linux.cmake	2011-07-21 19:45:00.000000000 +0200
+@@ -36,13 +36,13 @@
    # checking the platform every time.  This option is advanced enough
    # that only package maintainers should need to adjust it.  They are
    # capable of providing a setting on the command line.
--  if(EXISTS "/etc/debian_version")
--    set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
+-  IF(EXISTS "/etc/debian_version")
+-    SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
 -      "Install .so files without execute permission.")
--  else()
--    set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
--      "Install .so files without execute permission.")
--  endif()
-+  set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
-+    "Install .so files without execute permission.")
- endif()
+-  ELSE(EXISTS "/etc/debian_version")
++  #IF(EXISTS "/etc/debian_version")
++  #  SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
++  #    "Install .so files without execute permission.")
++  #ELSE(EXISTS "/etc/debian_version")
+     SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
+       "Install .so files without execute permission.")
+-  ENDIF(EXISTS "/etc/debian_version")
++  #ENDIF(EXISTS "/etc/debian_version")
+ ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
  
  # Match multiarch library directory names.
-@@ -50,8 +45,3 @@
+@@ -52,6 +52,6 @@
  
- include(Platform/UnixPaths)
- 
--# Debian has lib64 paths only for compatibility so they should not be
--# searched.
--if(EXISTS "/etc/debian_version")
--  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
--endif()
-diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.11.2/Modules/Platform/UnixPaths.cmake
---- cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake	2013-07-02 15:41:40.000000000 +0200
-+++ cmake-2.8.11.2/Modules/Platform/UnixPaths.cmake	2013-07-15 11:42:02.949204549 +0200
-@@ -31,58 +31,13 @@
- 
- # List common installation prefixes.  These will be used for all
+ # Debian has lib64 paths only for compatibility so they should not be
+ # searched.
+-IF(EXISTS "/etc/debian_version")
+-  SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+-ENDIF(EXISTS "/etc/debian_version")
++#IF(EXISTS "/etc/debian_version")
++#  SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
++#ENDIF(EXISTS "/etc/debian_version")
+diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/Modules/Platform/UnixPaths.cmake
+--- cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake	2011-07-08 14:21:44.000000000 +0200
++++ cmake-2.8.5/Modules/Platform/UnixPaths.cmake	2011-07-21 19:50:52.000000000 +0200
+@@ -33,55 +33,18 @@
  # search types.
--list(APPEND CMAKE_SYSTEM_PREFIX_PATH
--  # Standard
+ LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
+   # Standard
 -  /usr/local /usr /
-+list(APPEND CMAKE_SYSTEM_PREFIX_PATH "@glibc@")
- 
+-
 -  # CMake install location
 -  "${_CMAKE_INSTALL_DIR}"
-+list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "@glibc@/lib")
- 
+-
 -  # Project install destination.
 -  "${CMAKE_INSTALL_PREFIX}"
 -  )
-+list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES "@glibc@/include")
- 
+-
 -# List common include file locations not under the common prefixes.
--list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+-LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
 -  # Windows API on Cygwin
 -  /usr/include/w32api
 -
@@ -57,11 +56,11 @@ diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.
 -
 -  # Other
 -  /usr/pkg/include
--  /opt/csw/include /opt/include
+-  /opt/csw/include /opt/include  
 -  /usr/openwin/include
 -  )
 -
--list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+-LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
 -  # Windows API on Cygwin
 -  /usr/lib/w32api
 -
@@ -70,25 +69,27 @@ diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.
 -
 -  # Other
 -  /usr/pkg/lib
--  /opt/csw/lib /opt/lib
+-  /opt/csw/lib /opt/lib 
 -  /usr/openwin/lib
 -  )
 -
--list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+-LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
 -  /usr/pkg/bin
--  )
--
--list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
++  "@glibc@"
+   )
+ 
+ LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
 -  /lib /usr/lib /usr/lib32 /usr/lib64
--  )
--
--list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
++  "@glibc@/lib"
+   )
+ 
+ LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
 -  /usr/include
--  )
--list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
++  "@glibc@/include"
+   )
+ LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
 -  /usr/include
--  )
-+list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "@glibc@/include")
++  "@glibc@/include"
+   )
  
  # Enable use of lib64 search path variants by default.
- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)

From f8d885344a2fa52be96785b8f0669d4b632eb34d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jul 2013 14:16:24 +0200
Subject: [PATCH 200/439] haskell-xmonad-contrib: update to version 0.11.2

---
 pkgs/applications/window-managers/xmonad/xmonad-contrib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
index 218e2126a154..5c00ddf0fd13 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xmonad-contrib";
-  version = "0.11.1";
-  sha256 = "1356dn8ipw7fgn2xijppn69f64zg36gcxbw9qndxbbmml5gq0zrl";
+  version = "0.11.2";
+  sha256 = "0qlc732m6mhvx7g10r69hk5x460kjv2r04s91cnn5yfiia1qfpai";
   buildDepends = [
     extensibleExceptions mtl random utf8String X11 X11Xft xmonad
   ];

From 9518e1190a84bdc62ec7db9bf4e155139f254f85 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jul 2013 14:16:24 +0200
Subject: [PATCH 201/439] haskell-dual-tree: update to version 0.1.0.3

---
 pkgs/development/libraries/haskell/dual-tree/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix
index 841fae96791c..8500de5fcfb6 100644
--- a/pkgs/development/libraries/haskell/dual-tree/default.nix
+++ b/pkgs/development/libraries/haskell/dual-tree/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dual-tree";
-  version = "0.1.0.2";
-  sha256 = "0ys50m8yjksxi33qyk6ql4ldpdzb0fvxqvywi3y46xi16w5yrkb0";
+  version = "0.1.0.3";
+  sha256 = "0k3p1lqhynlqvkbnrs5vn478c76qcn754n5pb17p5i4jcw94bm0n";
   buildDepends = [ monoidExtras newtype semigroups ];
   jailbreak = true;
   meta = {

From 15555c457725a056ce6e48dfa1404aece9b3fd6c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jul 2013 14:16:24 +0200
Subject: [PATCH 202/439] haskell-happstack-hamlet: update to version 7.0.3

---
 .../libraries/haskell/happstack/happstack-hamlet.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
index fad611798e9d..c191c4287801 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-hamlet";
-  version = "7.0.2";
-  sha256 = "0hsmvv5rggyl7sa4sp30zyr43k6zj7dlpd0mb916wzcqrnyxa34a";
+  version = "7.0.3";
+  sha256 = "0z4phykm2wxpdga47sdg76v7vmy32kav4nscizlkl648qjrx9k3r";
   buildDepends = [ hamlet happstackServer text ];
   meta = {
     homepage = "http://www.happstack.com/";

From 073667d20d67c2fda555947901ad051ec1832655 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jul 2013 14:16:24 +0200
Subject: [PATCH 203/439] haskell-happstack-server: update to version 7.3.0

---
 .../libraries/haskell/happstack/happstack-server.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index b679ba453fd2..f58e4ba2d3d1 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "7.1.7.1";
-  sha256 = "1q897av0ynfh6jn4jhmmamkwda7zg36p4ncn9yic69calzvjpz72";
+  version = "7.3.0";
+  sha256 = "094q6m6a4cxwmmw9hin2pphiq8gi0y4ma4vkvqv7rwqnn3mf9n0q";
   buildDepends = [
     base64Bytestring blazeHtml extensibleExceptions filepath hslogger
     html monadControl mtl network parsec sendfile syb systemFilepath

From e24f16aef617c603dae58e7d238b9fe2042430b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jul 2013 14:16:24 +0200
Subject: [PATCH 204/439] haskell-random-source: update to version 0.3.0.6

---
 pkgs/development/libraries/haskell/random-source/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix
index acc0285a59a4..895a001d46f8 100644
--- a/pkgs/development/libraries/haskell/random-source/default.nix
+++ b/pkgs/development/libraries/haskell/random-source/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "random-source";
-  version = "0.3.0.4";
-  sha256 = "1gvx9r6vy36lx7fy537zdbnbhpmfxz88a7gh0aiyd2vi7bvnndxy";
+  version = "0.3.0.6";
+  sha256 = "0wsv41kpswqml04ym5bq2nan4i637f7h3fmvda2zy506xwxfrpzk";
   buildDepends = [
     flexibleDefaults mersenneRandomPure64 mtl mwcRandom random stateref
     syb thExtras

From 752a1889d5f382b3cf918545550af401bdd620d9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jul 2013 14:16:24 +0200
Subject: [PATCH 205/439] haskell-snap: update to version 0.12.1

---
 pkgs/development/libraries/haskell/snap/snap.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index 966a298fd3b6..11ef315a523e 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap";
-  version = "0.12.0";
-  sha256 = "0nccmbvhwrcfkz4771bhc210mh2ic0i93ks1752ndgk3007rkiff";
+  version = "0.12.1";
+  sha256 = "0mmmai257r3ssmy58v4c3hds0i0hwrww6r495j8yb2r90b31b1gg";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 8663959559ad26b2a1feebf042821c3886ea3ede Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jul 2013 14:16:24 +0200
Subject: [PATCH 206/439] haskell-th-orphans: update to version 0.7.0.1

---
 pkgs/development/libraries/haskell/th-orphans/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix
index d7b7c42b6c88..8fb51c77dbf1 100644
--- a/pkgs/development/libraries/haskell/th-orphans/default.nix
+++ b/pkgs/development/libraries/haskell/th-orphans/default.nix
@@ -2,10 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "th-orphans";
-  version = "0.7";
-  sha256 = "0fb0wkpvb8wc12gpgm90jfsgcm4p1wf8p0m5xjk64zkcjrdxjr80";
+  version = "0.7.0.1";
+  sha256 = "19lfq2m7c6n2z8gz4n57wc92x5x5rkgv4chbfq7w4n531qya4bgr";
   buildDepends = [ thLift ];
-  noHaddock = true;
   meta = {
     description = "Orphan instances for TH datatypes";
     license = self.stdenv.lib.licenses.bsd3;

From 751c267649f05171b4bd29d849f6c0059bfa1cb8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jul 2013 14:16:24 +0200
Subject: [PATCH 207/439] haskell-unbound: update to version 0.4.2

---
 pkgs/development/libraries/haskell/unbound/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix
index a90381202e1a..df57bbbdac70 100644
--- a/pkgs/development/libraries/haskell/unbound/default.nix
+++ b/pkgs/development/libraries/haskell/unbound/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unbound";
-  version = "0.4.1.1";
-  sha256 = "0niv8mm4zjkndj0g32dgr32177dfp647hi32hqzwiis77vcfvdzb";
+  version = "0.4.2";
+  sha256 = "1bnnnv4rmzb0pw7i56nzr7k7pahr9rcmlfi4xkpsjhrxmizcfml9";
   buildDepends = [ mtl RepLib transformers ];
   meta = {
     homepage = "http://code.google.com/p/replib/";

From 1cbfea141cee6d83d390f6ebdcdda5ceb48e2928 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jul 2013 14:16:24 +0200
Subject: [PATCH 208/439] haskell-zeromq3-haskell: update to version 0.5

---
 .../development/libraries/haskell/zeromq3-haskell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
index 3711c66b8cad..1240d4390a6a 100644
--- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zeromq3-haskell";
-  version = "0.4";
-  sha256 = "0kwf4bzqp02vk78c9rphyamwbmvzff1z9hqp70dhfggm0q2d655s";
+  version = "0.5";
+  sha256 = "16qh3q5rshaxzl79aiivrysl3dhilnd2mw2p45ifgbgv87m277gq";
   buildDepends = [
     async MonadCatchIOTransformers semigroups transformers
   ];

From c428feb0c4ead2405718ae524c56a6c9b9bf11bc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jul 2013 15:28:58 +0200
Subject: [PATCH 209/439] haskell-gitit: jailbreak to support recent versions
 of happstack-server

---
 pkgs/development/libraries/haskell/gitit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 9213c534fa3d..45c96e64012d 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -18,6 +18,7 @@ cabal.mkDerivation (self: {
     safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize
     zlib
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://gitit.net";
     description = "Wiki using happstack, git or darcs, and pandoc";

From 2c702a1d81259d4e7efef85ce2d800b9f1bc734e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 16 Jul 2013 19:40:45 +0200
Subject: [PATCH 210/439] avarice: set meta.platforms (make hydra build it)

---
 pkgs/development/tools/misc/avarice/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix
index d15c0bc59a81..bc3785181a8f 100644
--- a/pkgs/development/tools/misc/avarice/default.nix
+++ b/pkgs/development/tools/misc/avarice/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
     description = "AVaRICE translates between GDB's remote debug protocol and the AVR JTAG ICE protocol";
     homepage = http://sourceforge.net/projects/avarice/files/avarice/;
     maintainers = [ stdenv.lib.maintainers.smironov ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
 

From 8db7ff9b83de8fb93708e0ea2979c90a1eaae4a7 Mon Sep 17 00:00:00 2001
From: Baptist BENOIST <return_0@live.com>
Date: Mon, 24 Jun 2013 20:35:00 +0200
Subject: [PATCH 211/439] virtualbox: Comply with the Personal Use and
 Evaluation License

The direct download was unfortunately not compliant with the VirtualBox
Extension Pack's Personal Use and Evaluation License (PUEL) which
stipulates that any end-user should fetch the binaries from the official
Downloads page.

See https://github.com/NixOS/nixpkgs/issues/672 and
http://www.virtualbox.org/wiki/VirtualBox_PUEL for more info.
---
 .../virtualization/virtualbox/default.nix       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 6ca2c66a35ac..264f1259fe54 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -30,10 +30,23 @@ let
     done
   '';
 
-  extensionPack = fetchurl {
-    url = "http://download.virtualbox.org/virtualbox/${version}/Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
+  # See https://github.com/NixOS/nixpkgs/issues/672 for details
+  extpackRevision = "86644";
+  extensionPack = requireFile rec {
+    name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
     # Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
     sha256 = "5813cae72790de4893cadb839ffbd148290a44ec6913d901d84c9b3740ab1b1e";
+    message = ''
+      In order to use the extension pack, you need to comply with the VirtualBox Personal Use
+      and Evaluation License (PUEL) by downloading the related binaries from:
+
+      https://www.virtualbox.org/wiki/Downloads
+
+      Once you have downloaded the file, please use the following command and re-run the
+      installation:
+
+      nix-prefetch-url file://${name}
+    '';
   };
 
 in stdenv.mkDerivation {

From 9a6d5bf9c655f3c90998f6926d7fb630913fc4d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 16 Jul 2013 22:26:28 +0200
Subject: [PATCH 212/439] Revert "libva: update (fix h264encode)"

It breaks the latest vlc, and I don't need the new libva that much.
http://hydra.nixos.org/build/5540612/nixlog/1/tail-reload

This reverts commit 6a13cd01ac76465f7ce6397075ea8edeab434a74.
---
 pkgs/development/libraries/libva/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 6c13297b38cb..5b35d2b24ad4 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }:
 
 stdenv.mkDerivation rec {
-  name = "libva-1.2.1";
+  name = "libva-1.1.1";
   
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
-    sha1 = "f716a4cadd670b14f44a2e833f96a2c509956339";
+    sha256 = "0kfdcrzcr82g15l0vvmm6rqr0f0604d4dgrza78gn6bfx7rppby0";
   };
 
   buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ];

From 8e8c3d665c59c25a5889e7007e66fbe7f40af628 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jul 2013 21:30:45 +0200
Subject: [PATCH 213/439] Remove KDE 4.7

It's obsolete.
---
 pkgs/desktops/kde-4.7/default.nix             |  59 ----
 .../files/kde-wallpapers-buildsystem.patch    |  17 --
 .../kde-4.7/files/polkit-install.patch        |  12 -
 pkgs/desktops/kde-4.7/kde-baseapps/kate.nix   |  10 -
 .../kde-4.7/kde-baseapps/kde-baseapps.nix     |  10 -
 .../desktops/kde-4.7/kde-baseapps/konsole.nix |  11 -
 pkgs/desktops/kde-4.7/kde-package/4.7.4.nix   | 273 ------------------
 pkgs/desktops/kde-4.7/kde-package/default.nix | 127 --------
 .../kde-4.7/kde-package/kde-manifest.sh       | 145 ----------
 .../kde-4.7/kde-package/kde-submodules.xslt   |  22 --
 pkgs/desktops/kde-4.7/kde-runtime.nix         |  16 -
 pkgs/desktops/kde-4.7/kde-wallpapers.nix      |  17 --
 pkgs/desktops/kde-4.7/kde-workspace.nix       |  36 ---
 .../kde-4.7/kdeaccessibility/jovie.nix        |   9 -
 .../kde-4.7/kdeaccessibility/kaccessible.nix  |   9 -
 .../kde-4.7/kdeaccessibility/kmag.nix         |   9 -
 .../kde-4.7/kdeaccessibility/kmousetool.nix   |   9 -
 .../kde-4.7/kdeaccessibility/kmouth.nix       |   9 -
 pkgs/desktops/kde-4.7/kdeadmin/kcron.nix      |   5 -
 pkgs/desktops/kde-4.7/kdeadmin/ksystemlog.nix |   5 -
 pkgs/desktops/kde-4.7/kdeadmin/kuser.nix      |   5 -
 .../kdeadmin/system-config-printer-kde.nix    |  33 ---
 .../kde-4.7/kdeartwork/ColorSchemes.nix       |  11 -
 .../kde-4.7/kdeartwork/FindXscreensaver.cmake |  73 -----
 .../kdeartwork/HighResolutionWallpapers.nix   |  11 -
 .../kde-4.7/kdeartwork/IconThemes.nix         |  13 -
 .../kde-4.7/kdeartwork/WeatherWallpapers.nix  |  11 -
 pkgs/desktops/kde-4.7/kdeartwork/aurorae.nix  |   7 -
 .../kde-4.7/kdeartwork/desktopthemes.nix      |  11 -
 .../desktops/kde-4.7/kdeartwork/emoticons.nix |  11 -
 .../kde-4.7/kdeartwork/kscreensaver.nix       |  15 -
 .../kde-4.7/kdeartwork/kwin-styles.nix        |   9 -
 pkgs/desktops/kde-4.7/kdeartwork/sounds.nix   |  11 -
 pkgs/desktops/kde-4.7/kdeartwork/styles.nix   |  11 -
 .../kde-4.7/kdeartwork/wallpapers.nix         |  11 -
 .../kde-4.7/kdebindings/pykde-purity.patch    |  49 ----
 .../kde-4.7/kdebindings/pykde4-new-sip.patch  |  91 ------
 pkgs/desktops/kde-4.7/kdebindings/pykde4.nix  |  30 --
 .../desktops/kde-4.7/kdebindings/smokegen.nix |  13 -
 pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix |  12 -
 .../kde-4.7/kdeedu/FindLibfacile.cmake        |  32 --
 pkgs/desktops/kde-4.7/kdeedu/blinken.nix      |   8 -
 pkgs/desktops/kde-4.7/kdeedu/cantor.nix       |   8 -
 pkgs/desktops/kde-4.7/kdeedu/kalgebra.nix     |   8 -
 .../kde-4.7/kdeedu/kalzium-feature-log.patch  |  15 -
 pkgs/desktops/kde-4.7/kdeedu/kalzium.nix      |  15 -
 pkgs/desktops/kde-4.7/kdeedu/kanagram.nix     |   8 -
 pkgs/desktops/kde-4.7/kdeedu/kbruch.nix       |   8 -
 pkgs/desktops/kde-4.7/kdeedu/kgeography.nix   |   8 -
 pkgs/desktops/kde-4.7/kdeedu/khangman.nix     |   8 -
 pkgs/desktops/kde-4.7/kdeedu/kig.nix          |  12 -
 pkgs/desktops/kde-4.7/kdeedu/kiten.nix        |   9 -
 pkgs/desktops/kde-4.7/kdeedu/klettres.nix     |   9 -
 pkgs/desktops/kde-4.7/kdeedu/kmplot.nix       |  12 -
 pkgs/desktops/kde-4.7/kdeedu/kstars.nix       |   9 -
 pkgs/desktops/kde-4.7/kdeedu/ktouch.nix       |   9 -
 pkgs/desktops/kde-4.7/kdeedu/kturtle.nix      |   9 -
 pkgs/desktops/kde-4.7/kdeedu/kwordquiz.nix    |   9 -
 pkgs/desktops/kde-4.7/kdeedu/libkdeedu.nix    |   8 -
 pkgs/desktops/kde-4.7/kdeedu/marble.nix       |   9 -
 pkgs/desktops/kde-4.7/kdeedu/parley.nix       |   9 -
 pkgs/desktops/kde-4.7/kdeedu/rocs.nix         |  14 -
 pkgs/desktops/kde-4.7/kdeedu/step.nix         |  12 -
 pkgs/desktops/kde-4.7/kdegames.nix            |  20 --
 .../desktops/kde-4.7/kdegraphics/gwenview.nix |  15 -
 pkgs/desktops/kde-4.7/kdegraphics/kamera.nix  |  10 -
 .../kde-4.7/kdegraphics/kcolorchooser.nix     |  10 -
 .../kdegraphics-strigi-analyzer.nix           |  10 -
 .../kdegraphics/kdegraphics-thumbnailers.nix  |  10 -
 pkgs/desktops/kde-4.7/kdegraphics/kgamma.nix  |  10 -
 .../kde-4.7/kdegraphics/kolourpaint.nix       |  10 -
 pkgs/desktops/kde-4.7/kdegraphics/kruler.nix  |  10 -
 .../kde-4.7/kdegraphics/ksaneplugin.nix       |  10 -
 .../kde-4.7/kdegraphics/ksnapshot.nix         |  10 -
 .../kde-4.7/kdegraphics/libkdcraw.nix         |  10 -
 .../kde-4.7/kdegraphics/libkexiv2.nix         |  10 -
 pkgs/desktops/kde-4.7/kdegraphics/libkipi.nix |  10 -
 .../desktops/kde-4.7/kdegraphics/libksane.nix |  10 -
 .../kde-4.7/kdegraphics/mobipocket.nix        |  10 -
 pkgs/desktops/kde-4.7/kdegraphics/okular.nix  |  12 -
 pkgs/desktops/kde-4.7/kdegraphics/svgpart.nix |  10 -
 pkgs/desktops/kde-4.7/kdelibs.nix             |  38 ---
 pkgs/desktops/kde-4.7/kdemultimedia.nix       |  17 --
 .../kde-4.7/kdenetwork/FindmsiLBC.cmake       |  19 --
 .../kde-4.7/kdenetwork/filesharing.nix        |   7 -
 .../kde-4.7/kdenetwork/kdenetwork.patch       |  24 --
 pkgs/desktops/kde-4.7/kdenetwork/kdnssd.nix   |   7 -
 .../kde-4.7/kdenetwork/kfile-plugins.nix      |  11 -
 pkgs/desktops/kde-4.7/kdenetwork/kget.nix     |  13 -
 pkgs/desktops/kde-4.7/kdenetwork/kopete.nix   |  21 --
 pkgs/desktops/kde-4.7/kdenetwork/kppp.nix     |   7 -
 pkgs/desktops/kde-4.7/kdenetwork/krdc.nix     |   7 -
 pkgs/desktops/kde-4.7/kdenetwork/krfb.nix     |   7 -
 pkgs/desktops/kde-4.7/kdepim-runtime.nix      |  12 -
 pkgs/desktops/kde-4.7/kdepim.nix              |  21 --
 pkgs/desktops/kde-4.7/kdepimlibs.nix          |  16 -
 pkgs/desktops/kde-4.7/kdeplasma-addons.nix    |  20 --
 pkgs/desktops/kde-4.7/kdesdk/cervisia.nix     |   9 -
 .../kde-4.7/kdesdk/dolphin-plugins-git.nix    |  10 -
 .../kde-4.7/kdesdk/dolphin-plugins-svn.nix    |  10 -
 pkgs/desktops/kde-4.7/kdesdk/find-svn.patch   |  59 ----
 pkgs/desktops/kde-4.7/kdesdk/kapptemplate.nix |   9 -
 pkgs/desktops/kde-4.7/kdesdk/kcachegrind.nix  |   9 -
 .../kde-4.7/kdesdk/kdeaccounts-plugin.nix     |   9 -
 .../kde-4.7/kdesdk/kioslave-perldoc.nix       |  11 -
 pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix |  11 -
 pkgs/desktops/kde-4.7/kdesdk/kmtrace.nix      |  11 -
 pkgs/desktops/kde-4.7/kdesdk/kompare.nix      |   9 -
 pkgs/desktops/kde-4.7/kdesdk/kpartloader.nix  |   9 -
 .../kde-4.7/kdesdk/kprofilemethod.nix         |   9 -
 pkgs/desktops/kde-4.7/kdesdk/kstartperf.nix   |   9 -
 pkgs/desktops/kde-4.7/kdesdk/kuiviewer.nix    |   9 -
 pkgs/desktops/kde-4.7/kdesdk/lokalize.nix     |  13 -
 pkgs/desktops/kde-4.7/kdesdk/okteta.nix       |  11 -
 pkgs/desktops/kde-4.7/kdesdk/poxml.nix        |   9 -
 pkgs/desktops/kde-4.7/kdesdk/scripts.nix      |   9 -
 .../kde-4.7/kdesdk/strigi-analyzer.nix        |  13 -
 pkgs/desktops/kde-4.7/kdesdk/umbrello.nix     |   9 -
 pkgs/desktops/kde-4.7/kdetoys/amor.nix        |   9 -
 pkgs/desktops/kde-4.7/kdetoys/kteatime.nix    |   9 -
 pkgs/desktops/kde-4.7/kdetoys/ktux.nix        |   9 -
 pkgs/desktops/kde-4.7/kdeutils/ark.nix        |   9 -
 pkgs/desktops/kde-4.7/kdeutils/filelight.nix  |   9 -
 pkgs/desktops/kde-4.7/kdeutils/kcalc.nix      |   9 -
 .../desktops/kde-4.7/kdeutils/kcharselect.nix |   9 -
 pkgs/desktops/kde-4.7/kdeutils/kdf.nix        |   9 -
 pkgs/desktops/kde-4.7/kdeutils/kfloppy.nix    |   9 -
 pkgs/desktops/kde-4.7/kdeutils/kgpg.nix       |   9 -
 .../kde-4.7/kdeutils/kremotecontrol.nix       |   9 -
 pkgs/desktops/kde-4.7/kdeutils/ktimer.nix     |   9 -
 pkgs/desktops/kde-4.7/kdeutils/kwallet.nix    |   9 -
 .../kde-4.7/kdeutils/printer-applet.nix       |  28 --
 .../kde-4.7/kdeutils/superkaramba.nix         |  11 -
 pkgs/desktops/kde-4.7/kdeutils/sweeper.nix    |   9 -
 .../kde-4.7/kdewebdev/kfilereplace.nix        |  10 -
 .../kde-4.7/kdewebdev/kimagemapeditor.nix     |  10 -
 .../kde-4.7/kdewebdev/klinkstatus.nix         |  12 -
 pkgs/desktops/kde-4.7/kdewebdev/kommander.nix |   9 -
 pkgs/desktops/kde-4.7/l10n/default.nix        |  44 ---
 pkgs/desktops/kde-4.7/l10n/l10n-manifest.sh   |  32 --
 pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix | 267 -----------------
 pkgs/desktops/kde-4.7/oxygen-icons.nix        |  15 -
 .../kde-4.7/support/akonadi/default.nix       |  24 --
 pkgs/top-level/all-packages.nix               |   8 -
 144 files changed, 2793 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.7/default.nix
 delete mode 100644 pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch
 delete mode 100644 pkgs/desktops/kde-4.7/files/polkit-install.patch
 delete mode 100644 pkgs/desktops/kde-4.7/kde-baseapps/kate.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kde-package/4.7.4.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kde-package/default.nix
 delete mode 100755 pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
 delete mode 100644 pkgs/desktops/kde-4.7/kde-package/kde-submodules.xslt
 delete mode 100644 pkgs/desktops/kde-4.7/kde-runtime.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kde-wallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kde-workspace.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeaccessibility/jovie.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeaccessibility/kaccessible.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeaccessibility/kmag.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeaccessibility/kmouth.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeadmin/kcron.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeadmin/ksystemlog.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeadmin/kuser.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeadmin/system-config-printer-kde.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/ColorSchemes.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/FindXscreensaver.cmake
 delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/HighResolutionWallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/IconThemes.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/WeatherWallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/aurorae.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/desktopthemes.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/emoticons.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/kwin-styles.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/sounds.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/styles.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/wallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdebindings/pykde-purity.patch
 delete mode 100644 pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch
 delete mode 100644 pkgs/desktops/kde-4.7/kdebindings/pykde4.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdebindings/smokegen.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/FindLibfacile.cmake
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/blinken.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/cantor.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kalgebra.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kalzium-feature-log.patch
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kalzium.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kanagram.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kbruch.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kgeography.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/khangman.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kig.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kiten.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/klettres.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kmplot.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kstars.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/ktouch.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kturtle.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kwordquiz.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/libkdeedu.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/marble.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/parley.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/rocs.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/step.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegames.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/kamera.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/kcolorchooser.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-strigi-analyzer.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-thumbnailers.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/kgamma.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/kolourpaint.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/kruler.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/ksaneplugin.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/ksnapshot.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/libkexiv2.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/libkipi.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/libksane.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/okular.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/svgpart.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdelibs.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdemultimedia.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/FindmsiLBC.cmake
 delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/filesharing.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/kdenetwork.patch
 delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/kdnssd.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/kfile-plugins.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/kget.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/kopete.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/kppp.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/krdc.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/krfb.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdepim-runtime.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdepim.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdepimlibs.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeplasma-addons.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/cervisia.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-git.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-svn.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/find-svn.patch
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kapptemplate.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kcachegrind.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kdeaccounts-plugin.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kioslave-perldoc.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kmtrace.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kompare.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kpartloader.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kprofilemethod.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kstartperf.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kuiviewer.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/lokalize.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/okteta.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/poxml.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/scripts.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/strigi-analyzer.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/umbrello.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdetoys/amor.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdetoys/kteatime.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdetoys/ktux.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/ark.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/filelight.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/kcalc.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/kcharselect.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/kdf.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/kfloppy.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/kgpg.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/ktimer.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/kwallet.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/printer-applet.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/superkaramba.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/sweeper.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdewebdev/kfilereplace.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdewebdev/kimagemapeditor.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdewebdev/klinkstatus.nix
 delete mode 100644 pkgs/desktops/kde-4.7/kdewebdev/kommander.nix
 delete mode 100644 pkgs/desktops/kde-4.7/l10n/default.nix
 delete mode 100755 pkgs/desktops/kde-4.7/l10n/l10n-manifest.sh
 delete mode 100644 pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix
 delete mode 100644 pkgs/desktops/kde-4.7/oxygen-icons.nix
 delete mode 100644 pkgs/desktops/kde-4.7/support/akonadi/default.nix

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
deleted file mode 100644
index 428e13706356..000000000000
--- a/pkgs/desktops/kde-4.7/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ callPackage, callPackageOrig, stdenv, qt48 }:
-
-let
-  release = "4.7.4";
-
-  # Need callPackageOrig to avoid infinite cycle
-  kde = callPackageOrig ./kde-package {
-    inherit release ignoreList extraSubpkgs callPackage;
-  };
-
-  # The list of igored individual modules
-  ignoreList = {
-    # kdeadmin/strigi-analyzer has no real code
-    kdeadmin = [ "strigi-analyzer" ];
-    # kdesdk/kioslave is splitted into kioslave-svn and kioslave-git
-    kdesdk = [ "kioslave" ];
-    # Most of kdebindings do not compile due to a bug in the buildsystem
-    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "perlqt"
-      "qtruby" "qyoto" "smokekde" ];
-  };
-
-  # Extra subpackages in the manifest format
-  extraSubpkgs = {
-    kdesdk =
-      [
-      {
-        name = "kioslave-svn";
-        sane = "kioslave_svn";
-        subdir = "kioslave";
-      }
-      {
-        name = "kioslave-perldoc";
-        sane = "kioslave_perldoc";
-        subdir = "kioslave";
-      }
-      ];
-  };
-
-in
-
-kde.modules // kde.individual //
-{
-  inherit (kde) manifest modules individual splittedModuleList;
-
-  akonadi = callPackage ./support/akonadi { };
-
-  qt4 = qt48;
-
-  kdebase_workspace = kde.modules.kde_workspace;
-
-  inherit release;
-
-  full = stdenv.lib.attrValues kde.modules;
-
-  l10n = callPackage ./l10n {
-    inherit release;
-    inherit (kde.manifest) stable;
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch
deleted file mode 100644
index 378cdb646940..000000000000
--- a/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3d3e247..f78db67 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,10 @@
--find_package(KDE4 REQUIRED)
--include(KDE4Defaults)
-+project(kde-wallpapers NONE)
-+if( WALLPAPER_INSTALL_DIR )
-+  message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}")
-+else()
-+  find_package(KDE4 REQUIRED)
-+  include(KDE4Defaults)
-+endif()
- 
- install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)
- 
diff --git a/pkgs/desktops/kde-4.7/files/polkit-install.patch b/pkgs/desktops/kde-4.7/files/polkit-install.patch
deleted file mode 100644
index d2ecac663ec5..000000000000
--- a/pkgs/desktops/kde-4.7/files/polkit-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
-+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
-@@ -139,7 +139,7 @@
-         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
-         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- 
--    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
-+    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
-         "Where policy files generated by KAuth will be installed" FORCE)
- elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
-     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/desktops/kde-4.7/kde-baseapps/kate.nix b/pkgs/desktops/kde-4.7/kde-baseapps/kate.nix
deleted file mode 100644
index 1ffbcf9ebf98..000000000000
--- a/pkgs/desktops/kde-4.7/kde-baseapps/kate.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix
deleted file mode 100644
index 45192e0c4600..000000000000
--- a/pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, shared_desktop_ontologies, glib, htmlTidy }:
-
-kde {
-  buildInputs = [ kdelibs shared_desktop_ontologies glib htmlTidy ];
-
-  meta = {
-    description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix b/pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix
deleted file mode 100644
index 87ac24972bdb..000000000000
--- a/pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Konsole, the KDE terminal emulator";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kde-package/4.7.4.nix b/pkgs/desktops/kde-4.7/kde-package/4.7.4.nix
deleted file mode 100644
index 9a816b72cc68..000000000000
--- a/pkgs/desktops/kde-4.7/kde-package/4.7.4.nix
+++ /dev/null
@@ -1,273 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="blinken";value="16daqg0bbkci305qrcrvpv66cvshjfni5rf5gakblcn8qqlmwsi6";}
-  {name="cantor";value="0wgm0j9bl632bk94fi0hzp5s392xpyz0d524ahhi8q33bqkl06ra";}
-  {name="gwenview";value="1dhpb7q0myr9rl4bjsajq0kslvhxcddv1ddplqad63j619wk8gfj";}
-  {name="kalgebra";value="04g07syrk14kpr15f9kgfkkmkjgdvcwmrykmy56jwm8sfb6ncli9";}
-  {name="kalzium";value="0k25cinwp6yjp8q9irmwcb1ahf98ck3mw706jfpybpa7ds8ym5z1";}
-  {name="kamera";value="0airyhxzpnvpzag4w0q1h0pc1lwwplglki5max1mj5miaxg93r34";}
-  {name="kanagram";value="0271aq39dbs92rhc83m19pmm7rx5c573k27931sf3j3pw3x2q0nm";}
-  {name="kate";value="0pfddi7g99apqipnqv62i86ld11vl4igqv65xprqqf0a5a1413my";}
-  {name="kbruch";value="1dhhk55d3bs474l2w0xma89pq74gklq5faskrvd1lvvl853z3zib";}
-  {name="kcolorchooser";value="1gb861f1fy0fvmkg30l1gza998gyhjwj4gcyyv266wp5v7d01xda";}
-  {name="kdeaccessibility";value="12mvs1hy5ygnbbz14hg2fvs7mpvlamkfbz7g7kcvzp0fkjb524h3";}
-  {name="kdeadmin";value="16y73zpdgh72cf8yz8zn246i4d8nh4k6mbz9cbc4ggjblgjcn3pr";}
-  {name="kdeartwork";value="0vfz9mzpm8yy6fysmhcavd8l1fjcld36p0x9qymi4l072b7dkgyv";}
-  {name="kde-baseapps";value="075m3nn407di2mx8w5lv7va3ij0yd7yb575wmf05vfqr01xyhn8a";}
-  {name="kdegames";value="0c42wyk2mq3hz99zg4f9i2dbc9vyaa5l2301j0859pwvnp9zgafz";}
-  {name="kdegraphics-strigi-analyzer";value="1j7chf76mlwrq7z1dgm525f5srx1h30czm8dnw2f0yxfn18lvnl9";}
-  {name="kdegraphics-thumbnailers";value="1ny51jc8fm4gldrlmrfmslpfpn5pahlyws3jzaj6nkd3hdw3krnr";}
-  {name="kdelibs";value="0fdgl8qvpyb9pmb26b3yjfm9ib75mxayw75qm5kyzncmrvn427gy";}
-  {name="kdemultimedia";value="0a0vp1pq159lzgd0x817p9mf6al99w1dwnlyhs9zfpspgz8nw8y1";}
-  {name="kdenetwork";value="0zwqbyl5vw5nnzlilc4khlisjj1xjpziw9ahgvw8cbszscmv68b5";}
-  {name="kdepim";value="0s38qxks58dmwyi3fnvprpq5q9kr17v31n808j33d50rw62y398p";}
-  {name="kdepimlibs";value="0rpfkc0pxvfkaz8pb3yx21dm3ixw8gfrcdny1aqzbn3f7f8abhip";}
-  {name="kdepim-runtime";value="14p5bxrhqjnmz303hxlrdj4vxlmiv8j04qni33ljbgib0hnllva3";}
-  {name="kdeplasma-addons";value="068m2jpyprrscyk3f4nk9qix5smka5pq59sdwdan9996sh256py5";}
-  {name="kde-runtime";value="06nxv46s7ff5n3kmzq3mdc16b0ck0411lj0gf3scdyd85iqx06wd";}
-  {name="kdesdk";value="0v3gwml9rvqz96q8jk8myqvl6gjw3q37js2jn24yawli3sjjw552";}
-  {name="kdetoys";value="17fk1bmabgj9nz0m4j248f48m2xfscql43wmzkqnr7y6zghqfhfh";}
-  {name="kdeutils";value="0s1whgg59xnc6ny609s3vjzvpxak02f2y6v7zw72i808k03aal5v";}
-  {name="kde-wallpapers";value="133amrhhca4xi0gbmajcc6rw1c1ai5x29265fqp45588kyycbgvz";}
-  {name="kdewebdev";value="1nqp2j09nr3jhmfvjydwp86jz4nn5pxwcfi6ww9krfd1hyg4aqjc";}
-  {name="kde-workspace";value="1dj39nndpws9grinz287ypn5lj3zjh96gl4zhl7kp6z8f9mdqp0p";}
-  {name="kgamma";value="05vk5b40w0i75nx5lqn9qax10m604jkjxyxynm0i0b8gyksv78h9";}
-  {name="kgeography";value="1a49zqz8zb9kn7m4m5fsm5ibvn9m5pzq89isrd1yy9q7zlv3qfqc";}
-  {name="khangman";value="1bmzrc5jzbw9q9gxw9pzad37zj4h89rh3k4smycif6ky2jy72x6d";}
-  {name="kig";value="1s0mwnj2riam811l0nfk08ja43f0nibqaqchy2ff7627w22yr5m0";}
-  {name="kimono";value="1cbbchdj4x5sn6ldkmzrx5alhvgzgbprvyjpg1rcsfnyc6whp2p9";}
-  {name="kiten";value="13bcw1r39h0g75vwbyrsh8sb27vmqsbrmx2ay621ily4iy3jn5az";}
-  {name="klettres";value="1wczh41wq3w5ccy2yi4pqr3zk4v0wiy4slcn54a8bfi1b5s1267j";}
-  {name="kmplot";value="0dx5gnya008q7smf74fvygwfsa0hc2ajiznvdmf4qmm3s5bxpbrr";}
-  {name="kolourpaint";value="14zrh321av5f5i8a4bjj7xb1sqfcphzhc5qyg2w54cywaiswy8nx";}
-  {name="konsole";value="1wq2k8g6in86x72jzhz4ar8ba5lyjp0pia969wxa6b1vsj148ipy";}
-  {name="korundum";value="024daf05c9l83whcy0cfgxb3s24ci038kg1pnxlzz4z9sk39432r";}
-  {name="kross-interpreters";value="1kkg4w3id2g7nr89kjdgyy9hik75dnxlm6jmn3g8ilqdvw5ip1qx";}
-  {name="kruler";value="0wd805w2k1ask9l44z50jcd033zkbaxs3xd3w21qrwdvs52x8m41";}
-  {name="ksaneplugin";value="1rxpl6f5b0ld5ap6aag892rjd7r74szbzd6lqw8q8gzm6jmk34gq";}
-  {name="ksnapshot";value="0dn99b6qr4b4hc3c88m26axmb3jim836ig3mfgqpban9r7k15xci";}
-  {name="kstars";value="0zrw4rlfm5cwfbj884zn50sdp90zjg7inl9k2zj450dpvh7i6q3q";}
-  {name="ktouch";value="0vbzr69jbci058bcphf9i3fh40hwgrmcyj1n4gj90gwr4x2ha5hp";}
-  {name="kturtle";value="0mhg2b1jbywafnj93274yimvnaxivycqj98pvld3hppaq32f7vzp";}
-  {name="kwordquiz";value="0kfa83a91w8z39r55456i1vn85pb4dqrbav40sx5fhjb03iyrsdk";}
-  {name="libkdcraw";value="14y8ni9w441zx1k2fhcbnzpa1vcmpvk58mjdqrqvn8n630cy0hzn";}
-  {name="libkdeedu";value="1ga88g5s8mq1m8xwmhl09ylrnl8sw639cpah6wi8wwnqslj2zj0a";}
-  {name="libkexiv2";value="0w8mpjsiw2sr8ya7ffnvnprbsbi8ngpxrcxylgw617zcxpxky6ha";}
-  {name="libkipi";value="01fivyyg5jhnkn9r7bh96ygxvnh7a99h11wh228wk8nzx3i63lsc";}
-  {name="libksane";value="0bb26ajfmknxf4hdy513zx1q9j0hzrs0dr98vxmrwfxxbza67fbm";}
-  {name="marble";value="02yljp6lmqs753zkqpaz58zlrjjxydx9pizppzwjvjx8xk63b9z6";}
-  {name="mobipocket";value="0m08j4cdj2sr1xw3hi0zy651c2ap0q8y9s913r6ccm0f292n0856";}
-  {name="okular";value="03x1fgdnz0s17wj3pkdp77rqrbbb6ssgq0ly493pbi1x4lx768ib";}
-  {name="oxygen-icons";value="0ayx0y2swdcgz4wd1idkhm3gbixkn4mw89f1hrhrdvc6j7wdn2dj";}
-  {name="parley";value="0wgps4adiwaq3l471ig9j56vm7p2xf37779nlhfzavby622lyv8q";}
-  {name="perlkde";value="1psa8ca2ynmavhmbh5p8bgxiljiqj6figi3cmvkaa7ksnmg2p9a3";}
-  {name="perlqt";value="1v12vx46kmg9cgld7krphcqp97y0py1bc3s2gd6jbz5j48g1wznb";}
-  {name="pykde4";value="07c7rzi0rzafrh92m57ldz3v66v8996zqpgcqn351jfycwccg7pz";}
-  {name="qtruby";value="05j08dfqbqnj92k9n70x8yiiaxyk6p9sk3lwm8w8nhsxdciq8yny";}
-  {name="qyoto";value="1maq0c6qb618jiqrdfp4imq3x7x5rdgf80wbrsf8wmaz3iwg18jz";}
-  {name="rocs";value="0qqzfxas64jz95v8i0birbcp0azk01jx5ic6pny7szngwrms6k34";}
-  {name="smokegen";value="0rdaxss113l80gmzp71ngp1l07nn2ip5nhk0a3mmjkvd08i507i8";}
-  {name="smokekde";value="0cxd5y1i672wc295m2czvp5jry1lmvv88dkipd97368gxsqzd3q8";}
-  {name="smokeqt";value="0ll1q87y1sdmna4iac61cm6sn7imsfvcfq573cj7f5raqn08gbpf";}
-  {name="step";value="000a0hc45znshwrjsydrf05f5rwn7lmaiqbk65py827fgk67qkyb";}
-  {name="svgpart";value="056h2ynbl6ylfpf5a2l0qjasnicwx2yzizgd21pprzl9n7708zcw";}
-];
-modules=[
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
-    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
-    { name="kgamma";  }
-    { name="kolourpaint";  }
-    { name="kruler";  }
-    { name="ksaneplugin";  }
-    { name="ksnapshot";  }
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="libkipi";  }
-    { name="libksane";  }
-    { name="mobipocket";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="blinken";  }
-    { name="cantor";  }
-    { name="kalgebra";  }
-    { name="kalzium";  }
-    { name="kanagram";  }
-    { name="kbruch";  }
-    { name="kgeography";  }
-    { name="khangman";  }
-    { name="kig";  }
-    { name="kiten";  }
-    { name="klettres";  }
-    { name="kmplot";  }
-    { name="kstars";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
-    { name="marble";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="kimono";  }
-    { name="korundum";  }
-    { name="kross-interpreters"; sane="kross_interpreters"; }
-    { name="perlkde";  }
-    { name="perlqt";  }
-    { name="pykde4";  }
-    { name="qtruby";  }
-    { name="qyoto";  }
-    { name="smokegen";  }
-    { name="smokekde";  }
-    { name="smokeqt";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-    { name="konsole";  }
-  ];
-}
-{ module="kdeaccessibility";  split=false;
-  pkgs=[
-    { name="kaccessible"; }
-    { name="kmag"; }
-    { name="kmouth"; }
-    { name="kmousetool"; }
-    { name="jovie"; }
-  ];
-
-}
-{ module="kdeadmin";  split=false;
-  pkgs=[
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kuser"; }
-    { name="kcron"; }
-    { name="ksystemlog"; }
-    { name="system-config-printer-kde"; sane="system_config_printer_kde";}
-  ];
-
-}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="sounds"; }
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-    { name="aurorae"; }
-  ];
-
-}
-{ module="kdegames";  split=false;}
-{ module="kdelibs";  split=false;}
-{ module="kdemultimedia";  split=false;}
-{ module="kdenetwork";  split=false;
-  pkgs=[
-    { name="kfile-plugins"; sane="kfile_plugins";}
-    { name="kget"; }
-    { name="kopete"; }
-    { name="krdc"; }
-    { name="kppp"; }
-    { name="krfb"; }
-    { name="kdnssd"; }
-    { name="filesharing"; }
-  ];
-
-}
-{ module="kdepim";  split=false;}
-{ module="kdepimlibs";  split=false;}
-{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
-{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
-{ module="kde-runtime"; sane="kde_runtime"; split=false;}
-{ module="kdesdk";  split=false;
-  pkgs=[
-    { name="cervisia"; }
-    { name="lokalize"; }
-    { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";}
-    { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
-    { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
-    { name="kcachegrind"; }
-    { name="kapptemplate"; }
-    { name="kpartloader"; }
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kioslave"; }
-    { name="okteta"; }
-    { name="kmtrace"; }
-    { name="kompare"; }
-    { name="kprofilemethod"; }
-    { name="kstartperf"; }
-    { name="kuiviewer"; }
-    { name="poxml"; }
-    { name="scripts"; }
-    { name="umbrello"; }
-  ];
-
-}
-{ module="kdetoys";  split=false;
-  pkgs=[
-    { name="kteatime"; }
-    { name="ktux"; }
-    { name="amor"; }
-  ];
-
-}
-{ module="kdeutils";  split=false;
-  pkgs=[
-    { name="ark"; }
-    { name="kcalc"; }
-    { name="kremotecontrol"; }
-    { name="kdf"; }
-    { name="kfloppy"; }
-    { name="printer-applet"; sane="printer_applet";}
-    { name="filelight"; }
-    { name="kcharselect"; }
-    { name="kgpg"; }
-    { name="ktimer"; }
-    { name="kwallet"; }
-    { name="sweeper"; }
-    { name="superkaramba"; }
-  ];
-
-}
-{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
-{ module="kdewebdev";  split=false;
-  pkgs=[
-    { name="klinkstatus"; }
-    { name="kfilereplace"; }
-    { name="kimagemapeditor"; }
-    { name="kommander"; }
-  ];
-
-}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
-{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
-];
-}
diff --git a/pkgs/desktops/kde-4.7/kde-package/default.nix b/pkgs/desktops/kde-4.7/kde-package/default.nix
deleted file mode 100644
index 38713de5820a..000000000000
--- a/pkgs/desktops/kde-4.7/kde-package/default.nix
+++ /dev/null
@@ -1,127 +0,0 @@
-{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
-, release, ignoreList, extraSubpkgs
-}:
-
-let
-  inherit (stdenv.lib) filter fold;
-  inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
-in
-rec {
-  manifest = import (./. + "/${release}.nix");
-
-  # src attribute for $name tarball
-  kdesrc = name: fetchurl {
-    url = "mirror://kde/" + (if manifest.stable then "" else "un")
-      + "stable/${release}/src/${name}-${release}.tar.bz2";
-    sha256 = getAttr name manifest.hashes;
-  };
-
-  # Default meta attribute
-  defMeta = {
-    homepage = http://www.kde.org;
-    inherit (qt4.meta) platforms maintainers;
-  };
-
-  # KDE package built from the whole tarball
-  # This function is used both for monolithic modules and modules which are
-  # released as individual tarballs
-  kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}:
-    stdenv.mkDerivation ({
-      name = "${name}-${release}";
-      src = kdesrc name;
-      meta = defMeta // meta;
-      enableParallelBuilding = true;
-    } // (removeAttrs a [ "meta" "name" ]));
-
-  # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
-  # API.
-  kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
-
-  # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.bz2
-  kdeSubdirPkg = module:
-    {name, subdir ? name, sane ? name}:
-    let name_ = name; in
-    a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}:
-    stdenv.mkDerivation ({
-      name = "${name}-${release}";
-      src = kdesrc module;
-      cmakeFlags =
-        [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
-          "-DBUILD_doc=TRUE"
-          "-DBUILD_${subdir}=TRUE"
-        ] ++ cmakeFlags;
-      meta = defMeta // meta;
-      enableParallelBuilding = true;
-    } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
-
-  # A KDE monolithic module
-  kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
-
-  # Combine packages in one module.
-  # Arguments:
-  #  * pkgFun --- a function of the following signature:
-  #               module: manifest_attrs: manual_attrs: derivation;
-  #  * module --- name of the module
-  #  * pkgs --- list of packages in manifest format
-  combinePkgs = pkgFun: module: pkgs:
-    let
-      f = p@{name, ...}:
-        callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; };
-      list = map f pkgs;
-      attrs = listToAttrs (map
-        ({name, sane ? name, ...}@p: { name = sane; value = f p; })
-        pkgs);
-    in
-      runCommand "${module}-${release}"
-      ({passthru = attrs // {
-         propagatedUserEnvPackages = list;
-         projects = attrs;
-       };})
-        ''
-          mkdir -pv $out/nix-support
-          echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
-        '';
-
-  # Given manifest module data, return the module
-  kdeModule = { module, sane ? module, split, pkgs ? [] }:
-    let
-      pkgs_ = filterPkgs module pkgs;
-    in
-    # Module is splitted by upstream
-    if split then combinePkgs kdeSplittedPkg module pkgs_
-    # Monolithic module
-    else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix")
-    # Module is splitted by us
-    else combinePkgs kdeSubdirPkg module pkgs_;
-
-  # The same, as nameValuePair with sane name
-  kdeModuleNV = a@{ module, sane ? module, ... }:
-    { name = sane; value = kdeModule a; };
-
-  filterPkgs = module: (p:
-      removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p
-      ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs));
-
-  # Remove attrsets with x.name in subst. Optimized for empty subst.
-  removeNames = subst: big:
-    fold (s: out: filter (x: x.name != s) out) big subst;
-
-  modules = listToAttrs (map kdeModuleNV manifest.modules);
-
-  splittedModuleList =
-    let
-      splitted = filter (a: a ? pkgs) manifest.modules;
-      names = map ({module, sane ? module, ...}: sane) splitted;
-    in
-    map (m: m.projects) (stdenv.lib.attrVals names modules);
-
-  individual =
-    stdenv.lib.zipAttrsWith
-    (
-      name: list:
-      if tail list == []
-      then head list
-      else abort "Multiple modules define ${name}"
-    )
-    splittedModuleList;
-}
diff --git a/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
deleted file mode 100755
index 910394fb6a33..000000000000
--- a/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
+++ /dev/null
@@ -1,145 +0,0 @@
-#! /bin/sh
-
-# Usage: download kde release to $dir, then run
-# $0 $dir
-
-dir="$1"
-
-# Detect release number & whether it is a stable release
-if [[ ! -d "${dir}" ]]; then
-  echo "${dir} is not a directory (or doesn't exist)!" >&2
-  exit 1
-fi
-
-release=$(ls "${dir}"/kdelibs-*.tar.bz2 | \
-  sed -e 's/.*kdelibs-//' -e 's/\.tar\.bz2//')
-
-if [[ ${release##*.} -gt 50 ]]; then
-  stable="false"
-else
-  stable="true"
-fi
-
-echo "Detected release ${release}" >&2
-
-declare -A hash
-declare -A modules
-declare -a packages
-declare -a top_level
-
-# xsltproc output declares -A module
-if [[ ! -f kde_projects.xml ]]; then
-  curl -O -J http://projects.kde.org/kde_projects.xml
-fi
-eval `xsltproc kde-submodules.xslt kde_projects.xml`
-
-module[kde-baseapps]=kde-baseapps
-
-print_sane() {
-  echo "Called print_sane $1" >&2
-  sane="${1//[^a-z0-9_]/_}"
-  if [[ "$sane" != "$1" ]]; then
-    echo "Sane version is $sane" >&2
-    echo -n "sane=\"$sane\";"
-  fi
-}
-
-for i in `cd "${dir}"; ls *-${release}.tar.bz2`; do
-  package=${i%-${release}.tar.bz2}
-  packages+=( "$package" )
-  echo -n "${package}.. " >&2
-  hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo -n ${hash[$package]} >&2
-
-  if [ -n "${module[$package]}" ]; then
-    m="${module[$package]}"
-    echo " (${m})" >&2
-    modules[$m]=1
-  else
-    top_level+=( "$package" )
-    echo " (top-level)" >&2
-  fi
-  #nix-store --add-fixed sha256 "${dir}/${i}" >&2
-done
-
-
-print_pkg_hash() {
-  echo "  {name=\"${1}\";value=\"${hash[$1]}\";}"
-}
-
-print_hashes(){
-  echo "hashes=builtins.listToAttrs["
-  for p in "${packages[@]}"; do print_pkg_hash "$p"; done
-  echo "];"
-}
-
-print_split_module(){
-  echo -n "$1:" >&2
-  echo -e "{\n  module=\"$1\";"
-  print_sane "$1"
-  echo "  split=true;"
-  echo "  pkgs=["
-  for p in "${packages[@]}"; do
-    if [[ "${module[$p]}" == "$1" ]]; then
-      echo -n "    { name=\"$p\"; "
-      print_sane "$p"
-      echo " }"
-      echo -n " $p" >&2
-    fi
-  done
-  echo "  ];"
-  echo "}"
-  echo >&2
-}
-
-print_mono_module(){
-  echo -en "{ module=\"$1\"; "
-  print_sane "$1"
-  echo -n "$1 ... " >&2
-  echo -n " split=false;"
-  cml="$1-$release/CMakeLists.txt"
-  tar -xf "${dir}/$1-${release}.tar.bz2" "$cml"
-  if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
-    if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then
-      echo " is monolithic (has unconditionally added subdirs)" >&2
-    else
-      subdirs=( `grep '^[^#]*add_subdirectory' $cml |
-        sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
-        grep -v '\(doc\|cmake\)'` )
-      echo " seems splittable, subdirs: ${subdirs[*]}" >&2
-      echo -e "\n  pkgs=["
-      for s in "${subdirs[@]}"; do
-        echo -en "    {"
-		echo -n " name=\"${s//\//-}\"; "
-        print_sane "$s"
-        if [[ $s != "${s//\//-}" ]]; then
-          echo -n "subdir=\"$s\"; "
-        fi
-        echo "}"
-      done
-      echo -e "  ];\n"
-    fi
-  else
-    echo " is monolithic (has no subdirs)" >&2
-  fi
-  rm $cml
-  rmdir $1-$release
-  echo "}"
-}
-
-print_modules(){
-  echo "modules=["
-  echo "Printing modules splitted by upstream" >&2
-  for m in "${!modules[@]}"; do print_split_module "$m"; done
-  echo >&2
-  echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
-  for m in "${top_level[@]}"; do print_mono_module "$m"; done
-  echo "];"
-}
-
-echo "Writing ${release}.nix" >&2
-exec > "${release}.nix"
-echo "{stable=${stable};"
-print_hashes
-print_modules
-echo "}"
diff --git a/pkgs/desktops/kde-4.7/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.7/kde-package/kde-submodules.xslt
deleted file mode 100644
index 952a05a9d274..000000000000
--- a/pkgs/desktops/kde-4.7/kde-package/kde-submodules.xslt
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- xslt file for http://projects.kde.org/kde_projects.xml -->
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:output method="text" />
-	<xsl:template match="/">
-		<xsl:for-each select="kdeprojects/component[@identifier='kde']">
-			<xsl:text>declare -A module
</xsl:text>
-			<xsl:for-each select="module">
-				<xsl:variable name="module" select='@identifier' />
-				<xsl:for-each select=".//project[repo]">
-					<xsl:text>module["</xsl:text>
-					<xsl:value-of select='@identifier' />
-					<xsl:text>"]="</xsl:text>
-					<xsl:value-of select="$module" />
-					<xsl:text>"
</xsl:text>
-				</xsl:for-each>
-			</xsl:for-each>
-		</xsl:for-each>
-	</xsl:template>
-</xsl:stylesheet>
diff --git a/pkgs/desktops/kde-4.7/kde-runtime.nix b/pkgs/desktops/kde-4.7/kde-runtime.nix
deleted file mode 100644
index b82ec2f66783..000000000000
--- a/pkgs/desktops/kde-4.7/kde-runtime.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
-, libcanberra, virtuoso, samba, ntrack, libjpeg
-}:
-
-kde {
-  buildInputs =
-    [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica
-      samba libcanberra ntrack libjpeg
-    ];
-
-  passthru.propagatedUserEnvPackages = [ virtuoso ];
-
-  meta = {
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kde-wallpapers.nix b/pkgs/desktops/kde-4.7/kde-wallpapers.nix
deleted file mode 100644
index 57f2b643aa4d..000000000000
--- a/pkgs/desktops/kde-4.7/kde-wallpapers.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake }:
-
-kde {
-  nativeBuildInputs = [ cmake ];
-
-  patches = [ ./files/kde-wallpapers-buildsystem.patch ];
-
-  cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
-
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "29f4e8b24435ee8c64affdc6250f59ed9f78445118fe0a4e216d89969dd2006b";
-
-  meta = {
-    description = "Wallpapers for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix
deleted file mode 100644
index 827307029890..000000000000
--- a/pkgs/desktops/kde-4.7/kde-workspace.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies
-, lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate
-, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi
-, pykde4, libjpeg, pkgconfig, libXft, libXxf86misc
-}:
-
-kde {
-
-  buildInputs =
-    [ kdelibs qimageblitz libdbusmenu_qt pykde4 libjpeg libXft libXxf86misc
-      xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
-      xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
-      xorg.libpthreadstubs
-      boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394
-      libusb python libqalculate kdepimlibs pam prison akonadi
-    ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  preConfigure =
-   ''
-     # Fix incorrect path to kde4-config.
-     substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
-
-     # Fix the path to the keyboard configuration files.
-     substituteInPlace kcontrol/keyboard/xkb_rules.cpp \
-       --replace /usr/share/X11 ${xkeyboard_config}/etc/X11
-   '';
-
-  enableParallelBuilding = false;
-  
-  meta = {
-    description = "KDE workspace components such as Plasma, Kwin and System Settings";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/jovie.nix
deleted file mode 100644
index d38c80c4c36a..000000000000
--- a/pkgs/desktops/kde-4.7/kdeaccessibility/jovie.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
-  buildInputs = [ kdelibs speechd ];
-
-  meta = {
-    description = "Text-to-speech synthesis daemon";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/kaccessible.nix
deleted file mode 100644
index 98fae7c983f8..000000000000
--- a/pkgs/desktops/kde-4.7/kdeaccessibility/kaccessible.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
-  buildInputs = [ kdelibs speechd ];
-
-  meta = {
-    description = "Bridge that provides accessibility services to applications";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/kmag.nix
deleted file mode 100644
index f3b27dacf672..000000000000
--- a/pkgs/desktops/kde-4.7/kdeaccessibility/kmag.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Screen magnifier for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix
deleted file mode 100644
index 8e0caa76ed9c..000000000000
--- a/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libXtst, libXt }:
-
-kde {
-  buildInputs = [ kdelibs libXtst libXt ];
-
-  meta = {
-    description = "A program that clicks the mouse for you";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/kmouth.nix
deleted file mode 100644
index 4159501967cd..000000000000
--- a/pkgs/desktops/kde-4.7/kdeaccessibility/kmouth.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A type-and-say front end for speech synthesizers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.7/kdeadmin/kcron.nix
deleted file mode 100644
index bada0c1cb108..000000000000
--- a/pkgs/desktops/kde-4.7/kdeadmin/kcron.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.7/kdeadmin/ksystemlog.nix
deleted file mode 100644
index bada0c1cb108..000000000000
--- a/pkgs/desktops/kde-4.7/kdeadmin/ksystemlog.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.7/kdeadmin/kuser.nix
deleted file mode 100644
index 571674a461ad..000000000000
--- a/pkgs/desktops/kde-4.7/kdeadmin/kuser.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ kde, kdelibs, kdepimlibs }:
-
-kde {
-  buildInputs = [ kdelibs kdepimlibs ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdeadmin/system-config-printer-kde.nix b/pkgs/desktops/kde-4.7/kdeadmin/system-config-printer-kde.nix
deleted file mode 100644
index 2c462f67c159..000000000000
--- a/pkgs/desktops/kde-4.7/kdeadmin/system-config-printer-kde.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ kde, pkgconfig, pythonPackages, sip, pycups, pygobject, system_config_printer,
-  kdelibs, kdepimlibs, pykde4, cups, nettools }:
-
-let s_c_p = system_config_printer.override { withGUI = false; }; in
-kde {
-  buildInputs = [ kdelibs kdepimlibs pythonPackages.python pycups pykde4 sip
-    pygobject s_c_p ];
-
-  passthru = { system_config_printer = s_c_p; };
-
-  preConfigure =
-    ''
-      for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py; do
-        substituteInPlace $i \
-          --replace /usr/share/system-config-printer ${s_c_p}/share/system-config-printer \
-          --replace /usr/bin/cupstestppd ${cups}/bin/cupstestppd \
-          --replace /bin/hostname ${nettools}/bin/hostname
-      done
-    '';
-
-  postInstall =
-    ''
-      # Bake the required Python path into the printer configuration program.
-      res=
-      for i in $(IFS=:; echo $PYTHONPATH); do res="$res''${res:+,} '$i'"; done
-
-      sed -i $out/share/apps/system-config-printer-kde/system-config-printer-kde.py \
-          -e "1 a import sys\nsys.path = [$res] + sys.path"
-
-      mkdir -p $out/nix-support
-      echo ${pykde4} > $out/nix-support/propagated-user-env-packages
-    '';
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.7/kdeartwork/ColorSchemes.nix
deleted file mode 100644
index acccf66976fc..000000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/ColorSchemes.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-color-schemes";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE color schemes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.7/kdeartwork/FindXscreensaver.cmake
deleted file mode 100644
index 499ed75268e9..000000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/FindXscreensaver.cmake
+++ /dev/null
@@ -1,73 +0,0 @@
-#Macro to find xscreensaver directory
-
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT XSCREENSAVER_FOUND)
-  FIND_PATH(XSCREENSAVER_DIR deco
-    HINTS
-      ${KDE4_INCLUDE_DIR}
-    PATHS
-      /usr
-      /usr/local
-      /opt/local
-      /usr/X11R6
-      /opt/kde
-      /opt/kde3
-      /usr/kde
-      /usr/local/kde
-      /usr/local/xscreensaver
-      /usr/openwin/lib/xscreensaver
-      /etc
-    PATH_SUFFIXES
-      lib${LIB_SUFFIX}/xscreensaver
-      lib${LIB_SUFFIX}/misc/xscreensaver
-      lib/xscreensaver
-      lib64/xscreensaver
-      lib/misc/xscreensaver
-      libexec/xscreensaver
-      bin/xscreensaver-hacks
-      hacks)
-  message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
-
-  FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
-    PATHS
-    ${KDE4_INCLUDE_DIR}
-    /usr/
-    /usr/local/
-    /opt/local/
-    /usr/X11R6/
-    /opt/kde/
-    /opt/kde3/
-    /usr/kde/
-    /usr/local/kde/
-    /usr/openwin/lib/xscreensaver/
-    /etc/
-    PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
-  )
-  MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
-
-endif(NOT XSCREENSAVER_FOUND)
-
-#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
-#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
-
-# Need to fix hack
-if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-    set(XSCREENSAVER_FOUND TRUE)
-endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-
-if (XSCREENSAVER_FOUND)
-  if (NOT Xscreensaver_FIND_QUIETLY)
-    message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
-  endif (NOT Xscreensaver_FIND_QUIETLY)
-else (XSCREENSAVER_FOUND)
-  if (Xscreensaver_FIND_REQUIRED)
-    message(FATAL_ERROR "XScreenSaver not found")
-  endif (Xscreensaver_FIND_REQUIRED)
-endif (XSCREENSAVER_FOUND)
-
-
-MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.7/kdeartwork/HighResolutionWallpapers.nix
deleted file mode 100644
index edffca1562e1..000000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/HighResolutionWallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-wallpapers-high-resolution";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE wallpapers in high resolution";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.7/kdeartwork/IconThemes.nix
deleted file mode 100644
index 43071e8bd142..000000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/IconThemes.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kdeartwork-icon-themes";
-
-  # Sources contain primary and kdeclassic as well but they're not installed
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE nuvola and mono icon themes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.7/kdeartwork/WeatherWallpapers.nix
deleted file mode 100644
index 947e5e17ab0c..000000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/WeatherWallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-weather-wallpapers";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE wallpapers (weather)";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/aurorae.nix b/pkgs/desktops/kde-4.7/kdeartwork/aurorae.nix
deleted file mode 100644
index 4bce95217cc6..000000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/aurorae.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "aurorae-themes";
-
-  buildInputs = [ kdelibs ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.7/kdeartwork/desktopthemes.nix
deleted file mode 100644
index 93dd361af738..000000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/desktopthemes.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-desktop-themes";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE desktop themes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.7/kdeartwork/emoticons.nix
deleted file mode 100644
index 5ef9f78a7195..000000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/emoticons.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-emotion-icons";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE emotion icons (smiles)";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix
deleted file mode 100644
index 7028b9db228d..000000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }:
-
-kde {
-  buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
-
-  cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ];
-
-  meta = {
-    description = "KDE screensavers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.7/kdeartwork/kwin-styles.nix
deleted file mode 100644
index b5d769b216db..000000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/kwin-styles.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace ];
-
-  meta = {
-    description = "Styles for KWin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/sounds.nix b/pkgs/desktops/kde-4.7/kdeartwork/sounds.nix
deleted file mode 100644
index e98705da889e..000000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/sounds.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-sounds";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "New login/logout sounds";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/styles.nix b/pkgs/desktops/kde-4.7/kdeartwork/styles.nix
deleted file mode 100644
index 6a1306c37100..000000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/styles.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-style-phase";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Phase, a widget style for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.7/kdeartwork/wallpapers.nix
deleted file mode 100644
index 611c6a70f6bc..000000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/wallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-wallpapers";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE wallpapers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdebindings/pykde-purity.patch b/pkgs/desktops/kde-4.7/kdebindings/pykde-purity.patch
deleted file mode 100644
index dfc2c886bba3..000000000000
--- a/pkgs/desktops/kde-4.7/kdebindings/pykde-purity.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c853e38..5df3253 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -73,7 +73,7 @@ INCLUDE_DIRECTORIES(
-     ${QT_QTWEBKIT_INCLUDE_DIR}
-     ${KDE4_INCLUDE_DIR}
-     ${KDE4_INCLUDE_DIR}/solid
--    ${KDE4_INCLUDE_DIR}/phonon
-+	${PHONON_INCLUDE_DIR}/phonon
-     ${KDE4_INCLUDE_DIR}/kio
-     ${KDE4_INCLUDE_DIR}/kdeprint
-     ${KDE4_INCLUDE_DIR}/kdeprint/lpr
-@@ -232,7 +232,7 @@ _pkg_config = {
-     'pykde_kde_sip_flags':  '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}',
-     'pykde_mod_dir':        '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4',
-     'pykde_modules':        '${PYKDE_MODULES}',
--    'pykde_sip_dir':        '${SIP_DEFAULT_SIP_DIR}/PyKDE4',
-+    'pykde_sip_dir':        '${CMAKE_INSTALL_PREFIX}/share/sip/PyKDE4',
-     'pykde_version':        kde_version_hex,
-     'pykde_version_str':    '${KDE_VERSION}'
- }
-@@ -244,7 +244,7 @@ PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES
- 
- # Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
- # (Don't forget the / at the end of sip/.)
--INSTALL(DIRECTORY sip/ DESTINATION ${SIP_DEFAULT_SIP_DIR}/PyKDE4
-+INSTALL(DIRECTORY sip/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/sip/PyKDE4
-     PATTERN "*~" EXCLUDE    # This sucks, why can't I just whitelist what I _do_ want?
-     PATTERN ".svn" EXCLUDE
-     PATTERN "*.in" EXCLUDE)
-diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt
-index 41fa0fe..642d867 100644
---- a/kpythonpluginfactory/CMakeLists.txt
-+++ b/kpythonpluginfactory/CMakeLists.txt
-@@ -3,7 +3,12 @@
- set(kpythonpluginfactory_SRCS
-     kpythonpluginfactory.cpp)
- 
--GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
-+option(HARDCODE_LIB_PYTHON_PATH "Whether the path to libpython.so should be hardcoded" OFF)
-+if(HARDCODE_LIB_PYTHON_PATH)
-+	get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} REALPATH)
-+else(HARDCODE_LIB_PYTHON_PATH)
-+    get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
-+endif(HARDCODE_LIB_PYTHON_PATH)
- ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\")
- ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000)
- 
diff --git a/pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch b/pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch
deleted file mode 100644
index 96b3b887a8d1..000000000000
--- a/pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-commit 017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
-Author: Luca Beltrame <lbeltrame@kde.org>
-Date:   Mon Oct 1 20:47:56 2012 +0200
-
-    Remove duplicated QVector<int> definition, since it's in PyQt now.
-    Simon, if you have time, please review if everything is OK.
-    
-    CCMAIL: simon@simonzone.com
-
-diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip
-index 5a0a080..73dad01 100644
---- a/sip/kdecore/typedefs.sip
-+++ b/sip/kdecore/typedefs.sip
-@@ -951,77 +951,3 @@ template <TYPE1>
- %End
- };
- 
--%MappedType QVector<int>
--{
--%TypeHeaderCode
--#include <qvector.h>
--%End
--
--%ConvertFromTypeCode
--    // Create the list.
--    PyObject *l;
--
--    if ((l = PyList_New(sipCpp->size())) == NULL)
--        return NULL;
--
--    // Set the list elements.
--    for (int i = 0; i < sipCpp->size(); ++i)
--    {
--        int t = (sipCpp->at(i));
--
--#if PY_MAJOR_VERSION >= 3        
--        PyObject *tobj = PyLong_FromLong(t);
--#else
--        PyObject *tobj = PyInt_FromLong(t);
--#endif
--
--        PyList_SET_ITEM(l, i, tobj);
--    }
--
--    return l;
--%End
--
--%ConvertToTypeCode
--    // Check the type if that is all that is required.
--    if (sipIsErr == NULL)
--    {
--        if (!PyList_Check(sipPy))
--            return 0;
--
--        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
--            PyObject *tobj = PyList_GET_ITEM(sipPy, i);
--#if PY_MAJOR_VERSION >= 3
--            if (!PyNumber_Check(tobj))
--#else
--            if (!PyInt_Check(tobj))
--#endif
--                return 0;
--        }
--        return 1;
--    }
--
--    QVector<int> *qv = new QVector<int>;
-- 
--    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--    {
--        PyObject *tobj = PyList_GET_ITEM(sipPy, i);
-- #if PY_MAJOR_VERSION >= 3
--        int t = PyLong_AsLong (tobj);
--#else
--        int t = PyInt_AS_LONG (tobj);
--#endif
--
--        if (*sipIsErr)
--        {
--            delete qv;
--            return 0;
--        }
--
--        qv->append(t);
--    }
-- 
--    *sipCppPtr = qv;
-- 
--    return sipGetState(sipTransferObj);
--%End
--};
diff --git a/pkgs/desktops/kde-4.7/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.7/kdebindings/pykde4.nix
deleted file mode 100644
index 030f2fb430ac..000000000000
--- a/pkgs/desktops/kde-4.7/kdebindings/pykde4.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies,
-  boost, lndir }:
-
-let pydir = "lib/python${python.majorVersion}"; in
-
-kde {
-  buildInputs = [ python kdepimlibs shared_desktop_ontologies boost ];
-
-  propagatedBuildInputs = [ pyqt4 sip ];
-
-#NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon";
-
-  patches = [ ./pykde-purity.patch ./pykde4-new-sip.patch ];
-
-  cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON";
-
-  preConfigure =
-    ''
-      # Symlink PyQt into PyKDE.  This is necessary because PyQt looks
-      # in its PyQt4/uic/widget-plugins directory for plugins, and KDE
-      # needs to install a plugin.
-      mkdir -pv $out/${pydir}
-      ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
-    '';
-
-  meta = {
-    description = "Python bindings for KDE";
-    kde.name = "pykde4";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.7/kdebindings/smokegen.nix
deleted file mode 100644
index 43f54b552e5a..000000000000
--- a/pkgs/desktops/kde-4.7/kdebindings/smokegen.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, qt4, cmake }:
-
-kde {
-  buildInputs = [ qt4 ];
-  nativeBuildInputs = [ cmake ];
-
-  patchPhase = "sed -e /RPATH/d -i CMakeLists.txt";
-
-  meta = {
-    description = "C++ parser used to generate language bindings for Qt/KDE";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix
deleted file mode 100644
index 29e25093d11b..000000000000
--- a/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, qt4, cmake, phonon, qimageblitz, smokegen }:
-
-kde {
-  propagatedBuildInputs = [ qt4 phonon qimageblitz ];
-  nativeBuildInputs = [ cmake ];
-  propagatedNativeBuildInputs = [ smokegen ];
-
-  meta = {
-    description = "C++ parser used to generate language bindings for Qt/KDE";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/FindLibfacile.cmake b/pkgs/desktops/kde-4.7/kdeedu/FindLibfacile.cmake
deleted file mode 100644
index 617eb4b24676..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/FindLibfacile.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-# - Try to find Libfacile
-# Once done this will define
-#
-#  LIBFACILE_FOUND - system has Libfacile
-#  LIBFACILE_INCLUDE_DIR - the Libfacile include directory
-#  LIBFACILE_LIBRARIES - Link these to use Libfacile
-#
-# Copyright (c) 2006, Carsten Niehaus, <cniehaus@gmx.de>
-# Copyright (c) 2006, Montel Laurent, <montel@kde.org>
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-find_package(OCaml)
-
-if( OCAML_FOUND )
-   find_library(LIBFACILE_LIBRARIES NAMES facile.a
-       HINTS ${OCAMLC_DIR}
-       PATH_SUFFIXES facile ocaml/facile
-   )
-   find_path(LIBFACILE_INCLUDE_DIR NAMES facile.cmi
-       HINTS ${OCAMLC_DIR}
-       PATH_SUFFIXES facile lib/ocaml/facile
-   )
-endif(OCAML_FOUND)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Libfacile DEFAULT_MSG LIBFACILE_INCLUDE_DIR
-	LIBFACILE_LIBRARIES OCAML_FOUND)
-
-# show the LIBFACILE_INCLUDE_DIR and LIBFACILE_LIBRARIES variables only in the advanced view
-mark_as_advanced(LIBFACILE_INCLUDE_DIR LIBFACILE_LIBRARIES )
diff --git a/pkgs/desktops/kde-4.7/kdeedu/blinken.nix b/pkgs/desktops/kde-4.7/kdeedu/blinken.nix
deleted file mode 100644
index cdf9728833c2..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/blinken.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Memory Enhancement Game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/cantor.nix b/pkgs/desktops/kde-4.7/kdeedu/cantor.nix
deleted file mode 100644
index 8b8bbc210c75..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/cantor.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libspectre }:
-kde {
-  buildInputs = [ kdelibs libspectre ];
-
-  meta = {
-    description = "KDE Frontend to Mathematical Software";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.7/kdeedu/kalgebra.nix
deleted file mode 100644
index f1a190332cdc..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kalgebra.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu, readline }:
-kde {
-  buildInputs = [ kdelibs libkdeedu readline ];
-
-  meta = {
-    description = "2D and 3D Graph Calculator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kalzium-feature-log.patch b/pkgs/desktops/kde-4.7/kdeedu/kalzium-feature-log.patch
deleted file mode 100644
index 3c054e8d60ab..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kalzium-feature-log.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-commit d96c6e70400dcd4e3514065e607388b80f96d6a1
-Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
-Date:   Mon Aug 15 00:53:16 2011 +0400
-
-    Display feature log
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 132934c..eec6942 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -47,3 +47,4 @@ add_subdirectory(src)
- add_subdirectory(data)
- add_subdirectory(plasmoid)
- add_subdirectory(libscience)
-+macro_display_feature_log()
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.7/kdeedu/kalzium.nix
deleted file mode 100644
index d7d9b403b1a4..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kalzium.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro }:
-kde {
-  buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ];
-
-  prePatch = ''
-    cp -v ${./FindLibfacile.cmake} cmake/modules/FindLibfacile.cmake
-    sed -e 's/\+facile/''${LIBFACILE_INCLUDE_DIR}/' -i src/CMakeOCamlInstructions.cmake
-    '';
-
-  patches = [ ./kalzium-feature-log.patch ];
-
-  meta = {
-    description = "Periodic Table of Elements";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.7/kdeedu/kanagram.nix
deleted file mode 100644
index 8759c96d78c4..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kanagram.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "Letter Order Game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.7/kdeedu/kbruch.nix
deleted file mode 100644
index dc50f1e85a37..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kbruch.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Practice Fractions";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.7/kdeedu/kgeography.nix
deleted file mode 100644
index bd8d27c8d6e2..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kgeography.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Geography Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/khangman.nix b/pkgs/desktops/kde-4.7/kdeedu/khangman.nix
deleted file mode 100644
index 997b50e906a2..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/khangman.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "KDE hangman game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kig.nix b/pkgs/desktops/kde-4.7/kdeedu/kig.nix
deleted file mode 100644
index bd5ef67529cc..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kig.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, boost, python}:
-kde {
-  buildInputs = [ kdelibs boost python ];
-
-  cmakeFlags = ''
-    -DBOOST_PYTHON_INCLUDES:PATH=${boost}/include;${python}/include/${python.libPrefix}
-    -DBOOST_PYTHON_LIBS=boost_python;${python.libPrefix} -DKIG_ENABLE_PYTHON_SCRIPTING=1
-    '';
-  meta = {
-    description = "KDE Interactive Geometry";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kiten.nix b/pkgs/desktops/kde-4.7/kdeedu/kiten.nix
deleted file mode 100644
index 939b7a9f77a2..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kiten.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Japanese Reference/Study Tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/klettres.nix b/pkgs/desktops/kde-4.7/kdeedu/klettres.nix
deleted file mode 100644
index 7a0fa83078e3..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/klettres.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE alphabet tutorial";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.7/kdeedu/kmplot.nix
deleted file mode 100644
index 18458cf6f0bf..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kmplot.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE mathematical function plotter";
-    kde = {
-      name = "kmplot";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kstars.nix b/pkgs/desktops/kde-4.7/kdeedu/kstars.nix
deleted file mode 100644
index 5b5a2d621de7..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kstars.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, eigen, xplanet, indilib }:
-
-kde {
-  buildInputs = [ kdelibs eigen xplanet indilib ];
-
-  meta = {
-    description = "A KDE graphical desktop planetarium";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.7/kdeedu/ktouch.nix
deleted file mode 100644
index 768be6f4367c..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/ktouch.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Touch Typing Tutor";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.7/kdeedu/kturtle.nix
deleted file mode 100644
index 1e1922b1410d..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kturtle.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Educational Programming Environment";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.7/kdeedu/kwordquiz.nix
deleted file mode 100644
index 1b33ba2e469f..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kwordquiz.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "Flash Card Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.7/kdeedu/libkdeedu.nix
deleted file mode 100644
index def6c85fefe2..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/libkdeedu.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Libraries used by KDE Education applications";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/marble.nix b/pkgs/desktops/kde-4.7/kdeedu/marble.nix
deleted file mode 100644
index 8bd86c91094e..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/marble.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, gpsd }:
-
-kde {
-  buildInputs = [ kdelibs gpsd ];
-
-  meta = {
-    description = "Marble Virtual Globe";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/parley.nix b/pkgs/desktops/kde-4.7/kdeedu/parley.nix
deleted file mode 100644
index eccd40a598f0..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/parley.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkdeedu, libxml2, attica }:
-
-kde {
-  buildInputs = [ kdelibs libkdeedu libxml2 attica ];
-
-  meta = {
-    description = "Vocabulary Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/rocs.nix b/pkgs/desktops/kde-4.7/kdeedu/rocs.nix
deleted file mode 100644
index 91976b840011..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/rocs.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, kdelibs, boost }:
-
-kde {
-  buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) ];
-
-  NIX_CFLAGS_COMPILE = "-fexceptions";
-
-  meta = {
-    description = "A KDE graph theory viewer";
-    kde = {
-      name = "rocs";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/step.nix b/pkgs/desktops/kde-4.7/kdeedu/step.nix
deleted file mode 100644
index fac9974baf18..000000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/step.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, gsl, libqalculate, eigen }:
-
-kde {
-  buildInputs = [ kdelibs gsl libqalculate eigen ];
-
-  meta = {
-    description = "A KDE interactive physical simulator";
-    kde = {
-      name = "step";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegames.nix b/pkgs/desktops/kde-4.7/kdegames.nix
deleted file mode 100644
index dfca49be12fd..000000000000
--- a/pkgs/desktops/kde-4.7/kdegames.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, pykde4,
-  openal, libsndfile, qhull, sqlite, pkgconfig }:
-
-kde rec {
-  buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython
-    openal libsndfile qhull sqlite ] ++ pythonPath;
-
-  pythonPath = [ pythonPackages.twisted pykde4 ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  # TODO: ggz
-
-  postInstall = "wrapPythonPrograms";
-
-  meta = {
-    description = "KDE Games";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix
deleted file mode 100644
index c03c82469e66..000000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi
-, libjpeg, pkgconfig }:
-
-kde {
-
-  buildInputs =
-    [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi libjpeg ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Gwenview, the KDE image viewer";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.7/kdegraphics/kamera.nix
deleted file mode 100644
index 70904b17c232..000000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/kamera.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libgphoto2 }:
-
-kde {
-  buildInputs = [ kdelibs libgphoto2 ];
-
-  meta = {
-    description = "KDE camera interface library";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.7/kdegraphics/kcolorchooser.nix
deleted file mode 100644
index 58528cb186bb..000000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/kcolorchooser.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A small utility to select a color";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-strigi-analyzer.nix
deleted file mode 100644
index 6001a5f363db..000000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-strigi-analyzer.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Strigi analyzers for various graphics file formats";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-thumbnailers.nix
deleted file mode 100644
index 55bf8309b2a9..000000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-thumbnailers.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libkexiv2, libkdcraw }:
-
-kde {
-  buildInputs = [ kdelibs libkexiv2 libkdcraw ];
-
-  meta = {
-    description = "Thumbnailers for various graphics file formats";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.7/kdegraphics/kgamma.nix
deleted file mode 100644
index 28d9252187e0..000000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/kgamma.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libXxf86vm }:
-
-kde {
-  buildInputs = [ kdelibs libXxf86vm ];
-
-  meta = {
-    description = "KDE monitor calibration tool";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.7/kdegraphics/kolourpaint.nix
deleted file mode 100644
index 5276ec09f462..000000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/kolourpaint.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, qimageblitz }:
-
-kde {
-  buildInputs = [ kdelibs qimageblitz ];
-
-  meta = {
-    description = "KDE paint program";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.7/kdegraphics/kruler.nix
deleted file mode 100644
index c5c2c6e05d7c..000000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/kruler.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE screen ruler";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.7/kdegraphics/ksaneplugin.nix
deleted file mode 100644
index 1381ed7dd266..000000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/ksaneplugin.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libksane }:
-
-kde {
-  buildInputs = [ kdelibs libksane ];
-
-  meta = {
-    description = "A KScan plugin that implements the scanning through libksane";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.7/kdegraphics/ksnapshot.nix
deleted file mode 100644
index f01a609e20de..000000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/ksnapshot.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libkipi }:
-
-kde {
-  buildInputs = [ kdelibs libkipi ];
-
-  meta = {
-    description = "KDE screenshot utility";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix
deleted file mode 100644
index 9810a98551ed..000000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libjpeg, lcms1 }:
-
-kde {
-  buildInputs = [ kdelibs libjpeg lcms1 ];
-
-  meta = {
-    description = "Library for decoding RAW images";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.7/kdegraphics/libkexiv2.nix
deleted file mode 100644
index 096b0a6e957b..000000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/libkexiv2.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, exiv2 }:
-
-kde {
-  buildInputs = [ kdelibs exiv2 ];
-
-  meta = {
-    description = "Exiv2 support library";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.7/kdegraphics/libkipi.nix
deleted file mode 100644
index 6b16265e7a3e..000000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/libkipi.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Interface library to kipi-plugins";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.7/kdegraphics/libksane.nix
deleted file mode 100644
index b539eab38992..000000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/libksane.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, saneBackends }:
-
-kde {
-  buildInputs = [ kdelibs saneBackends ];
-
-  meta = {
-    description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix b/pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix
deleted file mode 100644
index 2c2ba3796a2c..000000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, okular }:
-
-kde {
-  buildInputs = [ kdelibs okular ];
-
-  meta = {
-    description = "A collection of plugins to handle mobipocket files";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/okular.nix b/pkgs/desktops/kde-4.7/kdegraphics/okular.nix
deleted file mode 100644
index 0c5c7b49b17d..000000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/okular.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
-, qimageblitz, pkgconfig }:
-
-kde {
-  buildInputs =
-    [ chmlib djvulibre ebook_tools kdelibs libspectre popplerQt4 qca2 qimageblitz pkgconfig ];
-
-  meta = {
-    description = "Okular, the KDE document viewer";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.7/kdegraphics/svgpart.nix
deleted file mode 100644
index a344cc4b4b46..000000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/svgpart.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "SVG KPart";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdelibs.nix b/pkgs/desktops/kde-4.7/kdelibs.nix
deleted file mode 100644
index 41a648d10561..000000000000
--- a/pkgs/desktops/kde-4.7/kdelibs.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ kde, gcc, cmake, perl, aspell
-, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
-, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
-, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
-, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
-, getopt, udev, herqq, phonon, libjpeg, xz
-}:
-
-kde {
-  buildInputs =
-    [ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper
-      libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2
-      shared_desktop_ontologies xz udev libxml2 libjpeg kerberos aspell
-    ];
-
-  propagatedBuildInputs = [ qt4 soprano strigi phonon ];
-
-  propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ];
-
-  # TODO: make sonnet plugins (dictionaries) really work.
-  # There are a few hardcoded paths.
-  # Let kdelibs find openexr
-  # Split plugins from libs?
-
-  patches = [ ./files/polkit-install.patch ];
-
-  # cmake fails to find acl.h because of C++-style comment
-  # TODO: OpenEXR
-  cmakeFlags = [
-    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
-    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
-  ];
-
-  meta = {
-    description = "KDE libraries";
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdemultimedia.nix b/pkgs/desktops/kde-4.7/kdemultimedia.nix
deleted file mode 100644
index 4c3182dd9fe7..000000000000
--- a/pkgs/desktops/kde-4.7/kdemultimedia.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, alsaLib, libvorbis, taglib, flac, cdparanoia, lame, kdelibs, ffmpeg,
-  libmusicbrainz3, libtunepimp, pulseaudio }:
-
-kde {
-
-  buildInputs =
-    # Note: kdemultimedia can use xine-lib, but it doesn't seem useful
-    # without the Phonon Xine backend.
-    [ kdelibs cdparanoia taglib libvorbis libmusicbrainz3 libtunepimp ffmpeg
-      flac lame pulseaudio
-    ];
-
-  meta = {
-    description = "KDE multimedia programs such as a movie player and volume utility";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/FindmsiLBC.cmake b/pkgs/desktops/kde-4.7/kdenetwork/FindmsiLBC.cmake
deleted file mode 100644
index c40b0bed3105..000000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/FindmsiLBC.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# cmake macro to test msiLBC
-
-# Copyright (c) 2009-2010 Pali Rohár <pali.rohar@gmail.com>
-#
-# MSILBC_FOUND
-# MSILBC_LIBRARY
-
-include ( FindPackageHandleStandardArgs )
-
-if ( MSILBC_LIBRARY )
-	set ( MSILBC_FOUND true )
-	set ( msiLBC_FIND_QUIETLY true )
-else ( MSILBC_LIBRARY )
-	find_library ( MSILBC_LIBRARY NAMES msilbc
-		PATH_SUFFIXES mediastreamer/plugins)
-endif ( MSILBC_LIBRARY )
-
-find_package_handle_standard_args ( msiLBC DEFAULT_MSG MSILBC_LIBRARY )
-mark_as_advanced ( MSILBC_LIBRARY )
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/filesharing.nix b/pkgs/desktops/kde-4.7/kdenetwork/filesharing.nix
deleted file mode 100644
index 2f32f4d6b2cd..000000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/filesharing.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kdenetwork.patch b/pkgs/desktops/kde-4.7/kdenetwork/kdenetwork.patch
deleted file mode 100644
index ebadbfad9bac..000000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/kdenetwork.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -r -u kdenetwork-4.7.1.orig/CMakeLists.txt kdenetwork-4.7.1/CMakeLists.txt
---- kdenetwork-4.7.1.orig/CMakeLists.txt	2011-03-29 15:25:42.174521812 +0400
-+++ kdenetwork-4.7.1/CMakeLists.txt	2011-03-29 15:27:43.268140322 +0400
-@@ -28,7 +28,8 @@
-    set(CMAKE_REQUIRED_INCLUDES  ${KDEWIN_INCLUDES} )
- endif (WIN32)
- 
--find_package(KdepimLibs REQUIRED)
-+macro_optional_find_package(KdepimLibs)
-+macro_log_feature(KDEPIMLIBS_FOUND "KDEPimLibs" "KDE pim-related libraries" "http://pim.kde.org.org/" FALSE "" "Required for Kopete")
- # find_package(X11VidMode) not used at this time
- 
- # NX support is not ready for KDE 4.2; disabled (uwolfer)
-@@ -79,7 +80,9 @@
- macro_optional_add_subdirectory(kfile-plugins)
- macro_optional_add_subdirectory(kget)
- 
--macro_optional_add_subdirectory(kopete)
-+if(KDEPIMLIBS_FOUND)
-+  macro_optional_add_subdirectory(kopete)
-+endif(KDEPIMLIBS_FOUND)
- 
- if(Q_WS_X11)
-   macro_optional_add_subdirectory(krdc)
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kdnssd.nix b/pkgs/desktops/kde-4.7/kdenetwork/kdnssd.nix
deleted file mode 100644
index 2f32f4d6b2cd..000000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/kdnssd.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kfile-plugins.nix b/pkgs/desktops/kde-4.7/kdenetwork/kfile-plugins.nix
deleted file mode 100644
index f90fd3560796..000000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/kfile-plugins.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, boost }:
-
-kde {
-  name = "strigi-analyzer-torrent";
-
-  buildInputs = [ kdelibs boost ];
-
-  preConfigure = "mv -v strigi-analyzer kfile-plugins";
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kget.nix b/pkgs/desktops/kde-4.7/kdenetwork/kget.nix
deleted file mode 100644
index 2381a2459e60..000000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/kget.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, sqlite
-, shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }:
-
-kde {
-  buildInputs =
-    [ kdelibs libktorrent kde_workspace shared_desktop_ontologies kdepimlibs
-      kde_baseapps gpgme boost libmms qca2 sqlite
-    ];
-
-  KDEDIRS = libktorrent;
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix
deleted file mode 100644
index 440e8595704a..000000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
-  jasper, libidn, mediastreamer, msilbc, pkgconfig, libxml2, libxslt, giflib,
-  libgadu, boost, qca2, gpgme, sqlite }:
-
-kde {
-  buildInputs = [ kdelibs speex libmsn libotr kdepimlibs qimageblitz libktorrent
-    jasper libidn mediastreamer msilbc libxml2 libxslt giflib libgadu boost qca2
-    gpgme sqlite ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  KDEDIRS = libktorrent;
-
-  patchPhase = "cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake";
-
-  cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];
-
-  meta = {
-    description = "A KDE multi-protocol IM client";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.7/kdenetwork/kppp.nix
deleted file mode 100644
index 2f32f4d6b2cd..000000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/kppp.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix
deleted file mode 100644
index 40ef91d54339..000000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libvncserver, libjpeg }:
-
-kde {
-  buildInputs = [ kdelibs libvncserver libjpeg ];
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.7/kdenetwork/krfb.nix
deleted file mode 100644
index 80013f430d3c..000000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/krfb.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libvncserver, libXdamage, libXtst }:
-
-kde {
-  buildInputs = [ kdelibs libvncserver libXdamage libXtst];
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdepim-runtime.nix b/pkgs/desktops/kde-4.7/kdepim-runtime.nix
deleted file mode 100644
index ef637f3f075b..000000000000
--- a/pkgs/desktops/kde-4.7/kdepim-runtime.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, fetchurl, cmake, kdelibs, libxml2, libxslt, boost, kdepimlibs, akonadi
-, shared_desktop_ontologies }:
-
-kde {
-  buildInputs = [ kdepimlibs akonadi boost shared_desktop_ontologies libxml2
-    libxslt ];
-
-  meta = {
-    description = "KDE PIM runtime";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdepim.nix b/pkgs/desktops/kde-4.7/kdepim.nix
deleted file mode 100644
index 9b95d491a447..000000000000
--- a/pkgs/desktops/kde-4.7/kdepim.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kde, boost, gpgme, libassuan, libxml2, libxslt, kdepimlibs, kdepim_runtime
-, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee }:
-
-kde {
-
-  buildInputs =
-    [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2
-      libxslt cyrus_sasl gpgme libassuan grantlee
-    ];
-
-  passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ];
-
-  meta = {
-    description = "KDE PIM tools";
-    longDescription = ''
-      Contains various personal information management tools for KDE, such as an organizer.
-    '';
-    license = "GPL";
-    homepage = http://pim.kde.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdepimlibs.nix b/pkgs/desktops/kde-4.7/kdepimlibs.nix
deleted file mode 100644
index 736508eaf0f3..000000000000
--- a/pkgs/desktops/kde-4.7/kdepimlibs.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
-, kdelibs, akonadi, shared_desktop_ontologies, libxml2, libxslt, prison }:
-
-kde {
-  buildInputs =
-    [ boost gpgme shared_desktop_ontologies libical libxml2 libxslt
-      openldap cyrus_sasl akonadi prison
-    ];
-
-  propagatedBuildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE PIM libraries";
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeplasma-addons.nix b/pkgs/desktops/kde-4.7/kdeplasma-addons.nix
deleted file mode 100644
index 30a32b465b60..000000000000
--- a/pkgs/desktops/kde-4.7/kdeplasma-addons.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
-, boost, eigen, kde_workspace, attica, python, qca2, qimageblitz
-, kdepimlibs, libkexiv2, libqalculate, libXtst }:
-# TODO: qwt, scim
-
-kde {
-
-  KDEDIRS=marble;
-
-  buildInputs = [ kdelibs boost eigen kde_workspace
-    attica python qca2 qimageblitz kdepimlibs
-    libqalculate libXtst shared_desktop_ontologies marble libkexiv2];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "KDE Plasma Addons";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.7/kdesdk/cervisia.nix
deleted file mode 100644
index 1dabe46cd429..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/cervisia.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE CVS frontend";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-git.nix b/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-git.nix
deleted file mode 100644
index df4a0856c6b0..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-git.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-  # Needs kdebase for libkonq
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  meta = {
-    description = "Git plugin for dolphin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-svn.nix b/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-svn.nix
deleted file mode 100644
index 8032b89ff54c..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-svn.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-  # Needs kdebase for libkonq
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  meta = {
-    description = "Svn plugin for dolphin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/find-svn.patch b/pkgs/desktops/kde-4.7/kdesdk/find-svn.patch
deleted file mode 100644
index 61cb49b308f2..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/find-svn.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/cmake/modules/FindSVN.cmake b/cmake/modules/FindSVN.cmake
-index 59bcb96..2eac05d 100644
---- a/cmake/modules/FindSVN.cmake
-+++ b/cmake/modules/FindSVN.cmake
-@@ -17,6 +17,9 @@ FIND_PROGRAM(SVNCONFIG_EXECUTABLE NAMES svn-config PATHS
- FIND_PROGRAM(APRCONFIG_EXECUTABLE NAMES apr-1-config apr-config PATHS
-    /usr/local/apr/bin
- )
-+find_program(APUCONFIG_EXECUTABLE NAMES apu-1-config apu-config PATHS
-+   /usr/local/apr/bin
-+)
- 
- if(SVNCONFIG_EXECUTABLE)
- 
-@@ -56,15 +59,9 @@ else(SVNCONFIG_EXECUTABLE)
-       set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-    else(APRCONFIG_EXECUTABLE)
-       FIND_PATH(_INCLUDES apr_pools.h
--         ${SVN_INCLUDES}/apr-0/
--         ${SVN_INCLUDES}/apr-1/
--         ${SVN_INCLUDES}/apr-1.0/
--         /usr/include/apr-0/
--         /usr/include/apr-1/
--         /usr/include/apr-1.0/
--         /usr/local/include/apr-0/
--         /usr/local/include/apr-1/
--         /usr/local/include/apr-1.0/
-+         HINTS ${SVN_INCLUDES}
-+         PATHS /usr /usr/local
-+         SUFFIXES apr-0 apr-1 apr-1.0
-       )
-       if(_INCLUDES)
-          set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-@@ -72,6 +69,25 @@ else(SVNCONFIG_EXECUTABLE)
-          set(SVN_FOUND FALSE) # no apr == can't compile!
-       endif(_INCLUDES)
-    endif(APRCONFIG_EXECUTABLE)
-+
-+   # Use apu-config if it exists
-+   if(APUCONFIG_EXECUTABLE)
-+      EXEC_PROGRAM(${APUCONFIG_EXECUTABLE} ARGS --includes RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _INCLUDES)
-+      string(REPLACE "-I" "" _INCLUDES ${_INCLUDES})
-+      string(REPLACE " " ";" _INCLUDES ${_INCLUDES})
-+      set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-+   else(APUCONFIG_EXECUTABLE)
-+      FIND_PATH(_INCLUDES apu.h
-+         HINTS ${SVN_INCLUDES}
-+         PATHS /usr /usr/local
-+         SUFFIXES apr-0 apr-1 apr-1.0
-+      )
-+      if(_INCLUDES)
-+         set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-+      else(_INCLUDES)
-+         set(SVN_FOUND FALSE) # no apr == can't compile!
-+      endif(_INCLUDES)
-+   endif(APUCONFIG_EXECUTABLE)
-    FIND_LIBRARY(SVN_LIBRARIES NAMES svn_client-1)
-    if(SVN_LIBRARIES)
-       FIND_LIBRARY(_LIBRARIES NAMES svn_subr-1)
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.7/kdesdk/kapptemplate.nix
deleted file mode 100644
index 391536248dd3..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kapptemplate.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE 4 project template generator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.7/kdesdk/kcachegrind.nix
deleted file mode 100644
index 65d410cca48d..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kcachegrind.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Frontend for Callgrind/Cachegrind";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kdeaccounts-plugin.nix b/pkgs/desktops/kde-4.7/kdesdk/kdeaccounts-plugin.nix
deleted file mode 100644
index 7e170ca2a2c2..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kdeaccounts-plugin.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kdepimlibs }:
-
-kde {
-  buildInputs = [ kdelibs kdepimlibs ];
-
-  meta = {
-    description = "KDE accounts akonadi agent";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.7/kdesdk/kioslave-perldoc.nix
deleted file mode 100644
index 6a10bdf7c4bc..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kioslave-perldoc.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, perl }:
-
-kde {
-  buildInputs = [ kdelibs perl ];
-
-  cmakeFlags = [ "-DBUILD_perldoc=ON" ];
-
-  meta = {
-    description = "perldoc: kioslave";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix b/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix
deleted file mode 100644
index db0bd27094b5..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, subversionClient, apr, aprutil }:
-
-kde {
-  buildInputs = [ kdelibs subversionClient apr aprutil ];
-
-  patches = [ ./find-svn.patch ];
-
-  meta = {
-    description = "Subversion kioslave";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kmtrace.nix b/pkgs/desktops/kde-4.7/kdesdk/kmtrace.nix
deleted file mode 100644
index d580f7fb6911..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kmtrace.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, gcc }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
-
-  meta = {
-    description = "KDE mtrace-based malloc debugger";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kompare.nix b/pkgs/desktops/kde-4.7/kdesdk/kompare.nix
deleted file mode 100644
index 1ddb4b8ea5b9..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kompare.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A program to view the differences between files and optionally generate a diff";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kpartloader.nix b/pkgs/desktops/kde-4.7/kdesdk/kpartloader.nix
deleted file mode 100644
index e7790d33c90c..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kpartloader.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A test application for KParts";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kprofilemethod.nix b/pkgs/desktops/kde-4.7/kdesdk/kprofilemethod.nix
deleted file mode 100644
index 5a6693f2f5d8..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kprofilemethod.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A macro for profiling using QTime";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kstartperf.nix b/pkgs/desktops/kde-4.7/kdesdk/kstartperf.nix
deleted file mode 100644
index 0c8259cd31f5..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kstartperf.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libtool }:
-
-kde {
-  buildInputs = [ kdelibs libtool ];
-
-  meta = {
-    description = "Measures start up time of a KDE application";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kuiviewer.nix b/pkgs/desktops/kde-4.7/kdesdk/kuiviewer.nix
deleted file mode 100644
index 7c5089dcd37f..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kuiviewer.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Displays Qt Designer's UI files";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.7/kdesdk/lokalize.nix
deleted file mode 100644
index 1565426eb1fc..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/lokalize.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, hunspell }:
-
-kde {
-  buildInputs = [ kdelibs hunspell ];
-
-  meta = {
-    description = "KDE 4 Computer-aided translation system";
-    longDescription = ''
-      Computer-aided translation system.
-      Do not translate what had already been translated.
-    '';
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/okteta.nix b/pkgs/desktops/kde-4.7/kdesdk/okteta.nix
deleted file mode 100644
index 1b53a0e03dc4..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/okteta.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, qca2 }:
-
-kde {
-  buildInputs = [ kdelibs qca2 ];
-
-# TODO: Look what does -DBUILD_mobile add
-
-  meta = {
-    description = "KDE byte editor";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/poxml.nix b/pkgs/desktops/kde-4.7/kdesdk/poxml.nix
deleted file mode 100644
index 1ab9ed49df56..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/poxml.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, antlr }:
-
-kde {
-  buildInputs = [ kdelibs antlr ];
-
-  meta = {
-    description = "Po<->xml tools";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/scripts.nix b/pkgs/desktops/kde-4.7/kdesdk/scripts.nix
deleted file mode 100644
index df81145e5d60..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/scripts.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Various scripts to ease KDE development";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/strigi-analyzer.nix b/pkgs/desktops/kde-4.7/kdesdk/strigi-analyzer.nix
deleted file mode 100644
index 0ad48c8cfdee..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/strigi-analyzer.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Strigi analyzers for diff, po and ts";
-    kde = {
-      name = "strigi-analyzer";
-      module = "kdesdk";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.7/kdesdk/umbrello.nix
deleted file mode 100644
index e83a2d9a901b..000000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/umbrello.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt, boost }:
-
-kde {
-  buildInputs = [ kdelibs libxml2 libxslt boost ];
-
-  meta = {
-    description = "Umbrello UML modeller";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdetoys/amor.nix b/pkgs/desktops/kde-4.7/kdetoys/amor.nix
deleted file mode 100644
index 936d63d544a9..000000000000
--- a/pkgs/desktops/kde-4.7/kdetoys/amor.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE creature for your desktop";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.7/kdetoys/kteatime.nix
deleted file mode 100644
index dacf54def4b0..000000000000
--- a/pkgs/desktops/kde-4.7/kdetoys/kteatime.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE utility for making a fine cup of tea";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdetoys/ktux.nix b/pkgs/desktops/kde-4.7/kdetoys/ktux.nix
deleted file mode 100644
index 108f9be7c722..000000000000
--- a/pkgs/desktops/kde-4.7/kdetoys/ktux.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace ];
-
-  meta = {
-    description = "Tux Screen Saver";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/ark.nix b/pkgs/desktops/kde-4.7/kdeutils/ark.nix
deleted file mode 100644
index 7fbdaf586d66..000000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/ark.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libarchive, bzip2, kde_baseapps }:
-
-kde {
-  buildInputs = [ kdelibs kde_baseapps libarchive bzip2 ];
-
-  meta = {
-    description = "KDE Archiving Tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/filelight.nix b/pkgs/desktops/kde-4.7/kdeutils/filelight.nix
deleted file mode 100644
index 25ecabed27ce..000000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/filelight.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Tool to visualise file and directory sizes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.7/kdeutils/kcalc.nix
deleted file mode 100644
index 08b202e8f0e8..000000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/kcalc.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, gmp }:
-
-kde {
-  buildInputs = [ kdelibs gmp ];
-
-  meta = {
-    description = "KDE Calculator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.7/kdeutils/kcharselect.nix
deleted file mode 100644
index d4c9c06f483d..000000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/kcharselect.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE character selection utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/kdf.nix b/pkgs/desktops/kde-4.7/kdeutils/kdf.nix
deleted file mode 100644
index 3f9da58d0a62..000000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/kdf.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE free disk space utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.7/kdeutils/kfloppy.nix
deleted file mode 100644
index 2434a4fa671f..000000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/kfloppy.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Floppy disk formatting utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.7/kdeutils/kgpg.nix
deleted file mode 100644
index f3b00a5b968c..000000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/kgpg.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kdepimlibs }:
-
-kde {
-  buildInputs = [ kdelibs kdepimlibs ];
-
-  meta = {
-    description = "Simple KDE GUI for GPG";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix
deleted file mode 100644
index fef516e478d3..000000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace, libXtst }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace libXtst ];
-
-  meta = {
-    description = "KDE remote control";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.7/kdeutils/ktimer.nix
deleted file mode 100644
index 5700977349e3..000000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/ktimer.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Timer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/kwallet.nix b/pkgs/desktops/kde-4.7/kdeutils/kwallet.nix
deleted file mode 100644
index 9ec0e6c0396c..000000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/kwallet.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Wallet (password storage) management tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/printer-applet.nix b/pkgs/desktops/kde-4.7/kdeutils/printer-applet.nix
deleted file mode 100644
index 2d937b3a4db7..000000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/printer-applet.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ kde, kdelibs
-, pythonPackages, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer
-, pythonDBus, makeWrapper }:
-
-let s_c_p = system_config_printer.override { withGUI = false; }; in
-
-kde rec {
-  buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython
-    ] ++ pythonPath;
-
-  pythonPath = [ pyqt4 pykde4 pycups s_c_p ];
-
-  passthru.propagatedUserEnvPackages = [ s_c_p ];
-
-  postInstall =
-    ''
-      wrapPythonPrograms
-
-      # ‘system-config-printer’ supplies some D-Bus policy that we need.
-      mkdir -p $out/nix-support
-      echo ${s_c_p} > $out/nix-support/propagated-user-env-packages
-    '';
-
-  meta = {
-    description = "KDE printer applet";
-    longDescription = "Applet to view current print jobs and configure new printers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.7/kdeutils/superkaramba.nix
deleted file mode 100644
index 4dce768078ba..000000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/superkaramba.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, qimageblitz }:
-
-kde {
-  buildInputs = [ kdelibs qimageblitz ];
-
-  cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ];
-
-  meta = {
-    description = "A KDE Eye-candy Application";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.7/kdeutils/sweeper.nix
deleted file mode 100644
index 78d56c7df30e..000000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/sweeper.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Helps clean unwanted traces the user leaves on the system";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.7/kdewebdev/kfilereplace.nix
deleted file mode 100644
index c3f6129d7e5c..000000000000
--- a/pkgs/desktops/kde-4.7/kdewebdev/kfilereplace.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt }:
-
-kde {
-  buildInputs = [ kdelibs libxml2 libxslt ];
-
-  meta = {
-    description = "Batch search and replace tool";
-    homepage = http://www.kdewebdev.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.7/kdewebdev/kimagemapeditor.nix
deleted file mode 100644
index bececea7797e..000000000000
--- a/pkgs/desktops/kde-4.7/kdewebdev/kimagemapeditor.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt }:
-
-kde {
-  buildInputs = [ kdelibs libxml2 libxslt ];
-
-  meta = {
-    description = "An HTML imagemap editor";
-    homepage = http://www.nongnu.org/kimagemap/;
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.7/kdewebdev/klinkstatus.nix
deleted file mode 100644
index 94adbb7fd6e0..000000000000
--- a/pkgs/desktops/kde-4.7/kdewebdev/klinkstatus.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt, kdepimlibs
-, boost, htmlTidy }:
-
-kde {
-  buildInputs =
-    [ kdelibs libxml2 libxslt kdepimlibs boost htmlTidy ];
-
-  meta = {
-    description = "A KDE link checker";
-    homepage = http://klinkstatus.kdewebdev.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.7/kdewebdev/kommander.nix
deleted file mode 100644
index 6a870e563033..000000000000
--- a/pkgs/desktops/kde-4.7/kdewebdev/kommander.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt }:
-
-kde {
-  buildInputs = [ kdelibs libxml2 libxslt ];
-
-  meta = {
-    description = "A graphical editor of scripted dialogs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/l10n/default.nix b/pkgs/desktops/kde-4.7/l10n/default.nix
deleted file mode 100644
index 69cfdcf8ab22..000000000000
--- a/pkgs/desktops/kde-4.7/l10n/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
-
-let
-
-  inherit (stdenv.lib) attrByPath singleton;
-
-  kdeL10nDerivation =
-    { lang, saneName, sha256 }:
-
-    stdenv.mkDerivation rec {
-      name = "kde-l10n-${saneName}-${release}";
-
-      src = fetchurl {
-        url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
-        name = "${name}.tar.bz2";
-        inherit sha256;
-      };
-
-      buildInputs = [ gettext kdelibs ];
-
-      cmakeFlags = "-Wno-dev";
-
-      meta = {
-        description = "KDE translation for ${lang}";
-        license = "GPL";
-        inherit (kdelibs.meta) maintainers platforms homepage;
-      };
-    };
-
-  kdeL10nRelease =
-    builtins.listToAttrs (
-      map ({lang, saneName, sha256}:
-        {
-          name = saneName;
-          value = kdeL10nDerivation { inherit lang saneName sha256; };
-        }
-      ) (import (./manifest + "-${release}.nix"))
-    );
-
-in
-{
-  inherit kdeL10nDerivation;
-  recurseForDerivations = true;
-} // kdeL10nRelease
diff --git a/pkgs/desktops/kde-4.7/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.7/l10n/l10n-manifest.sh
deleted file mode 100755
index cc0eec20aaaf..000000000000
--- a/pkgs/desktops/kde-4.7/l10n/l10n-manifest.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# Usage: download kde-l10n to $dir, then run
-# $0 $dir
-
-dir=$1
-
-if [[ ! -d "${dir}" ]]; then
-  echo "${dir} is not a directory (or doesn't exist)!" >&2
-  exit 1
-fi
-
-release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.bz2 | \
-	sed -e 's/.*en_GB-//' -e 's/\.tar\.bz2//')
-
-echo "Detected release ${release}" >&2
-
-exec > "manifest-${release}.nix"
-echo "["
-for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.bz2`; do
-  lang=${i%-${release}.tar.bz2}
-  lang=${lang#kde-l10n-}
-  echo -n "${lang}.. " >&2
-  hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo "{"
-  echo "  lang = \"${lang}\";"
-  echo "  saneName = \"$(echo $lang | sed s^@^_^g)\";"
-  echo "  sha256 = \"${hash}\";"
-  echo "}"
-  echo $hash >&2
-done
-echo "]"
diff --git a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix
deleted file mode 100644
index a128ff8dc622..000000000000
--- a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix
+++ /dev/null
@@ -1,267 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "1iw8x8k31jrgqc8nq276iwca1dgicz9vcx58rfbnk924dvqrflpv";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "07i4s6jkfkw59mr5n4256rzwy64y1c5wy957jbvnidqcrpzh1azf";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "080svc26zqf45wra6d6ljxzgs8f6gzl567wm73yp5qrgqnvyvxir";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "04fz56hsrpl6mxsbw5ja7armf8zbib542d7iv4p4c87xncib13qj";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "01mi1d6yz5w122bcjzp3r8g70pzil6216sv2y2dxaqjlxpdllklp";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "0l1rwx1k0vpkfc52divm5cnwxr05mwcl1sr84mi24s2ygs6rk8ib";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "1r2pzkvs1rc8hfzi5q0p6drvkl1ykq89bzi3k73i3fghx42qdxv6";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "100589wkw5rdcihk1nwl4i0bc30bq3b289n03q9lgf8zadflrrg9";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "0q41lpkf8srjxrrcnw9c7rkc83m4jw3r7z6s8x9rn0d5h2l36gv8";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "0mmvr3fh51r958myc18nxvl7d8hsm4wl70vmac3a3w47mr9aayqi";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "11k8svvnph9431maxdhzr334h7h11jk681fb2z1hb7i6cprmac9f";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "0pvjfkh93avkg9dii5byjh3kiqcgax9dfw97jmy6qccicgq6frvd";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "0gnnr7nyxjrzf632zs1k3j4bss3gm5qadfm2jki41y9q1f82vy99";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "0mfrmqn1yiqrgq79bgbb8799myv5h30g1gr83xja9g9y0lb645bs";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "03d6xbc7h9gslzvx1q7lcb8bfr5w8809jfb6cn4zv36in593wq85";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "13m7rdz2gd1cag2x6hfzyv8xj5777fly5f9pyhr28hrafyqc44l5";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "1ryimhlddxwaa40si3j0id37xm845ybsfkck0i7x2kmg87a55wcz";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "01v4vkbyhbsv64z7mnj129ss1rnr00n19iiza0ivjzsbzryhh3p2";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "0s2a4nc3z03xj8za426arwr1cjqqcd6pq82lc9q0kiv2fpxgagxw";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "0sv4fsnnnnpnf14s7fv83g9kzqq31gl0647cy523xkyxpdwhj9hp";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "0k9gzxiyplvk78nqk3kmqh74lani6iqciyighii1m0cvylq5sljz";
-}
-{
-  lang = "id";
-  saneName = "id";
-  sha256 = "16l4wif0qsmvpikagkhfyh98wdss4w0imixnzawadx0jq5mac6ga";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "1g5pan1iy2mx43z5gxvp07n3a9yrc56y4pya2r9g6wjnzcp0ynbj";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "0p0grhjx04khqmih8gmlpgjazr8asv7ql1gj965sjaf8a6z1h5ar";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "1f6ig8x3siqww4bwldpgncpyhlmkf6hbd6ahlvd5dqn6hqpknygx";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "0kyhr0b5g842dds59l3rcvyq3n12xx11svcqbqhiqqm3a8qki9vi";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "02ss6rxqf71n06a769l0xky30nhyqdhhsad9lmxs0dbbnxdcnixr";
-}
-{
-  lang = "kn";
-  saneName = "kn";
-  sha256 = "0rk193a27hvh63lfb7yy8g0wxb05kymyqnhdxcmai3wk2n53bi9y";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "0wyplpkkq6mdm5k7jxxppwgrm4rrb5mbhagszg1y460rcx7d5vcm";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "08767csx7sq02jkkrdl16jj7jprqc3qbsz7vdcwli3274qjkdk9s";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "0f4mxjsg2ipsj57ki26n870zxnk28z9ayblzgmv821xiawjaa4gc";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "1myb1b4p849nvb4q2n5hcy5fsfb4zdvhc5vkwa2giiy0pv230cmm";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "1vm6fjac0aaxls0rlgz4s804kbarj1rzyli50dzfcfqwngzkckxk";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "02v0cscngl7wfsl7yc2xr1a593qq064spgk1ynzad1rz1g98z212";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "01s1kfp5x036hcpyl87qzqjlmjwp8hda3qplnj3inihias2cnvb7";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "0al2lwvj23rp1plg2ykakbgw6qzxkkd5pd2nqdfnaif9xq9fp9db";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "08fffsaay01dnbs7bg3w325bknjcfbp3f1ryrdy2g7w2achyakls";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "03klc7q1h0xxc43vqw2m87n4wzxg140ql7mlzrjsrdnqgx2pvch4";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "1g4nd48fzfxam8zsi0imw57lhjm7i7qifqmy53s7pfr4cmq4fbw5";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "112pj6bi1bagafh89322mdj8ynmljv0ry7z2zss4ljfhqxxndc6b";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "1i4fx5mrz9910wkfgi885gjafcspnk8nyx7cimkvnp6y2xwpl733";
-}
-{
-  lang = "si";
-  saneName = "si";
-  sha256 = "0h77cqi9cmzni4mn7k91ar56b9ph8dlyagn29wd958hpkxwbdqiw";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "1q8bxlaah7afs12ni8xpjj6nlxjmxfpzabavm7ixqwnn4l732vyn";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "0508w2k4g7f9dm0ds28h5hhxd5qc4w16zxqskygrs6144567hb0c";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "0bvbzah338bh8vnn2ppakd8zb49vcc7d95ahyahrkqc4ls5z60sv";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "1glgb7shn3qlszayyc11wjhbc5g29agq2rlwf45drk2b5fi2m8bn";
-}
-{
-  lang = "th";
-  saneName = "th";
-  sha256 = "0g3pgrsb3d33295nw45y0a318yb4bvld46xvjsd3ay8hxpxrf4yy";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "02k1jakxwj5zp0z7x8yrjrl17syzv6rfyscal6af5bavjsx99kxp";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "0wq1jlxwz2avqzb9yqnck69qkfy3q7cq76i2jadbfdvwk06w44bi";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "0813bmgi9k3kx2k8rl8h1l9p6zcnabk36p7nm8v9vb4v7d52cyds";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "14slp0ybjbsm62misrp9qni5pzw4pzz3zznzc49z0a7yfni9i6av";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "18jfbz2h8jjby48hwjyrd9yn3k7xbp58g28psmlhsg2m3f8mr669";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "09mfspiy3ihg0n6paqhp0g1srl60sxrkxgha536624kbrbwp1jpq";
-}
-]
diff --git a/pkgs/desktops/kde-4.7/oxygen-icons.nix b/pkgs/desktops/kde-4.7/oxygen-icons.nix
deleted file mode 100644
index 1f7572b4d8ee..000000000000
--- a/pkgs/desktops/kde-4.7/oxygen-icons.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake }:
-
-kde {
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "0c12c72bcf41cfaf03f85fc1ae27e44d8cecac3deb504ab1de4c30f4fc9e3cd0";
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    description = "KDE Oxygen theme icons";
-    longDescription = "Icons for KDE's default theme";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/support/akonadi/default.nix b/pkgs/desktops/kde-4.7/support/akonadi/default.nix
deleted file mode 100644
index cf5155096027..000000000000
--- a/pkgs/desktops/kde-4.7/support/akonadi/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano }:
-
-stdenv.mkDerivation rec {
-  name = "akonadi-1.6.1";
-  
-  src = fetchurl {
-    url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
-    sha256 = "0r8sw7m1pwqc7qkaczm0r8adqi1wvlhdp32gy3q5p5plq50xhgra";
-  };
-
-  buildInputs = [ qt4 soprano libxslt boost ];
-
-  nativeBuildInputs = [ cmake automoc4 shared_mime_info ];
-
-  enableParallelBuilding = true;
-  
-  meta = with stdenv.lib; {
-    description = "KDE PIM Storage Service";
-    license = "LGPL";
-    homepage = http://pim.kde.org/akonadi;
-    maintainers = [ maintainers.sander maintainers.urkud ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcae246f5218..b76813099f04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9105,14 +9105,6 @@ let
 
   kde4 = recurseIntoAttrs pkgs.kde48;
 
-  kde47 = kdePackagesFor (pkgs.kde47 // {
-      boost = boost149;
-      eigen = eigen2;
-      libotr = libotr_3_2;
-      libgphoto2 = libgphoto2_4;
-      libcanberra = libcanberra_kde;
-    }) ../desktops/kde-4.7;
-
   kde48 = kdePackagesFor (pkgs.kde48 // {
       boost = boost149;
       eigen = eigen2;

From 8ebf53ce4cf55da6a37450ddae63c1d7892d9925 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jul 2013 22:37:11 +0200
Subject: [PATCH 214/439] Indent properly

---
 pkgs/top-level/all-packages.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b76813099f04..49e75a26b709 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2354,12 +2354,14 @@ let
     binutilsCross = null;
   }));
 
-  gcc46_multi = if system == "x86_64-linux" then lowPrio (
+  gcc46_multi =
+    if system == "x86_64-linux" then lowPrio (
       wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.gcc.override {
-      stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc);
-      profiledCompiler = false;
-      enableMultilib = true;
-    })) else throw "Multilib gcc not supported on ‘${system}’";
+        stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc);
+        profiledCompiler = false;
+        enableMultilib = true;
+      }))
+    else throw "Multilib gcc not supported on ‘${system}’";
 
   gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 {
     inherit noSysDirs;

From 54166165a690bd01953ef2c1b8257a5774f890e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jul 2013 22:38:36 +0200
Subject: [PATCH 215/439] Remove some unused GCC builds

---
 pkgs/top-level/all-packages.nix | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 49e75a26b709..ef0b595d153c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2283,12 +2283,6 @@ let
     cross = assert crossSystem != null; crossSystem;
   };
 
-  gcc43_multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc43.gcc.override {
-    stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc);
-    profiledCompiler = false;
-    enableMultilib = true;
-  }));
-
   gcc44 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.4) {
     inherit fetchurl stdenv texinfo gmp mpfr /* ppl cloogppl */
       gettext which noSysDirs;
@@ -2314,17 +2308,6 @@ let
       else null;
   }));
 
-  # A non-stripped version of GCC.
-  gcc45_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.5 {
-    stripped = false;
-
-    inherit noSysDirs;
-
-    # bootstrapping a profiled compiler does not work in the sheevaplug:
-    # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
-    profiledCompiler = !stdenv.system == "armv5tel-linux";
-  }));
-
   gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 {
     inherit noSysDirs;
 

From 20b4f0347e43c79340eb0b1fdde6c0f7d1f47def Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jul 2013 22:53:06 +0200
Subject: [PATCH 216/439] php: Update to 5.3.27, 5.4.17

CVE-2013-2110
---
 pkgs/development/interpreters/php/5.3.nix | 6 +++---
 pkgs/development/interpreters/php/5.4.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index d879a611c2ae..a84927a20f3d 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -10,7 +10,7 @@ in
 
 composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.3.25";
+  version = "5.3.27";
 
   name = "php-${version}";
 
@@ -217,8 +217,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
   '' );
 
   src = fetchurl {
-    url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
-    sha256 = "15dwks0823m0vc3qv58yxfvchwx9ydg5gjvjy8kpc5w3syras76m";
+    url = "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror";
+    sha256 = "11xj6v65m6l2lq2s2j5pq5l0iwjsnxmv1nad9hja50ivc8fb4bg1";
     name = "php-${version}.tar.bz2";
   };
 
diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index 6cb8c7336018..327ee8063a1b 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -9,7 +9,7 @@ in
 
 composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.4.15";
+  version = "5.4.17";
 
   name = "php-${version}";
 
@@ -227,10 +227,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
 
   src = fetchurl {
     urls = [
-      "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"
+      "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror"
       "http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror"
     ];
-    sha256 = "0dh159svdrakvm9nsyg3yyln7cqqzpxgs2163cqxplnc93d8a8id";
+    sha256 = "1d3y69hvplaqif2fl5s1lwx0y0m55j8b8fwag6ngdld5hx9r6jfw";
     name = "php-${version}.tar.bz2";
   };
 

From b89cbe26a8e43a3cb5e6e863a6b82c35e8dca005 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 16 Jul 2013 20:33:28 -0400
Subject: [PATCH 217/439] Add tar nodePackage

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/node-packages-generated.nix | 44 ++++++++++++++--------
 pkgs/top-level/node-packages.json          |  1 +
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 5adb589d522c..f628e2513bc4 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -2665,7 +2665,7 @@
   {
     name = "mongoose";
     spec = "*";
-    version = "3.6.14";
+    version = "3.6.15";
     topLevel = true;
     dependencies = [
       { name = "hooks"; spec = "0.2.1"; }
@@ -2678,8 +2678,8 @@
       { name = "regexp-clone"; spec = "0.0.1"; }
     ];
     patchLatest = false;
-    sha1 = "acf28354ba4f792ded931ccd0dfe038a65757832";
-    tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.14.tgz";
+    sha1 = "272f1575da3b48ec31467abdf15baa61854ba5f1";
+    tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.15.tgz";
   }
   {
     name = "mongoose-schema-extend";
@@ -3155,7 +3155,7 @@
   {
     name = "npm2nix";
     spec = "*";
-    version = "2.0.0";
+    version = "2.0.1";
     topLevel = true;
     dependencies = [
       { name = "semver"; spec = ">=2.0.10 <3.0.0"; }
@@ -3164,8 +3164,8 @@
       { name = "npmconf"; spec = "0.1.1"; }
     ];
     patchLatest = false;
-    sha1 = "9e1ff781524ee313bf64e3b5f390e90ced87ae6d";
-    tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-2.0.0.tgz";
+    sha1 = "bf50c8436339d309446582810ce0fff07f307d04";
+    tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-2.0.1.tgz";
   }
   {
     name = "npmconf";
@@ -4493,26 +4493,26 @@
   {
     name = "source-map";
     spec = "*";
-    version = "0.1.25";
+    version = "0.1.26";
     topLevel = true;
     dependencies = [
       { name = "amdefine"; spec = ">=0.0.4"; }
     ];
     patchLatest = false;
-    sha1 = "5851545c1f4a40243829065c20e6f40b023fba1a";
-    tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.25.tgz";
+    sha1 = "4cce2dcb5fa02cfe1b4cf32cc83962b1b3997560";
+    tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.26.tgz";
   }
   {
     name = "source-map";
     spec = "~0.1.7";
-    version = "0.1.25";
+    version = "0.1.26";
     topLevel = false;
     dependencies = [
       { name = "amdefine"; spec = ">=0.0.4"; }
     ];
     patchLatest = false;
-    sha1 = "5851545c1f4a40243829065c20e6f40b023fba1a";
-    tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.25.tgz";
+    sha1 = "4cce2dcb5fa02cfe1b4cf32cc83962b1b3997560";
+    tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.26.tgz";
   }
   {
     name = "spdy";
@@ -4666,6 +4666,20 @@
     sha1 = "2987b1ce2bd2f38b0dce2a34388884bfa4400ea7";
     tarball = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz";
   }
+  {
+    name = "tar";
+    spec = "*";
+    version = "0.1.17";
+    topLevel = true;
+    dependencies = [
+      { name = "inherits"; spec = "1.x"; }
+      { name = "block-stream"; spec = "*"; }
+      { name = "fstream"; spec = "~0.1.8"; }
+    ];
+    patchLatest = false;
+    sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc";
+    tarball = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
+  }
   {
     name = "tar";
     spec = "0";
@@ -4885,13 +4899,13 @@
   {
     name = "underscore.string";
     spec = "~2.3.1";
-    version = "2.3.2";
+    version = "2.3.3";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "c10835dc04c2677cd49e1d77d26c0d3b22cc5709";
-    tarball = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.2.tgz";
+    sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d";
+    tarball = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
   }
   {
     name = "util";
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 08b4f36b4821..06c8f541cc7a 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -62,4 +62,5 @@
 , "stylus"
 , "npm"
 , "gridfs-stream"
+, "tar"
 ]

From 0f096b70d09dfa14e345e2a75d4dbebef84d034a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 17 Jul 2013 05:34:18 +0200
Subject: [PATCH 218/439] python-hetzner: Update to new version 0.4.0.

This introduces the following changes:

 - Validate Robot's SSL server certificates.
 - Admin accounts can new be managed with the "admin" property of a
   server instance.
 - Better and fixed up error reporting.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 741d2549258f..b5c98051d41d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2128,12 +2128,12 @@ pythonPackages = python.modules // rec {
 
   hetzner = buildPythonPackage rec {
     name = "hetzner-${version}";
-    version = "0.3.0";
+    version = "0.4.0";
 
     src = fetchurl {
       url = "https://github.com/RedMoonStudios/hetzner/archive/"
           + "v${version}.tar.gz";
-      sha256 = "10ywn7jbrv86ippf3bpbf01a4jnalwkkd0k7kxc39a55mfbx5s7d";
+      sha256 = "1dzmb4k83cc6dqvxrk2vxvrhgi4x45b6yzs5jvyfjhgl5daisv4b";
     };
 
     # not there yet, but coming soon.

From 87444bc28181c663e02dc45e6f5b476a086db014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 17 Jul 2013 08:16:24 +0200
Subject: [PATCH 219/439] fix tarball after 541661

---
 pkgs/top-level/release-small.nix | 1 -
 pkgs/top-level/release.nix       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 7743f4d0d27c..f7fc9932f677 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -52,7 +52,6 @@ with (import ./release-lib.nix);
   gcc33 = linux;
   gcc34 = linux;
   gcc42 = linux;
-  gcc43_multi = ["x86_64-linux"];
   gcc44 = linux;
   gcj44 = linux;
   ghdl = linux;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 8a711d564050..9734adc34973 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -115,7 +115,6 @@ let
       gcc33 = linux;
       gcc34 = linux;
       gcc42 = linux;
-      gcc43_multi = ["x86_64-linux"];
       gcc44 = linux;
       gcj44 = linux;
       ghdl = linux;

From b9729fb4d49f1efb8e39fee83c2f133d30415094 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 17 Jul 2013 10:49:25 +0200
Subject: [PATCH 220/439] python-hetzner: Update to new version 0.4.1.

Small bugfix release, changes:

 - Don't include colons when generating passwords for admin logins.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b5c98051d41d..b223d941196a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2128,12 +2128,12 @@ pythonPackages = python.modules // rec {
 
   hetzner = buildPythonPackage rec {
     name = "hetzner-${version}";
-    version = "0.4.0";
+    version = "0.4.1";
 
     src = fetchurl {
       url = "https://github.com/RedMoonStudios/hetzner/archive/"
           + "v${version}.tar.gz";
-      sha256 = "1dzmb4k83cc6dqvxrk2vxvrhgi4x45b6yzs5jvyfjhgl5daisv4b";
+      sha256 = "1x48r3n818iyzyb0a5jpcrq1rgdrpj3549kcv76wgpw4f7hi0b76";
     };
 
     # not there yet, but coming soon.

From eec9e56226019ca182d42ee2b97837e6bcf25619 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Wed, 17 Jul 2013 10:02:19 +0100
Subject: [PATCH 221/439] perlPackages.AnyEvent: new expression

---
 pkgs/top-level/perl-packages.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8a060381aa45..36c38b578d35 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -98,6 +98,14 @@ rec {
     propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ];
   };
 
+  AnyEvent = buildPerlPackage {
+    name = "AnyEvent-7.04";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.04.tar.gz;
+      sha256 = "6a9d94fa61c7f5dc515c834eb224dbc6ce4123da8fd5bfa0cf3815f3f3e908b2";
+    };
+  };
+
   AnyMoose = buildPerlPackage rec {
     name = "Any-Moose-0.10";
     src = fetchurl {
@@ -6866,10 +6874,6 @@ rec {
       sha256 = "0i1mg3ivxhx09x0w06k15izc92bknwqwh0ghpmhlq9s9iw12mmry";
     };
     propagatedBuildInputs = [ URI ];
-    meta = {
-      description = "Unknown";
-      license = "unknown";
-    };
   };
 
   Throwable = buildPerlPackage rec {

From 9f347eba61b2fca5ae5ece21fa74af5d3024bfb3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jul 2013 11:10:21 +0200
Subject: [PATCH 222/439] nvidia-x11: Fix building on older kernels

The 3.10 patch breaks building on 3.4 at least.
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index c7fc5c44c22e..e4e9a2c02057 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -8,18 +8,24 @@
 
 with stdenv.lib;
 
-let versionNumber = "319.32";
-    kernel310patch = fetchurl {
-                       url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia";
-                       sha256 = "0nhzg6jdk9sf1vzj519gqi8a2n9xydhz2bcz472pss2cfgbc1ahb";
-                     };
+let
 
-in stdenv.mkDerivation {
+  versionNumber = "319.32";
+  kernel310patch = fetchurl {
+    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia";
+    sha256 = "0nhzg6jdk9sf1vzj519gqi8a2n9xydhz2bcz472pss2cfgbc1ahb";
+  };
+
+in
+
+stdenv.mkDerivation {
   name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}";
 
   builder = ./builder.sh;
 
-  patches = [ ./version-test.patch kernel310patch ];
+  patches =
+    [ ./version-test.patch ]
+    ++ optional (!versionOlder kernelDev.version "3.10") kernel310patch;
 
   src =
     if stdenv.system == "i686-linux" then

From 329a70500595e17729931781f411ec8a9964ee3d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jul 2013 11:14:26 +0200
Subject: [PATCH 223/439] nvidia-x11: Fix the library-only build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also, introduce a function ‘versionAtLeast’ which is probably more
natural than ‘versionOlder’.
---
 pkgs/lib/strings.nix                          | 4 ++++
 pkgs/os-specific/linux/nvidia-x11/default.nix | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/lib/strings.nix b/pkgs/lib/strings.nix
index ed668e2b9270..024a9ac7d7a2 100644
--- a/pkgs/lib/strings.nix
+++ b/pkgs/lib/strings.nix
@@ -163,6 +163,10 @@ rec {
   versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1;
 
 
+  # Return true iff string v1 denotes a version equal to or newer than v2.
+  versionAtLeast = v1: v2: !versionOlder v1 v2;
+
+
   # Get the version of the specified derivation, as specified in its
   # ‘name’ attribute.
   getVersion = drv: (builtins.parseDrvName drv.name).version;
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index e4e9a2c02057..9e750629b829 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   patches =
     [ ./version-test.patch ]
-    ++ optional (!versionOlder kernelDev.version "3.10") kernel310patch;
+    ++ optional (!libsOnly && versionAtLeast kernelDev.version "3.10") kernel310patch;
 
   src =
     if stdenv.system == "i686-linux" then

From ff5d030513365cc2e5f8530a217b1ccb0fb6076c Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Wed, 17 Jul 2013 10:31:19 +0100
Subject: [PATCH 224/439] perlPackages.DBIxSimple: new expression

---
 pkgs/top-level/perl-packages.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 36c38b578d35..7d77fc985d74 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2079,6 +2079,18 @@ rec {
     };
   };
 
+  DBIxSimple = buildPerlPackage {
+    name = "DBIx-Simple-1.35";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.35.tar.gz;
+      sha256 = "445535b3dfab88140c7a0d2776b1e78f254dc7e9c81072d5a01afc95a5db499a";
+    };
+    propagatedBuildInputs = [ DBI ];
+    meta = {
+      description = "Very complete easy-to-use OO interface to DBI";
+    };
+  };
+
   DevelCycle = buildPerlPackage {
     name = "Devel-Cycle-1.11";
     src = fetchurl {

From d7b5a1beb1a2f6de18a2f2122d1479327327c720 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Wed, 17 Jul 2013 10:33:04 +0100
Subject: [PATCH 225/439] perlPackages.LogContextual & dependencies: new
 expressions

---
 pkgs/top-level/perl-packages.nix | 55 ++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7d77fc985d74..f8c326b1c94c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2480,6 +2480,21 @@ rec {
     propagatedBuildInputs = [ ExceptionBase ];
   };
 
+  ExporterDeclare = buildPerlModule {
+    name = "Exporter-Declare-0.113";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/EX/EXODIST/Exporter-Declare-0.113.tar.gz;
+      sha256 = "724de5e982c8477df14a360c82233f9e0c26b4af9191647f750f5e465ea42dce";
+    };
+    buildInputs = [ FennecLite TestException ];
+    propagatedBuildInputs = [ MetaBuilder aliased ];
+    meta = {
+      homepage = http://open-exodus.net/projects/Exporter-Declare;
+      description = "Exporting done right";
+      license = "perl";
+    };
+  };
+
   ExporterLite = buildPerlPackage {
     name = "Exporter-Lite-0.02";
     src = fetchurl {
@@ -2654,6 +2669,19 @@ rec {
     buildInputs = [ ];
   };
 
+  FennecLite = buildPerlModule {
+    name = "Fennec-Lite-0.004";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/EX/EXODIST/Fennec-Lite-0.004.tar.gz;
+      sha256 = "dce28e3932762c2ff92aa52d90405c06e898e81cb7b164ccae8966ae77f1dcab";
+    };
+    meta = {
+      homepage = http://open-exodus.net/projects/Fennec-Lite;
+      description = "Minimalist Fennec, the commonly used bits";
+      license = "perl";
+    };
+  };
+
   FileChangeNotify = buildPerlModule rec {
     name = "File-ChangeNotify-0.20";
     src = fetchurl {
@@ -3812,6 +3840,20 @@ rec {
     };
   };
 
+  LogContextual = buildPerlPackage {
+    name = "Log-Contextual-0.005003";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FR/FREW/Log-Contextual-0.005003.tar.gz;
+      sha256 = "8519ae92bd8685d003460f99151996e94f38c3c8f12b90634857558605d13719";
+    };
+    buildInputs = [ TestFatal ];
+    propagatedBuildInputs = [ DataDumperConcise ExporterDeclare Moo ];
+    meta = {
+      description = "Simple logging interface with a contextual log";
+      license = "perl";
+    };
+  };
+
   LogDispatch = buildPerlPackage {
     name = "Log-Dispatch-2.39";
     src = fetchurl {
@@ -4051,6 +4093,19 @@ rec {
     };
   };
 
+  MetaBuilder = buildPerlModule {
+    name = "Meta-Builder-0.003";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/EX/EXODIST/Meta-Builder-0.003.tar.gz;
+      sha256 = "e7ac289b88d1662e87708d716877ac66a1a8414660996fe58c1db96d834a5375";
+    };
+    buildInputs = [ FennecLite TestException ];
+    meta = {
+      description = "Tools for creating Meta objects to track custom metrics";
+      license = "perl";
+    };
+  };
+
   MethodSignaturesSimple = buildPerlPackage {
     name = "Method-Signatures-Simple-1.07";
     src = fetchurl {

From 61d3429154f1d55aaa3255bf64074dee3c461bfe Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Wed, 17 Jul 2013 10:45:50 +0100
Subject: [PATCH 226/439] perlPackages.NetRabbitFoot & dependencies: new
 expressions

---
 pkgs/top-level/perl-packages.nix | 256 +++++++++++++++++++++++++++++++
 1 file changed, 256 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f8c326b1c94c..a66af2b4e968 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -106,6 +106,20 @@ rec {
     };
   };
 
+  AnyEventRabbitMQ = buildPerlPackage {
+    name = "AnyEvent-RabbitMQ-1.15";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BO/BOBTFISH/AnyEvent-RabbitMQ-1.15.tar.gz;
+      sha256 = "fda292dfaae10f6d99aafc46831ce507153b58368e3eb2617bbb3f749605805a";
+    };
+    buildInputs = [ TestException ];
+    propagatedBuildInputs = [ AnyEvent DevelGlobalDestruction FileShareDir ListMoreUtils NetAMQP Readonly namespaceclean ];
+    meta = {
+      description = "An asynchronous and multi channel Perl AMQP client";
+      license = "perl";
+    };
+  };
+
   AnyMoose = buildPerlPackage rec {
     name = "Any-Moose-0.10";
     src = fetchurl {
@@ -138,6 +152,21 @@ rec {
     propagatedBuildInputs = [LocaleMaketextSimple];
   };
 
+  AppCmd = buildPerlPackage {
+    name = "App-Cmd-0.320";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.320.tar.gz;
+      sha256 = "ca6174f634bbe5b73c5f5ad6e0f3b3385568934282f4e848da8e78025b2b185e";
+    };
+    buildInputs = [ TestFatal ];
+    propagatedBuildInputs = [ CaptureTiny ClassLoad DataOptList GetoptLongDescriptive IOTieCombine StringRewritePrefix SubExporter SubInstall ];
+    meta = {
+      homepage = https://github.com/rjbs/app-cmd;
+      description = "Write command line apps with less suffering";
+      license = "perl";
+    };
+  };
+
   AppConfig = buildPerlPackage {
     name = "AppConfig-1.66";
     src = fetchurl {
@@ -241,6 +270,18 @@ rec {
     };
   };
 
+  autodie = buildPerlPackage {
+    name = "autodie-2.20";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PJ/PJF/autodie-2.20.tar.gz;
+      sha256 = "346763c582cd8066b4e5d07e4013202f9f9296d32b42343e117dbfb13ea6e4f0";
+    };
+    meta = {
+      description = "Replace functions with ones that succeed or die with lexical scope";
+      license = "perl";
+    };
+  };
+
   BerkeleyDB = import ../development/perl-modules/BerkeleyDB {
     inherit buildPerlPackage fetchurl;
     inherit (pkgs) db4;
@@ -1328,6 +1369,15 @@ rec {
     propagatedBuildInputs = [ CGICookieXS ];
   };
 
+  Coro = buildPerlPackage {
+    name = "Coro-6.31";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.31.tar.gz;
+      sha256 = "a73ace48d940b28e3dfb32d2f3507205d3ddfdc6610075ecc72e19476bb6de44";
+    };
+    propagatedBuildInputs = [ AnyEvent Guard CommonSense ];
+  };
+
   CPANMeta = buildPerlPackage {
     name = "CPAN-Meta-2.120921";
     src = fetchurl {
@@ -2780,6 +2830,19 @@ rec {
     };
   };
 
+  Filepushd = buildPerlPackage {
+    name = "File-pushd-1.005";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.005.tar.gz;
+      sha256 = "50fdcc33e69a50bab1e32d1a7c96753938f6d95a06015e34e662958c58687842";
+    };
+    meta = {
+      homepage = https://metacpan.org/release/File-pushd;
+      description = "Change directory temporarily for a limited scope";
+      license = "apache";
+    };
+  };
+
   FileRemove = buildPerlPackage rec {
     name = "File-Remove-1.42";
     src = fetchurl {
@@ -3021,6 +3084,14 @@ rec {
     buildInputs = [ DataUUID CryptCBC ];
   };
 
+  Guard = buildPerlPackage {
+    name = "Guard-1.022";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/ML/MLEHMANN/Guard-1.022.tar.gz;
+      sha256 = "0saq9949d13mdvpnls7mw1cy74lm4ncl7agbs7n2jl4sy6bvmw9m";
+    };
+  };
+
   HashFlatten = buildPerlPackage rec {
     name = "Hash-Flatten-1.19";
     src = fetchurl {
@@ -3502,6 +3573,19 @@ rec {
     };
   };
 
+  IOTieCombine = buildPerlPackage {
+    name = "IO-TieCombine-1.002";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/IO-TieCombine-1.002.tar.gz;
+      sha256 = "fd4f59e82852fd8b868dd1642cb6ec9caf32a597803fdce2cbe8d580c3b41d44";
+    };
+    meta = {
+      homepage = https://github.com/rjbs/io-tiecombine;
+      description = "Produce tied (and other) separate but combined variables";
+      license = "perl";
+    };
+  };
+
   IOTty = buildPerlPackage rec {
     name = "IO-Tty-1.10";
     src = fetchurl {
@@ -4395,6 +4479,21 @@ rec {
     propagatedBuildInputs = [ Moose ];
   };
 
+  MooseXAppCmd = buildPerlPackage {
+    name = "MooseX-App-Cmd-0.10";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MJ/MJGARDNER/MooseX-App-Cmd-0.10.tar.gz;
+      sha256 = "6d2d8fdc4f3f7fa76dc82c10d71b099f1572c054a72f373e5a9fa6237e48634a";
+    };
+    buildInputs = [ MooseXConfigFromFile TestOutput YAML ];
+    propagatedBuildInputs = [ AppCmd GetoptLongDescriptive Moose MooseXConfigFromFile MooseXGetopt MooseXHasOptions MooseXMarkAsMethods TestUseOk ];
+    meta = {
+      homepage = http://metacpan.org/release/MooseX-App-Cmd;
+      description = "Mashes up MooseX::Getopt and App::Cmd";
+      license = "perl";
+    };
+  };
+
   MooseXAttributeChained = buildPerlModule rec {
     name = "MooseX-Attribute-Chained-1.0.1";
     src = fetchurl {
@@ -4404,6 +4503,20 @@ rec {
     propagatedBuildInputs = [ Moose TryTiny ];
   };
 
+  MooseXAttributeHelpers = buildPerlPackage {
+    name = "MooseX-AttributeHelpers-0.23";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-AttributeHelpers-0.23.tar.gz;
+      sha256 = "3f63f60d94d840a309d9137f78605e15f07c977fd15a4f4b55bd47b65ed52be1";
+    };
+    buildInputs = [ Moose TestException ];
+    propagatedBuildInputs = [ Moose ];
+    meta = {
+      description = "Extend your attribute interfaces (deprecated)";
+      license = "perl";
+    };
+  };
+
   MooseXClone = buildPerlPackage {
     name = "MooseX-Clone-0.05";
     src = fetchurl {
@@ -4413,6 +4526,20 @@ rec {
     propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat Moose namespaceclean TestUseOk ];
   };
 
+  MooseXConfigFromFile = buildPerlPackage {
+    name = "MooseX-ConfigFromFile-0.11";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-ConfigFromFile-0.11.tar.gz;
+      sha256 = "963e7dbb2bc7ca18995db903c64b0841c4e8d3877009bff5475125673c3b02b4";
+    };
+    buildInputs = [ Moose TestCheckDeps TestDeep TestFatal TestNoWarnings TestRequires TestWithoutModule ];
+    propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathTiny TryTiny namespaceautoclean ];
+    meta = {
+      description = "An abstract Moose role for setting attributes from a configfile";
+      license = "perl";
+    };
+  };
+
   MooseXDaemonize = buildPerlPackage {
     name = "MooseX-Daemonize-0.15";
     src = fetchurl {
@@ -4456,6 +4583,21 @@ rec {
     };
   };
 
+  MooseXHasOptions = buildPerlPackage {
+    name = "MooseX-Has-Options-0.003";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PS/PSHANGOV/MooseX-Has-Options-0.003.tar.gz;
+      sha256 = "07c21cf8ed500b272020ff8da19f194728bb414e0012a2f0cc54ef2ef6222a68";
+    };
+    buildInputs = [ Moose TestMost namespaceautoclean ];
+    propagatedBuildInputs = [ ClassLoad ListMoreUtils PackageStash StringRewritePrefix ];
+    meta = {
+      homepage = https://github.com/pshangov/moosex-has-options;
+      description = "Succinct options for Moose";
+      license = "perl";
+    };
+  };
+
   MooseXMarkAsMethods = buildPerlPackage {
     name = "MooseX-MarkAsMethods-0.15";
     src = fetchurl {
@@ -4697,6 +4839,36 @@ rec {
     };
   };
 
+  MooseXTypesPathTiny = buildPerlModule {
+    name = "MooseX-Types-Path-Tiny-0.006";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Tiny-0.006.tar.gz;
+      sha256 = "0260c6fbbf84d411b145238ffd92a73f754bd92434448d9f78798fba0a2dfdd6";
+    };
+    buildInputs = [ Filepushd ModuleBuildTiny TestCheckDeps TestFatal ];
+    propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesStringlike PathTiny ];
+    meta = {
+      homepage = https://github.com/karenetheridge/moosex-types-path-tiny;
+      description = "Path::Tiny types and coercions for Moose";
+      license = "apache";
+    };
+  };
+
+  MooseXTypesStringlike = buildPerlPackage {
+    name = "MooseX-Types-Stringlike-0.001";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/MooseX-Types-Stringlike-0.001.tar.gz;
+      sha256 = "2ba71fff105d851ea6aee85bef5d6629726138a2b005b77a163a8bfb403cea03";
+    };
+    buildInputs = [ Moose ];
+    propagatedBuildInputs = [ MooseXTypes ];
+    meta = {
+      homepage = https://github.com/dagolden/moosex-types-stringlike;
+      description = "Moose type constraints for strings or string-like objects";
+      license = "apache";
+    };
+  };
+
   MooseXTypesStructured = buildPerlPackage {
     name = "MooseX-Types-Structured-0.28";
     src = fetchurl {
@@ -4877,6 +5049,27 @@ rec {
     };
   };
 
+  NetAMQP = buildPerlPackage {
+    name = "Net-AMQP-0.06";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CH/CHIPS/Net-AMQP-0.06.tar.gz;
+      sha256 = "0b2ba7de2cd7ddd5fe102a2e2ae7aeba21eaab1078bf3bfd3c5a722937256380";
+    };
+    buildInputs = [ TestDeep ];
+    propagatedBuildInputs = [ ClassAccessor ClassDataInheritable XMLLibXML ];
+    meta = {
+      description = "Advanced Message Queue Protocol (de)serialization and representation";
+      license = "perl";
+    };
+    preConfigure =
+      ''
+        substituteInPlace META.json \
+          '"Module::Build" : "0.40"' '"Module::Build" : "0.39"'
+        substituteInPlace META.yml \
+          'Module::Build: 0.40' 'Module::Build: 0.39'
+      '';
+  };
+
   NetCoverArtArchive = buildPerlPackage {
     name = "Net-CoverArtArchive-1.02";
     src = fetchurl {
@@ -4957,6 +5150,20 @@ rec {
     };
   };
 
+  NetRabbitFoot = buildPerlPackage {
+    name = "Net-RabbitFoot-1.03";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/I/IK/IKUTA/Net-RabbitFoot-1.03.tar.gz;
+      sha256 = "0544b1914e7847b32b60a643abc6f0b1fdc6d4a816afd84bcd3eee0c28b001ac";
+    };
+    buildInputs = [ TestException ];
+    propagatedBuildInputs = [ AnyEventRabbitMQ ConfigAny Coro JSONXS ListMoreUtils Moose MooseXAppCmd MooseXAttributeHelpers MooseXConfigFromFile ];
+    meta = {
+      description = "An Asynchronous and multi channel Perl AMQP client";
+      license = "perl";
+    };
+  };
+
   NetServer = buildPerlPackage {
     name = "Net-Server-2.007";
     src = fetchurl {
@@ -5227,6 +5434,29 @@ rec {
     };
   };
 
+  PathTiny = buildPerlPackage {
+    name = "Path-Tiny-0.026";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.026.tar.gz;
+      sha256 = "e79ee187bbf7fdef387886a8c929bd0a1171fb54db1984d79f4e04d90f733cc6";
+    };
+    buildInputs = [ DevelHide Filepushd TestDeep TestFailWarnings TestFatal perl ];
+    propagatedBuildInputs = [ autodie ];
+    meta = {
+      homepage = https://metacpan.org/release/Path-Tiny;
+      description = "File path utility";
+      license = "apache";
+    };
+    preConfigure =
+      ''
+        substituteInPlace lib/Path/Tiny.pm --replace 'use File::Spec 3.40' \
+          'use File::Spec 3.39'
+      '';
+    # This appears to be currently failing tests, though I don't know why.
+    # -- ocharles
+    doCheck = false;
+  };
+
   Perl5lib = buildPerlPackage rec {
     name = "perl5lib-1.02";
     src = fetchurl {
@@ -6364,6 +6594,20 @@ rec {
     propagatedBuildInputs = [ SubUplevel ];
   };
 
+  TestFailWarnings = buildPerlPackage {
+    name = "Test-FailWarnings-0.005";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-0.005.tar.gz;
+      sha256 = "014f909e6c171f77b811139c49c1dca9d0f1e2d1c41b5dca332b6b55b3eb0b4e";
+    };
+    buildInputs = [ CaptureTiny ];
+    meta = {
+      homepage = https://metacpan.org/release/Test-FailWarnings;
+      description = "Add test failures if warnings are caught";
+      license = "apache";
+    };
+  };
+
   TestFatal = buildPerlPackage {
     name = "Test-Fatal-0.010";
     src = fetchurl {
@@ -6686,6 +6930,18 @@ rec {
     };
   };
 
+  TestWithoutModule = buildPerlPackage {
+    name = "Test-Without-Module-0.17";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.17.tar.gz;
+      sha256 = "a691b0bf6d92dedbacfd547551021389ebc79c51937de2b914e792457da56ff7";
+    };
+    meta = {
+      description = "Test fallback behaviour in absence of modules";
+      license = "perl";
+    };
+  };
+
   TestWWWMechanize = buildPerlPackage {
     name = "Test-WWW-Mechanize-1.44";
     src = fetchurl {

From 97b64665f5f9a1b58bdda4a18d60f2115f3d6bf8 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Wed, 17 Jul 2013 12:16:47 +0200
Subject: [PATCH 227/439] Use fetchgit for vanitygen instead of fetchurl,
 github changed something

---
 pkgs/applications/misc/vanitygen/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/vanitygen/default.nix b/pkgs/applications/misc/vanitygen/default.nix
index 1aa3f57ecca3..c68767290ee0 100644
--- a/pkgs/applications/misc/vanitygen/default.nix
+++ b/pkgs/applications/misc/vanitygen/default.nix
@@ -1,13 +1,13 @@
-{ fetchurl, stdenv, openssl, pcre }:
+{ fetchgit, stdenv, openssl, pcre }:
 
 stdenv.mkDerivation rec {
   version = "0.21";
   name = "vanitygen-${version}";
 
-  src = fetchurl {
-    name = "vanitygen-${version}.tar.gz";
-    url = "https://github.com/samr7/vanitygen/tarball/0.21";
-    sha256 = "1lj0gi08lg0pcby5pbpi08ysynzy24qa1n1065112shkpasi0kxv";
+  src = fetchgit {
+    url = "https://github.com/samr7/vanitygen";
+    rev = "refs/tags/${version}";
+    sha256  = "1vzfv74hhiyrrpvjca8paydx1ashgbgn5plzrx4swyzxy1xkamah";
   };
 
   buildInputs = [ openssl pcre ];

From ca0936f17f447e29e3653249ae0758967d11b972 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jul 2013 12:47:15 +0200
Subject: [PATCH 228/439] apache-httpd: Update to 2.2.25

CVE-2013-1896, CVE-2013-1862.
---
 pkgs/servers/http/apache-httpd/2.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index 23454d048b71..e9b1dba22e15 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert mpm == "prefork" || mpm == "worker" || mpm == "event";
 
 stdenv.mkDerivation rec {
-  version = "2.2.24";
+  version = "2.2.25";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "f73bce14832ec40c1aae68f4f8c367cab2266241";
+    sha1 = "e34222d1a8de38825397a1c70949bcc5836a1236";
   };
 
   buildInputs = [perl apr aprutil pcre] ++

From 3a9c3b9b41ab3e30e5f0250e8c243401ba57e70a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 17 Jul 2013 11:45:17 +0200
Subject: [PATCH 229/439] haskell-MonadRandom: update to version 0.1.10

---
 pkgs/development/libraries/haskell/MonadRandom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix
index 738b69f28325..2dead8de40d4 100644
--- a/pkgs/development/libraries/haskell/MonadRandom/default.nix
+++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "MonadRandom";
-  version = "0.1.9";
-  sha256 = "1n947650xlz47rj6y6ik2mknyr9smwragjr5akccinmfm1krg6lz";
+  version = "0.1.10";
+  sha256 = "0acx8vm43pd3wn5gp4rx9h24y08fcdy4bpack1sd0pxx2wmhi5qs";
   buildDepends = [ mtl random transformers ];
   meta = {
     description = "Random-number generation monad";

From 49818d17dac39db1703801bba016e7ca3845aaa2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 17 Jul 2013 11:45:17 +0200
Subject: [PATCH 230/439] haskell-active: update to version 0.1.0.6

---
 pkgs/development/libraries/haskell/active/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix
index 209341e22e76..c51663a9d091 100644
--- a/pkgs/development/libraries/haskell/active/default.nix
+++ b/pkgs/development/libraries/haskell/active/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "active";
-  version = "0.1.0.4";
-  sha256 = "0f4bgx7l9vx2kywl87zpxpjbfix79lp8chf6xzfpmh4wrbmfgi1s";
+  version = "0.1.0.6";
+  sha256 = "0hh52hkmma4lxfv3gj7x23cwx8v6wd1cm9hblvhzhylxk8dyl5m7";
   buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
   testDepends = [
     newtype QuickCheck semigroupoids semigroups vectorSpace

From b24d3e5b790023ac15256ff2cd9b28443795f28a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 17 Jul 2013 11:45:17 +0200
Subject: [PATCH 231/439] haskell-dimensional-tf: update to version 0.2

---
 pkgs/development/libraries/haskell/dimensional-tf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
index 70995ecb3ce7..d28de6c67a09 100644
--- a/pkgs/development/libraries/haskell/dimensional-tf/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dimensional-tf";
-  version = "0.1.1";
-  sha256 = "0hhp2nx8xyk5ms3mzg1d3jhzm1b0bxz7aijxqasrxjq9p04jr2ci";
+  version = "0.2";
+  sha256 = "0j23iamgcm7wy6y7i7diq5nnaimpsz0vvb1yrmyh0qz792d60fw1";
   buildDepends = [ numtypeTf time ];
   meta = {
     homepage = "http://dimensional.googlecode.com/";

From c2f14b02ed4511d227c9ed46c0954e5bf5ce44a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 17 Jul 2013 11:45:17 +0200
Subject: [PATCH 232/439] haskell-dimensional: update to version 0.12.1

---
 pkgs/development/libraries/haskell/dimensional/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix
index e820df4f0ba4..154b7ea06288 100644
--- a/pkgs/development/libraries/haskell/dimensional/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dimensional";
-  version = "0.12";
-  sha256 = "1bk52wxmgcm34b516npy1ynrzqajgkshd8vfjm44vjcjvfrlf3bc";
+  version = "0.12.1";
+  sha256 = "176mvnd570xskjs6ky1wax9adzzrm9j6ai0fc4hy2z4097ydcgwm";
   buildDepends = [ numtype time ];
   meta = {
     homepage = "http://dimensional.googlecode.com/";

From b7962135db1a082dda07f48b30a0b610b00d56c9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 17 Jul 2013 11:45:17 +0200
Subject: [PATCH 233/439] haskell-numtype-tf: update to version 0.1.1

---
 pkgs/development/libraries/haskell/numtype-tf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/numtype-tf/default.nix b/pkgs/development/libraries/haskell/numtype-tf/default.nix
index 76f57daca385..ad7f2d986602 100644
--- a/pkgs/development/libraries/haskell/numtype-tf/default.nix
+++ b/pkgs/development/libraries/haskell/numtype-tf/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "numtype-tf";
-  version = "0.1";
-  sha256 = "1hvnqgjg7yifxdsji9v0wqwbp4syhdc97pa3nrn4p96g7kmvw25v";
+  version = "0.1.1";
+  sha256 = "0aj24jlfcv4rsa0zfglsfgq9f0kxln32drypp66652ycffz3ip9a";
   meta = {
     homepage = "http://dimensional.googlecode.com/";
     description = "Type-level (low cardinality) integers, implemented using type families";

From 8db3aac875d54f19a4b82d74f45e99ba8db3c201 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 17 Jul 2013 11:45:17 +0200
Subject: [PATCH 234/439] haskell-numtype: update to version 1.0.1

---
 pkgs/development/libraries/haskell/numtype/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/numtype/default.nix b/pkgs/development/libraries/haskell/numtype/default.nix
index be90f003f7fb..d35f763d32e2 100644
--- a/pkgs/development/libraries/haskell/numtype/default.nix
+++ b/pkgs/development/libraries/haskell/numtype/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "numtype";
-  version = "1.0";
-  sha256 = "2606e81d7bcef0ba76b1e6ffc8d513c36fef5fefaab3bdd02da18761ec504e1f";
+  version = "1.0.1";
+  sha256 = "130qchi9dplpg7pxf4pz7nz4mnprngw16mizqycp5pdlawbcp5js";
   meta = {
     homepage = "http://dimensional.googlecode.com/";
     description = "Type-level (low cardinality) integers";

From ccc6de3f77d511432543c086efbfa6300d8a24cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 17 Jul 2013 11:45:17 +0200
Subject: [PATCH 235/439] haskell-semigroupoids: update to version 3.1

---
 pkgs/development/libraries/haskell/semigroupoids/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix
index f8b535824cf6..aa7176f7e161 100644
--- a/pkgs/development/libraries/haskell/semigroupoids/default.nix
+++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "semigroupoids";
-  version = "3.0.3";
-  sha256 = "0hxg3q4bx6lmccxx9hrgb1yvnvcgb5vcaw4xv1fgdcbrydjfgfrm";
+  version = "3.1";
+  sha256 = "02147y0nnvyc9ykvjbbxa9gzmkk9kgpsmx40ahwnjk9igjkbyp9g";
   buildDepends = [ comonad contravariant semigroups transformers ];
   meta = {
     homepage = "http://github.com/ekmett/semigroupoids";

From 09583c0f4eafe84a4736c88da3d137a8c7b25f18 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 17 Jul 2013 11:45:17 +0200
Subject: [PATCH 236/439] haskell-hlint: update to version 1.8.48

---
 pkgs/development/tools/haskell/hlint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index f8e7492184d5..c0510b40b852 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.8.47";
-  sha256 = "0ljqkqjn0b3j9la1i51k0019pirg4j8ap5v5b01ch7lj3jqzr85f";
+  version = "1.8.48";
+  sha256 = "1fysjs0vq3kafk12mb16xgq1svl5gcd3hxn86g5ncg6zb810fclf";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From dea87788f8b7e4be4b24b65b974c1f5d81fc17e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jul 2013 13:59:31 +0200
Subject: [PATCH 237/439] Make KDE 4.10 the default

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef0b595d153c..654ab935eba4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9088,7 +9088,7 @@ let
 
   gnome = recurseIntoAttrs gnome2;
 
-  kde4 = recurseIntoAttrs pkgs.kde48;
+  kde4 = recurseIntoAttrs pkgs.kde410;
 
   kde48 = kdePackagesFor (pkgs.kde48 // {
       boost = boost149;

From dfd621745a235d810d2c8d5d83dae8121951c5a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jul 2013 14:06:24 +0200
Subject: [PATCH 238/439] Remove KDE 4.10.4

---
 pkgs/desktops/kde-4.10/kde-package/4.10.4.nix | 399 ------------------
 1 file changed, 399 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.10/kde-package/4.10.4.nix

diff --git a/pkgs/desktops/kde-4.10/kde-package/4.10.4.nix b/pkgs/desktops/kde-4.10/kde-package/4.10.4.nix
deleted file mode 100644
index a2dafe03f58d..000000000000
--- a/pkgs/desktops/kde-4.10/kde-package/4.10.4.nix
+++ /dev/null
@@ -1,399 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="analitza";value="1ikja551kp2i4x6mw64i12yf84vx0g5rfmqcq93lj2z4gii17nlq";}
-  {name="ark";value="06ymghs1rflhij7skw3hnk2w8kjmmaigh31raq690vbnpa9w8isb";}
-  {name="audiocd-kio";value="1pxza8v5gb34hzbky5jwm2fw3b4bynpzcrggw6vvhnb0gqrfm7x6";}
-  {name="blinken";value="12rl2jl91mkvls7lh38hxxc8qfrw9lq56syb2k5v81x0gxzgz7gx";}
-  {name="bomber";value="13qi8q3jyk9dn2pnljrgh00qp5k4dimdfj5z8r6gb05cvzn1g5zw";}
-  {name="bovo";value="1j180rm5wr1yy2wn76g3s6v7hl54rhahna32lll8dv9srrpqry12";}
-  {name="cantor";value="1406bkky7pglck0vad9id02w5gyfcva9slmy5gb06iwi9rcvl13y";}
-  {name="dragon";value="1zc14x60rcmgiim5wlss0pva1mc89r00xasic55zkb9w1xl2ymrd";}
-  {name="ffmpegthumbs";value="03hyypzdaf1v7hczbmhnkw3fc1va1mfmhl3kdzm40cak2wf3fd89";}
-  {name="filelight";value="0snjk95jmw3f5v21jwld8ywxpa65zayq9n9bsryipg5i7swa9ylk";}
-  {name="granatier";value="0qsxgs11caccz695a7lcrhrm3awdm390fa1hmxs6ijrfj9wx3qkf";}
-  {name="gwenview";value="0b00cvgh1f6abj9ijg32yk1l8mfb0ph5iwqnbwj86z95v0i9kwhl";}
-  {name="jovie";value="0g07d9zdfjpscc8y4nhfsy869iy2h4vin7inlfk59jih4zbh2yss";}
-  {name="juk";value="01nxn50nxdkg87fljiz7y6s02wxbbbifv84p8hp1rswi5mx929a4";}
-  {name="kaccessible";value="0biygax3c5hcqhfgmggn3gbg4skhr75bix8swdj1mp8ypbk7cwn5";}
-  {name="kactivities";value="07f38qxbd1ads5v912759da6b6hxq9jhiphjlq7ja04130h5425l";}
-  {name="kajongg";value="0mp329yqxjvi4rzfam0dxjx0gacpgvzcnd5dbbw43f0bdi28r6xg";}
-  {name="kalgebra";value="139n44rvxdhph1bpvj8x83d4qslhjqwxpw09pj76qskdda0bw1ga";}
-  {name="kalzium";value="0j5dhaffvi825jbgr4vbi3k4ykk7ha8gv2sas1garqfrqbc30p7n";}
-  {name="kamera";value="06ny4af8071bd22kgvfx0vw37arvzmv0vimci17glp1v37qfafl5";}
-  {name="kanagram";value="1nzchi9sjphkh1rsg42jfn2xia9fcjcwihkgan01wd82hrim34bd";}
-  {name="kapman";value="1hgifdlzhrxabn4ywpxmwqikfms8ihnjz0dwbrfwdji84aij9kxf";}
-  {name="kate";value="0m9j7a42vzkdzhcd7hhvswyi7rwvicnb9wjs5ff01lg7zdnbyqxx";}
-  {name="katomic";value="1fj06n77krwyxvjmqwbhfsmi6vii36smifrpzd0yd1f0g3yihiaf";}
-  {name="kblackbox";value="1irnlwagxsik35n6zkdg6vqvydvhka3yq6p3najdav1hbs7liav6";}
-  {name="kblocks";value="0b5n3sil6llnryfns5cff07ckids65pz99swkkcgpalpqvhg5xva";}
-  {name="kbounce";value="0mqaxkgnylirrcip70b330q56c4j31pb2f7c5j65gvzxlk7n1kh9";}
-  {name="kbreakout";value="1c4ycncf21br0ywdbx91gia62k5kkrgnaj38qclfljhzqx83pr3q";}
-  {name="kbruch";value="143wfqjpnwcd51zr14mgn2ak38szbr24k1phv5lmlc3whgz7q15v";}
-  {name="kcalc";value="18jcr6mzasrbs4zbilxhqdsb03965bzm30f74clh5czsyv8s5129";}
-  {name="kcharselect";value="0hj9ax570qpgkj666qab6bdnz0irzlzynsq28dw64sdmjcxs28k4";}
-  {name="kcolorchooser";value="00pr0sgq8s008lc0a22nmavsqap8dk00y6wd56a8zv2fpnrys5gn";}
-  {name="kdeadmin";value="1m5svs6wq393i2ja2z8vivbiw05z41r8nq07j0qypcgzm8a801ks";}
-  {name="kdeartwork";value="1ax5m70zb8jfil2llia5ph8ykz3xm1xnz0irp5ivp69hixnrrp09";}
-  {name="kde-baseapps";value="067a2s8kw26yjsm8lmn9xg3nw80yyfbkz2x96pj4qx1qxv4qviil";}
-  {name="kde-base-artwork";value="0rjxk5qbr15vi4vrd2x9ypqpbam3jbgiylzgk3bx5v367ldrrsbs";}
-  {name="kdegraphics-mobipocket";value="0fky12546bywjng8vab4nr7ih3zrmskp6kz49hqqbhpcxrnlihpf";}
-  {name="kdegraphics-strigi-analyzer";value="0g2zf9fmn6720j29pxsq9hw424p1p1pgz4smz1gb8casfrpc2mqa";}
-  {name="kdegraphics-thumbnailers";value="19nplbwhv0mdg6iawwm8vbmincccyabq9k8ywd8icr8vgj4ikvd4";}
-  {name="kdelibs";value="08249hp7q8ck1sgihia1idxllp7qb85xw9xv21snhccgdv3p1rd1";}
-  {name="kdenetwork";value="1fm9f7nln3735frlcrqvwpg10b31dgr4gf6xiyq068sixh4cv0g6";}
-  {name="kdepim";value="0v9mp548nbqvd03krq6z1djsvr5a6p21bz5dspqy6kp6xymblwzz";}
-  {name="kdepimlibs";value="09p60h7m41495664ijab33dc5n64spynnjqay1allx0mcldqnapq";}
-  {name="kdepim-runtime";value="1d47byk057jdgyvzjyhv7px39dl6qcg26i5r12p3q8y2lslnz5wr";}
-  {name="kdeplasma-addons";value="001yfb324wb7fpi57dz6rnnbjrip9n14bxa7yv20fpq8i6ngv8hl";}
-  {name="kde-runtime";value="065jhs3ajg3c6k25g5cwbxpp6wxmrd6qg0aza3lxfm87fb1v255n";}
-  {name="kdesdk";value="1bvmfaddvpgh5kx4nv4c3z33bka6m7wlsw1nzyip9gw1ghac6a2s";}
-  {name="kdetoys";value="1frkz6k7q99y2nn0j2xw00zsq4dbsmwyvq7jbh7y4wyzanbyxh0f";}
-  {name="kde-wallpapers";value="0gspx1xld9da4ppcgr20rvkbhy3jh4yqjzfvhsfi1qhh61jgfcks";}
-  {name="kdewebdev";value="178sq7r584qlkphzwdqhkjaq2h87vjjghq3ialmahzsas3qihkbs";}
-  {name="kde-workspace";value="1l927wa1qlj0vcahqb0h8vx23fyg9nwv07lmacb7igpv56ccgfam";}
-  {name="kdf";value="18b623q0p3sh5y69i6likknh90h85imgr2glddsjz4p38f575kis";}
-  {name="kdiamond";value="0smq3333k5qiny3663yj9h8j0smgybjxr0qpf2m139amr45qcyn4";}
-  {name="kfloppy";value="0xv1nsnv105b9dr2vdlns1vwq25963fgl130lhg31dafkiyn3ivr";}
-  {name="kfourinline";value="0d721glmhjp9dr6y60gv299jnjf96n8rkws759kizlq2x3ggn1gx";}
-  {name="kgamma";value="1hmw7pbsxclws57saha7s253172b61lvqxcqp2vpgvdgjdrraik5";}
-  {name="kgeography";value="1vnrm7rva467z582qppqryz0671b1bcmgxcxlc2f223kp9g0k8d5";}
-  {name="kgoldrunner";value="1d2sl02c2ys6vnxxy1rh9lsz3aj5rlzjmpx39dbvap5qqjsan58b";}
-  {name="kgpg";value="0k1ni2xb4p5p5r8vmnpxm77jqa4176apy7047dxc3w3v0qgqvj9n";}
-  {name="khangman";value="0bq0bdrx761fyaxfv43sfq68hfcwzhvagxm66jzk4wzd6pb1m6ky";}
-  {name="kig";value="0jmax8a357iqa3nggpmpbzk9vdnisdmilyqxgkrd1n43cs4cbc9h";}
-  {name="kigo";value="029xn39sxp2dpj8isq1gmis1858iya0bc758jy8d1rq4c046zmxj";}
-  {name="killbots";value="0arvfbzsax61nn3hz8nk82l3in802866fqsxhz2zrwh03dbrl30i";}
-  {name="kimono";value="1ic2xbgd8xwadrvc7qfq1ihkpnh4dx2pjrm5zbjgycyfvsmvl6sh";}
-  {name="kiriki";value="1dp1dp8s4r4501ldn0v5phkk3fj2kfrncz6h4pfylx27lhpbjbn0";}
-  {name="kiten";value="0jd17nvk6vqniqs8rzmzsnc5hr05i3fwmmvf44g35gpqmr88kb5b";}
-  {name="kjumpingcube";value="0z6a8iaprdaqpif054a6glbgcgwaxm2w4i1r9077k91nnsnwrmp3";}
-  {name="klettres";value="10jc56ll0cgaqkb2xf1gh0k75l90al046syj2q2dqsnaa7lazxp7";}
-  {name="klickety";value="0afb8llrx30zajsy2k0i22xf8ll9lrlmwzrqn4qq7s9wxzwy291v";}
-  {name="klines";value="0mkwb4d60zxalv0asw4qnvml6jf153ghzqcxgbac40nhzl2abdyz";}
-  {name="kmag";value="0pjq6nax82x3ldknld25xrx4adc2i7jcy0x4l343m83f5c79xyn6";}
-  {name="kmahjongg";value="1sx8yplpc70z1vdp9j1shmhc8cqbwmshdhl23hxpl1jydd36q1wj";}
-  {name="kmines";value="0qpcnp0hfhwybqfxgqvbwhin8lb50gca2kwvms10cayqmjafj9j8";}
-  {name="kmix";value="1k67gygq1j13p8nxk50n9q01yfkrv0safvxrbq5f70yvka1jdyj7";}
-  {name="kmousetool";value="17sylfp5zicq36c812jy9h6s4qprwwad05zbbj9701ax40iwrvlr";}
-  {name="kmouth";value="1bpqq919rzcaaqxp3md4w1lrhf5mxfjp07z5v7ii8mgji8wrq1g5";}
-  {name="kmplot";value="0dhdpx79klqc5xb9h4dcgriqivppcrw2ib2piqbqs882mi3pdzx2";}
-  {name="knavalbattle";value="07x4vh2h0d62kwwai5j0d6a2zf615y4mp3iacp5rz8j9pdkhqn52";}
-  {name="knetwalk";value="151cj33kfyjf5xxgw0q00l5jbvx5kb893y2mv9ydc9xmwgcd4szz";}
-  {name="kolf";value="1ibrf01vzpr5dyy2hjb6jq6i9hk7w4kw1iffkyh6w5z40nphs2dx";}
-  {name="kollision";value="1fgs793v36j27z76ik50wz466r3wrga5pq8ibqy3cinvh7blk7cb";}
-  {name="kolourpaint";value="1wxja4xd3jhxib2vpa5289f80hfcd2idpvzz4ap71ca0bzkvknq3";}
-  {name="konquest";value="0aga5yzv5jqbgzp6dp11mgjvfjzrs4csaa5pppwbld81573vldmp";}
-  {name="konsole";value="0kvv4ccc76swxzsw3z7dis8lbmnf6mbzj4b0n9l4zcmmw2iphvd4";}
-  {name="korundum";value="03djf01c6rm76dzswnlccwr81p5qyzccv2zxmbycclp8lp6w4vgg";}
-  {name="kpat";value="1vlyya0yiizrd9c1d4pl1dn6nw7g14rzvwhny12qls7ssrj40zzc";}
-  {name="kremotecontrol";value="0i6jz6m2a2ff97hkqpjy2qhdagx82jwcsnafl2cv0kddszxdabni";}
-  {name="kreversi";value="0ci6aampxq6l6sc8m8gxqrzhws56fbhp2xil0qzgab93xn7mmp1c";}
-  {name="kross-interpreters";value="1iypzm9rwszw1walylq6fa16s4hw84zqpyvmd7aik2dz59fmmvlx";}
-  {name="kruler";value="0841j4001v7497xa6nzdlprnhx8whp0rq24z2yblqnjf1wi5d07y";}
-  {name="ksaneplugin";value="10x1shs2cfa4331qymwafpm3hm45n3aqrhiriyl7vsnk1cc2agin";}
-  {name="kscd";value="0ih7zwyvrgsfd4sqj1g5m5hv71sqdzfhmfn6p3crdnnssbvnfhzd";}
-  {name="kshisen";value="1pxqz390mr066kni1gxa0jay00mgm1r0dmxydrg6mbfyw4qqw554";}
-  {name="ksirk";value="0rf5hj19bfc8mgm810rwvj1173nk93npgbsd17vsj1rqskdi57zy";}
-  {name="ksnakeduel";value="0q02nbcl71h6kqs3mdgq51g4y66p5p62mm70j55cfwjq70i8abbw";}
-  {name="ksnapshot";value="1rlq34j5ay3vyp1vpxxfpzyap26dcwg4ii10ql5bl28z2m1xv8ba";}
-  {name="kspaceduel";value="1nhxcmrn42gfkifxfikldha9045ffq5xzbb95wwvwp478jcqi4xk";}
-  {name="ksquares";value="06kxr8v70ygk2bwcvnfp4l4kjj3yhm5f5wgmzfww8h7kxg87lhg7";}
-  {name="kstars";value="0hhi2vfvv5dzr82gg2p34nsclis0hswkgvh9q21zg2nj2g4byblh";}
-  {name="ksudoku";value="1jglf83shv3p3kn71i0lbga9mil54cs2m4xr0dd113961c2fnylf";}
-  {name="ktimer";value="0kqavcxrxly15az0h0yn8cn6mksvka12yc8fywr029drnr70hs0i";}
-  {name="ktouch";value="1b8612a6pcsaamdq9hpkxr71vvmd0mxrnb0hl8iy05q61cv71i0b";}
-  {name="ktuberling";value="1zqzs86ricqwvj6ragxj4rxhddr92a34z8jwdp7qqqjdafzq57c8";}
-  {name="kturtle";value="0nslszpkacbdwsq8l2phzls5qbfm76r32yiynnd35qjfh94dpilf";}
-  {name="kubrick";value="1qlysx8kvz6r80rm0szq7pk007d57ddv77qy7d3gmpijwa9giybj";}
-  {name="kwallet";value="1pw7wgfjfa553kdc8z91amg18zhr5c51nhklr7kpqgp1yj0hwp6a";}
-  {name="kwordquiz";value="016l2yv461w6liqnkszprlr22nyyy7wi9f3fqblqq5xbps8wr6b4";}
-  {name="libkcddb";value="0qjdxxwj0hw6ykya6npfq2kp21sspwxf79pklz3w7q3gnl98rlbb";}
-  {name="libkcompactdisc";value="1jql8hqsb5jl73c22ssv0ddmhipjpgqxhwnyw362djdxifvrybhi";}
-  {name="libkdcraw";value="0w9h9a69wz7m0hg486jcw7vxkzrr3nfjkgqgr40i3cmxpnnjjvp9";}
-  {name="libkdeedu";value="0ai6vr33wcphimgbznmi8arh9fa9xpcpkjq8hq07svdgmbxjd44m";}
-  {name="libkdegames";value="0ifpxwpfh79gh5qs8wl0i951kab3ppmri0h99hi0idj96xhkznpf";}
-  {name="libkexiv2";value="1w9k4c38ziyfnh9byjszg6aw1mbjii06ladgiwx1q397layd7qhx";}
-  {name="libkipi";value="1a4kqhsvpcly6mlr9w8g8gb2wyyrfbi89pwb3i1ky3w9wxk87pi4";}
-  {name="libkmahjongg";value="1rr5z04af5kswcn6pjpd9ryp1zwp3znhwb97xgvppni88cwawyff";}
-  {name="libksane";value="1sv0ba5p0m8d621vykhayblk6lsys4c80474b7d7vgh9xbcxhhgc";}
-  {name="lskat";value="0bimy8wng95mpkssssmfm2779qyjsw5f1i9wh695k0jq6j25dscy";}
-  {name="marble";value="1z90p25fgvwg35pxap1yd3k2i2qrsv9d2057lixv03ymbj0l93aq";}
-  {name="mplayerthumbs";value="1m83pglqgi6dwbbnm4djybki11f2s6q2lhbqa6v1kq12133fhkc4";}
-  {name="nepomuk-core";value="14sfvizfwnarcidmj74v1rsix85sn9hvs6wm4xnyv7d4xw7mgqv3";}
-  {name="nepomuk-widgets";value="02wm1ghsf8mxv24y1d1b5j4nq8jwi6dwlbzlqdl2hhjqxfc60sxw";}
-  {name="okular";value="15aydihdfd5hzkgchxi2xpfy96bm90jcn07lmmp5xcdng3jj520h";}
-  {name="oxygen-icons";value="0rwdp44nkigs0v449l90mjw7ngs21a0jx17biascjhq1kxrh0vmp";}
-  {name="pairs";value="009qpwhy64xfad4ch4l4dh5dn5cj9g9jg0b3384k6wjvx6k61fqq";}
-  {name="palapeli";value="0g03r8f1z2jxyh2hl6l21s292240d2dbcqi0lndjyfsz322i55wc";}
-  {name="parley";value="1xn5na30xabzp8lhbmq5ajv08rl1s7zsn08ffwd2vq8ac1nwi0k6";}
-  {name="perlkde";value="0088hbqdjqdfyf1pqksppbq1xzpgc49rqsnpgjikgdh9nqssnipd";}
-  {name="perlqt";value="1jgiicjknkfiavnq9jw2mdmsqbqb4ch5caxfhx1v6azj4s95ldpj";}
-  {name="picmi";value="0ckfcmbivkbkl9akb20ih2k4sz221ygqi51wmir3p5ryvk2dlq2a";}
-  {name="print-manager";value="0wszjqf42c3mb8c9iq5ngjz21424zjl9j0g3pwgdfj0i8iv1lcd2";}
-  {name="pykde4";value="18j9fh1w3n9yrrzgsq3pqj2pi53wp58kbwkfwb3hn3a2ksw569qb";}
-  {name="qtruby";value="0zc0if1c8c0ddfm2f6w4zp6dizxqd3z6dnr1iwydw7mdac205j38";}
-  {name="qyoto";value="1cgkpr68wh5rq3kbkv0zjylmyfg1ld4qh8r5azrq25y4qiisxmax";}
-  {name="rocs";value="1ak19mjsniwqzybjawigqg8a04kpv6jhx53mkvlm3wjdnsxi1jis";}
-  {name="smokegen";value="09liqidf5a862l6a4cz4wghhmfsjay647q2q3h17s8iwwid7k373";}
-  {name="smokekde";value="1xl56ygpc0ca7smxiagm7ch45w6m415i9nbzin08i4p017vvx0df";}
-  {name="smokeqt";value="0rk31vd45xraihhb3nmx0mkynlq3wwvdsn0460jfi30m72zpmkyc";}
-  {name="step";value="00vxnybi6q7lw6w22gmd5jmai8ysgyh9sy1cnn6jj4difn1x8zcr";}
-  {name="superkaramba";value="1rkbrifkvhl2zajr96kk63lc3r5s43acfih6m499hgwxg8g9z0cf";}
-  {name="svgpart";value="0892krp78wq731wdr5ipsgx10w45xsrr8jx00qyjsci7qsmpfz4w";}
-  {name="sweeper";value="1i151jzqabfs72c8rl5hh401nmwp9abpa6nfq3m8qyh4d8gn0fig";}
-];
-modules=[
-{
-  module="kdemultimedia";
-  split=true;
-  pkgs=[
-    { name="audiocd-kio"; sane="audiocd_kio"; }
-    { name="dragon";  }
-    { name="ffmpegthumbs";  }
-    { name="juk";  }
-    { name="kmix";  }
-    { name="kscd";  }
-    { name="libkcddb";  }
-    { name="libkcompactdisc";  }
-    { name="mplayerthumbs";  }
-  ];
-}
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
-    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
-    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
-    { name="kgamma";  }
-    { name="kolourpaint";  }
-    { name="kruler";  }
-    { name="ksaneplugin";  }
-    { name="ksnapshot";  }
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="libkipi";  }
-    { name="libksane";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdelibs";
-  split=true;
-  pkgs=[
-    { name="kdelibs";  }
-    { name="nepomuk-core"; sane="nepomuk_core"; }
-    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
-  ];
-}
-{
-  module="kdeutils";
-  split=true;
-  pkgs=[
-    { name="ark";  }
-    { name="filelight";  }
-    { name="kcalc";  }
-    { name="kcharselect";  }
-    { name="kdf";  }
-    { name="kfloppy";  }
-    { name="kgpg";  }
-    { name="kremotecontrol";  }
-    { name="ktimer";  }
-    { name="kwallet";  }
-    { name="print-manager"; sane="print_manager"; }
-    { name="superkaramba";  }
-    { name="sweeper";  }
-  ];
-}
-{
-  module="applications";
-  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="konsole";  }
-  ];
-}
-{
-  module="kdegames";
-  split=true;
-  pkgs=[
-    { name="bomber";  }
-    { name="bovo";  }
-    { name="granatier";  }
-    { name="kajongg";  }
-    { name="kapman";  }
-    { name="katomic";  }
-    { name="kblackbox";  }
-    { name="kblocks";  }
-    { name="kbounce";  }
-    { name="kbreakout";  }
-    { name="kdiamond";  }
-    { name="kfourinline";  }
-    { name="kgoldrunner";  }
-    { name="kigo";  }
-    { name="killbots";  }
-    { name="kiriki";  }
-    { name="kjumpingcube";  }
-    { name="klickety";  }
-    { name="klines";  }
-    { name="kmahjongg";  }
-    { name="kmines";  }
-    { name="knavalbattle";  }
-    { name="knetwalk";  }
-    { name="kolf";  }
-    { name="kollision";  }
-    { name="konquest";  }
-    { name="kpat";  }
-    { name="kreversi";  }
-    { name="kshisen";  }
-    { name="ksirk";  }
-    { name="ksnakeduel";  }
-    { name="kspaceduel";  }
-    { name="ksquares";  }
-    { name="ksudoku";  }
-    { name="ktuberling";  }
-    { name="kubrick";  }
-    { name="libkdegames";  }
-    { name="libkmahjongg";  }
-    { name="lskat";  }
-    { name="palapeli";  }
-    { name="picmi";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="analitza";  }
-    { name="blinken";  }
-    { name="cantor";  }
-    { name="kalgebra";  }
-    { name="kalzium";  }
-    { name="kanagram";  }
-    { name="kbruch";  }
-    { name="kgeography";  }
-    { name="khangman";  }
-    { name="kig";  }
-    { name="kiten";  }
-    { name="klettres";  }
-    { name="kmplot";  }
-    { name="kstars";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
-    { name="marble";  }
-    { name="pairs";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="kimono";  }
-    { name="korundum";  }
-    { name="kross-interpreters"; sane="kross_interpreters"; }
-    { name="perlkde";  }
-    { name="perlqt";  }
-    { name="pykde4";  }
-    { name="qtruby";  }
-    { name="qyoto";  }
-    { name="smokegen";  }
-    { name="smokekde";  }
-    { name="smokeqt";  }
-  ];
-}
-{
-  module="kdeaccessibility";
-  split=true;
-  pkgs=[
-    { name="jovie";  }
-    { name="kaccessible";  }
-    { name="kmag";  }
-    { name="kmousetool";  }
-    { name="kmouth";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdeadmin";  split=false;
-  pkgs=[
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kuser"; }
-    { name="kcron"; }
-    { name="ksystemlog"; }
-  ];
-
-}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="sounds"; }
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-  ];
-
-}
-{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
-{ module="kdenetwork";  split=false;
-  pkgs=[
-    { name="kfile-plugins"; sane="kfile_plugins";}
-    { name="kget"; }
-    { name="kopete"; }
-    { name="krdc"; }
-    { name="kppp"; }
-    { name="krfb"; }
-    { name="kdnssd"; }
-    { name="filesharing"; }
-  ];
-
-}
-{ module="kdepim";  split=false;}
-{ module="kdepimlibs";  split=false;}
-{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
-{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
-{ module="kde-runtime"; sane="kde_runtime"; split=false;}
-#had to add fake pkgs to kdesdk to get it to be treated like a split module
-{ module="kdesdk";  split=false; pkgs = [{ name="fake"; }]; }
-{ module="kdetoys";  split=false;
-  pkgs=[
-    { name="kteatime"; }
-    { name="ktux"; }
-    { name="amor"; }
-  ];
-
-}
-{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
-{ module="kdewebdev";  split=false;
-  pkgs=[
-    { name="klinkstatus"; }
-    { name="kfilereplace"; }
-    { name="kimagemapeditor"; }
-    { name="kommander"; }
-  ];
-
-}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
-{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
-];
-}

From 66021f9cd8b3076dc1d6d4be705850c32a2fe8d4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jul 2013 14:54:47 +0200
Subject: [PATCH 239/439] Fix kdenetwork

---
 .../kdenetwork/kdenetwork-filesharing.nix     |  2 --
 .../kdenetwork-strigi-analyzers.nix           |  4 +---
 .../kde-4.10/kdenetwork/kdenetwork.patch      | 24 -------------------
 pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix  |  2 --
 pkgs/desktops/kde-4.10/kdenetwork/kget.nix    | 11 ++++-----
 pkgs/desktops/kde-4.10/kdenetwork/kppp.nix    |  2 --
 pkgs/desktops/kde-4.10/kdenetwork/krdc.nix    |  3 ---
 pkgs/desktops/kde-4.10/kdenetwork/krfb.nix    |  6 ++---
 8 files changed, 7 insertions(+), 47 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch

diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix
index 2f32f4d6b2cd..bada0c1cb108 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix
@@ -2,6 +2,4 @@
 
 kde {
   buildInputs = [ kdelibs ];
-
-  patches = [ ./kdenetwork.patch ];
 }
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix
index f90fd3560796..ac28edb8dd98 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix
@@ -5,7 +5,5 @@ kde {
 
   buildInputs = [ kdelibs boost ];
 
-  preConfigure = "mv -v strigi-analyzer kfile-plugins";
-
-  patches = [ ./kdenetwork.patch ];
+  #preConfigure = "mv -v kdenetwork-strigi-analyzers kfile-plugins";
 }
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch
deleted file mode 100644
index ebadbfad9bac..000000000000
--- a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -r -u kdenetwork-4.7.1.orig/CMakeLists.txt kdenetwork-4.7.1/CMakeLists.txt
---- kdenetwork-4.7.1.orig/CMakeLists.txt	2011-03-29 15:25:42.174521812 +0400
-+++ kdenetwork-4.7.1/CMakeLists.txt	2011-03-29 15:27:43.268140322 +0400
-@@ -28,7 +28,8 @@
-    set(CMAKE_REQUIRED_INCLUDES  ${KDEWIN_INCLUDES} )
- endif (WIN32)
- 
--find_package(KdepimLibs REQUIRED)
-+macro_optional_find_package(KdepimLibs)
-+macro_log_feature(KDEPIMLIBS_FOUND "KDEPimLibs" "KDE pim-related libraries" "http://pim.kde.org.org/" FALSE "" "Required for Kopete")
- # find_package(X11VidMode) not used at this time
- 
- # NX support is not ready for KDE 4.2; disabled (uwolfer)
-@@ -79,7 +80,9 @@
- macro_optional_add_subdirectory(kfile-plugins)
- macro_optional_add_subdirectory(kget)
- 
--macro_optional_add_subdirectory(kopete)
-+if(KDEPIMLIBS_FOUND)
-+  macro_optional_add_subdirectory(kopete)
-+endif(KDEPIMLIBS_FOUND)
- 
- if(Q_WS_X11)
-   macro_optional_add_subdirectory(krdc)
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix
index 2f32f4d6b2cd..bada0c1cb108 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix
@@ -2,6 +2,4 @@
 
 kde {
   buildInputs = [ kdelibs ];
-
-  patches = [ ./kdenetwork.patch ];
 }
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kget.nix b/pkgs/desktops/kde-4.10/kdenetwork/kget.nix
index 25028ef974ef..d5f38096a427 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/kget.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kget.nix
@@ -4,14 +4,11 @@
 kde {
   buildInputs =
     [ kdelibs libktorrent
-#kde_workspace 
-shared_desktop_ontologies 
-#kdepimlibs
-#      kde_baseapps 
-gpgme boost libmms qca2 sqlite
+      kde_workspace
+      shared_desktop_ontologies
+      # kde_baseapps
+      gpgme boost libmms qca2 sqlite
     ];
 
   KDEDIRS = libktorrent;
-
-  patches = [ ./kdenetwork.patch ];
 }
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix
index 2f32f4d6b2cd..bada0c1cb108 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix
@@ -2,6 +2,4 @@
 
 kde {
   buildInputs = [ kdelibs ];
-
-  patches = [ ./kdenetwork.patch ];
 }
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix
index 1f3ba36aaa1b..1b7405f10062 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix
@@ -1,8 +1,5 @@
 { kde, kdelibs, libvncserver, libjpeg }:
 
 kde {
-
   buildInputs = [ kdelibs libvncserver libjpeg ];
-
-  patches = [ ./kdenetwork.patch ];
 }
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix
index 80013f430d3c..b6c36ea9c158 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix
@@ -1,7 +1,5 @@
-{ kde, kdelibs, libvncserver, libXdamage, libXtst }:
+{ kde, kdelibs, libvncserver, libXdamage, libXtst, libjpeg }:
 
 kde {
-  buildInputs = [ kdelibs libvncserver libXdamage libXtst];
-
-  patches = [ ./kdenetwork.patch ];
+  buildInputs = [ kdelibs libvncserver libXdamage libXtst libjpeg ];
 }

From 7ffb3a4ba5b36133808e603a769900a77e4962b2 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Thu, 18 Jul 2013 00:02:53 +0800
Subject: [PATCH 240/439] add herbstluftwm 0.5.2

---
 .../window-managers/herbstluftwm/default.nix  | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/window-managers/herbstluftwm/default.nix

diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix
new file mode 100644
index 000000000000..3ce50a82915a
--- /dev/null
+++ b/pkgs/applications/window-managers/herbstluftwm/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, glib, libX11, libXinerama }:
+
+stdenv.mkDerivation rec {
+  name = "herbstluftwm-0.5.2";
+
+  src = fetchurl {
+    url = "http://herbstluftwm.org/tarballs/${name}.tar.gz";
+    sha256 = "15crb77gw8p1h721r3dcgn0m1n03qk0g81rrnaqw8p7hz44k6gf5";
+  };
+
+  patchPhase = ''
+      sed -i -e "s:/usr/local:$\{out}:" \
+             -e "s:/etc:$\{out}/etc:" \
+          config.mk
+  '';
+
+  buildInputs = [ pkgconfig glib libX11 libXinerama ];
+
+  meta = {
+    description = "A manual tiling window manager for X";
+    homepage = "http://herbstluftwm.org/";
+    license = "BSD"; # Simplified BSD License
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef0b595d153c..b912ae4d2ee7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7704,6 +7704,8 @@ let
 
   hello = callPackage ../applications/misc/hello/ex-2 { };
 
+  herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { };
+
   hexedit = callPackage ../applications/editors/hexedit { };
 
   hetznerNixOpsInstaller =

From bc4c9312a5bb735e0c72345e4889bf41a3b07104 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Wed, 17 Jul 2013 11:47:38 -0430
Subject: [PATCH 241/439] Add aldor.

---
 pkgs/development/compilers/aldor/default.nix | 52 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/compilers/aldor/default.nix

diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix
new file mode 100644
index 000000000000..7d0fd7a39bbc
--- /dev/null
+++ b/pkgs/development/compilers/aldor/default.nix
@@ -0,0 +1,52 @@
+{ fetchgit, stdenv, gmp, which, flex, bison, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  pname = "aldor";
+  version = "1.1.0";
+  name = "${pname}-${version}";
+  gitRev = "a02b088c8d5d06f16c50a83ddee4019e962d6673";
+
+  src = fetchgit {
+    url = "https://github.com/pippijn/aldor";
+    sha256 = "1zd343wq46f74yr30a5nrbv5n831z6wd24yqnrs7w17ccic69lny";
+    rev = gitRev;
+  };
+
+  buildInputs = [ gmp which flex bison makeWrapper ];
+
+  installPhase = ''
+    for d in bin include lib ;
+    do
+      ensureDir $out/$d ;
+      cp -r build/$d $out/ ;
+    done
+
+    for prog in aldor unicl zacc ;
+    do
+      wrapProgram $out/bin/$prog --set ALDORROOT $out \
+        --prefix PATH : ${stdenv.gcc}/bin ;
+    done
+  '';
+
+  meta = with stdenv.lib ; {
+    description = "Aldor is a programming language with an expressive type system";
+
+    longDescription = ''
+      Aldor is a programming language with an expressive type system well-suited
+      for mathematical computing and which has been used to develop a number of
+      computer algebra libraries. Originally known as A#, Aldor was conceived as
+      an extension language for the Axiom system, but is now used more in other settings.
+      In Aldor, types and functions are first class values that can be constructed
+      and manipulated within programs. Pervasive support for dependent types allows
+      static checking of dynamic objects. What does this mean for a normal user? Aldor
+      solves many difficulties encountered in widely-used object-oriented programming
+      languages. It allows programs to use a natural style, combining the more attractive
+      and powerful properties of functional, object-oriented and aspect-oriented styles.
+    '';
+
+    homepage = http://www.aldor.org/;
+    license = licenses.asl20;
+    maintainers = [ ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 108424f87c79..a8b2370d1f53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2074,6 +2074,8 @@ let
       javaCup = callPackage ../development/libraries/java/cup { };
     };
 
+  aldor = callPackage ../development/compilers/aldor { };
+
   aspectj = callPackage ../development/compilers/aspectj { };
 
   bigloo = callPackage ../development/compilers/bigloo { };

From 8807aab195c113128b53b368e63f6ad229b193ad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 17 Jul 2013 19:07:51 +0200
Subject: [PATCH 242/439] haskell-Hipmunk: update to version 5.2.0.11

---
 pkgs/development/libraries/haskell/Hipmunk/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix
index c07060cf1970..7ee64f4254eb 100644
--- a/pkgs/development/libraries/haskell/Hipmunk/default.nix
+++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix
@@ -2,12 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "Hipmunk";
-  version = "5.2.0.10";
-  sha256 = "0kq6dlx1g7dra7nsfmrc13yvnl7wh00fadmgln9v2vyf0ww82x95";
+  version = "5.2.0.11";
+  sha256 = "0pcbwlq0njgj6dzh8h94gml63wv52f6l9hdas378lm7v8gbizxl7";
   buildDepends = [ StateVar transformers ];
-  patchPhase = ''
-    sed -i -e 's|containers.*,|containers,|' Hipmunk.cabal
-  '';
   meta = {
     homepage = "http://patch-tag.com/r/felipe/hipmunk/home";
     description = "A Haskell binding for Chipmunk";

From f1e8140966264c189390a2d7897d5cc20a7bd5c5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 17 Jul 2013 19:07:51 +0200
Subject: [PATCH 243/439] haskell-hackage-db: update to version 1.7

---
 pkgs/development/libraries/haskell/hackage-db/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix
index f3d029a5ea72..46e2913572ef 100644
--- a/pkgs/development/libraries/haskell/hackage-db/default.nix
+++ b/pkgs/development/libraries/haskell/hackage-db/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hackage-db";
-  version = "1.5";
-  sha256 = "1m7f6vwgjzibk8rd14y6m62xv5969ns94a57sansi9d83q6rj9iv";
+  version = "1.7";
+  sha256 = "0mf22xxbcbjb7l4jahknp6s7lsfn43ib7z9m2jsg9py92vkacfp1";
   buildDepends = [ Cabal filepath tar utf8String ];
   meta = {
     homepage = "http://github.com/peti/hackage-db";

From 57ce3126d7fd2924c1ec2b2a36d727dea635453f Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Wed, 17 Jul 2013 13:07:03 -0430
Subject: [PATCH 244/439] kde-base-artwork: fix hash.

---
 pkgs/desktops/kde-4.10/kde-base-artwork.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-4.10/kde-base-artwork.nix b/pkgs/desktops/kde-4.10/kde-base-artwork.nix
index d953a8306412..3f416cebddc4 100644
--- a/pkgs/desktops/kde-4.10/kde-base-artwork.nix
+++ b/pkgs/desktops/kde-4.10/kde-base-artwork.nix
@@ -3,7 +3,7 @@
 kde {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk5";
+  outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8";
 
   buildInputs = [ kdelibs ];
 

From 074898e0dbd033a4f88977f866c54c5b7205a3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 17 Jul 2013 01:53:30 +0200
Subject: [PATCH 245/439] apcupsd: new package

apcupsd is a daemon for controlling APC UPSes.
---
 pkgs/servers/apcupsd/default.nix | 54 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/servers/apcupsd/default.nix

diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
new file mode 100644
index 000000000000..45688ee7fd9f
--- /dev/null
+++ b/pkgs/servers/apcupsd/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils, nettools, man
+, enableCgiScripts ? true, gd
+}:
+
+stdenv.mkDerivation rec {
+  pname = "apcupsd";
+  name = "${pname}-3.14.10";
+
+  src = fetchurl {
+    url = "https://sourceforge/${pname}/${name}.tar.gz";
+    sha256 = "0ci0xyg1hzj8lnmm3vxfsvgpb3wdgh1ii3gb8jgdxyqnk7nba1q7";
+  };
+
+  buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd;
+
+  # ./configure ignores --prefix, so we must specify some paths manually
+  # There is no real reason for a bin/sbin split, so just use bin.
+  preConfigure = ''
+    export ac_cv_path_SHUTDOWN=${systemd}/sbin/shutdown
+    export ac_cv_path_WALL=${utillinux}/bin/wall
+    sed -i 's|/bin/cat|${coreutils}/bin/cat|' configure
+    export configureFlags="\
+        --bindir=$out/bin \
+        --sbindir=$out/bin \
+        --sysconfdir=$out/etc/apcupsd \
+        --mandir=$out/share/man \
+        --with-halpolicydir=$out/share/halpolicy \
+        --localstatedir=/var/ \
+        --with-nologin=/etc \
+        --with-log-dir=/var/log/apcupsd \
+        --with-pwrfail-dir=/run/apcupsd \
+        --with-lock-dir=/run/lock \
+        --with-pid-dir=/run \
+        --enable-usb \
+        ${stdenv.lib.optionalString enableCgiScripts "--enable-cgi --with-cgi-bin=$out/libexec/cgi-bin"}
+        "
+  '';
+
+  postInstall = ''
+    for file in "$out"/etc/apcupsd/*; do
+        sed -i -e 's|^WALL=.*|WALL="${utillinux}/bin/wall"|g' \
+               -e 's|^HOSTNAME=.*|HOSTNAME="${nettools}/bin/hostname"|g' \
+               "$file"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A daemon for controlling APC UPSes";
+    homepage = http://www.apcupsd.com/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8b2370d1f53..2237430ce7de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5822,6 +5822,8 @@ let
     sslSupport = true;
   });
 
+  apcupsd = callPackage ../servers/apcupsd { };
+
   sabnzbd = callPackage ../servers/sabnzbd { };
 
   bind = callPackage ../servers/dns/bind { };

From dcd3dad3d92a5191c0ef9394b4dfa9b551f1fe0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 17 Jul 2013 21:10:56 +0200
Subject: [PATCH 246/439] apcupsd: fix download url

---
 pkgs/servers/apcupsd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index 45688ee7fd9f..58b3df1b436e 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-3.14.10";
 
   src = fetchurl {
-    url = "https://sourceforge/${pname}/${name}.tar.gz";
+    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
     sha256 = "0ci0xyg1hzj8lnmm3vxfsvgpb3wdgh1ii3gb8jgdxyqnk7nba1q7";
   };
 

From a30c06de836908dd92d98760c08698aaafea2bce Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 17 Jul 2013 22:19:29 +0200
Subject: [PATCH 247/439] Add bitbucket_api and some of its dependencies

---
 pkgs/top-level/python-packages.nix | 92 ++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b223d941196a..e532fe473373 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -457,6 +457,26 @@ pythonPackages = python.modules // rec {
   };
 
 
+  bitbucket_api = buildPythonPackage rec {
+    name = "bitbucket-api-0.4.4";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/b/bitbucket-api/${name}.tar.gz";
+      md5 = "6f3cee3586c4aad9c0b2e04fce9704fb";
+    };
+
+    propagatedBuildInputs = [ requests_oauth2 nose sh ];
+
+    doCheck = false;
+
+    meta = {
+      homepage = https://github.com/Sheeprider/BitBucket-api;
+      description = "Python library to interact with BitBucket REST API";
+      license = pkgs.lib.licenses.mit;
+    };
+  };
+
+
   bitstring = buildPythonPackage rec {
     name = "bitstring-3.1.2";
 
@@ -3107,6 +3127,26 @@ pythonPackages = python.modules // rec {
     };
   });
 
+
+  oauthlib = buildPythonPackage rec {
+    name = "oauthlib-0.5.0";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/o/oauthlib/${name}.tar.gz";
+      md5 = "d12c507de33403ebdf290fbffdb98213";
+    };
+
+    buildInputs = [ mock nose unittest2 ];
+
+    propagatedBuildInputs = [ pycrypto ];
+
+    meta = {
+      homepage = https://github.com/idan/oauthlib;
+      description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic";
+    };
+  };
+
+
   obfsproxy = buildPythonPackage ( rec {
     name = "obfsproxy-0.2.2";
     src = fetchgit {
@@ -4473,6 +4513,7 @@ pythonPackages = python.modules // rec {
     };
   };
 
+
   requests = buildPythonPackage rec {
     name = "requests-1.2.0";
 
@@ -4488,6 +4529,40 @@ pythonPackages = python.modules // rec {
   };
 
 
+  requests_oauthlib = buildPythonPackage rec {
+    name = "requests-oauthlib-0.3.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/r/requests-oauthlib/${name}.tar.gz";
+      md5 = "35b3b750493c231145c39db0216813e7";
+    };
+
+    propagatedBuildInputs = [ oauthlib requests ];
+
+    meta = {
+      description = "OAuthlib authentication support for Requests";
+      homepage = https://github.com/requests/requests-oauthlib;
+    };
+  };
+
+
+  requests_oauth2 = buildPythonPackage rec {
+    name = "requests-oauth2-0.1.1";
+
+    src = fetchurl {
+      url = https://github.com/maraujop/requests-oauth2/archive/0.1.1.tar.gz;
+      sha256 = "1aij66qg9j5j4vzyh64nbg72y7pcafgjddxsi865racsay43xfqg";
+    };
+
+    propagatedBuildInputs = [ requests_oauthlib ];
+
+    meta = {
+      description = "Python's Requests OAuth2 (Open Authentication) plugin";
+      homepage = https://github.com/maraujop/requests-oauth2;
+    };
+  };
+
+
   reviewboard = buildPythonPackage rec {
     name = "ReviewBoard-1.6.16";
 
@@ -4752,6 +4827,23 @@ pythonPackages = python.modules // rec {
   };
 
 
+  sh = buildPythonPackage rec {
+    name = "sh-1.08";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/s/sh/${name}.tar.gz";
+      md5 = "4028bcba85daa0aef579ed24261e88a3";
+    };
+
+    doCheck = false;
+
+    meta = {
+      description = "Python subprocess interface";
+      homepage = http://pypi.python.org/pypi/sh/;
+    };
+  };
+
+
   six = buildPythonPackage rec {
     name = "six-1.3.0";
 

From 30f54585d57fd143e65e189e9b1b6e4d67215702 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sat, 22 Jun 2013 15:05:32 +0200
Subject: [PATCH 248/439] Add stm32flash, flash program for stm32 bootloader.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 .../tools/misc/stm32flash/default.nix         | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/tools/misc/stm32flash/default.nix

diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix
new file mode 100644
index 000000000000..496288285c7b
--- /dev/null
+++ b/pkgs/development/tools/misc/stm32flash/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation {
+  name = "stm32flash-1.0";
+
+  src = fetchurl {
+    url = https://stm32flash.googlecode.com/files/stm32flash.tar.gz;
+    sha256 = "04k631g9lzvp9xr4sw51xpq1g542np61s1l8fpwx9rbsc8m5l0i6";
+  };
+
+  buildInputs = [];
+
+  installPhase = ''
+    # Manually copy, make install copies to /usr/local/bin
+    mkdir -pv $out/bin/
+    cp stm32flash $out/bin/
+  '';
+
+  meta = { 
+    description = "Open source flash program for the STM32 ARM processors using the ST bootloader.";
+    homepage = https://code.google.com/p/stm32flash/;
+    license = "GPLv2";
+    platforms = stdenv.lib.platforms.all; # Should work on all platforms
+    maintainers = [ stdenv.lib.maintainers.the-kenny ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2237430ce7de..de84f54a82db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3589,6 +3589,8 @@ let
 
   splint = callPackage ../development/tools/analysis/splint { };
 
+  stm32flash = callPackage ../development/tools/misc/stm32flash { };
+
   strace = callPackage ../development/tools/misc/strace { };
 
   swig = callPackage ../development/tools/misc/swig { };

From ad6fb1fb357ada55a410093fdb072e3d3f1bb45a Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 18 Jul 2013 00:04:21 +0200
Subject: [PATCH 249/439] Update btsync to 1.1.42.

This upgrade is downward compatible down to 1.1.27 (same as prev.
version in Nix).

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/applications/networking/bittorrentsync/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix
index 73b456dc9a51..a8c4a5352581 100644
--- a/pkgs/applications/networking/bittorrentsync/default.nix
+++ b/pkgs/applications/networking/bittorrentsync/default.nix
@@ -14,9 +14,9 @@ let
     else if stdenv.system == "i686-linux" then "ld-linux.so.2"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  version = "1.1.33";
-  sha256 = if stdenv.system == "x86_64-linux" then "1h3b84cbj6w28q591v6ydvmkgv9ydl0qknxjb3vaba0dym5gblvv"
-    else if stdenv.system == "i686-linux" then "1l7l6najsbqxb01wld54fzgsb122z5a2mlnv1r48sxq26cfwp6bk"
+  version = "1.1.42";
+  sha256 = if stdenv.system == "x86_64-linux" then "07gcjzhhr8simkjjxhyzkvh3748ll81d742fz7j31nwdi34my8ri"
+    else if stdenv.system == "i686-linux" then "0awf5bfhb4dp4aydzrgdp3wqv1mz6ys1z45i0r1hbqszvf44xj7c"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
 in stdenv.mkDerivation {

From f142483de074f4bdb000e60aae1c89ef5244f0f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 16 Jul 2013 17:33:49 +0200
Subject: [PATCH 250/439] qemu: enable spice protocol support by default

We already enable VNC and SDL support by default and adding spice only
increases the closure size from 513 MB to 518 MB.

Closure size:
  du -sch $(nix-store -qR ./result)
---
 pkgs/applications/virtualization/qemu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 91050619e437..1a35b8701929 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -2,7 +2,7 @@
 , attr, libcap, vde2, alsaLib, texinfo, libuuid
 , sdlSupport ? true, SDL
 , vncSupport ? true, libjpeg, libpng
-, spiceSupport ? false, spice, spice_protocol
+, spiceSupport ? true, spice, spice_protocol
 , x86Only ? false
 }:
 

From d26e46acd61997259a1e7f752821b9e95507c5c5 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 18 Jul 2013 03:55:22 +0300
Subject: [PATCH 251/439] golly: fix version to match tarball. this time for
 sure :)

---
 pkgs/applications/science/misc/golly/src-for-default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/misc/golly/src-for-default.nix b/pkgs/applications/science/misc/golly/src-for-default.nix
index 331c63aa1803..50d3d41a8ba4 100644
--- a/pkgs/applications/science/misc/golly/src-for-default.nix
+++ b/pkgs/applications/science/misc/golly/src-for-default.nix
@@ -1,6 +1,6 @@
 rec {
    version="2.4";
-   name="golly-2.4-src";
+   name="golly-2.4";
    hash="06vajm019q4q4wfy6pc1669fbjqdb4jaxcc419bk0vzky40anl9w";
    url="mirror://sourceforge/golly/golly-2.4-src.tar.gz";
    advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz";

From 7889b82f32cb37d8e158a8b62d67d44970563a88 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 18 Jul 2013 08:21:41 +0200
Subject: [PATCH 252/439] updates for python packages: mccabe, pep8, flake8

---
 pkgs/top-level/python-packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e532fe473373..7d26cdbc7a38 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2603,11 +2603,11 @@ pythonPackages = python.modules // rec {
 
 
   mccabe = buildPythonPackage (rec {
-    name = "mccabe-0.2";
+    name = "mccabe-0.2.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/m/mccabe/${name}.tar.gz";
-      md5 = "c1012c7c24081471f45aab864d4e3805";
+      md5 = "5a3f3fa6a4bad126c88aaaa7dab682f5";
     };
 
     buildInputs = [ ];
@@ -3320,11 +3320,11 @@ pythonPackages = python.modules // rec {
 
   pep8 = buildPythonPackage rec {
     name = "pep8-${version}";
-    version = "1.4.5";
+    version = "1.4.6";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz";
-      md5 = "055dbd22ac5669232fdba752612e9686";
+      md5 = "a03bb494859e87b42601b61b1b043a0c";
     };
 
     #======================================================================
@@ -3823,11 +3823,11 @@ pythonPackages = python.modules // rec {
   };
 
   pyflakes = buildPythonPackage rec {
-    name = "pyflakes-0.6.1";
+    name = "pyflakes-0.7.3";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pyflakes/${name}.tar.gz";
-      md5 = "00debd2280b962e915dfee552a675915";
+      md5 = "ec94ac11cb110e6e72cca23c104b66b1";
     };
 
     buildInputs = [ unittest2 ];

From 181dc4032dcb0a72eebf5f2949f9f56227dbabc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 18 Jul 2013 03:12:41 +0200
Subject: [PATCH 253/439] Remove the old KQEMU accelerator module

KQEMU was a linux kernel module for accelerating the QEMU virtual
machine on x86 hardware. Since QEMU 0.11 (and up), there is no support
for KQEMU any more, the focus is now on KVM.

http://wiki.qemu.org/KQemu/Doc
---
 pkgs/os-specific/linux/kqemu/default.nix | 28 ------------------------
 pkgs/top-level/all-packages.nix          |  2 --
 pkgs/top-level/release-python.nix        |  1 -
 3 files changed, 31 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kqemu/default.nix

diff --git a/pkgs/os-specific/linux/kqemu/default.nix b/pkgs/os-specific/linux/kqemu/default.nix
deleted file mode 100644
index 97b7c495bb38..000000000000
--- a/pkgs/os-specific/linux/kqemu/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, kernelDev, perl }:
-
-stdenv.mkDerivation rec {
-  name = "kqemu-1.4.0pre1-${kernelDev.version}";
-  
-  src = fetchurl {
-    url = "http://www.nongnu.org/qemu/${name}.tar.gz";
-    sha256 = "14dlmawn3gia1j401ag5si5k1a1vav7jpv86rl37p1hwmr7fihxs";
-  };
-
-  buildInputs = [ perl ];
-  
-  configureFlags = [ ''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernelDev}/lib/modules/*/build)'' ];
-  
-  preConfigure = '' 
-    sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c
-
-    sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c
-    sed -e 's/`uname -r`/'"$(basename ${kernelDev}/lib/modules/*)"'/' -i install.sh
-    sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
-    sed -e '/depmod/d' -i install.sh
-    cat install.sh
-  '';
-
-  meta = {
-    description = "Kernel module for QEMU acceleration";
-  }; 
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de84f54a82db..d85880ac4395 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6473,8 +6473,6 @@ let
 
     wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { };
 
-    kqemu = callPackage ../os-specific/linux/kqemu { };
-
     klibc = callPackage ../os-specific/linux/klibc {
       linuxHeaders = glibc.kernelHeaders;
     };
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 9cde018632fc..2ed725e68ce2 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -1093,7 +1093,6 @@ in
     iscsitarget = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     iwlwifi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     klibc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-    kqemu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     ndiswrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     nvidia_x11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     nvidia_x11_legacy173 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };

From d898762d8b0db968286ed515fd69243ea4a741ed Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 18 Jul 2013 11:05:08 +0200
Subject: [PATCH 254/439] unetbootin: update to version 585

---
 pkgs/tools/cd-dvd/unetbootin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index b1fd5a10c2b4..0b97f03a9adc 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, p7zip, mtools, syslinux }:
 
-let version = "563"; in
+let version = "585"; in
 
 stdenv.mkDerivation rec {
   name = "unetbootin-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz";
-    sha256 = "1j4ka6rjf5akhcdb4pbfdrka9zflhch97b5i42zk1cf8hd6wx939";
+    sha256 = "1jwwmh4bfrsy4clmnmk9y7h5cd9nh2z3bbm6qwd5p5aw0ich9vk3";
   };
 
   sourceRoot = ".";

From 328774ab1fbb665d37acd83cc39da506015f5ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 18 Jul 2013 11:40:23 +0200
Subject: [PATCH 255/439] Updating qgis (1.8.0 & geos (3.3.8).

I also add libspatialindex and libspatialite, to get the latest qgis building.
---
 pkgs/applications/misc/qgis/default.nix       | 27 ++++++++-----
 pkgs/applications/misc/qgis/r14988.diff       | 38 -------------------
 pkgs/development/libraries/geos/default.nix   | 16 +++-----
 .../libraries/libspatialindex/default.nix     | 20 ++++++++++
 .../libraries/libspatialite/default.nix       | 23 +++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 6 files changed, 69 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/applications/misc/qgis/r14988.diff
 create mode 100644 pkgs/development/libraries/libspatialindex/default.nix
 create mode 100644 pkgs/development/libraries/libspatialite/default.nix

diff --git a/pkgs/applications/misc/qgis/default.nix b/pkgs/applications/misc/qgis/default.nix
index 834b3f0cfbe3..d6711c82968e 100644
--- a/pkgs/applications/misc/qgis/default.nix
+++ b/pkgs/applications/misc/qgis/default.nix
@@ -1,25 +1,32 @@
 { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl,
-  pyqt4, qwt, fcgi, python }:
+  pyqt4, qwt, fcgi, python, libspatialindex, libspatialite }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-1.6.0";
+  name = "qgis-1.8.0";
 
   buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt
-    fcgi ];
+    fcgi libspatialindex libspatialite ];
 
-  nativeBuildInputs = [ cmake python];
+  nativeBuildInputs = [ cmake python ];
 
-  patches = [ ./r14988.diff ];
+  enableParallelBuilding = true;
+
+  # To handle the lack of 'local' RPATH; required, as they call one of
+  # their built binaries requiring their libs, in the build process.
+  preBuild = ''
+    export LD_LIBRARY_PATH=`pwd`/output/lib:$LD_LIBRARY_PATH
+  '';
 
   src = fetchurl {
     url = "http://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "0vlz1z3scj3k6nxf3hzfiq7k2773i6xvk6dvj4axs2f4njpnx7pr";
+    sha256 = "1aq32ch61bqsvh39lmrxah1fmh18cd3nqyi1l0sn6ssa3kwf82vh";
   };
 
   meta = {
-    description = "user friendly Open Source Geographic Information System";
-    homepage = ttp://www.qgis.org;
-    # you can choose one of the following licenses:
-    license = [ "GPL" ];
+    description = "User friendly Open Source Geographic Information System";
+    homepage = http://www.qgis.org;
+    license = "GPLv2+";
+    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [viric];
   };
 }
diff --git a/pkgs/applications/misc/qgis/r14988.diff b/pkgs/applications/misc/qgis/r14988.diff
deleted file mode 100644
index 95d55047e1da..000000000000
--- a/pkgs/applications/misc/qgis/r14988.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: qgis/python/core/conversions.sip
-===================================================================
---- qgis/python/core/conversions.sip	(revision 14323)
-+++ qgis/python/core/conversions.sip	(revision 14988)
-@@ -16,4 +16,5 @@
- 
- %Feature QSETINT_CONVERSION
-+%Feature QSETTYPE_CONVERSION
- 
- %ModuleHeaderCode
-@@ -321,5 +322,5 @@
- %End
- 
--
-+%If (QSETTYPE_CONVERSION)
- template <TYPE>
- %MappedType QSet<TYPE>
-@@ -395,6 +396,5 @@
- 
- };
--
--
-+%End
- 
- template<TYPE>
-Index: qgis/python/CMakeLists.txt
-===================================================================
---- qgis/python/CMakeLists.txt	(revision 14330)
-+++ qgis/python/CMakeLists.txt	(revision 14988)
-@@ -44,4 +44,8 @@
- ENDIF(NOT PYQT4_VERSION_NUM LESS 263941)
- 
-+IF(NOT PYQT4_VERSION_NUM LESS 264194)	# 0x040802
-+  SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION)
-+ENDIF(NOT PYQT4_VERSION_NUM LESS 264194)
-+
- # core module
- FILE(GLOB sip_files_core core/*.sip)
diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index 734bde71338c..56c3c3e7a2bd 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -2,7 +2,7 @@
 
 let inherit (composableDerivation) edf; in
 
-composableDerivation.composableDerivation {} {
+composableDerivation.composableDerivation {} rec {
 
   flags =
   # python and ruby untested 
@@ -10,20 +10,14 @@ composableDerivation.composableDerivation {} {
     # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else [])
     # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };}
 
-  name = "geos-3.2.2";
+  name = "geos-3.3.8";
 
   src = fetchurl {
-    url = http://download.osgeo.org/geos/geos-3.2.2.tar.bz2;
-    sha256 = "0711wcq46h7zgvp0bk4m60vmx1wal9db1q36mayf0vwk34hprpr4";
+    url = "http://download.osgeo.org/geos/${name}.tar.bz2";
+    sha256 = "0fshz8s9g610ycl4grrmcdcxb01aqpc6qac3x3jjik0vlz8x9v7b";
   };
 
-  # for development version. can be removed ?
-  #configurePhase = "
-  #  [ -f configure ] || \\
-  #  LIBTOOLIZE=libtoolize ./autogen.sh
-  #  [>{ automake --add-missing; autoconf; }
-  #  unset configurePhase; configurePhase
-  #";
+  enableParallelBuilding = true;
 
   meta = {
     description = "C++ port of the Java Topology Suite (JTS)";
diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix
new file mode 100644
index 000000000000..c48c5265fc48
--- /dev/null
+++ b/pkgs/development/libraries/libspatialindex/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+let version = "1.8.1"; in
+
+stdenv.mkDerivation rec {
+  name = "libspatialindex-${version}";
+
+  src = fetchurl {
+    url = "http://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz";
+    sha256 = "1ay1kxn4baccd0cqx466v7fn8c8gcfbhlnd5mbdnd7s4aw0ix88j";
+  };
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Extensible spatial index library in C++";
+    homepage = http://libspatialindex.github.io/;
+    license = "MIT";
+  };
+}
diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix
new file mode 100644
index 000000000000..d5b401b804fb
--- /dev/null
+++ b/pkgs/development/libraries/libspatialite/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, sqlite, zlib, proj, geos }:
+
+stdenv.mkDerivation rec {
+  name = "libspatialite-4.1.1";
+
+  src = fetchurl {
+    url = "http://www.gaia-gis.it/gaia-sins/${name}.tar.gz";
+    sha256 = "03wikddl60ly0yh8szrra1ng2iccsdzz645vkn6a7x2jz45a5084";
+  };
+
+  buildInputs = [ sqlite zlib proj geos ];
+
+  configureFlags = "--disable-freexl";
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Extensible spatial index library in C++";
+    homepage = https://www.gaia-gis.it/fossil/libspatialite;
+    # They allow any of these
+    license = [ "GPLv2+" "LGPLv2+" "MPL1.1" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d85880ac4395..2505f239a86f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4786,6 +4786,10 @@ let
 
   libstartup_notification = callPackage ../development/libraries/startup-notification { };
 
+  libspatialindex = callPackage ../development/libraries/libspatialindex { };
+
+  libspatialite = callPackage ../development/libraries/libspatialite { };
+
   libtasn1 = callPackage ../development/libraries/libtasn1 { };
 
   libtheora = callPackage ../development/libraries/libtheora { };

From 906097c1e8239fae5f96043fad84172f16d8f1d6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 18 Jul 2013 10:51:34 -0400
Subject: [PATCH 256/439] Add uptime nodePackage (and update the rest)

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/node-packages-generated.nix | 63 ++++++++--------------
 pkgs/top-level/node-packages.json          |  1 +
 2 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index f628e2513bc4..142fc9616853 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -1708,17 +1708,6 @@
     sha1 = "f76f791e0d1b22649e11beeacddf8e62bd89ca2a";
     tarball = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.4.0.tgz";
   }
-  {
-    name = "growl";
-    spec = "1.5.x";
-    version = "1.5.1";
-    topLevel = false;
-    dependencies = [
-    ];
-    patchLatest = false;
-    sha1 = "1decd1f22a4b30dae7d363799ec624cf40cc0070";
-    tarball = "http://registry.npmjs.org/growl/-/growl-1.5.1.tgz";
-  }
   {
     name = "growl";
     spec = "1.7.x";
@@ -2621,22 +2610,6 @@
     sha1 = "95fc936622ce156b8b19ff8def466ac2f3a3f29e";
     tarball = "http://registry.npmjs.org/mocha/-/mocha-1.12.0.tgz";
   }
-  {
-    name = "mocha";
-    spec = "~1.3.2";
-    version = "1.3.2";
-    topLevel = false;
-    dependencies = [
-      { name = "commander"; spec = "0.6.1"; }
-      { name = "growl"; spec = "1.5.x"; }
-      { name = "jade"; spec = "0.26.3"; }
-      { name = "diff"; spec = "1.0.2"; }
-      { name = "debug"; spec = "*"; }
-    ];
-    patchLatest = false;
-    sha1 = "ab97b4f1e5942b9fe4d4436b8bd9eeda0eb01e13";
-    tarball = "http://registry.npmjs.org/mocha/-/mocha-1.3.2.tgz";
-  }
   {
     name = "mongodb";
     spec = "1.2.x";
@@ -2684,15 +2657,14 @@
   {
     name = "mongoose-schema-extend";
     spec = "*";
-    version = "0.1.3";
+    version = "0.1.4";
     topLevel = true;
     dependencies = [
       { name = "owl-deepcopy"; spec = "~0.0.1"; }
-      { name = "mocha"; spec = "~1.3.2"; }
     ];
     patchLatest = false;
-    sha1 = "8ee39f48c7a0beb4aad555c25cbac59fe7bd6502";
-    tarball = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.3.tgz";
+    sha1 = "9f61b2abba5352fcd3d7b1193ee4b4d9f2a83804";
+    tarball = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.4.tgz";
   }
   {
     name = "monocle";
@@ -3001,14 +2973,14 @@
   {
     name = "nopt";
     spec = "2";
-    version = "2.1.1";
+    version = "2.1.2";
     topLevel = false;
     dependencies = [
       { name = "abbrev"; spec = "1"; }
     ];
     patchLatest = false;
-    sha1 = "91eb7c4b017e7c00adcad1fd6d63944d0fdb75c1";
-    tarball = "http://registry.npmjs.org/nopt/-/nopt-2.1.1.tgz";
+    sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
+    tarball = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
   }
   {
     name = "nopt";
@@ -3025,14 +2997,14 @@
   {
     name = "nopt";
     spec = "~2.1.1";
-    version = "2.1.1";
+    version = "2.1.2";
     topLevel = false;
     dependencies = [
       { name = "abbrev"; spec = "1"; }
     ];
     patchLatest = false;
-    sha1 = "91eb7c4b017e7c00adcad1fd6d63944d0fdb75c1";
-    tarball = "http://registry.npmjs.org/nopt/-/nopt-2.1.1.tgz";
+    sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
+    tarball = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
   }
   {
     name = "normalize-package-data";
@@ -4541,13 +4513,13 @@
   {
     name = "stack-trace";
     spec = "0.0.x";
-    version = "0.0.6";
+    version = "0.0.7";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "1e719bd6a2629ff09c189e17a9ef902a94fc5db0";
-    tarball = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.6.tgz";
+    sha1 = "c72e089744fc3659f508cdce3621af5634ec0fff";
+    tarball = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz";
   }
   {
     name = "stream-counter";
@@ -4907,6 +4879,17 @@
     sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d";
     tarball = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
   }
+  {
+    name = "uptime";
+    spec = "*";
+    version = "0.0.3";
+    topLevel = true;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "bc94f617767813e2450e035aa6ba6468fa13a07d";
+    tarball = "http://registry.npmjs.org/uptime/-/uptime-0.0.3.tgz";
+  }
   {
     name = "util";
     spec = ">= 0.4.9";
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 06c8f541cc7a..e8533a398824 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -63,4 +63,5 @@
 , "npm"
 , "gridfs-stream"
 , "tar"
+, "uptime"
 ]

From 4ac1973ec524139be2f4d3ba6139f6d423652ed7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 18 Jul 2013 11:14:56 -0400
Subject: [PATCH 257/439] Update npm2nix

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/node-packages-generated.nix | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 142fc9616853..736b726ea00a 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -3127,17 +3127,18 @@
   {
     name = "npm2nix";
     spec = "*";
-    version = "2.0.1";
+    version = "3.0.0";
     topLevel = true;
     dependencies = [
       { name = "semver"; spec = ">=2.0.10 <3.0.0"; }
       { name = "argparse"; spec = "0.1.15"; }
       { name = "npm-registry-client"; spec = "0.2.27"; }
       { name = "npmconf"; spec = "0.1.1"; }
+      { name = "tar"; spec = "0.1.17"; }
     ];
     patchLatest = false;
-    sha1 = "bf50c8436339d309446582810ce0fff07f307d04";
-    tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-2.0.1.tgz";
+    sha1 = "e7efdddb685c35239c8ad00d5af32a391b6bc4a8";
+    tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-3.0.0.tgz";
   }
   {
     name = "npmconf";
@@ -4666,6 +4667,20 @@
     sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc";
     tarball = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
   }
+  {
+    name = "tar";
+    spec = "0.1.17";
+    version = "0.1.17";
+    topLevel = false;
+    dependencies = [
+      { name = "inherits"; spec = "1.x"; }
+      { name = "block-stream"; spec = "*"; }
+      { name = "fstream"; spec = "~0.1.8"; }
+    ];
+    patchLatest = false;
+    sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc";
+    tarball = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
+  }
   {
     name = "tar";
     spec = "~0.1.17";

From 870dd29077a2b0a65cbff68cf57dbc6e96ff4c89 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 18 Jul 2013 11:21:38 -0400
Subject: [PATCH 258/439] Update npm2nix, again (found a bug right away)

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/node-packages-generated.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 736b726ea00a..3ba9413a8a97 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -3127,7 +3127,7 @@
   {
     name = "npm2nix";
     spec = "*";
-    version = "3.0.0";
+    version = "3.0.1";
     topLevel = true;
     dependencies = [
       { name = "semver"; spec = ">=2.0.10 <3.0.0"; }
@@ -3137,8 +3137,8 @@
       { name = "tar"; spec = "0.1.17"; }
     ];
     patchLatest = false;
-    sha1 = "e7efdddb685c35239c8ad00d5af32a391b6bc4a8";
-    tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-3.0.0.tgz";
+    sha1 = "76ddefae0a2e82c769007d113f5e9c725fc9957b";
+    tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-3.0.1.tgz";
   }
   {
     name = "npmconf";

From 792e51e1ef2f09b16c21eab580b5fb78185867e4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 18 Jul 2013 12:02:56 -0400
Subject: [PATCH 259/439] Yet anoterh npm2nix update

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/node-packages-generated.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 3ba9413a8a97..7696e0327c1e 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -3127,7 +3127,7 @@
   {
     name = "npm2nix";
     spec = "*";
-    version = "3.0.1";
+    version = "3.0.3";
     topLevel = true;
     dependencies = [
       { name = "semver"; spec = ">=2.0.10 <3.0.0"; }
@@ -3137,8 +3137,8 @@
       { name = "tar"; spec = "0.1.17"; }
     ];
     patchLatest = false;
-    sha1 = "76ddefae0a2e82c769007d113f5e9c725fc9957b";
-    tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-3.0.1.tgz";
+    sha1 = "425e47672a9088dbd00a325eda6b7b1e92a3190b";
+    tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-3.0.3.tgz";
   }
   {
     name = "npmconf";

From 3016640375bf8eb19234b3807701c13583f78af1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 18 Jul 2013 12:09:27 -0400
Subject: [PATCH 260/439] Add the right uptime nodePackage

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/node-packages-generated.nix | 581 ++++++++++++++++++++-
 pkgs/top-level/node-packages.json          |   2 +-
 2 files changed, 571 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 7696e0327c1e..37db5db9ed89 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -21,6 +21,29 @@
     sha1 = "bd55ae5e413ba1722ee4caba1f6ea10414a59ecd";
     tarball = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.4.tgz";
   }
+  {
+    name = "active-x-obfuscator";
+    spec = "0.0.1";
+    version = "0.0.1";
+    topLevel = false;
+    dependencies = [
+      { name = "zeparser"; spec = "0.0.5"; }
+    ];
+    patchLatest = false;
+    sha1 = "089b89b37145ff1d9ec74af6530be5526cae1f1a";
+    tarball = "http://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz";
+  }
+  {
+    name = "addressparser";
+    spec = "~0.1";
+    version = "0.1.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "9e9ab43d257e1ae784e1df5f580c9f5240f58874";
+    tarball = "http://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz";
+  }
   {
     name = "amdefine";
     spec = "*";
@@ -101,6 +124,19 @@
     sha1 = "28a1f72c43113e763220e5708414301c8840f0a1";
     tarball = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz";
   }
+  {
+    name = "argparse";
+    spec = "~ 0.1.11";
+    version = "0.1.15";
+    topLevel = false;
+    dependencies = [
+      { name = "underscore"; spec = "~1.4.3"; }
+      { name = "underscore.string"; spec = "~2.3.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "28a1f72c43113e763220e5708414301c8840f0a1";
+    tarball = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz";
+  }
   {
     name = "asn1";
     spec = "0.1.11";
@@ -146,6 +182,17 @@
     sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
     tarball = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
   }
+  {
+    name = "async";
+    spec = "0.1.22";
+    version = "0.1.22";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
+    tarball = "http://registry.npmjs.org/async/-/async-0.1.22.tgz";
+  }
   {
     name = "async";
     spec = "0.1.x";
@@ -261,6 +308,17 @@
     sha1 = "19b4e9f9fb75c122ad7bb1c6c376d6085d43ea09";
     tarball = "http://registry.npmjs.org/backoff/-/backoff-2.1.0.tgz";
   }
+  {
+    name = "base64id";
+    spec = "0.1.0";
+    version = "0.1.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
+    tarball = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
+  }
   {
     name = "bcrypt";
     spec = "*";
@@ -594,6 +652,17 @@
     sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
     tarball = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
   }
+  {
+    name = "coffee-script";
+    spec = ">=1.2.0";
+    version = "1.6.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
+    tarball = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
+  }
   {
     name = "colors";
     spec = "0.6.0-1";
@@ -673,6 +742,31 @@
     sha1 = "fd5713bfa153c7d6cc599378a5ab4c45c535029e";
     tarball = "http://registry.npmjs.org/commander/-/commander-1.2.0.tgz";
   }
+  {
+    name = "commander";
+    spec = "~0.6.1";
+    version = "0.6.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
+    tarball = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
+  }
+  {
+    name = "config";
+    spec = "0.4.15";
+    version = "0.4.15";
+    topLevel = false;
+    dependencies = [
+      { name = "js-yaml"; spec = "0.3.x"; }
+      { name = "coffee-script"; spec = ">=1.2.0"; }
+      { name = "vows"; spec = ">=0.5.13"; }
+    ];
+    patchLatest = false;
+    sha1 = "d43ddf58b8df5637fdd1314fc816ccae7bfbcd18";
+    tarball = "http://registry.npmjs.org/config/-/config-0.4.15.tgz";
+  }
   {
     name = "config-chain";
     spec = "~1.1.1";
@@ -707,6 +801,27 @@
     sha1 = "139111b4b03f0533a524927a88a646ae467b2c02";
     tarball = "http://registry.npmjs.org/connect/-/connect-2.7.5.tgz";
   }
+  {
+    name = "connect";
+    spec = "2.7.6";
+    version = "2.7.6";
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; spec = "0.5.1"; }
+      { name = "formidable"; spec = "1.0.11"; }
+      { name = "cookie-signature"; spec = "1.0.1"; }
+      { name = "buffer-crc32"; spec = "0.1.1"; }
+      { name = "cookie"; spec = "0.0.5"; }
+      { name = "send"; spec = "0.1.0"; }
+      { name = "bytes"; spec = "0.2.0"; }
+      { name = "fresh"; spec = "0.1.0"; }
+      { name = "pause"; spec = "0.0.1"; }
+      { name = "debug"; spec = "*"; }
+    ];
+    patchLatest = false;
+    sha1 = "b83b68fa6f245c5020e2395472cc8322b0060738";
+    tarball = "http://registry.npmjs.org/connect/-/connect-2.7.6.tgz";
+  }
   {
     name = "connect";
     spec = "2.8.4";
@@ -764,6 +879,17 @@
     sha1 = "d8630f26d95a7f851f9956b1e8cc6732f3b6aa30";
     tarball = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz";
   }
+  {
+    name = "connect-flash";
+    spec = "0.1.0";
+    version = "0.1.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "82b381d61a12b651437df1c259c1f1c841239b88";
+    tarball = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz";
+  }
   {
     name = "connect-mongo";
     spec = "*";
@@ -1079,6 +1205,17 @@
     sha1 = "4ae73f1aee8d6fcf484f1a1ce77ce651d9b7f0c9";
     tarball = "http://registry.npmjs.org/diff/-/diff-1.0.2.tgz";
   }
+  {
+    name = "diff";
+    spec = "~1.0.3";
+    version = "1.0.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "664b6bdb113fb3a51ced79aff621badeed29a02c";
+    tarball = "http://registry.npmjs.org/diff/-/diff-1.0.5.tgz";
+  }
   {
     name = "director";
     spec = "1.1.10";
@@ -1112,6 +1249,17 @@
     sha1 = "478920f77bca6c1c1749d5e3edde4bd5966efda8";
     tarball = "http://registry.npmjs.org/editor/-/editor-0.0.4.tgz";
   }
+  {
+    name = "ejs";
+    spec = "0.8.3";
+    version = "0.8.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "db8aac47ff80a7df82b4c82c126fe8970870626f";
+    tarball = "http://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz";
+  }
   {
     name = "emitter-component";
     spec = "1.0.0";
@@ -1123,6 +1271,18 @@
     sha1 = "f04dd18fc3dc3e9a74cbc0f310b088666e4c016f";
     tarball = "http://registry.npmjs.org/emitter-component/-/emitter-component-1.0.0.tgz";
   }
+  {
+    name = "encoding";
+    spec = "~0.1";
+    version = "0.1.6";
+    topLevel = false;
+    dependencies = [
+      { name = "iconv-lite"; spec = "0.2.7"; }
+    ];
+    patchLatest = false;
+    sha1 = "fec66b6d1c6b8cc554aa78c05ece35bef11a913f";
+    tarball = "http://registry.npmjs.org/encoding/-/encoding-0.1.6.tgz";
+  }
   {
     name = "escape-html";
     spec = "*";
@@ -1134,6 +1294,17 @@
     sha1 = "fedcd79564444ddaf2bd85b22c9961b3a3a38bf5";
     tarball = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.0.tgz";
   }
+  {
+    name = "esprima";
+    spec = "~ 1.0.2";
+    version = "1.0.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "7bdb544f95526d424808654d3b8fbe928650c0fe";
+    tarball = "http://registry.npmjs.org/esprima/-/esprima-1.0.3.tgz";
+  }
   {
     name = "event-stream";
     spec = "~0.5";
@@ -1201,6 +1372,28 @@
     sha1 = "9abf22017213a8f6f54a421ce22b8ec27b7def62";
     tarball = "http://registry.npmjs.org/express/-/express-3.3.4.tgz";
   }
+  {
+    name = "express";
+    spec = "3.2.0";
+    version = "3.2.0";
+    topLevel = false;
+    dependencies = [
+      { name = "connect"; spec = "2.7.6"; }
+      { name = "commander"; spec = "0.6.1"; }
+      { name = "range-parser"; spec = "0.0.4"; }
+      { name = "mkdirp"; spec = "~0.3.4"; }
+      { name = "cookie"; spec = "0.0.5"; }
+      { name = "buffer-crc32"; spec = "~0.2.1"; }
+      { name = "fresh"; spec = "0.1.0"; }
+      { name = "methods"; spec = "0.0.1"; }
+      { name = "send"; spec = "0.1.0"; }
+      { name = "cookie-signature"; spec = "1.0.1"; }
+      { name = "debug"; spec = "*"; }
+    ];
+    patchLatest = false;
+    sha1 = "7b66d6c66b038038eedf452804222b3077374ae0";
+    tarball = "http://registry.npmjs.org/express/-/express-3.2.0.tgz";
+  }
   {
     name = "express";
     spec = "~3.1.1";
@@ -1223,6 +1416,17 @@
     sha1 = "52a02c8db8f22bbfa0d7478d847cd45161f985f7";
     tarball = "http://registry.npmjs.org/express/-/express-3.1.2.tgz";
   }
+  {
+    name = "express-partials";
+    spec = "0.0.6";
+    version = "0.0.6";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda";
+    tarball = "http://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz";
+  }
   {
     name = "extend";
     spec = "*";
@@ -1267,6 +1471,17 @@
     sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
     tarball = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
   }
+  {
+    name = "eyes";
+    spec = ">=0.1.6";
+    version = "0.1.8";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
+    tarball = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
+  }
   {
     name = "faye-websocket";
     spec = "*";
@@ -1931,6 +2146,17 @@
     sha1 = "9c5806d50d374d09ad76e13da4c6d7357e8c555b";
     tarball = "http://registry.npmjs.org/i18next/-/i18next-1.6.8.tgz";
   }
+  {
+    name = "iconv-lite";
+    spec = "0.2.7";
+    version = "0.2.7";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "45be2390d27af4b7613aac4ee4d957e3f4cbdb54";
+    tarball = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.7.tgz";
+  }
   {
     name = "inherits";
     spec = "1";
@@ -2076,6 +2302,30 @@
     sha1 = "348a83baaec3b5fb9901c7efe7e64cdd1a8f46e2";
     tarball = "http://registry.npmjs.org/jayschema/-/jayschema-0.1.5.tgz";
   }
+  {
+    name = "js-yaml";
+    spec = "0.3.x";
+    version = "0.3.7";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "d739d8ee86461e54b354d6a7d7d1f2ad9a167f62";
+    tarball = "http://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz";
+  }
+  {
+    name = "js-yaml";
+    spec = "2.1.0";
+    version = "2.1.0";
+    topLevel = false;
+    dependencies = [
+      { name = "argparse"; spec = "~ 0.1.11"; }
+      { name = "esprima"; spec = "~ 1.0.2"; }
+    ];
+    patchLatest = false;
+    sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f";
+    tarball = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz";
+  }
   {
     name = "jshint";
     spec = "*";
@@ -2303,6 +2553,19 @@
     sha1 = "1cee12d5a9f28ed1ee37e9c332b8888e6b85412a";
     tarball = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz";
   }
+  {
+    name = "mailcomposer";
+    spec = ">= 0.1.27";
+    version = "0.2.1";
+    topLevel = false;
+    dependencies = [
+      { name = "mimelib"; spec = "~0.2"; }
+      { name = "mime"; spec = "1.2.9"; }
+    ];
+    patchLatest = false;
+    sha1 = "89e1326147fb2c222feb931b40e98b6be133f14a";
+    tarball = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.1.tgz";
+  }
   {
     name = "methods";
     spec = "0.0.1";
@@ -2391,6 +2654,19 @@
     sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09";
     tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz";
   }
+  {
+    name = "mimelib";
+    spec = "~0.2";
+    version = "0.2.12";
+    topLevel = false;
+    dependencies = [
+      { name = "encoding"; spec = "~0.1"; }
+      { name = "addressparser"; spec = "~0.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "5dcbb99c7369e5d62d7e12e71fa334179aebd748";
+    tarball = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.12.tgz";
+  }
   {
     name = "minimatch";
     spec = "0";
@@ -2610,6 +2886,29 @@
     sha1 = "95fc936622ce156b8b19ff8def466ac2f3a3f29e";
     tarball = "http://registry.npmjs.org/mocha/-/mocha-1.12.0.tgz";
   }
+  {
+    name = "moment";
+    spec = "2.1.0";
+    version = "2.1.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567";
+    tarball = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz";
+  }
+  {
+    name = "mongodb";
+    spec = "1.2.14";
+    version = "1.2.14";
+    topLevel = false;
+    dependencies = [
+      { name = "bson"; spec = "0.1.8"; }
+    ];
+    patchLatest = false;
+    sha1 = "269665552066437308d0942036646e6795c3a9a3";
+    tarball = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz";
+  }
   {
     name = "mongodb";
     spec = "1.2.x";
@@ -2654,6 +2953,35 @@
     sha1 = "272f1575da3b48ec31467abdf15baa61854ba5f1";
     tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.15.tgz";
   }
+  {
+    name = "mongoose";
+    spec = "3.6.7";
+    version = "3.6.7";
+    topLevel = false;
+    dependencies = [
+      { name = "hooks"; spec = "0.2.1"; }
+      { name = "mongodb"; spec = "1.2.14"; }
+      { name = "ms"; spec = "0.1.0"; }
+      { name = "sliced"; spec = "0.0.3"; }
+      { name = "muri"; spec = "0.3.1"; }
+      { name = "mpromise"; spec = "0.2.1"; }
+      { name = "mpath"; spec = "0.1.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "aa6c9f4dfb740c7721dbe734fbb97714e5ab0ebc";
+    tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz";
+  }
+  {
+    name = "mongoose-lifecycle";
+    spec = "1.0.0";
+    version = "1.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2";
+    tarball = "http://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz";
+  }
   {
     name = "mongoose-schema-extend";
     spec = "*";
@@ -2822,6 +3150,18 @@
     sha1 = "12ec7b4a9f3b4c894c31d8c4ec015925ba547eec";
     tarball = "http://registry.npmjs.org/negotiator/-/negotiator-0.2.5.tgz";
   }
+  {
+    name = "net-ping";
+    spec = "1.1.7";
+    version = "1.1.7";
+    topLevel = false;
+    dependencies = [
+      { name = "raw-socket"; spec = "*"; }
+    ];
+    patchLatest = false;
+    sha1 = "49f5bca55a30a3726d69253557f231135a637075";
+    tarball = "http://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz";
+  }
   {
     name = "nib";
     spec = "0.5.0";
@@ -2904,6 +3244,31 @@
     sha1 = "2b81f9c1b9cd3cc8fd56fe776744814e394d3427";
     tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.6.tgz";
   }
+  {
+    name = "node-uptime";
+    spec = "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7";
+    version = "3.2.0";
+    topLevel = true;
+    dependencies = [
+      { name = "mongoose"; spec = "3.6.7"; }
+      { name = "mongoose-lifecycle"; spec = "1.0.0"; }
+      { name = "express"; spec = "3.2.0"; }
+      { name = "express-partials"; spec = "0.0.6"; }
+      { name = "connect-flash"; spec = "0.1.0"; }
+      { name = "ejs"; spec = "0.8.3"; }
+      { name = "config"; spec = "0.4.15"; }
+      { name = "async"; spec = "0.1.22"; }
+      { name = "socket.io"; spec = "0.9.14"; }
+      { name = "semver"; spec = "1.1.0"; }
+      { name = "moment"; spec = "2.1.0"; }
+      { name = "nodemailer"; spec = "0.3.35"; }
+      { name = "net-ping"; spec = "1.1.7"; }
+      { name = "js-yaml"; spec = "2.1.0"; }
+    ];
+    patchLatest = false;
+    sha256 = "46424d7f9553ce7313cc09995ab11d237dd02257c29f260cfb38d2799e7c7746";
+    tarball = "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7";
+  }
   {
     name = "node-uuid";
     spec = "*";
@@ -2959,6 +3324,20 @@
     sha1 = "07f9b2337572ff6275c775e1d48513f3a45d7a65";
     tarball = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz";
   }
+  {
+    name = "nodemailer";
+    spec = "0.3.35";
+    version = "0.3.35";
+    topLevel = false;
+    dependencies = [
+      { name = "mailcomposer"; spec = ">= 0.1.27"; }
+      { name = "simplesmtp"; spec = ">= 0.1.22"; }
+      { name = "optimist"; spec = "*"; }
+    ];
+    patchLatest = false;
+    sha1 = "4d38cdc0ad230bdf88cc27d1256ef49fcb422e19";
+    tarball = "http://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz";
+  }
   {
     name = "nodemon";
     spec = "*";
@@ -3355,6 +3734,17 @@
     sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
     tarball = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
   }
+  {
+    name = "options";
+    spec = ">=0.0.5";
+    version = "0.0.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "9a3806378f316536d79038038ba90ccb724816c3";
+    tarball = "http://registry.npmjs.org/options/-/options-0.0.5.tgz";
+  }
   {
     name = "optparse";
     spec = "*";
@@ -3530,6 +3920,17 @@
     sha1 = "726411401039fe9b009eea86614295d5f3a54276";
     tarball = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
   }
+  {
+    name = "policyfile";
+    spec = "0.0.4";
+    version = "0.0.4";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d";
+    tarball = "http://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz";
+  }
   {
     name = "posix-getopt";
     spec = "1.0.0";
@@ -3659,6 +4060,17 @@
     sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef";
     tarball = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz";
   }
+  {
+    name = "rai";
+    spec = "~0.1";
+    version = "0.1.7";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "1b50f1dcb4a493a67ef7a0a8c72167d789df52a0";
+    tarball = "http://registry.npmjs.org/rai/-/rai-0.1.7.tgz";
+  }
   {
     name = "range-parser";
     spec = "0.0.4";
@@ -3670,6 +4082,17 @@
     sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
     tarball = "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
   }
+  {
+    name = "raw-socket";
+    spec = "*";
+    version = "1.2.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "586a3acba952922aff9e19ef3b9665aba1f6d152";
+    tarball = "http://registry.npmjs.org/raw-socket/-/raw-socket-1.2.0.tgz";
+  }
   {
     name = "rbytes";
     spec = "*";
@@ -3820,6 +4243,17 @@
     sha1 = "fa557fef4985ab3e3384fdc5be6e2541a0bb49af";
     tarball = "http://registry.npmjs.org/redis/-/redis-0.7.2.tgz";
   }
+  {
+    name = "redis";
+    spec = "0.7.3";
+    version = "0.7.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "ee57b7a44d25ec1594e44365d8165fa7d1d4811a";
+    tarball = "http://registry.npmjs.org/redis/-/redis-0.7.3.tgz";
+  }
   {
     name = "redis";
     spec = ">= 0.6.6";
@@ -4170,6 +4604,17 @@
     sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31";
     tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz";
   }
+  {
+    name = "semver";
+    spec = "1.1.0";
+    version = "1.1.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "da9b9c837e31550a7c928622bc2381de7dd7a53e";
+    tarball = "http://registry.npmjs.org/semver/-/semver-1.1.0.tgz";
+  }
   {
     name = "semver";
     spec = "1.1.4";
@@ -4348,6 +4793,19 @@
     sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296";
     tarball = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz";
   }
+  {
+    name = "simplesmtp";
+    spec = ">= 0.1.22";
+    version = "0.3.4";
+    topLevel = false;
+    dependencies = [
+      { name = "rai"; spec = "~0.1"; }
+      { name = "xoauth2"; spec = "~0.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "fe8bfe63c2f96e0bbe54bd373a0dc0d09b594133";
+    tarball = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.4.tgz";
+  }
   {
     name = "sliced";
     spec = "0.0.3";
@@ -4450,6 +4908,36 @@
     sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
     tarball = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
   }
+  {
+    name = "socket.io";
+    spec = "0.9.14";
+    version = "0.9.14";
+    topLevel = false;
+    dependencies = [
+      { name = "socket.io-client"; spec = "0.9.11"; }
+      { name = "policyfile"; spec = "0.0.4"; }
+      { name = "base64id"; spec = "0.1.0"; }
+      { name = "redis"; spec = "0.7.3"; }
+    ];
+    patchLatest = false;
+    sha1 = "81af80ebf3ee8f7f6e71b1495db91f8fa53ff667";
+    tarball = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz";
+  }
+  {
+    name = "socket.io-client";
+    spec = "0.9.11";
+    version = "0.9.11";
+    topLevel = false;
+    dependencies = [
+      { name = "uglify-js"; spec = "1.2.5"; }
+      { name = "ws"; spec = "0.4.x"; }
+      { name = "xmlhttprequest"; spec = "1.4.2"; }
+      { name = "active-x-obfuscator"; spec = "0.0.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "94defc1b29e0d8a8fe958c1cf33300f68d8a19c7";
+    tarball = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz";
+  }
   {
     name = "sockjs";
     spec = "*";
@@ -4729,6 +5217,17 @@
     sha1 = "933c3d1950224957a349183e124147dd99e182f5";
     tarball = "http://registry.npmjs.org/timezone/-/timezone-0.0.22.tgz";
   }
+  {
+    name = "tinycolor";
+    spec = "0.x";
+    version = "0.0.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
+    tarball = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
+  }
   {
     name = "transformers";
     spec = "2.0.1";
@@ -4765,6 +5264,17 @@
     sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
     tarball = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
   }
+  {
+    name = "uglify-js";
+    spec = "1.2.5";
+    version = "1.2.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "b542c2c76f78efb34b200b20177634330ff702b6";
+    tarball = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz";
+  }
   {
     name = "uglify-js";
     spec = "2.3.6";
@@ -4894,17 +5404,6 @@
     sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d";
     tarball = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
   }
-  {
-    name = "uptime";
-    spec = "*";
-    version = "0.0.3";
-    topLevel = true;
-    dependencies = [
-    ];
-    patchLatest = false;
-    sha1 = "bc94f617767813e2450e035aa6ba6468fa13a07d";
-    tarball = "http://registry.npmjs.org/uptime/-/uptime-0.0.3.tgz";
-  }
   {
     name = "util";
     spec = ">= 0.4.9";
@@ -5011,6 +5510,19 @@
     sha1 = "20643e9f50d00cf46da754dc934d791d4f6e3bb2";
     tarball = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.2.tgz";
   }
+  {
+    name = "vows";
+    spec = ">=0.5.13";
+    version = "0.7.0";
+    topLevel = false;
+    dependencies = [
+      { name = "eyes"; spec = ">=0.1.6"; }
+      { name = "diff"; spec = "~1.0.3"; }
+    ];
+    patchLatest = false;
+    sha1 = "dd0065f110ba0c0a6d63e844851c3208176d5867";
+    tarball = "http://registry.npmjs.org/vows/-/vows-0.7.0.tgz";
+  }
   {
     name = "walk";
     spec = "*";
@@ -5173,6 +5685,20 @@
     sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
     tarball = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
   }
+  {
+    name = "ws";
+    spec = "0.4.x";
+    version = "0.4.27";
+    topLevel = false;
+    dependencies = [
+      { name = "commander"; spec = "~0.6.1"; }
+      { name = "tinycolor"; spec = "0.x"; }
+      { name = "options"; spec = ">=0.0.5"; }
+    ];
+    patchLatest = false;
+    sha1 = "077d3a48b6e0b5a96f68f3b38a94ea1ec72c2555";
+    tarball = "http://registry.npmjs.org/ws/-/ws-0.4.27.tgz";
+  }
   {
     name = "wu";
     spec = "*";
@@ -5219,4 +5745,37 @@
     sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83";
     tarball = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz";
   }
+  {
+    name = "xmlhttprequest";
+    spec = "1.4.2";
+    version = "1.4.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "01453a1d9bed1e8f172f6495bbf4c8c426321500";
+    tarball = "http://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz";
+  }
+  {
+    name = "xoauth2";
+    spec = "~0.1";
+    version = "0.1.8";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2";
+    tarball = "http://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz";
+  }
+  {
+    name = "zeparser";
+    spec = "0.0.5";
+    version = "0.0.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
+    tarball = "http://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz";
+  }
 ]
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index e8533a398824..bf07faf31771 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -63,5 +63,5 @@
 , "npm"
 , "gridfs-stream"
 , "tar"
-, "uptime"
+, { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
 ]

From d4c52014e6a3f61a774d9ce012cc49433ab8da05 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 18 Jul 2013 20:20:45 +0300
Subject: [PATCH 261/439] Pinta: fix url

---
 pkgs/applications/graphics/pinta/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix
index b845abacf7ec..b54d73b4964f 100644
--- a/pkgs/applications/graphics/pinta/default.nix
+++ b/pkgs/applications/graphics/pinta/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pinta-1.4";
 
   src = fetchurl {
-    url = "https://github.com/PintaProject/pinta/tarball/3f7ccfa93d";
+    url = "https://github.com/PintaProject/Pinta/tarball/3f7ccfa93d";
     name = "pinta-1.4.tar.gz";
     sha256 = "1kgb4gy5l6bd0akniwhiqqkvqayr5jgdsvn2pgg1038q9raafnpn";
   };

From a0c3bc137b7505a698be038d0ae247fa1bfcd6a3 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 18 Jul 2013 20:37:32 +0300
Subject: [PATCH 262/439] JUnit: fix url

---
 pkgs/development/libraries/java/junit/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix
index ea9b1029efc9..c1d713950b40 100644
--- a/pkgs/development/libraries/java/junit/default.nix
+++ b/pkgs/development/libraries/java/junit/default.nix
@@ -1,12 +1,13 @@
-{stdenv, fetchurl, unzip} :
+{stdenv, fetchgit, unzip} :
 
 stdenv.mkDerivation {
   name = "junit-4.8.2";
   builder = ./builder.sh;
 
-  src = fetchurl {
-    url = http://github.com/downloads/KentBeck/junit/junit4.8.2.zip;
-    sha256 = "01simvc3pmgp27p7vzavmsx5rphm6hqzwrqfkwllhf3812dcqxy6";
+  src = fetchgit {
+    url = https://github.com/junit-team/junit.git;
+    rev = "refs/tags/r4.8.2";
+    sha256 = "1w73l3x97kg8zmrp44xgvp3gr6sih0crm0dhhky6jiq915ba1dlh";
   };
 
   inherit unzip;

From 6d3329dc317256cb80fac35275438398d66204e5 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 18 Jul 2013 20:42:04 +0300
Subject: [PATCH 263/439] rapcad: fix url

---
 pkgs/applications/graphics/rapcad/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix
index e83824bd685a..2ff824124098 100644
--- a/pkgs/applications/graphics/rapcad/default.nix
+++ b/pkgs/applications/graphics/rapcad/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "rapcad-${version}";
 
   src = fetchgit {
-    url = "git://git.rapcad.org/rapcad";
+    url = "https://github.com/GilesBathgate/RapCAD.git";
     rev = "refs/tags/v${version}";
     sha256 = "37c7107dc4fcf8942a4ad35377c4e42e6aedfa35296e5fcf8d84882ae35087c7";
   };

From 0c3b84c850e09faa2ef0d05ace89e96ba03ed2ec Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 18 Jul 2013 15:05:49 -0400
Subject: [PATCH 264/439] mongodb 2.4.5

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/servers/nosql/mongodb/default.nix | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 612db162e5c5..11dff3244208 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -1,25 +1,15 @@
 { stdenv, fetchurl, scons, boost, v8, gperftools, pcre, snappy }:
 
-with stdenv.lib;
-
-let installerPatch = fetchurl {
-      url = "https://jira.mongodb.org/secure/attachment/18160/SConscript.client.patch";
-      sha256 = "0n60fh2r8i7m6g113k0iw4adc8jv2by4ahrd780kxg47kzfgw06a";
-    };
-
-in
-stdenv.mkDerivation rec {
-  name = "mongodb-2.4.3";
+let version = "2.4.5"; in stdenv.mkDerivation rec {
+  name = "mongodb-${version}";
 
   src = fetchurl {
-    url = http://downloads.mongodb.org/src/mongodb-src-r2.4.3.tar.gz;
-    sha256 = "1k653xmwphdk88z2byz5fglr8xcsm8nw13prls1rx16qnc6h1pb1";
+    url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
+    sha256 = "01c7lb3jdr51gy7459vg5rg002xxg0mj79vlhy54n50kr31cnxmm";
   };
 
   nativeBuildInputs = [ scons boost v8 gperftools pcre snappy ];
 
-  patches = [ installerPatch ];
-
   postPatch = ''
     substituteInPlace SConstruct \
         --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" \

From 6b0d6593e802732b3d65669c0ff99b458188bdd1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 18 Jul 2013 15:13:42 -0400
Subject: [PATCH 265/439] Create a mkEnableOption function for an extremely
 common NixOS idiom

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/lib/options.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix
index 1fdf9ad8088d..5c896d5714c9 100644
--- a/pkgs/lib/options.nix
+++ b/pkgs/lib/options.nix
@@ -28,6 +28,13 @@ rec {
     # extraConfigs (list of possible configurations)
   };
 
+  mkEnableOption = name: mkOption {
+    default = false;
+    example = true;
+    description = "Whether to enable ${name}";
+    type = lib.types.bool;
+  };
+
   mapSubOptions = f: opt:
     if opt ? options then
       opt // {

From 7f9e83f8cc20b4552a9fa00377e843ae75584a84 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 18 Jul 2013 21:37:59 +0200
Subject: [PATCH 266/439] dosfstools: update to version 3.0.21

---
 pkgs/tools/filesystems/dosfstools/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index b0ee47e23b56..a98def328352 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -1,14 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dosfstools-3.0.11";
+  name = "dosfstools-3.0.21";
 
   src = fetchurl {
-    urls = [
-      "http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2"
-      "http://pkgs.fedoraproject.org/repo/pkgs/dosfstools/${name}.tar.bz2/8d2211d5bd813164e20740e7c852aa06/${name}.tar.bz2"
-    ];
-    sha256 = "1a6rzjy82f6579ywaln33g1wc7k8gbgjdss9q2q8daplac7pmcll";
+    url = "http://daniel-baumann.ch/files/software/dosfstools/${name}.tar.xz";
+    sha256 = "12c9ilcpknm7hg3czkc50azndd0yjdj4jjnvizhwqxy3g0gm2960";
   };
 
   makeFlags = "PREFIX=$(out)";

From b73021a475f7f2a2eac7946972241c30eeceaf1c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 18 Jul 2013 15:44:48 -0400
Subject: [PATCH 267/439] buildNodePackage: Handle all node/coffee shebang
 possibilities

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/web/nodejs/build-node-package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index 1e6d5cc6bcac..415f2209597c 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -42,8 +42,14 @@ stdenv.mkDerivation ({
     mv node_modules $out/node_modules/${requireName}
     if [ -d "$out/node_modules/.bin" ]; then
       ln -sv node_modules/.bin $out/bin
+      node=`type -p node`
+      coffee=`type -p coffee || true`
       find -L $out/node_modules/.bin/* -type f -print0 | \
-        xargs -0 sed --follow-symlinks -i 's@#!/usr/bin/env node@#!${nodejs}/bin/node@'
+        xargs -0 sed --follow-symlinks -i \
+          -e 's@#!/usr/bin/env node@#!'"$node"'@' \
+          -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \
+          -e 's@#!/.*/node@#!'"$node"'@' \
+          -e 's@#!/.*/coffee@#!'"$coffee"'@'
     fi
     if [ -e "$out/node_modules/${requireName}/man" ]; then
       mkdir $out/share

From d37795e572b49cb85b6c6494f32d20fe47c4ff7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 18 Jul 2013 21:47:27 +0200
Subject: [PATCH 268/439] Adding guifi-earth 0.2.1

That may have updated some node-packages.
---
 pkgs/top-level/node-packages-generated.nix | 91 ++++++++++++++++++++--
 pkgs/top-level/node-packages.json          |  1 +
 2 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 37db5db9ed89..31dd33a8059c 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -240,28 +240,28 @@
   {
     name = "aws-sdk";
     spec = "*";
-    version = "1.3.2";
+    version = "1.4.0";
     topLevel = true;
     dependencies = [
       { name = "xml2js"; spec = "0.2.4"; }
       { name = "xmlbuilder"; spec = "*"; }
     ];
     patchLatest = true;
-    sha1 = "23a6cca1eb4a3c50ac67fb354ec9a5725d31a1f4";
-    tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.3.2.tgz";
+    sha1 = "57a3291994d2b2b484ebd39e1ecb216a05c1c60e";
+    tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.4.0.tgz";
   }
   {
     name = "aws-sdk";
     spec = ">=1.2.0 <2";
-    version = "1.3.2";
+    version = "1.4.0";
     topLevel = false;
     dependencies = [
       { name = "xml2js"; spec = "0.2.4"; }
       { name = "xmlbuilder"; spec = "*"; }
     ];
     patchLatest = true;
-    sha1 = "23a6cca1eb4a3c50ac67fb354ec9a5725d31a1f4";
-    tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.3.2.tgz";
+    sha1 = "57a3291994d2b2b484ebd39e1ecb216a05c1c60e";
+    tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.4.0.tgz";
   }
   {
     name = "aws-sign";
@@ -652,6 +652,17 @@
     sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
     tarball = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
   }
+  {
+    name = "coffee-script";
+    spec = ">= 0.0.1";
+    version = "1.6.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
+    tarball = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
+  }
   {
     name = "coffee-script";
     spec = ">=1.2.0";
@@ -1934,6 +1945,22 @@
     sha1 = "de2d66136d002e112ba70f3f10c31cf7c350b2da";
     tarball = "http://registry.npmjs.org/growl/-/growl-1.7.0.tgz";
   }
+  {
+    name = "guifi-earth";
+    spec = "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 ";
+    version = "0.2.1";
+    topLevel = true;
+    dependencies = [
+      { name = "coffee-script"; spec = ">= 0.0.1"; }
+      { name = "jade"; spec = ">= 0.0.1"; }
+      { name = "q"; spec = ">= 0.0.1"; }
+      { name = "xml2js"; spec = ">= 0.0.1"; }
+      { name = "msgpack"; spec = ">= 0.0.1"; }
+    ];
+    patchLatest = false;
+    sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
+    tarball = "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854";
+  }
   {
     name = "gzippo";
     spec = "*";
@@ -2291,6 +2318,24 @@
     sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c";
     tarball = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
   }
+  {
+    name = "jade";
+    spec = ">= 0.0.1";
+    version = "0.33.0";
+    topLevel = false;
+    dependencies = [
+      { name = "commander"; spec = "1.2.0"; }
+      { name = "mkdirp"; spec = "0.3.x"; }
+      { name = "transformers"; spec = "2.0.1"; }
+      { name = "character-parser"; spec = "1.0.2"; }
+      { name = "monocle"; spec = "0.1.48"; }
+      { name = "with"; spec = "~1.1.0"; }
+      { name = "constantinople"; spec = "~1.0.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "1b0bb45f9dd4ce57723605177713d80bccd4e429";
+    tarball = "http://registry.npmjs.org/jade/-/jade-0.33.0.tgz";
+  }
   {
     name = "jayschema";
     spec = "*";
@@ -3051,6 +3096,17 @@
     sha1 = "03edc348d613e66a56486cfdac53bcbe899cbd61";
     tarball = "http://registry.npmjs.org/ms/-/ms-0.3.0.tgz";
   }
+  {
+    name = "msgpack";
+    spec = ">= 0.0.1";
+    version = "0.1.8";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "cd5c0d2277bf1659a871209ddf59f57ad1124d68";
+    tarball = "http://registry.npmjs.org/msgpack/-/msgpack-0.1.8.tgz";
+  }
   {
     name = "muri";
     spec = "0.3.1";
@@ -4005,6 +4061,17 @@
     sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc";
     tarball = "http://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz";
   }
+  {
+    name = "q";
+    spec = ">= 0.0.1";
+    version = "0.9.6";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "5884b2154bdb3b6d5765e0fafddcb1506e133619";
+    tarball = "http://registry.npmjs.org/q/-/q-0.9.6.tgz";
+  }
   {
     name = "qs";
     spec = "0.5.1";
@@ -5734,6 +5801,18 @@
     sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2";
     tarball = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz";
   }
+  {
+    name = "xml2js";
+    spec = ">= 0.0.1";
+    version = "0.2.8";
+    topLevel = false;
+    dependencies = [
+      { name = "sax"; spec = "0.5.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2";
+    tarball = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz";
+  }
   {
     name = "xmlbuilder";
     spec = "*";
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index bf07faf31771..d58967b0b39b 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -64,4 +64,5 @@
 , "gridfs-stream"
 , "tar"
 , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
+, { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
 ]

From 67ce7f863ab1c3200df192719b0cdcd034ab45dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 19 Jul 2013 00:29:50 +0200
Subject: [PATCH 269/439] srecord: new package

The SRecord package is a collection of powerful tools for manipulating
EPROM load files.

http://srecord.sourceforge.net/
---
 .../tools/misc/srecord/default.nix            | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/tools/misc/srecord/default.nix

diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix
new file mode 100644
index 000000000000..25140093f516
--- /dev/null
+++ b/pkgs/development/tools/misc/srecord/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, boost, libtool, groff, ghostscript }:
+
+stdenv.mkDerivation rec {
+  name = "srecord-1.62";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/srecord/${name}.tar.gz";
+    sha256 = "0bfbmhsm9mbwiik3yrhm95q8bgx1k4mh2ai412k8zjyi8f5f3904";
+  };
+
+  buildInputs = [ boost libtool groff ghostscript ];
+
+  meta = with stdenv.lib; {
+    description = "Collection of powerful tools for manipulating EPROM load files";
+    homepage = http://srecord.sourceforge.net/;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.bjornfor ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2505f239a86f..d1467985b9c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3220,6 +3220,8 @@ let
 
   guile_ncurses = callPackage ../development/guile-modules/guile-ncurses { };
 
+  srecord = callPackage ../development/tools/misc/srecord { };
+
   windowssdk = (
     import ../development/misc/windows-sdk {
       inherit fetchurl stdenv cabextract;

From b5a59b66b1fc550bd816f3dc8d720a9d98ecd5d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 19 Jul 2013 00:53:06 +0200
Subject: [PATCH 270/439] msmtp: 1.4.30 -> 1.4.31

Also, set meta.platforms and fix meta.description (msmtp is not a MUA).
---
 pkgs/applications/networking/msmtp/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index bf0ca68177b0..584fdcd170a7 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,18 +1,20 @@
 { stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn }:
+
 stdenv.mkDerivation rec {
-  name = "msmtp-1.4.30";
+  name = "msmtp-1.4.31";
 
   src = fetchurl {
     url = "mirror://sourceforge/msmtp/${name}.tar.bz2";
-    sha256 = "11lq82byx9xyfkf4nrcfjjfv5k8gk3bf8zlw0kml1qrndqlvjlpi";
+    sha256 = "0pr29kb7qsz4q6yfw5wvmw1wm4axi8kc97qhhmp50bx2bylzjyi4";
   };
 
   buildInputs = [ openssl pkgconfig gnutls gsasl libidn ];
 
   meta = {
-      description = "a MUA";
+      description = "Simple and easy to use SMTP client with excellent sendmail compatibility";
       homepage = "http://msmtp.sourceforge.net/";
       license = stdenv.lib.licenses.gpl3;
       maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = stdenv.lib.platforms.linux;
     };
 }

From d7283abbbb79e014b523e343b008c799f7ed0bfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Fri, 19 Jul 2013 01:22:29 +0200
Subject: [PATCH 271/439] gtypist: update to 2.9.3 and fix the patch

---
 pkgs/games/gtypist/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix
index f83e21eab7c0..3dded927ba1f 100644
--- a/pkgs/games/gtypist/default.nix
+++ b/pkgs/games/gtypist/default.nix
@@ -1,19 +1,16 @@
 {stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation {
-  name = "gtypist-2.9.1";
+  name = "gtypist-2.9.3";
 
   src = fetchurl {
-    url = "mirror://gnu/gtypist/gtypist-2.9.1.tar.xz";
-    sha256 = "1yv209aih1ixbs477vzzk1xj013g6w32vi33g0hldfzvfxbl9y5s";
+    url = "mirror://gnu/gtypist/gtypist-2.9.3.tar.xz";
+    sha256 = "0srwa841caci69hzqb47xfbxxf7fvz3640qka083p72vm8z9hsxw";
   };
 
   buildInputs = [ncurses];
 
-  patches = [ (fetchurl {
-    url = "http://projects.archlinux.org/svntogit/community.git/plain/trunk/ncurses.patch?h=packages/gtypist";
-    sha256 = "14crgh21gghszwijxjvixpijqzsgn62wx6kz28zkjskdw0p5vij1";
-  })];
+  patchPhase = "sed -e 's#ncursesw/##' -i configure src/*";
 
   meta = {
     homepage = http://www.gnu.org/software/gtypist;

From 589d6ff51ceb564b0800e4a19c649af3673c7535 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 19 Jul 2013 07:28:43 +0300
Subject: [PATCH 272/439] vfdecrypt: fix source location

---
 pkgs/tools/misc/vfdecrypt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/vfdecrypt/default.nix b/pkgs/tools/misc/vfdecrypt/default.nix
index 5692aecebbf0..de7ee27d7045 100644
--- a/pkgs/tools/misc/vfdecrypt/default.nix
+++ b/pkgs/tools/misc/vfdecrypt/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "vfdecrypt";
 
   src = fetchgit {
-    url = git://github.com/dra1nerdrake/VFDecrypt.git;
+    url = git://github.com/drakealleg/VFDecrypt.git;
     rev = "4e2fa32816254907e82886b936afcae9859a876c";
     sha256 = "0b945805f7f60bf48556c2db45c9ab26485fb05acbc6160a563d529b20cb56a3";
   };

From 2422bef9f9b5359cf407a31ff22debc04892940d Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 19 Jul 2013 07:45:45 +0300
Subject: [PATCH 273/439] area53: fix source url

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7d26cdbc7a38..c6c9eb6ff984 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -296,7 +296,7 @@ pythonPackages = python.modules // rec {
     name = "area53-b2c9cdcabd";
 
     src = fetchgit {
-      url = git://github.com/mariusv/Area53.git;
+      url = git://github.com/bigmlcom/Area53.git;
       rev = "b2c9cdcabd";
       sha256 = "b0c12b8c48ed9180c7475fab18de50d63e1b517cfb46da4d2c66fc406fe902bc";
     };

From b98fccf4866b0d1d40706fb4bbe1948e16996b10 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 19 Jul 2013 07:50:27 +0300
Subject: [PATCH 274/439] pyside-generatorrunner: fix version to match sources

---
 pkgs/development/python-modules/pyside/generatorrunner.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix
index afb258cec70a..12ec5a7ef51b 100644
--- a/pkgs/development/python-modules/pyside/generatorrunner.nix
+++ b/pkgs/development/python-modules/pyside/generatorrunner.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, cmake, pysideApiextractor, python27Packages, qt4 }:
 
 stdenv.mkDerivation {
-  name = "pyside-generatorrunner-0.6.13-9-g567ca6e";
+  name = "pyside-generatorrunner-0.6.15";
 
   src = fetchgit {
     url = "git://github.com/PySide/Generatorrunner.git";

From 74491ea24b2a61ffa14466dddbabeda9993ae697 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 19 Jul 2013 08:25:00 +0300
Subject: [PATCH 275/439] boinc: fix url

---
 pkgs/applications/science/misc/boinc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index 9d8bc705fa47..0bc5c3cb7c7c 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "boinc-7.0.44";
 
   src = fetchgit {
-    url = "git://boinc.berkeley.edu/boinc.git";
+    url = "git://boinc.berkeley.edu/boinc-v2.git";
     rev = "7c449b1fb8a681ceb27d6895751b62a2b3adf0f2";
     sha256 = "0hdramyl9nip3gadp7xiaz8ngyld15i93d8ai1nsd04bmrvdfqia";
   };

From c22eff7505760b22464e5df0c098f1dbacee6f1a Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 19 Jul 2013 09:30:04 +0300
Subject: [PATCH 276/439] mopidy: fix broken fetchgit -> fetchurl

---
 pkgs/applications/audio/mopidy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index a8c33329227b..e31798a101b9 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pythonPackages, pygobject, gst_python
+{ stdenv, fetchurl, pythonPackages, pygobject, gst_python
 , gst_plugins_good, gst_plugins_base
 }:
 
@@ -7,7 +7,7 @@ pythonPackages.buildPythonPackage rec {
 
   version = "0.14.2";
 
-  src = fetchgit {
+  src = fetchurl {
     url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz";
     sha256 = "0fqx7lk9g61d744b951cwx0szqbyji58dhw2ravnq9785nkhi7i4";
   };

From 8a357239ac6aa13932d4c42ee3da118bdd0a30bb Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 19 Jul 2013 13:07:12 +0200
Subject: [PATCH 277/439] libevent: Update to 2.0.21

---
 pkgs/development/libraries/libevent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index b2987689be7c..a2a8403b4983 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl}:
 
-let version = "2.0.17"; in
+let version = "2.0.21"; in
 stdenv.mkDerivation {
   name = "libevent-${version}";
 
   src = fetchurl {
     url = "https://github.com/downloads/libevent/libevent/libevent-${version}-stable.tar.gz";
-    sha256 = "51735d1241f9f6d2d6465d8abc76f7511764f6de7d81026120c629612296faa6";
+    sha256 = "1xblymln9vihdmf1aqkp8chwvnhpdch3786bh30bj75slnl31992";
   };
 
   meta = {

From 582e9a94e6821de09419bd3e92adc1b72bd9424f Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 19 Jul 2013 13:07:42 +0200
Subject: [PATCH 278/439] opensmtpd: Update to 201307151923p1

---
 pkgs/servers/mail/opensmtpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index 8f18cb468613..fc518e4f889d 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "opensmtpd-${version}";
-  version = "201306271531p1";
+  version = "201307151923p1";
 
   buildInputs = [ libevent zlib openssl db4 bison pam ];
 
   src = fetchurl {
     url = "http://www.opensmtpd.org/archives/${name}.tar.gz";
-    sha256 = "0b06vzv566nai9j506rl3cwkk5favqxg23hsn08490ynn23im0sc";
+    sha256 = "0cggq60zzz5mgj093pmgwjp4bm6znnhyv6ibp1vhkba7cxjavr4g";
   };  
 
   configureFlags = [ 

From 3c35daeebe147e2820c161f47fce191c3d370b60 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Jul 2013 15:19:10 +0200
Subject: [PATCH 279/439] nixUnstable: Update to 1.6pre3166_15e5ac8

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 pkgs/top-level/all-packages.nix                | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 73bed52654f2..bab89a1145eb 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.5.3pre3141_1b6ee8f";
+  name = "nix-1.6pre3166_15e5ac8";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/5305802/download/5/${name}.tar.xz";
-    sha256 = "834a0d23456331ac06b6117078f0b9bbeecbc8620d5f844b61455e3daac6ceb0";
+    url = "http://hydra.nixos.org/build/5566779/download/5/${name}.tar.xz";
+    sha256 = "c25209bb93ca6859df84f74bd16cb0daee9e6c9820139e9dab1d2848129a2558";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1467985b9c7..ded923ac511f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9592,13 +9592,10 @@ let
     stateDir = config.nix.stateDir or "/nix/var";
   };
 
-  nixUnstable = nixStable;
-  /*
   nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
     storeDir = config.nix.storeDir or "/nix/store";
     stateDir = config.nix.stateDir or "/nix/var";
   };
-  */
 
   nixops = callPackage ../tools/package-management/nixops { };
 

From b57cdc584a62feb0aded6fd98d98ee040de886cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 19 Jul 2013 16:20:27 +0200
Subject: [PATCH 280/439] Fixing evtest and updating to 1.31.

The fetchgit wasn't a fixed-output, so on chroot, it couldn't connect.
---
 pkgs/applications/misc/evtest/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix
index 58b4f0d01bf5..635775e75ac7 100644
--- a/pkgs/applications/misc/evtest/default.nix
+++ b/pkgs/applications/misc/evtest/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoconf, automake, pkgconfig, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "evtest-1.30";
+  name = "evtest-1.31";
 
   preConfigure = "autoreconf -iv";
 
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://anongit.freedesktop.org/evtest";
-    rev = "1a50f2479c4775e047f234a24d95dda82441bfbd";
+    rev = "871371806017301373b8b0e5b7e8f168ce1ea13f";
+    sha256 = "1hxldlldlrb9lnnybn839a97fpqd1cixbmci2wzgr0rzhjbwhcgp";
   };
 
   meta = with stdenv.lib; {

From 4e94dafa4e0e2bbc1e0c2a0293c82d4e7e34f962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 19 Jul 2013 16:33:42 +0200
Subject: [PATCH 281/439] nut: adding libtool enables nut-scanner

---
 pkgs/applications/misc/nut/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix
index 157ecc0ffd8a..078ea7fcbd8f 100644
--- a/pkgs/applications/misc/nut/default.nix
+++ b/pkgs/applications/misc/nut/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }:
+{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi
+, libtool }:
 
 stdenv.mkDerivation rec {
   name = "nut-2.6.5";
@@ -8,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0gxrzsblx0jc4g9w0903ybwqbv1d79vq5hnks403fvnay4fgg3b1";
   };
 
-  buildInputs = [ neon libusb openssl udev avahi freeipmi ];
+  buildInputs = [ neon libusb openssl udev avahi freeipmi libtool ];
 
   nativeBuildInputs = [ pkgconfig ];
 

From aeef361b0d9ed426cb0262e28204687d75b696e4 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 19 Jul 2013 19:42:11 +0200
Subject: [PATCH 282/439] netpbm: add tiff support

---
 pkgs/tools/graphics/netpbm/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 2af863e37bc7..df65325b98d9 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2, makeWrapper, libX11 }:
+{stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2, makeWrapper, libX11, libtiff }:
 
 let rev = 1742; in
 stdenv.mkDerivation {
@@ -12,12 +12,19 @@ stdenv.mkDerivation {
 
   NIX_CFLAGS_COMPILE = "-fPIC"; # Gentoo adds this on every platform
 
-  buildInputs = [ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libX11 ];
+  buildInputs = [ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libX11 libtiff ];
 
-  configurePhase = "cp config.mk.in config.mk";
+  configurePhase = ''
+    cp config.mk.in config.mk
+    substituteInPlace "config.mk" \
+        --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff}/lib/libtiff.so" \
+        --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff}/include" \
+        --replace "TIFFLIB_NEEDS_JPEG = Y" "TIFFLIB_NEEDS_JPEG = N" \
+        --replace "TIFFLIB_NEEDS_Z = Y" "TIFFLIB_NEEDS_Z = N"
+  '';
 
   preBuild = ''
-    export LDFLAGS=-lz
+    export LDFLAGS="-lz"
     substituteInPlace "pm_config.in.h" \
         --subst-var-by "rgbPath1" "$out/lib/rgb.txt" \
         --subst-var-by "rgbPath2" "/var/empty/rgb.txt" \

From fc8d1341f671ce3ceead3041b0eb72b53691ecb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= <es@ertes.de>
Date: Fri, 19 Jul 2013 17:20:12 +0200
Subject: [PATCH 283/439] Maintainers: added ertes.

---
 pkgs/lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index da4d13b354d6..ab76e2018c0d 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -19,6 +19,7 @@
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
+  ertes = "Ertugrul Söylemez <es@ertes.de>";
   garbas = "Rok Garbas <rok@garbas.si>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
   guibert = "David Guibert <david.guibert@gmail.com>";

From 2519a869426bd0b69aef9d63002f47aec0a1b722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= <es@ertes.de>
Date: Fri, 19 Jul 2013 17:20:37 +0200
Subject: [PATCH 284/439] pari: Updated to 2.5.4, fixed GMP and readline
 support.

---
 .../science/math/pari/default.nix             | 61 ++++++-------------
 1 file changed, 18 insertions(+), 43 deletions(-)

diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 43291d792b72..5fda04fed4f3 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -1,50 +1,25 @@
-x@{builderDefsPackage
-  , perl, zlib, gmp, readline
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, gmp, readline }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="pari";
-    version="2.5.0";
-    name="${baseName}-${version}";
-    url="http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
-    hash="18ipxj4hzj7s3fqz878fiypkzrkbjj8wvbygz9j8c3ya06q27jax";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "pari-2.5.4";
+
+  src = fetchurl {
+    url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
+    sha256 = "0gpsj5n8d1gyl7nq2y915sscs3d334ryrv8qgjdwqf3cr95f2dwz";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [gmp readline];
+
+  configureScript = "./Configure";
+  configureFlags =
+    "--with-gmp=${gmp} " +
+    "--with-readline=${readline}";
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-  configureCommand="./Configure";
-      
   meta = {
     description = "Computer algebra system for high-performance number theory computations";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = "GPLv2+";
-    homepage = "http://pari.math.u-bordeaux.fr/";
+    homepage    = "http://pari.math.u-bordeaux.fr/";
+    license     = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [ertes raskin];
+    platforms   = stdenv.lib.platforms.linux;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
-    };
-  };
-}) x
-
+}

From 84ca773f9b72f755cc2261ba5c4a9fd73af6fe8d Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 17 Jul 2013 01:12:05 +0200
Subject: [PATCH 285/439] use simpleDerivation for all Vim plugins

---
 pkgs/misc/vim-plugins/default.nix | 107 +++++++++++++-----------------
 1 file changed, 45 insertions(+), 62 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index e8d9e9a11e4b..6e337b8feefc 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, python, cmake, vim, perl, ruby }:
+{fetchurl, stdenv, python, cmake, vim, perl, ruby}:
 
 /*
 About Vim and plugins
@@ -11,7 +11,7 @@ typical plugin files:
   plugin/P1.vim
   autoload/P1.vim
   ftplugin/xyz.vim
-  doc/plugin-documentation.txt
+  doc/plugin-documentation.txt (traditional documentation)
   README(.md) (nowadays thanks to github)
 
 Traditionally plugins were installed into ~/.vim/* so it was your task to keep track
@@ -25,16 +25,16 @@ this to your .vimrc should make most plugins work:
   set rtp+=~/.nix-profile/vim-plugins/YouCompleteMe
   " or for p in ["YouCompleteMe"] | exec 'set rtp+=~/.nix-profile/vim-plugins/'.p | endfor
 
-Its what
-pathogen, vundle, vim-addon-manager (VAM) use.
+Its what pathogen, vundle, vim-addon-manager (VAM) use.
 
 VAM's benefits:
-- works around after/* directories if they are used in non ~/.vim locations
 - allows activating plugins at runtime, eg when you need them. (works around
   some au command hooks, eg required for TheNerdTree plugin)
 - VAM checkous out all sources (vim.sf.net, git, mercurial, ...)
 - runs :helptags on update/installation only. Obviously it cannot do that on
   store paths.
+- it reads addon-info.json files which can declare dependencies by name
+  (without version)
 
 VAM is made up of
 - the code loading plugins
@@ -63,31 +63,50 @@ How to install VAM? eg provide such a bash function:
     EOF
     }
 
-IMHO having no plugins listed might be better than having outdated ones.
+Marc Weber thinks that having no plugins listed might be better than having
+outdated ones.
 
 So which plugins to add here according to what Marc Weber thinks is best?
-complicated plugins requiring dependencies, such as YouCompleteMe.
+Complicated plugins requiring dependencies, such as YouCompleteMe.
 Then its best to symlink ~/.nix-profile/vim-plugins/YouCompleteMe to
 ~/.vim/{vim-addons,bundle} or whatever plugin management solution you use.
 
 If you feel differently change the comments and proceed.
 */
 
-let vimHelptags = path: ''
-  ${vim}/bin/vim -N -u NONE -i NONE -n -e -s -c "helptags ${path}" +quit!
-'';
+# provide a function creating tag files for vim help documentation (doc/*.txt)
+let vimHelpTags = ''
+    vimHelpTags(){
+      if [ -d "$1/doc" ]; then
+        ${vim}/bin/vim -N -u NONE -i NONE -n -e -s -c "helptags $1/doc" +quit!
+      fi
+    }
+  '';
+
+  # install a simple standard vim plugin
+  simpleDerivation = a@{name, src, path, buildPhase ? "", ...} : stdenv.mkDerivation (a // {
+    inherit buildPhase;
+
+    installPhase = ''
+      target=$out/vim-plugins/$path
+      ensureDir $out/vim-plugins
+      ls -l
+      cp -r . $target
+      ${vimHelpTags}
+      vimHelpTags $target
+    '';
+  });
 
 in
 
 {
 
-  #TODO :helptags should be run
-
   vimAddonNix = {
     # github.com/MarcWeber/vim-addon-nix provides some additional support for
     # editing .nix files
 
-    # This is a placeholder, because I think you always should be using latest git version
+    # This is a placeholder, because I think you always should be using latest
+    # git version. It also depends on some additional plugins (see addon-info.json)
   };
 
   YouCompleteMe = stdenv.mkDerivation {
@@ -100,7 +119,6 @@ in
     configurePhase = ":";
 
     buildPhase = ''
-      set -x
       target=$out/vim-plugins/YouCompleteMe
       mkdir -p $target
       cp -a ./ $target
@@ -110,7 +128,8 @@ in
       cmake -G "Unix Makefiles" . $target/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7
       make -j -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
 
-      ${vimHelptags "$out/vim-plugins/YouCompleteMe/doc"}
+      ${vimHelpTags}
+      vimHelpTags $target
     '';
 
     # TODO: implement proper install phase rather than keeping everything in store
@@ -126,52 +145,26 @@ in
     };
   };
 
-  syntastic = stdenv.mkDerivation {
+  syntastic = simpleDerivation {
     name = "vim-syntastic-3.0.0";
-   
     src = fetchurl {
       url = "https://github.com/scrooloose/syntastic/archive/3.0.0.tar.gz";
       sha256 = "0nf69wpa8qa7xcfvywy2khmazs4dn1i2nal9qwjh2bzrbwbbkdyl";
     };
-
-    buildPhase = "";
-
-    installPhase = ''
-      mkdir -p "$out/vim-plugins"
-      cp -R autoload "$out/vim-plugins"
-      cp -R doc "$out/vim-plugins"
-      cp -R plugin "$out/vim-plugins"
-      cp -R syntax_checkers "$out/vim-plugins"
-
-      ${vimHelptags "$out/vim-plugins/doc"}
-    '';
+    path = "syntastic";
   };
 
-  coffeeScript = stdenv.mkDerivation {
+  coffeeScript = simpleDerivation {
     name = "vim-coffee-script-v002";
-
     src = fetchurl {
       url = "https://github.com/vim-scripts/vim-coffee-script/archive/v002.tar.gz";
       sha256 = "1xln6i6jbbihcyp5bsdylr2146y41hmp2xf7wi001g2ymj1zdsc0";
     };
-
-    buildPhase = "";
-
-    installPhase = ''
-      mkdir -p "$out/vim-plugins"
-      cp -R after "$out/vim-plugins"
-      cp -R compiler "$out/vim-plugins"
-      cp -R doc "$out/vim-plugins"
-      cp -R ftdetect "$out/vim-plugins"
-      cp -R ftplugin "$out/vim-plugins"
-      cp -R indent "$out/vim-plugins"
-      cp -R syntax "$out/vim-plugins"
-
-      ${vimHelptags "$out/vim-plugins/doc"}
-    '';
+    path = "vim-coffee-script";
   };
 
-  commandT = stdenv.mkDerivation {
+  command_T = simpleDerivation {
+
     name = "vim-command-t-1.4";
 
     src = fetchurl {
@@ -179,6 +172,8 @@ in
       sha256 = "1ka9hwx9n0vj1dd5qsd2l1wq0kriwl76jmmdjzh7zaf0p547v98s";
     };
 
+    path = "Command-T";
+
     buildInputs = [ perl ruby ];
 
     buildPhase = ''
@@ -187,18 +182,10 @@ in
       make
       popd
     '';
-
-    installPhase = ''
-      mkdir -p "$out/vim-plugins"
-      cp -R doc "$out/doc"
-      cp -R plugin "$out/vim-plugins"
-      cp -R ruby "$out/vim-plugins"
-
-      ${vimHelptags "$out/vim-plugins/doc"}
-    '';
   };
 
-  xdebug = stdenv.mkDerivation {
+  xdebug = simpleDerivation {
+
     name = "vim-xdebug-a4980fa65f7f159780593ee37c178281691ba2c4";
 
     src = fetchurl {
@@ -206,12 +193,8 @@ in
       sha256 = "1348gzp0zhc2wifvs5vmf92m9y8ik8ldnvy7bawsxahy8hmhiksk";
     };
 
-    installPhase = ''
-      mkdir -p "$out/vim-plugins"
-      cp -R plugin "$out/vim-plugins"
-    '';
+    path = "xdebug";
 
     postInstall = false;
   };
 }
-

From b139a69f7c8d75331874327b5e3e2790168b3ea2 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 19 Jul 2013 20:48:26 +0200
Subject: [PATCH 286/439] netpbm: set platforms

---
 pkgs/tools/graphics/netpbm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index df65325b98d9..dc45ad7a8419 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -58,5 +58,6 @@ stdenv.mkDerivation {
     homepage = http://netpbm.sourceforge.net/;
     description = "Toolkit for manipulation of graphic images";
     license = "GPL,free";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 6e97ea6b0039d2a597cb7419f6c5cfdfd73bc0fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 19 Jul 2013 23:21:34 +0200
Subject: [PATCH 287/439] guix: update to 0.3

---
 pkgs/tools/package-management/guix/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/package-management/guix/default.nix b/pkgs/tools/package-management/guix/default.nix
index 37957235629e..7c4a098cad8a 100644
--- a/pkgs/tools/package-management/guix/default.nix
+++ b/pkgs/tools/package-management/guix/default.nix
@@ -15,11 +15,11 @@ let
     };
   };
 in stdenv.mkDerivation rec {
-  name = "guix-0.2";
+  name = "guix-0.3";
 
   src = fetchurl {
     url = "ftp://alpha.gnu.org/gnu/guix/${name}.tar.gz";
-    sha256 = "140y0ywbgl6vxl4nwswz4vim2wwdiajxlksj24lnv40aw5hyvifr";
+    sha256 = "0xpfdmlfkkpmgrb8lpaqs5wxx31m4jslajs6b9waz5wp91zk7fix";
   };
 
   configureFlags =
@@ -33,11 +33,6 @@ in stdenv.mkDerivation rec {
        cp -v "${boot_guile.x86_64}" gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz
     '';
 
-  preCheck =
-    # XXX: Skip this test (see commit 91fe0e20c7da2b706a1ac0e7b75235b6c1e6ed0a).
-    '' sed -i tests/guix-package.sh -e's/guix package --version/exit 0/'
-    '';
-
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ guile libgcrypt sqlite bzip2 ];
 
@@ -52,7 +47,7 @@ in stdenv.mkDerivation rec {
 
       In addition to standard package management features, Guix supports
       transactional upgrades and roll-backs, unprivileged package management,
-      per-user profiles, and garbage collection. 
+      per-user profiles, and garbage collection.
 
       It provides Guile Scheme APIs, including high-level embedded
       domain-specific languages (EDSLs), to describe how packages are built
@@ -67,6 +62,7 @@ in stdenv.mkDerivation rec {
     license = "GPLv3+";
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.linux;
 
     homepage = http://www.gnu.org/software/guix;
   };

From f2f0674c5b8741cc9ae6eac682ef64c0e6f25c88 Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Sat, 20 Jul 2013 10:56:51 +0200
Subject: [PATCH 288/439] Add haskell-qrencode

---
 .../libraries/haskell/qrencode/default.nix         | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  4 ++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/qrencode/default.nix

diff --git a/pkgs/development/libraries/haskell/qrencode/default.nix b/pkgs/development/libraries/haskell/qrencode/default.nix
new file mode 100644
index 000000000000..bd46bb9b4158
--- /dev/null
+++ b/pkgs/development/libraries/haskell/qrencode/default.nix
@@ -0,0 +1,14 @@
+{ cabal, qrencode }:
+
+cabal.mkDerivation (self: {
+  pname = "haskell-qrencode";
+  version = "1.0.4";
+  sha256 = "1cq6fpz4vsx1kfnxnxnqz0pi5nzfg86s76vd0hcqvyqxnqbcd8hj";
+  extraLibraries = [ qrencode ];
+  meta = {
+    homepage = "https://github.com/jamessanders/haskell-qrencode";
+    description = "Haskell bindings for libqrencode";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index bd7959463f37..7d48176f72d4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1645,6 +1645,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {};
 
+  qrencode = callPackage ../development/libraries/haskell/qrencode {
+    inherit (pkgs) qrencode;
+  };
+
   RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {};
 
   random_1_0_1_1 = callPackage ../development/libraries/haskell/random/1.0.1.1.nix {};

From 7f874ca558d09adb04310ea3b210ac9d69405848 Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Fri, 19 Jul 2013 13:30:16 +0200
Subject: [PATCH 289/439] Add haskell-happstack-lite

---
 .../libraries/haskell/happstack/happstack-lite.nix | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/happstack/happstack-lite.nix

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix
new file mode 100644
index 000000000000..46edfb8946ac
--- /dev/null
+++ b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix
@@ -0,0 +1,14 @@
+{ cabal, happstackServer, mtl, text }:
+
+cabal.mkDerivation (self: {
+  pname = "happstack-lite";
+  version = "7.3.1";
+  sha256 = "0y8d0xv26szfjmkfqzak19zqjgv0w6rkc1rzrd2jkvsbchnwacjy";
+  buildDepends = [ happstackServer mtl text ];
+  meta = {
+    homepage = "http://www.happstack.com/";
+    description = "Happstack minus the useless stuff";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index bd7959463f37..dd9ed825e0ce 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1083,6 +1083,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {};
 
+  happstackLite = callPackage ../development/libraries/haskell/happstack/happstack-lite.nix {};
+
   hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {};
   hashable_1_2_0_10 = callPackage ../development/libraries/haskell/hashable/1.2.0.10.nix {};
   hashable = self.hashable_1_2_0_10;

From 8ea138d2121c008cb009fa0f34917ff560af182b Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 20 Jul 2013 12:45:33 +0200
Subject: [PATCH 290/439] add development version of speedtest-cli

---
 .../networking/speedtest-cli/default.nix      | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/networking/speedtest-cli/default.nix

diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
new file mode 100644
index 000000000000..15ca99f47e9e
--- /dev/null
+++ b/pkgs/tools/networking/speedtest-cli/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit, pythonPackages }:
+
+stdenv.mkDerivation rec {
+  name = "speedtest-cli-dev";
+  
+  src = fetchgit {
+    url = "https://github.com/sivel/speedtest-cli.git";
+    rev = "fe0940c5744ebe74ca31ad44e6b181d82a89edab";
+    sha256 = "0iywcmgqi58bhldcf8qn1nr7mihypi5fp9s13d4vqc7797xvb28k";
+  };
+
+  buildInputs = [ pythonPackages.python ];
+
+  installPhase = ''
+      mkdir -p $out/bin
+      cp speedtest-cli $out/bin/
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/sivel/speedtest-cli;
+    description = "Command line interface for testing internet bandwidth using speedtest.net";
+    platforms = platforms.all;
+    license = licenses.asl20;
+    maintainers = [ maintainers.iElectric ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ded923ac511f..7afc75b0a57a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3587,6 +3587,8 @@ let
 
   sparse = callPackage ../development/tools/analysis/sparse { };
 
+  speedtest_cli = callPackage ../tools/networking/speedtest-cli { };
+
   spin = callPackage ../development/tools/analysis/spin { };
 
   splint = callPackage ../development/tools/analysis/splint { };

From 1d59e54ebc58827053ff17b732ecea47d4eb24b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 20 Jul 2013 21:36:18 +0200
Subject: [PATCH 291/439] apcupsd: fix hostname command patching

The source has HOSTNAME=`hostname` (capture output of hostname command)
but currently it is replaced with HOSTNAME="/path/to/hostname" (which is
just a plain string). Fix it by substituting with
HOSTNAME=`/path/to/hostname`.
---
 pkgs/servers/apcupsd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index 58b3df1b436e..b8a8cbbfa1c9 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     for file in "$out"/etc/apcupsd/*; do
         sed -i -e 's|^WALL=.*|WALL="${utillinux}/bin/wall"|g' \
-               -e 's|^HOSTNAME=.*|HOSTNAME="${nettools}/bin/hostname"|g' \
+               -e 's|^HOSTNAME=.*|HOSTNAME=`${nettools}/bin/hostname`|g' \
                "$file"
     done
   '';

From b513ea43e41df1d1feb9dac8cca21f6f56bcd0a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 17 Jul 2013 09:33:39 +0200
Subject: [PATCH 292/439] Enable blowfish/twoflish crypto in sheevaplug kernel

---
 pkgs/top-level/platforms.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index b2a12bf8b503..ec047efecb02 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -53,6 +53,11 @@ rec {
 
         # mv cesa requires this sw fallback, for mv-sha1
         CRYPTO_SHA1 y
+        # Fast crypto
+        CRYPTO_TWOFISH y
+        CRYPTO_TWOFISH_COMMON y
+        CRYPTO_BLOWFISH y
+        CRYPTO_BLOWFISH_COMMON y
 
         IP_PNP y
         IP_PNP_DHCP y

From a0893d472e0ef8335015fe8a710df2e348a9ba69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 20 Jul 2013 23:15:37 +0200
Subject: [PATCH 293/439] Buidling cairo without gl on arm and mips

Mesa didn't build for arm, and I don't think anyone with arm wants mesa now.
And I needed cairo for rrdtool.
---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7afc75b0a57a..86d1059bda42 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4219,7 +4219,8 @@ let
   pixman = callPackage ../development/libraries/pixman { };
 
   cairo = callPackage ../development/libraries/cairo {
-    glSupport = config.cairo.gl or stdenv.isLinux;
+    glSupport = config.cairo.gl or (stdenv.isLinux &&
+      !stdenv.isArm && !stdenv.isMips);
   };
   cairo_1_12_2 = callPackage ../development/libraries/cairo/1.12.2.nix { };
   cairomm = callPackage ../development/libraries/cairomm { };

From 9ff7e1380d6089905282e873a872e148876f44a5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 18 Jul 2013 08:50:59 +0400
Subject: [PATCH 294/439] Add mi2ly MIDI to lilypond converter

---
 pkgs/applications/audio/mi2ly/default.nix     | 38 +++++++++++++++++++
 .../applications/audio/mi2ly/default.upstream |  3 ++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/audio/mi2ly/default.nix
 create mode 100644 pkgs/applications/audio/mi2ly/default.upstream

diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/applications/audio/mi2ly/default.nix
new file mode 100644
index 000000000000..1d736b06938a
--- /dev/null
+++ b/pkgs/applications/audio/mi2ly/default.nix
@@ -0,0 +1,38 @@
+{stdenv, fetchurl}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="mi2ly";
+    version="0.12";
+    name="${baseName}-${version}";
+    hash="1b14zcwlvnxhjxr3ymyzg0mg4sbijkinzpxm641s859jxcgylmll";
+    url="http://download.savannah.gnu.org/releases/mi2ly/mi2ly.0.12.tar.bz2";
+    sha256="1b14zcwlvnxhjxr3ymyzg0mg4sbijkinzpxm641s859jxcgylmll";
+  };
+  buildInputs = [
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+
+  sourceRoot=".";
+
+  buildPhase = "./cc";
+  installPhase = ''
+    mkdir -p "$out"/{bin,share/doc/mi2ly}
+    cp mi2ly "$out/bin"
+    cp README Doc.txt COPYING Manual.txt "$out/share/doc/mi2ly"
+  '';
+
+  meta = {
+    inherit (s) version;
+    description = ''MIDI to Lilypond converter'';
+    license = stdenv.lib.licenses.gpl2Plus ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/audio/mi2ly/default.upstream b/pkgs/applications/audio/mi2ly/default.upstream
new file mode 100644
index 000000000000..131f0e3a71d6
--- /dev/null
+++ b/pkgs/applications/audio/mi2ly/default.upstream
@@ -0,0 +1,3 @@
+url http://download.savannah.gnu.org/releases/mi2ly/
+ensure_choice
+version '.*/mi2ly[.]([0-9.]+)[.]tar.*' '\1'
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86d1059bda42..aee877b0ebce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7609,6 +7609,8 @@ let
 
   libquvi = callPackage ../applications/video/quvi/library.nix { };
 
+  mi2ly = callPackage ../applications/audio/mi2ly {};
+
   praat = callPackage ../applications/audio/praat { };
 
   quvi = callPackage ../applications/video/quvi/tool.nix { };

From 9230619ee760d17a8c8fd4cd1049b230ac2bddaa Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 20 Jul 2013 13:01:41 +0200
Subject: [PATCH 295/439] haskell-mode: upgrade to 13.07

---
 .../editors/emacs-modes/haskell/default.nix           | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
index 7e490f253d19..a1e52e1c301c 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, fetchurl, emacs }:
+{ stdenv, fetchurl, emacs, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "haskell-mode-2.9.1-102-g8d4b965";
+  name = "haskell-mode-13.07";
 
   src = fetchurl {
-    url = "https://github.com/haskell/haskell-mode/tarball/8d4b9651a69b62fcbedbac63de29a1e87ff0e97f";
-    sha256 = "02sil43885xjbfqakrxkm7bjnjd930lx6845fc2rxmkq5plkq85a";
-    name = "${name}.tar.gz";
+    url = "https://github.com/haskell/haskell-mode/archive/v13.07.tar.gz";
+    sha256 = "15c8ncj9mykkrizy1a8l94gq37s8hj13v3p5rgyaj9z0cwgl85kx";
   };
 
-  buildInputs = [emacs];
+  buildInputs = [ emacs texinfo ];
 
   installPhase = ''
     mkdir -p "$out/share/emacs/site-lisp"

From a2b44374abb01b17607fd91a50448ce030f744bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 21 Jul 2013 15:37:56 +0200
Subject: [PATCH 296/439] haskell-atomic-primops: update to version 0.4

---
 pkgs/development/libraries/haskell/atomic-primops/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix
index 4645442a1997..b542816f05b7 100644
--- a/pkgs/development/libraries/haskell/atomic-primops/default.nix
+++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "atomic-primops";
-  version = "0.2.2";
-  sha256 = "1a3svsh96pl6915g70sf9zhqby0ahhifww6m13cn0zr4za32vl7n";
+  version = "0.4";
+  sha256 = "01sg0yn25fs0z7dmrvhyp3amay9l028xs570xhy6vvplrji1mxf0";
   buildDepends = [ bitsAtomic Cabal primitive ];
   meta = {
     homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";

From 16581965df0b2c92d5132673a8a81946522a391d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 21 Jul 2013 15:37:56 +0200
Subject: [PATCH 297/439] haskell-attoparsec-conduit: update to version 1.0.1.2

---
 .../libraries/haskell/attoparsec-conduit/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
index a08495db61b7..68b08e50686e 100644
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec-conduit";
-  version = "1.0.1.1";
-  sha256 = "0v6d5a720fksvgaysbhqfzsq9a9h0l37yw3dbskxljbdy66gqsh0";
+  version = "1.0.1.2";
+  sha256 = "1j05r7mvm83wgnka7asmwd1dj4ajkg548mryyhpr7dd53vn5lbx0";
   buildDepends = [ attoparsec conduit text transformers ];
   testDepends = [ attoparsec conduit hspec resourcet text ];
   meta = {

From 8740b48d862a3d739e0f261b7a4833c3f994eddc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 21 Jul 2013 15:37:56 +0200
Subject: [PATCH 298/439] haskell-classy-prelude: update to version 0.5.9

---
 .../libraries/haskell/classy-prelude/default.nix     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix
index 14695fd08f59..69acb897220c 100644
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix
@@ -1,15 +1,15 @@
-{ cabal, basicPrelude, hashable, hspec, liftedBase, monadControl
-, QuickCheck, systemFilepath, text, transformers
+{ cabal, async, basicPrelude, deepseq, hashable, hspec, liftedBase
+, monadControl, QuickCheck, systemFilepath, text, transformers
 , unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude";
-  version = "0.5.8";
-  sha256 = "1yq2x3mfkasprmsx1gracjhih9l9x0dsq6pdf90khlcl11qh57ir";
+  version = "0.5.9";
+  sha256 = "1qqmip3ynqdxlwynm60wsn82dcyymcfql79k039iablanj4mic61";
   buildDepends = [
-    basicPrelude hashable liftedBase monadControl systemFilepath text
-    transformers unorderedContainers vector
+    async basicPrelude deepseq hashable liftedBase monadControl
+    systemFilepath text transformers unorderedContainers vector
   ];
   testDepends = [ hspec QuickCheck transformers ];
   meta = {

From 1d8c4711f6ebfd1e594c63225cf026c96944633e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 21 Jul 2013 15:37:56 +0200
Subject: [PATCH 299/439] haskell-comonad-transformers: update to version 3.0.4

---
 .../libraries/haskell/comonad-transformers/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
index eb1a83c80e87..45b218a40f7d 100644
--- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "comonad-transformers";
-  version = "3.0.3";
-  sha256 = "1q11xasl90z8sv9f7h77dxjsi2cwnjxqpaf0n5pvzn88nz9h6g66";
+  version = "3.0.4";
+  sha256 = "1jvg08vmi47p8ji1llci02lk675q93pm6dd8imqj6xjrq34g4x9a";
   buildDepends = [
     comonad contravariant distributive semigroupoids semigroups
     transformers

From a98a96bffe0c5f2269e050ca1b9229bb03102719 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 21 Jul 2013 15:37:56 +0200
Subject: [PATCH 300/439] haskell-conduit: update to version 1.0.7.3

---
 pkgs/development/libraries/haskell/conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index be94e811e8db..8c550065debe 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.7.1";
-  sha256 = "1j80kc1nwhsglh991rp9lfawlhr0kc8q8lzglfkda60f0nihiijy";
+  version = "1.0.7.3";
+  sha256 = "0ih3ymv5m3c66wr9xydc1dxgpvh5b92dyyc7v67li6n3w7dzi6fp";
   buildDepends = [
     liftedBase mmorph monadControl mtl resourcet text transformers
     transformersBase void

From 8e736f12d45d634324e93b0f67dfcfe193eb2b19 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 21 Jul 2013 15:37:56 +0200
Subject: [PATCH 301/439] haskell-contravariant: update to version 0.4.3

---
 pkgs/development/libraries/haskell/contravariant/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix
index e1f5e2ae567a..7978a4185afa 100644
--- a/pkgs/development/libraries/haskell/contravariant/default.nix
+++ b/pkgs/development/libraries/haskell/contravariant/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "contravariant";
-  version = "0.4.1";
-  sha256 = "0alzl47lqzw9fqjqxdfy40f1aynd8mc00b2h7fj2ch0zq82hm85q";
+  version = "0.4.3";
+  sha256 = "1hhcsy5bshi2yx8618wxa40gax5wfapnbgdmv1acgjyxb6vbmsp6";
   buildDepends = [ tagged transformers transformersCompat ];
   meta = {
     homepage = "http://github.com/ekmett/contravariant/";

From e1c3350da4f8313fb8575483fd49ede5fcee0cbb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 21 Jul 2013 15:37:56 +0200
Subject: [PATCH 302/439] haskell-shakespeare-css: update to version 1.0.6.2

---
 .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 89a6a0970e87..df12c935d71d 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "1.0.6.1";
-  sha256 = "1hzq7z7yhb80f4qqnjjky5kva0j1lk4jp4h50j822jyn9xn783vw";
+  version = "1.0.6.2";
+  sha256 = "1w29k0k5124vygydavb6a5szrv5a6n9qqhf1f27bkk86br55vnw6";
   buildDepends = [ parsec shakespeare text transformers ];
   testDepends = [ hspec HUnit shakespeare text ];
   meta = {

From fdf9b9784c810bb51c9d81e67e7c6352a1a3811d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 21 Jul 2013 15:37:56 +0200
Subject: [PATCH 303/439] haskell-shakespeare-js: update to version 1.1.4.1

---
 pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index 802fc8851371..917ea0c6cad1 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "1.1.4";
-  sha256 = "05hnqpg1icf6akvchhiam8sd2xkfiyvbwq504gnys55rxgjabfy3";
+  version = "1.1.4.1";
+  sha256 = "1mvsdbc3c6vgdpdb4m8b2d28vrh79v64vb9wkpnvhfg0jn7kb5c0";
   buildDepends = [ aeson shakespeare text ];
   testDepends = [ aeson hspec HUnit shakespeare text ];
   meta = {

From f749af3daadfc73e87e104384fc17782cb94022b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 21 Jul 2013 15:37:56 +0200
Subject: [PATCH 304/439] haskell-shakespeare-text: update to version 1.0.0.6

---
 .../libraries/haskell/shakespeare-text/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index d4cc135cc62a..e2ff7ff27e1b 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-text";
-  version = "1.0.0.5";
-  sha256 = "176yzx43sh0fnxpszn8kximd6i96yf2s374z55kvc1kspf7jk736";
+  version = "1.0.0.6";
+  sha256 = "1qlf51rpyzgnxdhyfs6g3vh8zq5vyq263qhm577w7rc9s4hjxk45";
   buildDepends = [ shakespeare text ];
   testDepends = [ hspec HUnit text ];
   meta = {

From 9102dbe6672eecfbf5bdd0d58b58d4857baa5755 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 21 Jul 2013 15:37:56 +0200
Subject: [PATCH 305/439] haskell-xml-conduit: update to version 1.1.0.5

---
 pkgs/development/libraries/haskell/xml-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 7a03815c183d..98166f80d31b 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "1.1.0.4";
-  sha256 = "0mbn0xm3br4f645qk1cv09zjlrcws5qdn498iwm5lx4j2ygg9swa";
+  version = "1.1.0.5";
+  sha256 = "1ryiacx42hdh564zy6dj5vxxl2l8flfffmdw8shb32w3gp11fzmp";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
     blazeHtml blazeMarkup conduit dataDefault failure monadControl

From 88da6b5d89b85ed95d06783b999181fb3904bc8a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 21 Jul 2013 15:37:57 +0200
Subject: [PATCH 306/439] haskell-xml-types: update to version 0.3.4

---
 pkgs/development/libraries/haskell/xml-types/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/xml-types/default.nix b/pkgs/development/libraries/haskell/xml-types/default.nix
index 48bd32b7c897..94a7d3f7dfff 100644
--- a/pkgs/development/libraries/haskell/xml-types/default.nix
+++ b/pkgs/development/libraries/haskell/xml-types/default.nix
@@ -1,10 +1,10 @@
-{ cabal, text }:
+{ cabal, deepseq, text }:
 
 cabal.mkDerivation (self: {
   pname = "xml-types";
-  version = "0.3.3";
-  sha256 = "0jvchgzmqsnc0dax73nh7wa7x6n07qnl4wr1d58v21rlbqcklgcn";
-  buildDepends = [ text ];
+  version = "0.3.4";
+  sha256 = "1689ijr4xxh4shxxvd51wdkpc535kzv6liqg4m1prag96aq05r8y";
+  buildDepends = [ deepseq text ];
   meta = {
     homepage = "https://john-millikin.com/software/haskell-xml/";
     description = "Basic types for representing XML";

From 8d835064525920eea95678484226b026c983fac6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 21 Jul 2013 15:37:57 +0200
Subject: [PATCH 307/439] haskell-yaml: update to version 0.8.4

---
 pkgs/development/libraries/haskell/yaml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index 1324a2137b1e..ee8b28b94cba 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.8.3";
-  sha256 = "1lbf0dgc3qvcdiyzk8zkpkga7f7g4i2rxriwdvwbxx199xr4apx3";
+  version = "0.8.4";
+  sha256 = "0kdqhdiyy2mqc3rb3l7aaspalkj4z8jndyzhij8m06n43hfzbhhi";
   buildDepends = [
     aeson attoparsec conduit resourcet text transformers
     unorderedContainers vector

From 7eea045b28bbf95e3814df4792402b62be3ee0e9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 21 Jul 2013 15:37:57 +0200
Subject: [PATCH 308/439] haskell-yesod-bin: update to version 1.2.2

---
 pkgs/development/libraries/haskell/yesod-bin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index 1a88ccfd2237..a7925e82b107 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.1";
-  sha256 = "0qag1phagcdn1zq3kgxbxynqdy5grj8icifz896v0n6bzjsn102b";
+  version = "1.2.2";
+  sha256 = "03c53kgiqmjjihszmvqjgkcklq28mvyn4m2lhcbmqqzkkzyjb0rj";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 38a2056f7042905efafcfa3044608006df89197f Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Tue, 9 Jul 2013 20:53:45 +0200
Subject: [PATCH 309/439] fix bug in perf-linux installation, oops

---
 pkgs/os-specific/linux/kernel/perf.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index 83de0effcecb..04924f013a45 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   preConfigure = ''
     cd tools/perf
     sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile
-    -f bash_completion && sed -i 's,^have perf,_have perf,' bash_completion
+    [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion
     export makeFlags="DESTDIR=$out $makeFlags"
   '';
 

From 147a6ae62fb0469b8c968958b7d50c65cf60c792 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 21 Jul 2013 19:32:54 +0200
Subject: [PATCH 310/439] nvidia: also install useful nvidia-smi tool

---
 pkgs/os-specific/linux/nvidia-x11/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index c1e60a79082a..28e2bd5642c0 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -74,7 +74,7 @@ installPhase() {
         # Install the programs.
         mkdir -p $out/bin
 
-        for i in nvidia-settings nvidia-xconfig; do
+        for i in nvidia-settings nvidia-smi nvidia-xconfig; do
 	    cp $i $out/bin/$i
 	    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
 	        --set-rpath $out/lib:$programPath:$glPath $out/bin/$i

From 480f27b218a7a3ebe937b8f645eb132339302e75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 21 Jul 2013 20:58:26 +0200
Subject: [PATCH 311/439] apcupsd: use /run/nologin (instead of /etc/nologin)
 to prevent logins

This is what systemd uses, see "man systemd-user-sessions.service".
---
 pkgs/servers/apcupsd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index b8a8cbbfa1c9..877be1d74b8a 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
         --mandir=$out/share/man \
         --with-halpolicydir=$out/share/halpolicy \
         --localstatedir=/var/ \
-        --with-nologin=/etc \
+        --with-nologin=/run \
         --with-log-dir=/var/log/apcupsd \
         --with-pwrfail-dir=/run/apcupsd \
         --with-lock-dir=/run/lock \

From f2601c5aded96a8e4ea25b23fcc4295e826cfbcd Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sun, 14 Jul 2013 13:41:56 +1000
Subject: [PATCH 312/439] matplotlib: fix build on darwin

* build with clangStdenv
* update to 1.2.1
---
 pkgs/top-level/python-packages.nix | 33 ++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9ae389d8e699..bf9746bbcd3e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2581,23 +2581,38 @@ pythonPackages = python.modules // rec {
   };
 
 
-  matplotlib = buildPythonPackage ( rec {
-    name = "matplotlib-1.1.0";
+  # not sure if this is the best way to accomplish this -- needed to provide
+  # objective-c compiler on darwin
+  matplotlibStdenv = if stdenv.isDarwin
+    then pkgs.clangStdenv
+    else pkgs.stdenv;
+
+  matplotlib = matplotlibStdenv.mkDerivation (rec {
+    name = "matplotlib-1.2.1";
+
     src = fetchurl {
-      url = "mirror://sourceforge/matplotlib/${name}.tar.gz";
-      sha256 = "be37e1d86c65ecacae6683f8805e051e9904e5f2e02bf2b7a34262c46a6d06a7";
+      url = "http://downloads.sourceforge.net/matplotlib/${name}.tar.gz";
+      sha256 = "16x2ksdxx5p92v98qngh29hdz1bnqy77fhggbjq30pyqmrr8kqaj";
     };
 
     # error: invalid command 'test'
     doCheck = false;
 
-    propagatedBuildInputs = [ dateutil numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ];
+    buildInputs = [ python pkgs.which pkgs.ghostscript ];
 
-    meta = {
+    propagatedBuildInputs =
+      [ dateutil numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl
+        pkgs.tk pkgs.xlibs.libX11 ];
+
+    buildPhase = "python setup.py build";
+
+    installPhase = "python setup.py install --prefix=$out";
+
+    meta = with stdenv.lib; {
       description = "python plotting library, making publication quality plots";
-      homepage = "http://matplotlib.sourceforge.net/";
-      platforms = stdenv.lib.platforms.linux;
-      maintainers = [ stdenv.lib.maintainers.simons ];
+      homepage    = "http://matplotlib.sourceforge.net/";
+      maintainers = with maintainers; [ lovek323 simons ];
+      platforms   = platforms.unix;
     };
   });
 

From 48e187836b180965a9855b99ef3409cc7294f2fa Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 22 Jul 2013 11:15:21 +0200
Subject: [PATCH 313/439] Added flatiron nodejs package + updated other nodejs
 packages

---
 pkgs/top-level/node-packages-generated.nix | 285 ++++++++++++++++++++-
 pkgs/top-level/node-packages.json          |   1 +
 2 files changed, 283 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 31dd33a8059c..b64ffd37792a 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -490,6 +490,17 @@
     sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c";
     tarball = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz";
   }
+  {
+    name = "buffer-equal";
+    spec = "~0.0.0";
+    version = "0.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "4a68196ac33522daa17ec99858b302a636b62cf1";
+    tarball = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.0.tgz";
+  }
   {
     name = "buffertools";
     spec = "*";
@@ -512,6 +523,18 @@
     sha1 = "1071a5f40fe76c39d7a4fe2ea030324d09d6ec9d";
     tarball = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz";
   }
+  {
+    name = "bunker";
+    spec = "0.1.X";
+    version = "0.1.2";
+    topLevel = false;
+    dependencies = [
+      { name = "burrito"; spec = ">=0.2.5 <0.3"; }
+    ];
+    patchLatest = false;
+    sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c";
+    tarball = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz";
+  }
   {
     name = "bunyan";
     spec = "0.21.1";
@@ -525,6 +548,19 @@
     sha1 = "ea00a0d5223572e31e1e71efba2237cb1915942a";
     tarball = "http://registry.npmjs.org/bunyan/-/bunyan-0.21.1.tgz";
   }
+  {
+    name = "burrito";
+    spec = ">=0.2.5 <0.3";
+    version = "0.2.12";
+    topLevel = false;
+    dependencies = [
+      { name = "traverse"; spec = "~0.5.1"; }
+      { name = "uglify-js"; spec = "~1.1.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b";
+    tarball = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz";
+  }
   {
     name = "bytes";
     spec = "0.2.0";
@@ -547,6 +583,17 @@
     sha1 = "55384d6afcf8c6b9dd483e8347646a790e4545e7";
     tarball = "http://registry.npmjs.org/character-parser/-/character-parser-1.0.2.tgz";
   }
+  {
+    name = "charm";
+    spec = "0.1.x";
+    version = "0.1.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296";
+    tarball = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz";
+  }
   {
     name = "child-process-close";
     spec = "~0.1.1";
@@ -1194,6 +1241,28 @@
     sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83";
     tarball = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
   }
+  {
+    name = "deep-equal";
+    spec = "~0.0.0";
+    version = "0.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83";
+    tarball = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
+  }
+  {
+    name = "deep-is";
+    spec = "0.1.x";
+    version = "0.1.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "9ced65ea0bc0b09f42a6d79c1b1903f9d913cc18";
+    tarball = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.2.tgz";
+  }
   {
     name = "delayed-stream";
     spec = "0.0.5";
@@ -1227,6 +1296,20 @@
     sha1 = "664b6bdb113fb3a51ced79aff621badeed29a02c";
     tarball = "http://registry.npmjs.org/diff/-/diff-1.0.5.tgz";
   }
+  {
+    name = "difflet";
+    spec = "~0.2.0";
+    version = "0.2.6";
+    topLevel = false;
+    dependencies = [
+      { name = "traverse"; spec = "0.6.x"; }
+      { name = "charm"; spec = "0.1.x"; }
+      { name = "deep-is"; spec = "0.1.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa";
+    tarball = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz";
+  }
   {
     name = "director";
     spec = "1.1.10";
@@ -1516,6 +1599,22 @@
     sha1 = "c14c5b3bf14d7417ffbfd990c0a7495cd9f337bc";
     tarball = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz";
   }
+  {
+    name = "flatiron";
+    spec = "*";
+    version = "0.3.8";
+    topLevel = true;
+    dependencies = [
+      { name = "broadway"; spec = "0.2.7"; }
+      { name = "optimist"; spec = "0.3.5"; }
+      { name = "prompt"; spec = "0.2.11"; }
+      { name = "director"; spec = "1.1.10"; }
+      { name = "pkginfo"; spec = "0.3.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "235d691f19154eff033610c12bcd51f304ff09c6";
+    tarball = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.8.tgz";
+  }
   {
     name = "flatiron";
     spec = "0.3.5";
@@ -2184,6 +2283,17 @@
     sha1 = "45be2390d27af4b7613aac4ee4d957e3f4cbdb54";
     tarball = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.7.tgz";
   }
+  {
+    name = "inherits";
+    spec = "*";
+    version = "2.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "76c81b3b1c10ddee3a60bf2c247162bc369f8ba8";
+    tarball = "http://registry.npmjs.org/inherits/-/inherits-2.0.0.tgz";
+  }
   {
     name = "inherits";
     spec = "1";
@@ -2890,6 +3000,17 @@
     sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
     tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
   }
+  {
+    name = "mkdirp";
+    spec = "~0.3";
+    version = "0.3.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+    tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+  }
   {
     name = "mkdirp";
     spec = "~0.3.3";
@@ -3099,13 +3220,14 @@
   {
     name = "msgpack";
     spec = ">= 0.0.1";
-    version = "0.1.8";
+    version = "0.1.10";
     topLevel = false;
     dependencies = [
+      { name = "nodeunit"; spec = "https://github.com/godsflaw/nodeunit/tarball/master"; }
     ];
     patchLatest = false;
-    sha1 = "cd5c0d2277bf1659a871209ddf59f57ad1124d68";
-    tarball = "http://registry.npmjs.org/msgpack/-/msgpack-0.1.8.tgz";
+    sha1 = "ebb2edea5ebc3616a2ce003d8d8ef73b52bf7318";
+    tarball = "http://registry.npmjs.org/msgpack/-/msgpack-0.1.10.tgz";
   }
   {
     name = "muri";
@@ -3405,6 +3527,18 @@
     sha1 = "c0667a000f208dbf6a4dad08a5186595a9889590";
     tarball = "http://registry.npmjs.org/nodemon/-/nodemon-0.7.8.tgz";
   }
+  {
+    name = "nodeunit";
+    spec = "https://github.com/godsflaw/nodeunit/tarball/master";
+    version = "0.7.4";
+    topLevel = false;
+    dependencies = [
+      { name = "tap"; spec = ">=0.2.3"; }
+    ];
+    patchLatest = false;
+    sha256 = "c79333b5b54ca3b9eb42e42d6ea48d261aa9e015c0ad9cf340abacb528d0ee3a";
+    tarball = "https://github.com/godsflaw/nodeunit/tarball/master";
+  }
   {
     name = "nopt";
     spec = "2";
@@ -3429,6 +3563,18 @@
     sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d";
     tarball = "http://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz";
   }
+  {
+    name = "nopt";
+    spec = "~2";
+    version = "2.1.2";
+    topLevel = false;
+    dependencies = [
+      { name = "abbrev"; spec = "1"; }
+    ];
+    patchLatest = false;
+    sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
+    tarball = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
+  }
   {
     name = "nopt";
     spec = "~2.1.1";
@@ -4010,6 +4156,22 @@
     sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e";
     tarball = "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz";
   }
+  {
+    name = "prompt";
+    spec = "0.2.11";
+    version = "0.2.11";
+    topLevel = false;
+    dependencies = [
+      { name = "pkginfo"; spec = "0.x.x"; }
+      { name = "read"; spec = "1.0.x"; }
+      { name = "revalidator"; spec = "0.1.x"; }
+      { name = "utile"; spec = "0.2.x"; }
+      { name = "winston"; spec = "0.6.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "26d455af4b7fac15291dfcdddf2400328c1fa446";
+    tarball = "http://registry.npmjs.org/prompt/-/prompt-0.2.11.tgz";
+  }
   {
     name = "prompt";
     spec = "0.2.9";
@@ -4588,6 +4750,18 @@
     sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5";
     tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz";
   }
+  {
+    name = "rimraf";
+    spec = "2.x.x";
+    version = "2.2.1";
+    topLevel = false;
+    dependencies = [
+      { name = "graceful-fs"; spec = "~1"; }
+    ];
+    patchLatest = false;
+    sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5";
+    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz";
+  }
   {
     name = "rimraf";
     spec = "~2";
@@ -4624,6 +4798,18 @@
     sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5";
     tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz";
   }
+  {
+    name = "runforcover";
+    spec = "~0.0.2";
+    version = "0.0.2";
+    topLevel = false;
+    dependencies = [
+      { name = "bunker"; spec = "0.1.X"; }
+    ];
+    patchLatest = false;
+    sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc";
+    tarball = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz";
+  }
   {
     name = "s3http";
     spec = "*";
@@ -4895,6 +5081,17 @@
     sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee";
     tarball = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz";
   }
+  {
+    name = "slide";
+    spec = "*";
+    version = "1.1.4";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "2b23f1949b369ed61d22bd6570ff0320302fc8df";
+    tarball = "http://registry.npmjs.org/slide/-/slide-1.1.4.tgz";
+  }
   {
     name = "slide";
     spec = "~1.1.3";
@@ -5194,6 +5391,27 @@
     sha1 = "2987b1ce2bd2f38b0dce2a34388884bfa4400ea7";
     tarball = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz";
   }
+  {
+    name = "tap";
+    spec = ">=0.2.3";
+    version = "0.4.3";
+    topLevel = false;
+    dependencies = [
+      { name = "inherits"; spec = "*"; }
+      { name = "yamlish"; spec = "*"; }
+      { name = "slide"; spec = "*"; }
+      { name = "runforcover"; spec = "~0.0.2"; }
+      { name = "nopt"; spec = "~2"; }
+      { name = "mkdirp"; spec = "~0.3"; }
+      { name = "difflet"; spec = "~0.2.0"; }
+      { name = "deep-equal"; spec = "~0.0.0"; }
+      { name = "buffer-equal"; spec = "~0.0.0"; }
+      { name = "glob"; spec = "~3.2.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "5ead7ede530658167fe28e3cdb9b0f96d3cf0c76";
+    tarball = "http://registry.npmjs.org/tap/-/tap-0.4.3.tgz";
+  }
   {
     name = "tar";
     spec = "*";
@@ -5309,6 +5527,28 @@
     sha1 = "352131dfceb93a7532dc7535a4f142510435a394";
     tarball = "http://registry.npmjs.org/transformers/-/transformers-2.0.1.tgz";
   }
+  {
+    name = "traverse";
+    spec = "0.6.x";
+    version = "0.6.3";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "a053ffa1b6179b9240ea16d74bfd604bd6b6e41b";
+    tarball = "http://registry.npmjs.org/traverse/-/traverse-0.6.3.tgz";
+  }
+  {
+    name = "traverse";
+    spec = "~0.5.1";
+    version = "0.5.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85";
+    tarball = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz";
+  }
   {
     name = "tunnel-agent";
     spec = "~0.2.0";
@@ -5356,6 +5596,17 @@
     sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
     tarball = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
   }
+  {
+    name = "uglify-js";
+    spec = "~1.1.1";
+    version = "1.1.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b";
+    tarball = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz";
+  }
   {
     name = "uglify-js";
     spec = "~2.2.5";
@@ -5517,6 +5768,23 @@
     sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69";
     tarball = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz";
   }
+  {
+    name = "utile";
+    spec = "0.2.x";
+    version = "0.2.0";
+    topLevel = false;
+    dependencies = [
+      { name = "async"; spec = "0.1.x"; }
+      { name = "deep-equal"; spec = "*"; }
+      { name = "i"; spec = "0.3.x"; }
+      { name = "mkdirp"; spec = "0.x.x"; }
+      { name = "ncp"; spec = "0.2.x"; }
+      { name = "rimraf"; spec = "2.x.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "91a2423ca2eb3322390e211ee3d71cf4fa193aea";
+    tarball = "http://registry.npmjs.org/utile/-/utile-0.2.0.tgz";
+  }
   {
     name = "vasync";
     spec = "1.3.3";
@@ -5846,6 +6114,17 @@
     sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2";
     tarball = "http://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz";
   }
+  {
+    name = "yamlish";
+    spec = "*";
+    version = "0.0.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "86c6c8e6b28b0827416dcc86f7419bba5610b57d";
+    tarball = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.5.tgz";
+  }
   {
     name = "zeparser";
     spec = "0.0.5";
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index d58967b0b39b..2bb095cf9138 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -63,6 +63,7 @@
 , "npm"
 , "gridfs-stream"
 , "tar"
+, "flatiron"
 , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
 , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
 ]

From a321f6f3027bde8df2dee8280f08e1e9b726666f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Mon, 22 Jul 2013 14:05:39 +0200
Subject: [PATCH 314/439] Oxygen-gtk: upgrade to 1.3.4

---
 pkgs/misc/themes/gtk2/oxygen-gtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
index 185532589c6a..3a619220bcf8 100644
--- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
+++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
@@ -2,12 +2,12 @@
   cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.2.1";
+  version = "1.3.4";
   name = "oxygen-gtk2-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2";
-    sha256 = "19l0dhjswvm7y99pvbd3qnz37k0p5y2slljy8mm4r8awjff3v4qi";
+    sha256 = "02q46kq0hhrmzwbjngg31ydl2198ls5bxgnz2si4amdmqii1nlmj";
   };
 
   buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf

From 3fa913d5ec035c2eedfc52e5753b355c22c2a745 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 22 Jul 2013 16:28:33 +0200
Subject: [PATCH 315/439] libspotify: Fix build for linux.

For Linux, the phases was run in the wrong order. I've
fixed that, but the package is still a complete mess that
needs to be cleaned up. The linux and darwin builds should
probably be separated into two different Nix expressions
to avoid the current conditional mess.
---
 pkgs/development/libraries/libspotify/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix
index 86007920d0e1..000112008a33 100644
--- a/pkgs/development/libraries/libspotify/default.nix
+++ b/pkgs/development/libraries/libspotify/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey, unzip }:
+{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey, unzip, gnused }:
 
 let version = "12.1.51"; in
 
-if (stdenv.system == "x86_64-linux" && stdenv.system != "x86_64-darwin")
+if (stdenv.system != "x86_64-linux" && stdenv.system != "x86_64-darwin")
 then throw "Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here"
 else stdenv.mkDerivation {
   name = "libspotify-${version}";
@@ -24,9 +24,10 @@ else stdenv.mkDerivation {
   # common
   buildPhase = "true";
   # no patch or build phase for darwin
-  phases = [ "unpackPhase" "installPhase" ]
-    ++ stdenv.lib.optionals (stdenv.system == "x86_64-linux")
-      [ "patchPhase" "buildPhase" ];
+  phases = 
+    [ "unpackPhase" ] ++ 
+    (stdenv.lib.optionals (stdenv.system == "x86_64-linux") [ "patchPhase" "buildPhase" ]) ++
+    [ "installPhase" ];
   installPhase = if (stdenv.system == "x86_64-linux")
     then "installPhase"
     else ''
@@ -48,7 +49,7 @@ else stdenv.mkDerivation {
   installFlags = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
     "prefix=$(out)";
   patchPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
-    "sed -i 's/ldconfig//' Makefile";
+    "${gnused}/bin/sed -i 's/ldconfig//' Makefile";
   postInstall = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
     "mv -v share $out";
 

From b52621a5fe59ca22a2ced78d8041ff7138a1cbe6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 22 Jul 2013 16:25:02 +0200
Subject: [PATCH 316/439] ipsec-tools: update to version 0.8.1

---
 pkgs/os-specific/linux/ipsec-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix
index 00676319b034..b28320c06252 100644
--- a/pkgs/os-specific/linux/ipsec-tools/default.nix
+++ b/pkgs/os-specific/linux/ipsec-tools/default.nix
@@ -7,11 +7,11 @@
 # the time being.
 
 stdenv.mkDerivation rec {
-  name = "ipsec-tools-0.8.0";
+  name = "ipsec-tools-0.8.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/ipsec-tools/${name}.tar.bz2";
-    sha256 = "2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717";
+    sha256 = "1m1x2planqqxi0587g7d8xhy0gkyfaxs3ry4hhdh0bw46sxrajps";
   };
 
   buildInputs = [ readline openssl flex krb5 pam ];

From 22689567edb2bafe375560c568e90d727aea0a29 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sun, 21 Jul 2013 02:14:16 +0000
Subject: [PATCH 317/439] apparmor: Update to kernel 3.4 series (the current
 default)

---
 pkgs/os-specific/linux/kernel/patches.nix | 7 +++++++
 pkgs/top-level/all-packages.nix           | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 73146d8b67d2..35f47b8e6079 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -55,6 +55,13 @@ rec {
     features.apparmor = true;
   };
 
+  apparmor_3_4 = rec {
+    version = "3.4";
+    name = "apparmor-${version}";
+    patch = makeAppArmorPatch { inherit apparmor version; };
+    features.apparmor = true;
+  };
+
   sec_perm_2_6_24 =
     { name = "sec_perm-2.6.24";
       patch = ./sec_perm-2.6.24.patch;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aee877b0ebce..6020b4ae515d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6373,6 +6373,14 @@ let
       ];
   };
 
+  linux_3_4_apparmor = linux_3_4.override {
+    kernelPatches = [ kernelPatches.apparmor_3_4 ];
+    extraConfig = ''
+      SECURITY_APPARMOR y
+      DEFAULT_SECURITY_APPARMOR y
+    '';
+  };
+
   linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
   };
@@ -6534,6 +6542,7 @@ let
   linuxPackages_3_2_apparmor = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_apparmor linuxPackages_3_2_apparmor);
   linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen);
   linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4);
+  linuxPackages_3_4_apparmor = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor);
   linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi);
   linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8);
   linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9);

From 212a2a5c37c0578e62c339a27b45e682b6c4556b Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 22 Jul 2013 21:28:46 +0200
Subject: [PATCH 318/439] Fix junit

---
 pkgs/development/libraries/java/junit/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix
index c1d713950b40..7a6db1ad4b30 100644
--- a/pkgs/development/libraries/java/junit/default.nix
+++ b/pkgs/development/libraries/java/junit/default.nix
@@ -1,13 +1,12 @@
-{stdenv, fetchgit, unzip} :
+{stdenv, fetchurl, unzip} :
 
 stdenv.mkDerivation {
   name = "junit-4.8.2";
   builder = ./builder.sh;
 
-  src = fetchgit {
-    url = https://github.com/junit-team/junit.git;
-    rev = "refs/tags/r4.8.2";
-    sha256 = "1w73l3x97kg8zmrp44xgvp3gr6sih0crm0dhhky6jiq915ba1dlh";
+  src = fetchurl {
+    url = https://github.com/downloads/junit-team/junit/junit4.8.2.zip;
+    sha256 = "01simvc3pmgp27p7vzavmsx5rphm6hqzwrqfkwllhf3812dcqxy6";
   };
 
   inherit unzip;

From af2a12755113d8c1e1464fbe20ead31389a66e32 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 22 Jul 2013 21:44:31 +0200
Subject: [PATCH 319/439] Add linux 3.2.48 with grsecurity patches

---
 pkgs/os-specific/linux/kernel/builder.sh  | 2 +-
 pkgs/os-specific/linux/kernel/patches.nix | 9 +++++++++
 pkgs/top-level/all-packages.nix           | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh
index 14d8108ba16b..47c7a22c177a 100644
--- a/pkgs/os-specific/linux/kernel/builder.sh
+++ b/pkgs/os-specific/linux/kernel/builder.sh
@@ -1,7 +1,7 @@
 source $stdenv/setup
 
 
-makeFlags="ARCH=$arch SHELL=/bin/sh"
+makeFlags="ARCH=$arch SHELL=/bin/sh $makeFlags"
 if [ -n "$crossConfig" ]; then
   makeFlags="$makeFlags CROSS_COMPILE=$crossConfig-"
 fi
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 35f47b8e6079..37c5f926e87a 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -154,6 +154,15 @@ rec {
       patch = ./mips-ext3-n32.patch;
     };
 
+  grsecurity_2_9_1_3_2_48 =
+    { name = "grsecurity-2.9.1-3.2.48";
+      patch =
+        (fetchurl {
+           url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.48-201307212241.patch;
+           sha256 = "1llgrcd7ynxx60dn05bcbysd6a1091wwxkck4d15gvp71s9r6scm";
+         });
+    };
+
   guruplug_defconfig =
     { # Default configuration for the GuruPlug.  From
       # <http://www.openplug.org/plugwiki/images/c/c6/Guruplug-patchset-2.6.33.2.tar.bz2>.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6020b4ae515d..fab5abd9c496 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6348,6 +6348,10 @@ let
       ];
   };
 
+  linux_3_2_grsecurity = lib.overrideDerivation (linux_3_2.override (args: {
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_48 ];
+  })) (args: { makeFlags = "DISABLE_PAX_PLUGINS=y";});
+
   linux_3_2_apparmor = linux_3_2.override {
     kernelPatches = [ kernelPatches.apparmor_3_2 ];
     extraConfig = ''

From b1db03ece62c1a566187880092e0e1ec542944b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 22 Jul 2013 22:18:26 +0200
Subject: [PATCH 320/439] Updating go to 1.1.1

---
 pkgs/development/compilers/go/1.1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix
index 39c79e9a3de1..01a8f1b6b186 100644
--- a/pkgs/development/compilers/go/1.1.nix
+++ b/pkgs/development/compilers/go/1.1.nix
@@ -7,11 +7,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "go-1.1";
+  name = "go-1.1.1";
 
   src = fetchurl {
-    url = http://go.googlecode.com/files/go1.1.src.tar.gz;
-    sha1 = "a464704ebbbdd552a39b5f9429b059c117d165b3";
+    url = http://go.googlecode.com/files/go1.1.1.src.tar.gz;
+    sha1 = "f365aed8183e487a48a66ace7bf36e5974dffbb3";
   };
 
   buildInputs = [ bison glibc bash makeWrapper ];

From bee4c41e13a9276db4f4a582234c670d74edfa1a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Jul 2013 10:40:35 +0200
Subject: [PATCH 321/439] smartmontools: update drive database to the latest
 version

---
 pkgs/tools/system/smartmontools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index 909b0d832f78..b901bd3b78e7 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -2,8 +2,8 @@
 
 let
   driverdb = fetchurl {
-    url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3797";
-    sha256 = "01ycm3vffxpfvfga9vp1d38jy3lqpkpxnxf78pidc8q1nn8bpdyz";
+    url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3812";
+    sha256 = "1x22ammjwlb7p3cmd13shqq1payb7nr9pgfa9xifs19qyr77mrwp";
     name = "smartmontools-drivedb.h";
   };
 in

From 4dd9507b835fd0b8ff556a1c547601a9ac1857ae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jul 2013 11:12:03 +0200
Subject: [PATCH 322/439] netpbm: Fix a truly random build failure

Since "src" is a fetchsvn directory, the source is copied with "cp
--no-preserve=timestamps" (see commit
6d928ab684327e0eeb1bf6cd889d57ca7127e8a7).  So some source files might
get a slightly different timestamp.  Here, if lib/standard.ppmdfont
gets a newer timestamp than the generated file lib/standardppmdfont.c,
Make will try to rebuild the latter.  But that fails because the
ppmdcfont program doesn't exist (yet).

Probably stdenv should ensure that every file has the same timestamp.
---
 pkgs/tools/graphics/netpbm/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index dc45ad7a8419..39e134ad9069 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2, makeWrapper, libX11, libtiff }:
+{ stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2, makeWrapper, libX11, libtiff }:
 
 let rev = 1742; in
 stdenv.mkDerivation {
@@ -29,8 +29,11 @@ stdenv.mkDerivation {
         --subst-var-by "rgbPath1" "$out/lib/rgb.txt" \
         --subst-var-by "rgbPath2" "/var/empty/rgb.txt" \
         --subst-var-by "rgbPath3" "/var/empty/rgb.txt"
+    touch lib/standardppmdfont.c
   '';
 
+  enableParallelBuilding = true;
+
   installPhase = ''
     make package pkgdir=$PWD/netpbmpkg
     # Pass answers to the script questions

From 04a9e809d41225d40e7c311c8e67c6014a338fd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 22 Jul 2013 22:18:26 +0200
Subject: [PATCH 323/439] Updating go to 1.1.1

---
 pkgs/tools/networking/network-manager-applet/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 7e86b5769679..8670a5d15249 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -18,11 +18,13 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    gtk libglade networkmanager GConf libnotify libsecret dbus_glib
-    polkit isocodes makeWrapper udev libgnome_keyring
+    gtk libglade networkmanager libnotify libsecret dbus_glib
+    polkit isocodes makeWrapper udev
   ];
 
-  nativeBuildInputs = [ intltool pkgconfig ];
+  nativeBuildInputs = [ intltool pkgconfig];
+
+  propagatedBuildInputs = [ GConf libgnome_keyring ];
 
   makeFlags = [
     ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''

From a143c0bb107bf96458b0a55070f35a0d1ed60b57 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Tue, 23 Jul 2013 11:19:07 +0200
Subject: [PATCH 324/439] networkmanagerapplet: add GConf libgnome_keyring to
 propagatedBuildInputs

---
 pkgs/tools/networking/network-manager-applet/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 8670a5d15249..c03e29ba3816 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     polkit isocodes makeWrapper udev
   ];
 
-  nativeBuildInputs = [ intltool pkgconfig];
+  nativeBuildInputs = [ intltool pkgconfig ];
 
   propagatedBuildInputs = [ GConf libgnome_keyring ];
 

From e491997a6b242945a0e2d8f8541c8d600aef3a4e Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Tue, 23 Jul 2013 11:21:38 +0200
Subject: [PATCH 325/439] python3: 3.3.1 -> 3.3.2

---
 pkgs/development/interpreters/python/3.3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index 16973c6226ee..84f4ec184aa6 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -17,7 +17,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.3";
-  version = "${majorVersion}.1";
+  version = "${majorVersion}.2";
 
   buildInputs = filter (p: p != null) [
     zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
@@ -28,8 +28,8 @@ stdenv.mkDerivation {
   inherit majorVersion version;
 
   src = fetchurl {
-    url = "http://www.python.org/ftp/python/3.3.1/Python-${version}.tar.bz2";
-    sha256 = "0mm7nvdd85p6b26jwshy2dhicf0b06mb5lrl564i3c5q7jgs1vll";
+    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
+    sha256 = "16myvina7nakyyg7r5gnjyydk8bzar988vmxsw2k485w5gz04wpp";
   };
 
   preConfigure = ''

From 2252bfe79fe196e33c0dd3f91ef4ed56c525dcce Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 23 Jul 2013 11:33:48 +0200
Subject: [PATCH 326/439] Added ironhorse nodejs package + updated other node
 packages

---
 pkgs/top-level/node-packages-generated.nix | 114 ++++++++++++---------
 pkgs/top-level/node-packages.json          |   1 +
 2 files changed, 64 insertions(+), 51 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index b64ffd37792a..564dff15ad75 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -1991,7 +1991,7 @@
   }
   {
     name = "graceful-fs";
-    spec = "~1.2";
+    spec = "~1.2.0";
     version = "1.2.3";
     topLevel = false;
     dependencies = [
@@ -2002,14 +2002,14 @@
   }
   {
     name = "graceful-fs";
-    spec = "~1.2.0";
-    version = "1.2.3";
+    spec = "~2";
+    version = "2.0.0";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
-    tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+    sha1 = "c9a206f6f5f4b94e1046dfaaccfe9e12d0ab8cef";
+    tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.0.tgz";
   }
   {
     name = "graceful-fs";
@@ -2386,6 +2386,18 @@
     sha1 = "7baf10535227e0878105a04e44b78f132475da6a";
     tarball = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.10.tgz";
   }
+  {
+    name = "ironhorse";
+    spec = "*";
+    version = "0.0.2";
+    topLevel = true;
+    dependencies = [
+      { name = "winston"; spec = "*"; }
+    ];
+    patchLatest = false;
+    sha1 = "9a8e27407ecfba7cd4d1d5886c7d97e65d44da9c";
+    tarball = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.2.tgz";
+  }
   {
     name = "is-promise";
     spec = "~1";
@@ -4384,47 +4396,47 @@
   {
     name = "read-installed";
     spec = "~0.2.2";
-    version = "0.2.2";
+    version = "0.2.3";
     topLevel = false;
     dependencies = [
       { name = "semver"; spec = "2"; }
       { name = "slide"; spec = "~1.1.3"; }
       { name = "read-package-json"; spec = "1"; }
-      { name = "graceful-fs"; spec = "~1.2.0"; }
+      { name = "graceful-fs"; spec = "~2"; }
     ];
     patchLatest = false;
-    sha1 = "f570ac84fb29c75f16faa3940a8c1e602c8eecab";
-    tarball = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.2.tgz";
+    sha1 = "234204b47f6a0eb82c662fc04f7b7c5f7e795239";
+    tarball = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.3.tgz";
   }
   {
     name = "read-package-json";
     spec = "1";
-    version = "1.1.0";
+    version = "1.1.1";
     topLevel = false;
     dependencies = [
       { name = "glob"; spec = "~3.2.1"; }
       { name = "lru-cache"; spec = "2"; }
       { name = "normalize-package-data"; spec = "~0.2"; }
-      { name = "graceful-fs"; spec = "~1.2"; }
+      { name = "graceful-fs"; spec = "2"; }
     ];
     patchLatest = false;
-    sha1 = "6447ac4d10788c76d0682cf2086eaa809076aafc";
-    tarball = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.0.tgz";
+    sha1 = "5d679b34ddf53ac3bc232aeb421f6b6857f925e5";
+    tarball = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.1.tgz";
   }
   {
     name = "read-package-json";
     spec = "~1.1.0";
-    version = "1.1.0";
+    version = "1.1.1";
     topLevel = false;
     dependencies = [
       { name = "glob"; spec = "~3.2.1"; }
       { name = "lru-cache"; spec = "2"; }
       { name = "normalize-package-data"; spec = "~0.2"; }
-      { name = "graceful-fs"; spec = "~1.2"; }
+      { name = "graceful-fs"; spec = "2"; }
     ];
     patchLatest = false;
-    sha1 = "6447ac4d10788c76d0682cf2086eaa809076aafc";
-    tarball = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.0.tgz";
+    sha1 = "5d679b34ddf53ac3bc232aeb421f6b6857f925e5";
+    tarball = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.1.tgz";
   }
   {
     name = "readable-stream";
@@ -4521,7 +4533,7 @@
   {
     name = "request";
     spec = "2";
-    version = "2.22.0";
+    version = "2.23.0";
     topLevel = false;
     dependencies = [
       { name = "qs"; spec = "~0.6.0"; }
@@ -4538,13 +4550,13 @@
       { name = "form-data"; spec = "0.0.8"; }
     ];
     patchLatest = false;
-    sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592";
-    tarball = "http://registry.npmjs.org/request/-/request-2.22.0.tgz";
+    sha1 = "121742874bf40b3c149fe113b7a35847597fc885";
+    tarball = "http://registry.npmjs.org/request/-/request-2.23.0.tgz";
   }
   {
     name = "request";
     spec = "2 >=2.14";
-    version = "2.22.0";
+    version = "2.23.0";
     topLevel = false;
     dependencies = [
       { name = "qs"; spec = "~0.6.0"; }
@@ -4561,13 +4573,13 @@
       { name = "form-data"; spec = "0.0.8"; }
     ];
     patchLatest = false;
-    sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592";
-    tarball = "http://registry.npmjs.org/request/-/request-2.22.0.tgz";
+    sha1 = "121742874bf40b3c149fe113b7a35847597fc885";
+    tarball = "http://registry.npmjs.org/request/-/request-2.23.0.tgz";
   }
   {
     name = "request";
     spec = "2 >=2.20.0";
-    version = "2.22.0";
+    version = "2.23.0";
     topLevel = false;
     dependencies = [
       { name = "qs"; spec = "~0.6.0"; }
@@ -4584,8 +4596,8 @@
       { name = "form-data"; spec = "0.0.8"; }
     ];
     patchLatest = false;
-    sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592";
-    tarball = "http://registry.npmjs.org/request/-/request-2.22.0.tgz";
+    sha1 = "121742874bf40b3c149fe113b7a35847597fc885";
+    tarball = "http://registry.npmjs.org/request/-/request-2.23.0.tgz";
   }
   {
     name = "request";
@@ -4623,7 +4635,7 @@
   {
     name = "request";
     spec = "~2";
-    version = "2.22.0";
+    version = "2.23.0";
     topLevel = false;
     dependencies = [
       { name = "qs"; spec = "~0.6.0"; }
@@ -4640,8 +4652,8 @@
       { name = "form-data"; spec = "0.0.8"; }
     ];
     patchLatest = false;
-    sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592";
-    tarball = "http://registry.npmjs.org/request/-/request-2.22.0.tgz";
+    sha1 = "121742874bf40b3c149fe113b7a35847597fc885";
+    tarball = "http://registry.npmjs.org/request/-/request-2.23.0.tgz";
   }
   {
     name = "request";
@@ -4741,38 +4753,38 @@
   {
     name = "rimraf";
     spec = "2";
-    version = "2.2.1";
+    version = "2.2.2";
     topLevel = false;
     dependencies = [
-      { name = "graceful-fs"; spec = "~1"; }
+      { name = "graceful-fs"; spec = "~2"; }
     ];
     patchLatest = false;
-    sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5";
-    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz";
+    sha1 = "d99ec41dc646e55bf7a7a44a255c28bef33a8abf";
+    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.2.tgz";
   }
   {
     name = "rimraf";
     spec = "2.x.x";
-    version = "2.2.1";
+    version = "2.2.2";
     topLevel = false;
     dependencies = [
-      { name = "graceful-fs"; spec = "~1"; }
+      { name = "graceful-fs"; spec = "~2"; }
     ];
     patchLatest = false;
-    sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5";
-    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz";
+    sha1 = "d99ec41dc646e55bf7a7a44a255c28bef33a8abf";
+    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.2.tgz";
   }
   {
     name = "rimraf";
     spec = "~2";
-    version = "2.2.1";
+    version = "2.2.2";
     topLevel = false;
     dependencies = [
-      { name = "graceful-fs"; spec = "~1"; }
+      { name = "graceful-fs"; spec = "~2"; }
     ];
     patchLatest = false;
-    sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5";
-    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz";
+    sha1 = "d99ec41dc646e55bf7a7a44a255c28bef33a8abf";
+    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.2.tgz";
   }
   {
     name = "rimraf";
@@ -4789,14 +4801,14 @@
   {
     name = "rimraf";
     spec = "~2.2.0";
-    version = "2.2.1";
+    version = "2.2.2";
     topLevel = false;
     dependencies = [
-      { name = "graceful-fs"; spec = "~1"; }
+      { name = "graceful-fs"; spec = "~2"; }
     ];
     patchLatest = false;
-    sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5";
-    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz";
+    sha1 = "d99ec41dc646e55bf7a7a44a255c28bef33a8abf";
+    tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.2.tgz";
   }
   {
     name = "runforcover";
@@ -5218,26 +5230,26 @@
   {
     name = "source-map";
     spec = "*";
-    version = "0.1.26";
+    version = "0.1.27";
     topLevel = true;
     dependencies = [
       { name = "amdefine"; spec = ">=0.0.4"; }
     ];
     patchLatest = false;
-    sha1 = "4cce2dcb5fa02cfe1b4cf32cc83962b1b3997560";
-    tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.26.tgz";
+    sha1 = "f114e06a8b5c05cbc51aa1fa600e728162455eda";
+    tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.27.tgz";
   }
   {
     name = "source-map";
     spec = "~0.1.7";
-    version = "0.1.26";
+    version = "0.1.27";
     topLevel = false;
     dependencies = [
       { name = "amdefine"; spec = ">=0.0.4"; }
     ];
     patchLatest = false;
-    sha1 = "4cce2dcb5fa02cfe1b4cf32cc83962b1b3997560";
-    tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.26.tgz";
+    sha1 = "f114e06a8b5c05cbc51aa1fa600e728162455eda";
+    tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.27.tgz";
   }
   {
     name = "spdy";
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 2bb095cf9138..3379321bb5f4 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -64,6 +64,7 @@
 , "gridfs-stream"
 , "tar"
 , "flatiron"
+, "ironhorse"
 , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
 , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
 ]

From bea0ac29d4325d6f534e167663c54bb21d695420 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Tue, 23 Jul 2013 11:53:12 +0200
Subject: [PATCH 327/439] networkmanagerapplet: propagatedBuildInputs ->
 propagatedUserEnvPkgs

---
 pkgs/tools/networking/network-manager-applet/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index c03e29ba3816..cbae1a29de5d 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf
-, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring
+, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring, gnome_keyring icon
 , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
-, makeWrapper, networkmanager_openvpn, udev }:
+, makeWrapper, networkmanager_openvpn, udev, hicolor_icon_theme }:
 
 let
   pn = "network-manager-applet";
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk libglade networkmanager libnotify libsecret dbus_glib
-    polkit isocodes makeWrapper udev
+    polkit isocodes makeWrapper udev GConf
   ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
-  propagatedBuildInputs = [ GConf libgnome_keyring ];
+  propagatedUserEnvPkgs = [ GConf gnome_keyring hicolor_icon_theme ];
 
   makeFlags = [
     ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''

From e41fc2a67750d78c0aa7f6cb4482e5a1363daaab Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Tue, 23 Jul 2013 11:36:33 +0200
Subject: [PATCH 328/439] add python32

---
 .../interpreters/python/3.2/default.nix       | 82 +++++++++++++++++++
 .../interpreters/python/3.2/setup-hook.sh     | 15 ++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 98 insertions(+)
 create mode 100644 pkgs/development/interpreters/python/3.2/default.nix
 create mode 100644 pkgs/development/interpreters/python/3.2/setup-hook.sh

diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
new file mode 100644
index 000000000000..b3f5a17b0641
--- /dev/null
+++ b/pkgs/development/interpreters/python/3.2/default.nix
@@ -0,0 +1,82 @@
+{ stdenv, fetchurl
+, bzip2
+, db4
+, gdbm
+, libX11, xproto
+, ncurses
+, openssl
+, readline
+, sqlite
+, tcl, tk
+, zlib
+}:
+
+assert readline != null -> ncurses != null;
+
+with stdenv.lib;
+
+let
+  majorVersion = "3.2";
+  version = "${majorVersion}.5";
+
+  buildInputs = filter (p: p != null) [
+    zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
+  ];
+in
+stdenv.mkDerivation {
+  name = "python3-${version}";
+  inherit majorVersion version;
+
+  src = fetchurl {
+    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
+    sha256 = "0pxs234g08v3lar09lvzxw4vqdpwkbqmvkv894j2w7aklskcjd6v";
+  };
+
+  preConfigure = ''
+    for i in /usr /sw /opt /pkg; do	# improve purity
+      substituteInPlace ./setup.py --replace $i /no-such-path
+    done
+    ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
+
+    configureFlagsArray=( --enable-shared --with-threads
+                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
+                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
+                          LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}"
+                        )
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  postInstall = ''
+    rm -rf "$out/lib/python${majorVersion}/test"
+  '';
+
+  passthru = {
+    zlibSupport = zlib != null;
+    sqliteSupport = sqlite != null;
+    db4Support = db4 != null;
+    readlineSupport = readline != null;
+    opensslSupport = openssl != null;
+    tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
+    libPrefix = "python${majorVersion}m";
+  };
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = "http://python.org";
+    description = "a high-level dynamically-typed programming language";
+    longDescription = ''
+      Python is a remarkably powerful dynamic programming language that
+      is used in a wide variety of application domains. Some of its key
+      distinguishing features include: clear, readable syntax; strong
+      introspection capabilities; intuitive object orientation; natural
+      expression of procedural code; full modularity, supporting
+      hierarchical packages; exception-based error handling; and very
+      high level dynamic data types.
+    '';
+    license = stdenv.lib.licenses.psfl;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
+  };
+}
diff --git a/pkgs/development/interpreters/python/3.2/setup-hook.sh b/pkgs/development/interpreters/python/3.2/setup-hook.sh
new file mode 100644
index 000000000000..e6fa34bf54ba
--- /dev/null
+++ b/pkgs/development/interpreters/python/3.2/setup-hook.sh
@@ -0,0 +1,15 @@
+addPythonPath() {
+    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.2/site-packages
+}
+
+toPythonPath() {
+    local paths="$1"
+    local result=
+    for i in $paths; do
+        p="$i/lib/python3.2/site-packages"
+        result="${result}${result:+:}$p"
+    done
+    echo $result
+}
+
+envHooks=(${envHooks[@]} addPythonPath)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fab5abd9c496..aa8586d185c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3091,6 +3091,7 @@ let
 
   python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { });
   python33 = callPackage ../development/interpreters/python/3.3 { };
+  python32 = callPackage ../development/interpreters/python/3.2 { };
 
   python = python27;
   python26 = callPackage ../development/interpreters/python/2.6 { };

From 11eef4f79f15c1019c1254032cbde8855c5830e3 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Tue, 23 Jul 2013 13:18:54 +0200
Subject: [PATCH 329/439] networkmanagerapplet: fix build

---
 pkgs/tools/networking/network-manager-applet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index cbae1a29de5d..ca9515795487 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf
-, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring, gnome_keyring icon
+, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring, gnome_keyring
 , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
 , makeWrapper, networkmanager_openvpn, udev, hicolor_icon_theme }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk libglade networkmanager libnotify libsecret dbus_glib
-    polkit isocodes makeWrapper udev GConf
+    polkit isocodes makeWrapper udev GConf gnome_keyring
   ];
 
   nativeBuildInputs = [ intltool pkgconfig ];

From b95e01dd88c42fc370d577eeb8ea881c410e34b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Jul 2013 10:51:47 +0200
Subject: [PATCH 330/439] haskell-monad-par: update to version 0.3.4.3

---
 .../libraries/haskell/monad-par/{0.3.4.2.nix => 0.3.4.3.nix}  | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/monad-par/{0.3.4.2.nix => 0.3.4.3.nix} (90%)

diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.2.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.3.nix
similarity index 90%
rename from pkgs/development/libraries/haskell/monad-par/0.3.4.2.nix
rename to pkgs/development/libraries/haskell/monad-par/0.3.4.3.nix
index ab875b34c360..22b9d359faf2 100644
--- a/pkgs/development/libraries/haskell/monad-par/0.3.4.2.nix
+++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.3.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-par";
-  version = "0.3.4.2";
-  sha256 = "1k10m4w2g92psahsvcyi98sc31wg5anijp46lbsipi2r2gxxc7bs";
+  version = "0.3.4.3";
+  sha256 = "1yf1s44r2mkqimi26g9y4zxqgs4yizfmigfx9mkfgbqsn2a8sff6";
   buildDepends = [
     abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
     parallel
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 879e2d61fdb2..adc86c6d00c8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1407,8 +1407,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   monadLogger = callPackage ../development/libraries/haskell/monad-logger {};
 
   monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {};
-  monadPar_0_3_4_2 = callPackage ../development/libraries/haskell/monad-par/0.3.4.2.nix {};
-  monadPar = self.monadPar_0_3_4_2;
+  monadPar_0_3_4_3 = callPackage ../development/libraries/haskell/monad-par/0.3.4.3.nix {};
+  monadPar = self.monadPar_0_3_4_3;
 
   monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {};
 

From 08c2f03b2920ba2ee30e3fc755c91d10ed7e323e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Jul 2013 10:51:57 +0200
Subject: [PATCH 331/439] haskell-fast-logger: update to version 0.3.2

---
 pkgs/development/libraries/haskell/fast-logger/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix
index c9544b2c1f69..b192c1e0c61e 100644
--- a/pkgs/development/libraries/haskell/fast-logger/default.nix
+++ b/pkgs/development/libraries/haskell/fast-logger/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fast-logger";
-  version = "0.3.1";
-  sha256 = "0sjn3vad0fbchv1fhap71wfnihlwnfhk6p9h9hpnbr0i4b32f1ks";
+  version = "0.3.2";
+  sha256 = "0bx8yjg7bf18i7j7fnhidnms5a3v6hiwqqvr249fk03c86v20rla";
   buildDepends = [ blazeBuilder dateCache filepath text unixTime ];
   testDepends = [ hspec ];
   meta = {

From fad190185bfbb4d8bb2af3fcc1c77e6c7210f027 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Jul 2013 10:51:57 +0200
Subject: [PATCH 332/439] haskell-fclabels: update to version 1.1.7

---
 pkgs/development/libraries/haskell/fclabels/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index 0064a7f425a8..e3c794d6d5e2 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fclabels";
-  version = "1.1.6";
-  sha256 = "0f5zqbqsm89lp1f7wrmcs8pn7hzbbl8id7xa6ny114bgxrfbrwpk";
+  version = "1.1.7";
+  sha256 = "0mk75fk3c4ilb2hmz972ymv1pkzxp6010mlma7hw1l13dfy0hy9v";
   buildDepends = [ mtl transformers ];
   meta = {
     homepage = "https://github.com/sebastiaanvisser/fclabels";

From 3f2d39e42166a4f5bb16f62063e2dd1b9ed8a5ea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Jul 2013 10:51:57 +0200
Subject: [PATCH 333/439] haskell-highlighting-kate: update to version 0.5.5

---
 .../libraries/haskell/highlighting-kate/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index f09e3efaeb4b..e0cab3852862 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "highlighting-kate";
-  version = "0.5.4";
-  sha256 = "0khwhhcjvhsh92b420bylx4c1ahpvk6c50s8y6bacfwfq71ydwmb";
+  version = "0.5.5";
+  sha256 = "0ypxlsfh9xdpnxp6j7wy7q7ymhmxfgwrqi4c08zwf8xy5sfvahs9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];

From ba95a91106cad8d44141da558648b32ed5bf2701 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Jul 2013 10:51:57 +0200
Subject: [PATCH 334/439] haskell-postgresql-simple: update to version 0.3.4.0

---
 .../libraries/haskell/postgresql-simple/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index 888f992b159a..1ae1737e4b25 100644
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-simple";
-  version = "0.3.3.2";
-  sha256 = "1gh2ih1n6g17jry12g7nv344sfzrhfc1assslx0cjlsryhbz25lp";
+  version = "0.3.4.0";
+  sha256 = "1xqs5hpljsapgisr7q3yd8ir351196xrdrk51dsizvk4vcs85wgs";
   buildDepends = [
     attoparsec blazeBuilder blazeTextual postgresqlLibpq text time
     transformers vector

From cf4c6a6949f6a65dd9f204181963e3380c8d256d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Jul 2013 10:51:57 +0200
Subject: [PATCH 335/439] haskell-simple-sendfile: update to version 0.2.12

---
 .../development/libraries/haskell/simple-sendfile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
index 9e8f638c65cf..b8c527daf1a9 100644
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "simple-sendfile";
-  version = "0.2.11";
-  sha256 = "1q9m9lxv9jfkn6a1lf07jcl4li3n5996df1qrfkfjq2n0bvn4qfj";
+  version = "0.2.12";
+  sha256 = "019n82700fbhsqxgn1cwfqii27r436gljis7yl02zjnzy7xlvrha";
   buildDepends = [ network ];
   testDepends = [ conduit hspec HUnit network networkConduit ];
   doCheck = false;

From 57844acb420f441f37279a055f3f7664a19b398f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Jul 2013 10:51:57 +0200
Subject: [PATCH 336/439] haskell-unix-time: update to version 0.1.10

---
 pkgs/development/libraries/haskell/unix-time/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix
index c3e5ca14b239..691787e7f87c 100644
--- a/pkgs/development/libraries/haskell/unix-time/default.nix
+++ b/pkgs/development/libraries/haskell/unix-time/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-time";
-  version = "0.1.9";
-  sha256 = "0z4761g7rkw771r9828h1l37pp3brrra9ihjg203h66jc1wlvb72";
+  version = "0.1.10";
+  sha256 = "0z8i02j295fi0y512bwhxfk2dr2s4i0xlgi80pnq680zdrahgwlf";
   testDepends = [ doctest hspec QuickCheck time ];
   meta = {
     description = "Unix time parser/formatter and utilities";

From 05ec96b00e2210207b9aae18d4db48e2fa558f80 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Jul 2013 11:23:09 +0200
Subject: [PATCH 337/439] python-packages: cosmetic to fix syntax highlighting
 and trailing whitespace

---
 pkgs/top-level/python-packages.nix | 66 +++++++++++++++---------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9ae389d8e699..987e85ea8a6a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23,7 +23,7 @@ pythonPackages = python.modules // rec {
   wrapPython = pkgs.makeSetupHook
     { deps = pkgs.makeWrapper;
       substitutions.libPrefix = python.libPrefix;
-    } 
+    }
    ../development/python-modules/generic/wrap.sh;
 
   # specials
@@ -165,7 +165,7 @@ pythonPackages = python.modules // rec {
       pythonPackages.webtest
     ];
 
-    propagatedBuildInputs = [ 
+    propagatedBuildInputs = [
       pkgs.makeWrapper
       pkgs.bacula
       pythonPackages.colander
@@ -508,7 +508,7 @@ pythonPackages = python.modules // rec {
 
      propagatedBuildInputs = [ python.modules.curses pygments ];
      doCheck = false;
-     
+
      meta = {
        description = "UNKNOWN";
        homepage = "UNKNOWN";
@@ -1124,7 +1124,7 @@ pythonPackages = python.modules // rec {
     buildInputs = [ paver ];
 
     postInstall = ''
-      for prog in $out/bin/*; do
+      for prog in "$out/bin/"*; do
         wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH"
       done
     '';
@@ -1154,7 +1154,7 @@ pythonPackages = python.modules // rec {
     };
     propagatedBuildInputs = [ paramiko pycrypto ];
     buildInputs = [ fudge nose ];
-  }; 
+  };
 
   fudge = buildPythonPackage rec {
     name = "fudge-0.9.4";
@@ -1247,12 +1247,12 @@ pythonPackages = python.modules // rec {
       md5 = "967a04fcb2143b31b279c3013a778a2b";
     };
 
-    buildInputs = [ 
-      docutils 
-      virtualenv 
-      webtest 
-      zope_component 
-      zope_interface 
+    buildInputs = [
+      docutils
+      virtualenv
+      webtest
+      zope_component
+      zope_interface
     ] ++ optional isPy26 unittest2;
 
     propagatedBuildInputs = [
@@ -1559,7 +1559,7 @@ pythonPackages = python.modules // rec {
     propagatedBuildInputs = with pkgs; [
       pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl
     ];
- 
+
     postInstall = ''
        cp -R deluge/data/share $out/share
        cp -R deluge/data/pixmaps $out/share/
@@ -2681,7 +2681,7 @@ pythonPackages = python.modules // rec {
       url = "${meta.homepage}/download/${name}.tar.gz";
       sha256 = "1ddqni6d4kc8ypl6yig4nc00izvbk359sz6hykb9g0lfcpfqlngj";
     };
-    
+
     buildInputs = [
       pkgs.pyopenssl pyasn1 urwid pil lxml flask protobuf netlib
     ];
@@ -2689,7 +2689,7 @@ pythonPackages = python.modules // rec {
     doCheck = false;
 
     postInstall = ''
-      for prog in $out/bin/*; do
+      for prog in "$out/bin/"*; do
         wrapProgram "$prog" \
           --prefix PYTHONPATH : "$PYTHONPATH"
       done
@@ -2917,7 +2917,7 @@ pythonPackages = python.modules // rec {
       name = "${name}.tar.gz";
       sha256 = "1y8lx2j1jrr93mqfb06zg1x5jm9lllw744sb61ib8dagw43nnq3v";
     };
-    
+
     buildInputs = [
       pkgs.pyopenssl pyasn1
     ];
@@ -3529,7 +3529,7 @@ pythonPackages = python.modules // rec {
       homepage = https://github.com/Lokaltog/powerline;
       description = "The ultimate statusline/prompt utility.";
       license = with stdenv.lib.licenses; mit;
-      platforms = with stdenv.lib.platforms; all; 
+      platforms = with stdenv.lib.platforms; all;
     };
   };
 
@@ -4739,7 +4739,7 @@ pythonPackages = python.modules // rec {
         };
 
       preInstall = ''
-        cp ${x_ignore_nofocus}/* .
+        cp "${x_ignore_nofocus}/"* .
         sed -i 's|dlopen(library,|dlopen("libX11.so.6",|' x_ignore_nofocus.c
         gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o
         gcc -shared -Wl,-soname,x_ignore_nofocus.so -o x_ignore_nofocus.so  x_ignore_nofocus.o
@@ -6431,17 +6431,17 @@ pythonPackages = python.modules // rec {
 
   pyspotify = buildPythonPackage rec {
     name = "pyspotify-${version}";
-  
+
     version = "1.11";
-  
+
     src = fetchurl {
       url = "https://github.com/mopidy/pyspotify/archive/v1.11.tar.gz";
       sha256 = "089ml6pqr3f2d15n70jpzbaqjp5pjgqlyv4algkxw92xscjw2izg";
     };
-  
+
     buildInputs = [ pkgs.libspotify ]
       ++ stdenv.lib.optional stdenv.isDarwin pkgs.install_name_tool;
-  
+
     # python zip complains about old timestamps
     preConfigure = ''
       find -print0 | xargs -0 touch
@@ -6454,10 +6454,10 @@ pythonPackages = python.modules // rec {
           ${pkgs.libspotify}/lib/libspotify.dylib \
           {} \;
     '';
-  
+
     # There are no tests
     doCheck = false;
-  
+
     meta = with stdenv.lib; {
       homepage    = http://pyspotify.mopidy.com;
       description = "A Python interface to Spotify’s online music streaming service";
@@ -6469,23 +6469,23 @@ pythonPackages = python.modules // rec {
 
   pykka = buildPythonPackage rec {
     name = "pykka-${version}";
-  
+
     version = "1.1.0";
-  
+
     src = fetchgit {
       url = "https://github.com/jodal/pykka.git";
       rev = "refs/tags/v${version}";
       sha256 = "0w6bcaqkzwmd9habszlgjkp3kkhkna08s9aivnmna5hddsghfqmz";
     };
-  
+
     # python zip complains about old timestamps
     preConfigure = ''
       find -print0 | xargs -0 touch
     '';
-  
+
     # There are no tests
     doCheck = false;
-  
+
     meta = {
       homepage = http://www.pykka.org;
       description = "A Python implementation of the actor model";
@@ -6495,23 +6495,23 @@ pythonPackages = python.modules // rec {
 
   ws4py = buildPythonPackage rec {
     name = "ws4py-${version}";
-  
+
     version = "git-20130303";
-  
+
     src = fetchgit {
       url = "https://github.com/Lawouach/WebSocket-for-Python.git";
       rev = "ace276500ca7e4c357595e3773be151d37bcd6e2";
       sha256 = "04m4m3ncn7g4rb81xg5n28imns7rsq8d2w98gjpaib6vlmyly3g1";
     };
-  
+
     # python zip complains about old timestamps
     preConfigure = ''
       find -print0 | xargs -0 touch
     '';
-  
+
     # Tests depend on other packages
     doCheck = false;
-  
+
     meta = {
       homepage = https://ws4py.readthedocs.org;
       description = "A WebSocket package for Python";

From ea3906c0f30ed184ba1de2bd2990e174ab187b19 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Jul 2013 11:50:32 +0200
Subject: [PATCH 338/439] pylint: install emacs lisp files

---
 pkgs/top-level/python-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 987e85ea8a6a..6905e4033b63 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4171,6 +4171,11 @@ pythonPackages = python.modules // rec {
 
     propagatedBuildInputs = [ logilab_astng ];
 
+    postInstall = ''
+      mkdir -p $out/share/emacs/site-lisp
+      cp "elisp/"*.el $out/share/emacs/site-lisp/
+    '';
+
     meta = {
       homepage = http://www.logilab.org/project/pylint;
       description = "A bug and style checker for Python";

From dc1d57e3d33d30154da774c212071b651e2583a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Jul 2013 11:50:47 +0200
Subject: [PATCH 339/439] ipython: update to version 0.13.2

---
 pkgs/shells/ipython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix
index 84ca7f04e7e2..f8fda4f051b0 100644
--- a/pkgs/shells/ipython/default.nix
+++ b/pkgs/shells/ipython/default.nix
@@ -13,12 +13,12 @@ assert qtconsoleSupport == true -> pyqt4 != null;
 assert pylabQtSupport == true -> pyqt4 != null && sip != null;
 
 buildPythonPackage rec {
-  name = "ipython-0.13.1";
+  name = "ipython-0.13.2";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
-    sha256 = "1h7q2zlyfn7si2vf6gnq2d0krkm1f5jy5nbi105by7zxqjai1grv";
+    sha256 = "1sh0n47i1zxqmbzjv6iqc66c8pdk9spzgzchgmhqscgjvyhyxyqp";
   };
 
   propagatedBuildInputs = [

From 025995edafc2001d4c7cabbc2cd09d83b606b65e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Jul 2013 11:56:01 +0200
Subject: [PATCH 340/439] haskell-fclabels: disable the Haddock documentation
 to fix the build

https://github.com/sebastiaanvisser/fclabels/issues/20
---
 pkgs/development/libraries/haskell/fclabels/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index e3c794d6d5e2..ec63c287fe9d 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "1.1.7";
   sha256 = "0mk75fk3c4ilb2hmz972ymv1pkzxp6010mlma7hw1l13dfy0hy9v";
   buildDepends = [ mtl transformers ];
+  noHaddock = true;
   meta = {
     homepage = "https://github.com/sebastiaanvisser/fclabels";
     description = "First class accessor labels";

From 91c98e03c6a0290867fcc2aabe1d2d2940340eb6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Jul 2013 15:45:34 +0200
Subject: [PATCH 341/439] haskell-fclabels: update to version 1.1.7.1

---
 pkgs/development/libraries/haskell/fclabels/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index ec63c287fe9d..71a3fe8d0c23 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -2,10 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "fclabels";
-  version = "1.1.7";
-  sha256 = "0mk75fk3c4ilb2hmz972ymv1pkzxp6010mlma7hw1l13dfy0hy9v";
+  version = "1.1.7.1";
+  sha256 = "1f34r3bzn1cbba8d5d1j3wxrlrrj5vf09hpgd6ppina91wyj4dyn";
   buildDepends = [ mtl transformers ];
-  noHaddock = true;
   meta = {
     homepage = "https://github.com/sebastiaanvisser/fclabels";
     description = "First class accessor labels";

From 775fbbe46bec9ffba52dd89736cb99c91ccc45d3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Jul 2013 15:45:34 +0200
Subject: [PATCH 342/439] haskell-yesod-platform: update to version 1.2.3

---
 pkgs/development/libraries/haskell/yesod-platform/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix
index 20d457816312..3d900d94cdab 100644
--- a/pkgs/development/libraries/haskell/yesod-platform/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix
@@ -29,8 +29,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-platform";
-  version = "1.2.2";
-  sha256 = "18kgw094y3vzlpdn1rfrsrrqymhsw5y7kyrql3ghwgp0cm3fiks0";
+  version = "1.2.3";
+  sha256 = "16hp64gqgvpmlrwg6h8ldakw2n3x985cnv4pzmv9akjq27jq8rjl";
   buildDepends = [
     aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
     authenticate base64Bytestring baseUnicodeSymbols blazeBuilder

From 6c63a857861ef792ea77be6cf99c58df6dfb8289 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Jul 2013 15:45:34 +0200
Subject: [PATCH 343/439] haskell-hlint: update to version 1.8.49

---
 pkgs/development/tools/haskell/hlint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index c0510b40b852..fbef1f832267 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.8.48";
-  sha256 = "1fysjs0vq3kafk12mb16xgq1svl5gcd3hxn86g5ncg6zb810fclf";
+  version = "1.8.49";
+  sha256 = "03i5nw2v2s4c5860vpqnvil2wrxblavjkbnrgi59jkmcbhl2h70f";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From aa88e7269dfaaa6baa034649d30e7daac5c96f40 Mon Sep 17 00:00:00 2001
From: Jonas Hoersch <coroa@online.de>
Date: Thu, 18 Apr 2013 01:44:12 +0200
Subject: [PATCH 344/439] Add quodlibet-2.5: GTK+Python based music player
 (close #481)

---
 pkgs/applications/audio/quodlibet/default.nix | 67 +++++++++++++++++++
 .../quodlibet/quodlibet-package-plugins.patch | 18 +++++
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 89 insertions(+)
 create mode 100644 pkgs/applications/audio/quodlibet/default.nix
 create mode 100644 pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
new file mode 100644
index 000000000000..d9554d5f7249
--- /dev/null
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, fetchurl, python, buildPythonPackage, mutagen, pygtk, pygobject
+, pythonDBus, gst_python, gst_plugins_base, gst_plugins_good, gst_plugins_ugly }:
+
+let version = "2.5"; in
+
+buildPythonPackage {
+  # call the package quodlibet and just quodlibet
+  name = "quodlibet-${version}";
+  namePrefix = "";
+
+  # XXX, tests fail
+  doCheck = false;
+
+  src = [
+    (fetchurl {
+      url = "https://quodlibet.googlecode.com/files/quodlibet-${version}.tar.gz";
+      sha256 = "0qrmlz7m1jpmriy8bgycjiwzbf3annznkn4x5k32yy9bylxa7lwb";
+     })
+    (fetchurl {
+      url = "https://quodlibet.googlecode.com/files/quodlibet-plugins-${version}.tar.gz";
+      sha256 = "0kf2mkq2zk38626bn48gscvy6ir04f5b2z57ahlxlqy8imv2cjff";
+     })
+  ];       
+
+  sourceRoot = "quodlibet-${version}";
+  postUnpack = ''
+    # the patch searches for plugins in directory ../plugins
+    # so link the appropriate directory there
+    ln -sf quodlibet-plugins-${version} plugins
+  '';
+  patches = [ ./quodlibet-package-plugins.patch ];
+
+  buildInputs = [
+    gst_plugins_base gst_plugins_good gst_plugins_ugly
+  ];
+
+  propagatedBuildInputs = [
+    mutagen pygtk pygobject pythonDBus gst_python
+  ];
+
+  postInstall = ''
+    # Wrap quodlibet so it finds the GStreamer plug-ins
+    wrapProgram "$out/bin/quodlibet" --prefix                                 \
+      GST_PLUGIN_PATH ":"                                                     \
+      "${gst_plugins_base}/lib/gstreamer-0.10:${gst_plugins_good}/lib/gstreamer-0.10:${gst_plugins_ugly}/lib/gstreamer-0.10"
+  '';
+
+  meta = {
+    description = "Quod Libet is a GTK+-based audio player written in Python, using the Mutagen tagging library.";
+
+    longDescription = ''
+      Quod Libet is a GTK+-based audio player written in Python, using
+      the Mutagen tagging library. It's designed around the idea that
+      you know how to organize your music better than we do. It lets
+      you make playlists based on regular expressions (don't worry,
+      regular searches work too). It lets you display and edit any
+      tags you want in the file. And it lets you do this for all the
+      file formats it supports. Quod Libet easily scales to libraries
+      of thousands (or even tens of thousands) of songs. It also
+      supports most of the features you expect from a modern media
+      player, like Unicode support, tag editing, Replay Gain, podcasts
+      & internet radio, and all major audio formats.
+    '';
+
+    homepage = http://code.google.com/p/quodlibet/;
+  };
+}
diff --git a/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch b/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch
new file mode 100644
index 000000000000..d518f857cf10
--- /dev/null
+++ b/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch
@@ -0,0 +1,18 @@
+diff -Naur quodlibet-2.5.orig/setup.py quodlibet-2.5.new/setup.py
+--- quodlibet-2.5.orig/setup.py	2012-12-19 08:47:41.000000000 +0000
++++ quodlibet-2.5.new/setup.py	2013-04-22 19:27:07.152631051 +0000
+@@ -337,5 +338,14 @@
+                 }
+             }
+         })
++    else:
++        from os.path import join
++
++        data_files = []
++        for type in ["playorder", "songsmenu", "editing", "events", "gstreamer"]:
++            data_files.append((join('quodlibet', 'plugins', type),
++                               glob.glob(join('..', 'plugins', type, '*.py'))))
++        setup_kwargs.update({ 'data_files': data_files });
++
+     setup(**setup_kwargs)
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa8586d185c3..b68c7ee17ebc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8266,6 +8266,10 @@ let
 
   qtractor = callPackage ../applications/audio/qtractor { };
 
+  quodlibet = callPackage ../applications/audio/quodlibet {
+    inherit (pythonPackages) mutagen;
+  };
+
   rakarrack = callPackage ../applications/audio/rakarrack {
     inherit (xorg) libXpm libXft;
     fltk = fltk13;

From 949c4fe7585ebef7e862bf42af84882a6124e139 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Tue, 23 Jul 2013 18:22:58 +0200
Subject: [PATCH 345/439] networkmanagerapplet: fix the build

---
 pkgs/tools/networking/network-manager-applet/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index ca9515795487..387ccfcaed43 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk libglade networkmanager libnotify libsecret dbus_glib
-    polkit isocodes makeWrapper udev GConf gnome_keyring
+    polkit isocodes makeWrapper udev GConf libgnome_keyring
   ];
 
   nativeBuildInputs = [ intltool pkgconfig ];

From 52fe6943603ee39e41a0af9b7ff85c50953a87a6 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Tue, 23 Jul 2013 18:51:20 +0200
Subject: [PATCH 346/439] networkmanager: we dont need networkmanager group
 anymore, just use at_console policy

---
 pkgs/tools/networking/network-manager/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index af35e3f71da2..ce372d495b6b 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -56,9 +56,6 @@ stdenv.mkDerivation rec {
   postInstall =
     ''
       mkdir -p $out/lib/NetworkManager
-      
-      # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy
-      substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"'
     '';
 
   meta = with stdenv.lib; {

From 4124741d436f9799b1e4b4d54113549bf57c9d07 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Tue, 23 Jul 2013 09:42:11 +0800
Subject: [PATCH 347/439] gimp_2_8: update to 2.8.6, enable xpm support

---
 pkgs/applications/graphics/gimp/2.8.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index b4c1fccf9dcf..4e12e2320815 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -4,18 +4,18 @@
 , python, pygtk, libart_lgpl, libexif, gettext, xlibs }:
 
 stdenv.mkDerivation rec {
-  name = "gimp-2.8.4";
+  name = "gimp-2.8.6";
 
   src = fetchurl {
     url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
-    md5 = "392592e8755d046317878d226145900f";
+    md5 = "12b3fdf33d1f07ae79b412a9e38b9693";
   };
 
   buildInputs =
     [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo
       freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
       libmng librsvg libwmf zlib libzip ghostscript aalib jasper
-      python pygtk libart_lgpl libexif gettext
+      python pygtk libart_lgpl libexif gettext xlibs.libXpm
     ];
 
   passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?

From 1386036457dc33812f520ae4f869e29c05acec47 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jul 2013 22:35:49 +0200
Subject: [PATCH 348/439] linux: Update to 3.4.54

---
 pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 34a36bb276d6..6dcd88a1f913 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -246,7 +246,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.4.53";
+    version = "3.4.54";
     testing = false;
 
     preConfigure = ''
@@ -255,7 +255,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "1imrs9shy8gbiylz2rlm9l312r1z0clnky5l965113ciarz65qjz";
+      sha256 = "06gz0svm4ngn9iaq9hw5c63mi0613nlzh78dny2m6z00ivpbnk6i";
     };
 
     config = configWithPlatform stdenv.platform;

From 626c4d5f5b6010487c69288c06419d7e35122238 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 23 Jul 2013 22:40:36 +0200
Subject: [PATCH 349/439] venus: new package

---
 pkgs/tools/misc/venus/default.nix | 50 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  4 +++
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/tools/misc/venus/default.nix

diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix
new file mode 100644
index 000000000000..b4f9732dec6c
--- /dev/null
+++ b/pkgs/tools/misc/venus/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, python, pythonPackages, libxslt, libxml2, makeWrapper }:
+
+let
+  rev = "9de21094a8cf565bdfcf75688e121a5ad1f5397b";
+in
+
+stdenv.mkDerivation rec {
+  name = "venus-${rev}";
+
+  src = fetchurl {
+    url = "https://github.com/rubys/venus/tarball/${rev}";
+    name = "${name}.tar.bz";
+    sha256 = "0lsc9d83grbi3iwm8ppaig4h9vbmd5h4vvz83lmpnyp7zqfka7dy";
+  };
+
+  preConfigure = ''
+    substituteInPlace tests/test_spider.py \
+        --replace "urllib.urlopen('http://127.0.0.1:%d/' % _PORT).read()" "" \
+        --replace "[200,200,200,200,404]" "[200,200,200,404]"
+    substituteInPlace planet.py \
+        --replace "#!/usr/bin/env python" "#!${python}/bin/python"
+    substituteInPlace tests/test_apply.py \
+        --replace "'xsltproc" "'${libxslt}/bin/xsltproc"
+    substituteInPlace planet/shell/xslt.py \
+        --replace "'xsltproc" "'${libxslt}/bin/xsltproc"
+  '';
+
+  doCheck = true;
+  checkPhase = "python runtests.py";
+
+  buildInputs = [ python python.modules.bsddb python.modules.ssl libxslt
+    libxml2 pythonPackages.genshi pythonPackages.lxml makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -R ./* $out/
+    ln -s $out/planet.py $out/bin/venus-planet
+    wrapProgram $out/planet.py \
+        --prefix PYTHONPATH : $PYTHONPATH:${pythonPackages.lxml}/lib/${python.libPrefix}/site-packages:${pythonPackages.genshi}/lib/${python.libPrefix}/site-packages
+    python runtests.py
+  '';
+
+  meta = {
+    description = "Planet Venus is an awesome ‘river of news’ feed reader. It downloads news feeds published by web sites and aggregates their content together into a single combined feed, latest news first.";
+    homepage = "http://intertwingly.net/code/venus/docs/index.html";
+    license = stdenv.lib.licenses.psfl;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b68c7ee17ebc..25af46702ed0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1914,6 +1914,10 @@ let
 
   varnish = callPackage ../servers/varnish { };
 
+  venus = callPackage ../tools/misc/venus {
+    python = python27;
+  };
+
   vlan = callPackage ../tools/networking/vlan { };
 
   wakelan = callPackage ../tools/networking/wakelan { };

From a0bed10ab53da57bd713de11034442bab526441b Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Tue, 23 Jul 2013 22:41:27 +0200
Subject: [PATCH 350/439] WIP: pypy

---
 .../interpreters/pypy/2.0/default.nix         | 89 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 91 insertions(+)
 create mode 100644 pkgs/development/interpreters/pypy/2.0/default.nix

diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix
new file mode 100644
index 000000000000..f689ef9db21a
--- /dev/null
+++ b/pkgs/development/interpreters/pypy/2.0/default.nix
@@ -0,0 +1,89 @@
+{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
+, sqlite, openssl, ncurses, pythonFull }:
+
+assert zlibSupport -> zlib != null;
+
+let
+
+  majorVersion = "2.0";
+  version = "${majorVersion}.2";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2";
+    sha256 = "0g2cajs6m3yf0lak5f18ccs6j77cf5xvbm4h6y5l1qlqdc6wk48r";
+  };
+
+  #patches =
+  #  [ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
+  #    ./search-path.patch
+
+      # Python recompiles a Python if the mtime stored *in* the
+      # pyc/pyo file differs from the mtime of the source file.  This
+      # doesn't work in Nix because Nix changes the mtime of files in
+      # the Nix store to 1.  So treat that as a special case.
+  #    ./nix-store-mtime.patch
+
+      # patch python to put zero timestamp into pyc
+      # if DETERMINISTIC_BUILD env var is set
+  #    ./deterministic-build.patch
+  #  ];
+  #'';
+
+  install = ''
+    cd ./pypy/pypy/tool/release/
+    ${pythonFull}/bin/python package.py ../../.. pypy-my-own-package-name
+  '';
+
+  buildInputs =
+    optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
+    [ bzip2 openssl pkgconfig pythonFull libffi ncurses ]
+    ++ optional zlibSupport zlib;
+
+  pypy = stdenv.mkDerivation rec {
+    name = "pypy-${version}";
+
+    inherit majorVersion version src buildInputs;
+
+    C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
+    LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
+
+    preConfigure = ''
+      substituteInPlace Makefile \
+        --replace "-Ojit" "-Ojit --batch" \
+        --replace "pypy/goal/targetpypystandalone.py" "pypy/goal/targetpypystandalone.py --withmod-_minimal_curses"
+
+      # we are using cpython and not pypy to do translation
+      substituteInPlace rpython/bin/rpython \
+        --replace "/usr/bin/env pypy" "${pythonFull}/bin/python"
+      substituteInPlace pypy/goal/targetpypystandalone.py \
+        --replace "/usr/bin/env pypy" "${pythonFull}/bin/python"
+
+      # convince pypy to find nix ncurses
+      substituteInPlace pypy/module/_minimal_curses/fficurses.py \
+        --replace "/usr/include/ncurses/curses.h" "${ncurses}/include/curses.h" \
+        --replace "ncurses/curses.h" "${ncurses}/include/curses.h" \
+        --replace "ncurses/term.h" "${ncurses}/include/term.h" \
+        --replace "libraries = ['curses']" "libraries = ['ncurses']"
+
+      #substituteInPlace rpython/translator/platform/__init__.py \
+      #  --replace "return include_dirs" "return tuple(\"{expat}\", *include_dirs)" \
+      #  --replace "return library_dirs" "return tuple(\"{expat}\", *library_dirs)"
+    '';
+
+    passthru = {
+      inherit zlibSupport;
+      libPrefix = "pypy${majorVersion}";
+    };
+
+    enableParallelBuilding = true;
+
+    meta = with stdenv.lib; {
+      homepage = "http://pypy.org/";
+      description = "PyPy is a fast, compliant alternative implementation of the Python language (2.7.3)";
+      license = licenses.mit;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ iElectric ];
+    };
+  };
+
+in pypy // { inherit modules; }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b68c7ee17ebc..c689386d357d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3099,6 +3099,8 @@ let
     libX11 = xlibs.libX11;
   };
 
+  pypy = callPackage ../development/interpreters/pypy/2.0 { };
+
   pythonFull = python27Full;
   python26Full = callPackage ../development/interpreters/python/wrapper.nix {
     extraLibs = lib.attrValues python26.modules;

From e52fc8f431ea0542a34b376e1e63a96681702d80 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Tue, 23 Jul 2013 23:24:51 +0200
Subject: [PATCH 351/439] pypy: fix stdenv.lib removal

---
 pkgs/development/interpreters/pypy/2.0/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix
index f689ef9db21a..711c27fabf22 100644
--- a/pkgs/development/interpreters/pypy/2.0/default.nix
+++ b/pkgs/development/interpreters/pypy/2.0/default.nix
@@ -35,18 +35,15 @@ let
   '';
 
   buildInputs =
-    optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
+    stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
     [ bzip2 openssl pkgconfig pythonFull libffi ncurses ]
-    ++ optional zlibSupport zlib;
+    ++ stdenv.lib.optional zlibSupport zlib;
 
   pypy = stdenv.mkDerivation rec {
     name = "pypy-${version}";
 
     inherit majorVersion version src buildInputs;
 
-    C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
-    LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
-
     preConfigure = ''
       substituteInPlace Makefile \
         --replace "-Ojit" "-Ojit --batch" \
@@ -86,4 +83,4 @@ let
     };
   };
 
-in pypy // { inherit modules; }
+in pypy

From b800c5d1f9b5493e28ba0d8a08ff01ed3c712e28 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 24 Jul 2013 09:58:00 +0200
Subject: [PATCH 352/439] python-genzshcomp-0.5.1

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6905e4033b63..3444045b1474 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2051,11 +2051,11 @@ pythonPackages = python.modules // rec {
 
 
   genzshcomp = buildPythonPackage {
-    name = "genzshcomp-0.2.2";
+    name = "genzshcomp-0.5.1";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/g/genzshcomp/genzshcomp-0.2.2.tar.gz";
-      sha256 = "0bhiyx41kilvy04cgjbvjy2r4b6l7zz31fbrg3l6lvnqm26nihb0";
+      url = "http://pypi.python.org/packages/source/g/genzshcomp/genzshcomp-0.5.1.tar.gz";
+      md5 = "7a954f1835875002e9044fe55ed1b488";
     };
 
     buildInputs = [ pkgs.setuptools ] ++ (optional isPy26 argparse);

From 58c08fdefbce5d81d3f429de1eadc096b8be7f8d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 24 Jul 2013 10:50:42 +0200
Subject: [PATCH 353/439] aldor: fix the sha256 hash (plus minor cosmetic
 changes)

---
 pkgs/development/compilers/aldor/default.nix | 21 +++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix
index 7d0fd7a39bbc..25d1a2c25bc8 100644
--- a/pkgs/development/compilers/aldor/default.nix
+++ b/pkgs/development/compilers/aldor/default.nix
@@ -1,15 +1,12 @@
 { fetchgit, stdenv, gmp, which, flex, bison, makeWrapper }:
 
-stdenv.mkDerivation rec {
-  pname = "aldor";
-  version = "1.1.0";
-  name = "${pname}-${version}";
-  gitRev = "a02b088c8d5d06f16c50a83ddee4019e962d6673";
+stdenv.mkDerivation {
+  name = "aldor-1.1.0";
 
   src = fetchgit {
     url = "https://github.com/pippijn/aldor";
-    sha256 = "1zd343wq46f74yr30a5nrbv5n831z6wd24yqnrs7w17ccic69lny";
-    rev = gitRev;
+    sha256 = "14xv3jl15ib2knsdz0bd7jx64zg1qrr33q5zcr8gli860ps8gkg3";
+    rev = "a02b088c8d5d06f16c50a83ddee4019e962d6673";
   };
 
   buildInputs = [ gmp which flex bison makeWrapper ];
@@ -28,8 +25,10 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with stdenv.lib ; {
+  meta = {
+    homepage = "http://www.aldor.org/";
     description = "Aldor is a programming language with an expressive type system";
+    license = stdenv.lib.licenses.asl20;
 
     longDescription = ''
       Aldor is a programming language with an expressive type system well-suited
@@ -44,9 +43,7 @@ stdenv.mkDerivation rec {
       and powerful properties of functional, object-oriented and aspect-oriented styles.
     '';
 
-    homepage = http://www.aldor.org/;
-    license = licenses.asl20;
-    maintainers = [ ];
-    platforms = platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 850f20567efbcacdee4615b4dbf74daaec8925ab Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 24 Jul 2013 12:27:06 +0200
Subject: [PATCH 354/439] Fix apg

---
 pkgs/tools/security/apg/apg.patch   | 44 +++++++++++++++++++++++++++++
 pkgs/tools/security/apg/default.nix |  6 ++--
 2 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/tools/security/apg/apg.patch

diff --git a/pkgs/tools/security/apg/apg.patch b/pkgs/tools/security/apg/apg.patch
new file mode 100644
index 000000000000..abc22647d52f
--- /dev/null
+++ b/pkgs/tools/security/apg/apg.patch
@@ -0,0 +1,44 @@
+diff -rc apg-2.2.3/Makefile apg-2.2.3-new/Makefile
+*** apg-2.2.3/Makefile	2003-08-07 17:40:30.000000000 +0200
+--- apg-2.2.3-new/Makefile	2013-07-24 12:25:31.159938436 +0200
+***************
+*** 113,131 ****
+  	if test -x ./apg; then \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+  ./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+  fi
+  	if test -x ./apgd; then \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
+! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
+  ./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
+  fi
+  	if test -x ./apgbfm; then \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+  ./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+  fi
+  
+--- 113,131 ----
+  	if test -x ./apg; then \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+! ./install-sh -c -m 0755 ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+  ./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+  fi
+  	if test -x ./apgd; then \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
+! ./install-sh -c -m 0755 ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
+  ./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
+  fi
+  	if test -x ./apgbfm; then \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+! ./install-sh -c -m 0755 ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+  ./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+  fi
+  
diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix
index 7eeb491374a3..28f66e1e4929 100644
--- a/pkgs/tools/security/apg/default.nix
+++ b/pkgs/tools/security/apg/default.nix
@@ -8,10 +8,8 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     substituteInPlace Makefile --replace /usr/local "$out"
   '';
-  preInstall = ''
-    export CHOWNPROG=true
-    export CHGRPPROG=true
-  '';
+
+  patches = [ ./apg.patch ];
 
   meta = {
     description = "A tool set for random password generation.";

From 63f9aed9ebe20b926f221997eb237cd96076fb5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 24 Jul 2013 14:36:00 +0200
Subject: [PATCH 355/439] minicom: 2.4 -> 2.6.2

This also fixes the annoying issue that minicom doesn't work out of the
box:

  $ minicom
  minicom: there is no global configuration file /etc/minirc.dfl
  Ask your sysadmin to create one (with minicom -s).

  $ sudo minicom -s
  minicom: there is no global configuration file /etc/minirc.dfl
  Ask your sysadmin to create one (with minicom -s).

minicom 2.4 basically refuses to enter setup unless /etc/minirc.dfl
already exists. sudo touch /etc/minirc.dfl is enough to fix that though,
but with this commit "sudo minicom -s" will work out of the box.
---
 pkgs/tools/misc/minicom/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix
index ef735bf4384c..2ab1195020c3 100644
--- a/pkgs/tools/misc/minicom/default.nix
+++ b/pkgs/tools/misc/minicom/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "minicom-2.4";
+  name = "minicom-2.6.2";
 
   src = fetchurl {
-    url = "http://alioth.debian.org/frs/download.php/3195/${name}.tar.gz";
-    sha256 = "0j0ayimh3389pciqs60fsfafn87p9gnmmmqz15xq9fkkn10g4ykb";
+    url = "http://alioth.debian.org/frs/download.php/file/3869/${name}.tar.gz";
+    sha256 = "0s4ibk8scspm8a0raf5s4zgp9b82c4bn529rir9abzqlg5gj3kzk";
   };
 
   buildInputs = [ncurses];

From 18702109263391ab6b3fac70a5c7080ccd047804 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 24 Jul 2013 14:41:20 +0200
Subject: [PATCH 356/439] libvirt: Update to 1.1.0

---
 pkgs/development/libraries/libvirt/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 6a6b693cbbe0..e1e4a759e06f 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python
-, iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext 
-, libtasn1, ebtables, libgcrypt, yajl
+, iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext
+, libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils
 }:
 
-let version = "1.0.3"; in
+let version = "1.1.0"; in
 
 stdenv.mkDerivation {
   name = "libvirt-${version}";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
-    sha256 = "0mr727n0ygxk6y69srg3ahmjd7wligamw683x2snmz6wgk6llkzn";
+    sha256 = "0a39cwvzwf79gv3zw5mwp9q9n792rr1m0rl9ji39bdgcjxb7d7nf";
   };
 
   buildInputs =
     [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2
-      utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl
+      utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper
     ];
 
   preConfigure =
@@ -32,6 +32,8 @@ stdenv.mkDerivation {
     ''
       substituteInPlace $out/libexec/libvirt-guests.sh \
         --replace "$out/bin" "${gettext}/bin"
+      wrapProgram $out/sbin/libvirtd \
+        --prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin
     '';
 
   enableParallelBuilding = true;

From 3c60e2ec39b11353779518e39a1d4aad13193b99 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 24 Jul 2013 04:26:14 +0200
Subject: [PATCH 357/439] chromium: Add API keys for NixOS.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As requested by some users, we finally have support for cloud sync,
spelling, geolocation and a lot more of the services that require API
keys from Google. Details about which services are involved can be found
at: http://www.chromium.org/developers/how-tos/api-keys

Thanks to Paweł Hajdan <phajdan@google.com> for giving us permission to
distribute the API keys with our build of Chromium:

> Note that the public Terms of Service do not allow distribution of the
> API keys in any form. To make this work for you, on behalf of Google
> Chrome Team I am providing you with:

> Official permission to include Google API keys in your packages and to
> distribute these packages. The remainder of the Terms of Service for
> each API applies, but at this time you are not bound by the
> requirement to only access the APIs for personal and development use,
> and Additional quota for each API in an effort to adequately support
> your users.

As noted in the source: Those keys are for use in NixOS/nixpkgs ONLY!

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../applications/networking/browsers/chromium/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 3f072b509945..e8973f1bd72f 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -146,6 +146,14 @@ in stdenv.mkDerivation rec {
     linux_sandbox_path="${libExecPath}/${packageName}_sandbox";
     linux_sandbox_chrome_path="${libExecPath}/${packageName}";
     werror = "";
+
+    # Google API keys, see http://www.chromium.org/developers/how-tos/api-keys.
+    # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
+    # please get your own set of keys.
+    google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
+    google_default_client_id = "404761575300.apps.googleusercontent.com";
+    google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D";
+
   } // optionalAttrs proprietaryCodecs {
     # enable support for the H.264 codec
     proprietary_codecs = true;

From 78bfe0ab5bbde7a642d02c2edb414790c0119bdc Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 24 Jul 2013 04:42:05 +0200
Subject: [PATCH 358/439] chromium: Update all channels to latest versions.

So, chromium 30 entered the dev release channel, so the overview of the
current versions is:

stable: 28.0.1500.52 -> 28.0.1500.71 (builds fine, tested)
beta:   28.0.1500.52 -> 29.0.1547.22 (builds fine, tested)
dev:    29.0.1547.0  -> 30.0.1566.2  (builds fine, tested)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/sources.nix   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index 952ecf2a6f10..709e16e80053 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "29.0.1547.0";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.0.tar.xz";
-    sha256 = "0ydinl0zrsm995rcpph4i56335nzhp1fqnlz39lg4vbjsshchh9x";
+    version = "30.0.1566.2";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1566.2.tar.xz";
+    sha256 = "0hfpa46hivr3yxj80vhsdkb59zs0020whz95yb6gvwi7ql8p6lvh";
   };
   beta = {
-    version = "28.0.1500.52";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.52.tar.xz";
-    sha256 = "1d0q8lsvwqkaninmnyc8jjj0pnqxc5rr3lr3mgzj37avksxvyg3v";
+    version = "29.0.1547.22";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.22.tar.xz";
+    sha256 = "1vaz1abhs0x5frkx3xcgcdpi1n0mmrijfh57kqz54mw7xjlh71vm";
   };
   stable = {
-    version = "28.0.1500.52";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.52.tar.xz";
-    sha256 = "1d0q8lsvwqkaninmnyc8jjj0pnqxc5rr3lr3mgzj37avksxvyg3v";
+    version = "28.0.1500.71";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.71.tar.xz";
+    sha256 = "1w8hkbb17bwq9myhj7fig27pn50qlwdfrqs04xjvam4ah3w6qb0r";
   };
 }

From f77de3953626f393ea0bead66dce65cb4a13ede3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 25 Jul 2013 01:02:15 +0200
Subject: [PATCH 359/439] chromium: Update dev channel to v30.0.1568.0.

The sha256 has changed upstream for 30.0.1566.2 and in addition there is
a new version available, so let's switch to the new version.

Unfortunately the user namespaces sandbox patch doesn't apply anymore
because of http://crbug.com/242290, so this adds a rebased version on
top of the current trunk of Chromium.

In order to build version 30, file is now needed as an additional build
input, because it is used by gyp.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/default.nix  |  10 +-
 .../browsers/chromium/sandbox_userns_30.patch | 287 ++++++++++++++++++
 .../networking/browsers/chromium/sources.nix  |   6 +-
 3 files changed, 298 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index e8973f1bd72f..8188d5279a75 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -18,6 +18,9 @@
 # optional dependencies
 , libgcrypt ? null # gnomeSupport || cupsSupport
 
+# dependency for version 30
+, file
+
 # package customization
 , channel ? "stable"
 , enableSELinux ? false, libselinux ? null
@@ -87,7 +90,9 @@ let
   # user namespace sandbox patch
   userns_patch = if versionOlder sourceInfo.version "29.0.0.0"
                  then ./sandbox_userns.patch
-                 else ./sandbox_userns_29.patch;
+                 else if versionOlder sourceInfo.version "30.0.0.0"
+                      then ./sandbox_userns_29.patch
+                      else ./sandbox_userns_30.patch;
 
 in stdenv.mkDerivation rec {
   name = "${packageName}-${version}";
@@ -115,7 +120,8 @@ in stdenv.mkDerivation rec {
     ++ optionals gnomeSupport [ gconf libgcrypt ]
     ++ optional enableSELinux libselinux
     ++ optional cupsSupport libgcrypt
-    ++ optional pulseSupport pulseaudio;
+    ++ optional pulseSupport pulseaudio
+    ++ optional (!versionOlder sourceInfo.version "30.0.0.0") file;
 
   opensslPatches = optional useOpenSSL openssl.patches;
 
diff --git a/pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch b/pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch
new file mode 100644
index 000000000000..ef1a08ee313a
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch
@@ -0,0 +1,287 @@
+commit b9a1fa30eb3296b169f51ffa8ee05513c5c1dbae
+Author: aszlig <aszlig@redmoonstudios.org>
+Date:   Thu May 16 14:17:56 2013 +0200
+
+    zygote: Add support for user namespaces on Linux.
+    
+    The implementation is done by patching the Zygote host to execute the sandbox
+    binary with CLONE_NEWUSER and setting the uid and gid mapping so that the child
+    process is using uid 0 and gid 0 which map to the current user of the parent.
+    Afterwards, the sandbox will continue as if it was called as a setuid binary.
+    
+    In addition, this adds new_user_namespace as an option in process_util in order
+    to set the UID and GID mapping correctly. The reason for this is that just
+    passing CLONE_NEWUSER to clone_flags doesn't help in LaunchProcess(), because
+    without setting the mappings exec*() will clear the process's capability sets.
+    
+    If the kernel doesn't support unprivileged user namespaces and the sandbox
+    binary doesn't have the setuid flag, the Zygote main process will run without a
+    sandbox. This is to mimic the behaviour if no SUID sandbox binary path is set.
+    
+    Signed-off-by: aszlig <aszlig@redmoonstudios.org>
+
+diff --git a/base/process/launch.h b/base/process/launch.h
+index 45b1053..ce71418 100644
+--- a/base/process/launch.h
++++ b/base/process/launch.h
+@@ -51,6 +51,7 @@ struct LaunchOptions {
+         new_process_group(false)
+ #if defined(OS_LINUX)
+         , clone_flags(0)
++        , new_user_namespace(false)
+ #endif  // OS_LINUX
+ #if defined(OS_CHROMEOS)
+         , ctrl_terminal_fd(-1)
+@@ -125,6 +126,9 @@ struct LaunchOptions {
+ #if defined(OS_LINUX)
+   // If non-zero, start the process using clone(), using flags as provided.
+   int clone_flags;
++
++  // If true, start the process in a new user namespace.
++  bool new_user_namespace;
+ #endif  // defined(OS_LINUX)
+ 
+ #if defined(OS_CHROMEOS)
+diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc
+index 336633c..4b50a5d 100644
+--- a/base/process/launch_posix.cc
++++ b/base/process/launch_posix.cc
+@@ -36,6 +36,13 @@
+ #include "base/threading/platform_thread.h"
+ #include "base/threading/thread_restrictions.h"
+ 
++#if defined(OS_LINUX)
++#include <sched.h>
++#if !defined(CLONE_NEWUSER)
++#define CLONE_NEWUSER 0x10000000
++#endif
++#endif
++
+ #if defined(OS_CHROMEOS)
+ #include <sys/ioctl.h>
+ #endif
+@@ -395,8 +402,19 @@ bool LaunchProcess(const std::vector<std::string>& argv,
+ 
+   pid_t pid;
+ #if defined(OS_LINUX)
+-  if (options.clone_flags) {
+-    pid = syscall(__NR_clone, options.clone_flags, 0, 0, 0);
++  int map_pipe_fd[2];
++  int flags = options.clone_flags;
++
++  if (options.new_user_namespace) {
++    flags |= CLONE_NEWUSER;
++    if (pipe(map_pipe_fd) < 0) {
++      DPLOG(ERROR) << "user namespace pipe";
++      return false;
++    }
++  }
++
++  if (options.clone_flags || options.new_user_namespace) {
++    pid = syscall(__NR_clone, flags, 0, 0, 0);
+   } else
+ #endif
+   {
+@@ -409,6 +427,21 @@ bool LaunchProcess(const std::vector<std::string>& argv,
+   } else if (pid == 0) {
+     // Child process
+ 
++#if defined(OS_LINUX)
++    if (options.new_user_namespace) {
++      // Close the write end of the pipe so we get an EOF when the parent closes
++      // the FD. This is to avoid race conditions when the UID/GID mappings are
++      // written _after_ execvp().
++      close(map_pipe_fd[1]);
++
++      char dummy;
++      if (HANDLE_EINTR(read(map_pipe_fd[0], &dummy, 1)) != 0) {
++        RAW_LOG(ERROR, "Unexpected input in uid/gid mapping pipe.");
++        _exit(127);
++      }
++    }
++#endif
++
+     // DANGER: fork() rule: in the child, if you don't end up doing exec*(),
+     // you call _exit() instead of exit(). This is because _exit() does not
+     // call any previously-registered (in the parent) exit handlers, which
+@@ -523,6 +556,40 @@ bool LaunchProcess(const std::vector<std::string>& argv,
+     _exit(127);
+   } else {
+     // Parent process
++#if defined(OS_LINUX)
++    if (options.new_user_namespace) {
++      // We need to write UID/GID mapping here to map the current user outside
++      // the namespace to the root user inside the namespace in order to
++      // correctly "fool" the child process.
++      char buf[256];
++      int map_fd, map_len;
++
++      snprintf(buf, sizeof(buf), "/proc/%d/uid_map", pid);
++      map_fd = open(buf, O_RDWR);
++      DPCHECK(map_fd >= 0);
++      snprintf(buf, sizeof(buf), "0 %d 1", geteuid());
++      map_len = strlen(buf);
++      if (write(map_fd, buf, map_len) != map_len) {
++        RAW_LOG(WARNING, "Can't write to uid_map.");
++      }
++      close(map_fd);
++
++      snprintf(buf, sizeof(buf), "/proc/%d/gid_map", pid);
++      map_fd = open(buf, O_RDWR);
++      DPCHECK(map_fd >= 0);
++      snprintf(buf, sizeof(buf), "0 %d 1", getegid());
++      map_len = strlen(buf);
++      if (write(map_fd, buf, map_len) != map_len) {
++        RAW_LOG(WARNING, "Can't write to gid_map.");
++      }
++      close(map_fd);
++
++      // Close the pipe on the parent, so the child can continue doing the
++      // execvp() call.
++      close(map_pipe_fd[1]);
++    }
++#endif
++
+     if (options.wait) {
+       // While this isn't strictly disk IO, waiting for another process to
+       // finish is the sort of thing ThreadRestrictions is trying to prevent.
+diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc
+index bb84e62..bce0d18 100644
+--- a/content/browser/zygote_host/zygote_host_impl_linux.cc
++++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
+@@ -119,25 +119,31 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
+ 
+   sandbox_binary_ = sandbox_cmd.c_str();
+ 
+-  // A non empty sandbox_cmd means we want a SUID sandbox.
+-  using_suid_sandbox_ = !sandbox_cmd.empty();
++  bool userns_sandbox = false;
++  const std::vector<std::string> cmd_line_unwrapped(cmd_line.argv());
+ 
+-  if (using_suid_sandbox_) {
++  if (!sandbox_cmd.empty()) {
+     struct stat st;
+     if (stat(sandbox_binary_.c_str(), &st) != 0) {
+       LOG(FATAL) << "The SUID sandbox helper binary is missing: "
+                  << sandbox_binary_ << " Aborting now.";
+     }
+ 
+-    if (access(sandbox_binary_.c_str(), X_OK) == 0 &&
+-        (st.st_uid == 0) &&
+-        (st.st_mode & S_ISUID) &&
+-        (st.st_mode & S_IXOTH)) {
++    if (access(sandbox_binary_.c_str(), X_OK) == 0) {
++      using_suid_sandbox_ = true;
++
+       cmd_line.PrependWrapper(sandbox_binary_);
+ 
+       scoped_ptr<sandbox::SetuidSandboxClient>
+           sandbox_client(sandbox::SetuidSandboxClient::Create());
+       sandbox_client->SetupLaunchEnvironment();
++
++      if (!((st.st_uid == 0) &&
++            (st.st_mode & S_ISUID) &&
++            (st.st_mode & S_IXOTH))) {
++        userns_sandbox = true;
++        sandbox_client->SetNoSuid();
++      }
+     } else {
+       LOG(FATAL) << "The SUID sandbox helper binary was found, but is not "
+                     "configured correctly. Rather than run without sandboxing "
+@@ -161,7 +167,19 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
+   base::ProcessHandle process = -1;
+   base::LaunchOptions options;
+   options.fds_to_remap = &fds_to_map;
++  if (userns_sandbox)
++    options.new_user_namespace = true;
+   base::LaunchProcess(cmd_line.argv(), options, &process);
++
++  if (process == -1 && userns_sandbox) {
++    LOG(ERROR) << "User namespace sandbox failed to start, running without "
++               << "sandbox! You need at least kernel 3.8.0 with CONFIG_USER_NS "
++               << "enabled in order to use the sandbox without setuid bit.";
++    using_suid_sandbox_ = false;
++    options.new_user_namespace = false;
++    base::LaunchProcess(cmd_line_unwrapped, options, &process);
++  }
++
+   CHECK(process != -1) << "Failed to launch zygote process";
+ 
+   if (using_suid_sandbox_) {
+diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc
+index dcea4c0..c06b4ae 100644
+--- a/content/zygote/zygote_main_linux.cc
++++ b/content/zygote/zygote_main_linux.cc
+@@ -398,6 +398,13 @@ static bool EnterSandbox(sandbox::SetuidSandboxClient* setuid_sandbox,
+       *has_started_new_init = true;
+     }
+ 
++    // Don't set non-dumpable, as it causes trouble when the host tries to find
++    // the zygote process (XXX: Not quite sure why this happens with user
++    // namespaces). Fortunately, we also have the seccomp filter sandbox which
++    // should disallow the use of ptrace.
++    if (setuid_sandbox->IsNoSuid())
++      return true;
++
+ #if !defined(OS_OPENBSD)
+     // Previously, we required that the binary be non-readable. This causes the
+     // kernel to mark the process as non-dumpable at startup. The thinking was
+diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc
+index 34231d4..36e3201 100644
+--- a/sandbox/linux/suid/client/setuid_sandbox_client.cc
++++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc
+@@ -166,6 +166,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const {
+   return env_->HasVar(kSandboxNETNSEnvironmentVarName);
+ }
+ 
++bool SetuidSandboxClient::IsNoSuid() const {
++  return env_->HasVar(kSandboxNoSuidVarName);
++}
++
+ bool SetuidSandboxClient::IsSandboxed() const {
+   return sandboxed_;
+ }
+@@ -175,5 +179,9 @@ void SetuidSandboxClient::SetupLaunchEnvironment() {
+   SetSandboxAPIEnvironmentVariable(env_);
+ }
+ 
++void SetuidSandboxClient::SetNoSuid() {
++  env_->SetVar(kSandboxNoSuidVarName, "1");
++}
++
+ }  // namespace sandbox
+ 
+diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h
+index a9f6536..2e8113a 100644
+--- a/sandbox/linux/suid/client/setuid_sandbox_client.h
++++ b/sandbox/linux/suid/client/setuid_sandbox_client.h
+@@ -39,6 +39,8 @@ class SetuidSandboxClient {
+   bool IsInNewPIDNamespace() const;
+   // Did the setuid helper create a new network namespace ?
+   bool IsInNewNETNamespace() const;
++  // Is sandboxed without SUID binary ?
++  bool IsNoSuid() const;
+   // Are we done and fully sandboxed ?
+   bool IsSandboxed() const;
+ 
+@@ -46,6 +48,8 @@ class SetuidSandboxClient {
+   // helper.
+   void SetupLaunchEnvironment();
+ 
++  void SetNoSuid();
++
+  private:
+   // Holds the environment. Will never be NULL.
+   base::Environment* env_;
+diff --git a/sandbox/linux/suid/common/sandbox.h b/sandbox/linux/suid/common/sandbox.h
+index aad4ff8..bd710d5 100644
+--- a/sandbox/linux/suid/common/sandbox.h
++++ b/sandbox/linux/suid/common/sandbox.h
+@@ -18,6 +18,7 @@ static const char kAdjustLowMemMarginSwitch[] = "--adjust-low-mem";
+ 
+ static const char kSandboxDescriptorEnvironmentVarName[] = "SBX_D";
+ static const char kSandboxHelperPidEnvironmentVarName[] = "SBX_HELPER_PID";
++static const char kSandboxNoSuidVarName[] = "SBX_NO_SUID";
+ 
+ static const long kSUIDSandboxApiNumber = 1;
+ static const char kSandboxEnvironmentApiRequest[] = "SBX_CHROME_API_RQ";
diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index 709e16e80053..47840ac3ebba 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,9 +1,9 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "30.0.1566.2";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1566.2.tar.xz";
-    sha256 = "0hfpa46hivr3yxj80vhsdkb59zs0020whz95yb6gvwi7ql8p6lvh";
+    version = "30.0.1568.0";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1568.0.tar.xz";
+    sha256 = "0c30mbaj98ibyvg855zsqggy3mzhpwkaiw3x37na5hw6qabqizbf";
   };
   beta = {
     version = "29.0.1547.22";

From c067505c7d3aea7e5c922b1dbabaa6cdbf38592e Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@skami.org>
Date: Thu, 25 Jul 2013 10:05:49 +0200
Subject: [PATCH 360/439] aldor: fix the build

---
 pkgs/development/compilers/aldor/default.nix | 22 +++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix
index 25d1a2c25bc8..fcd0c9fd453d 100644
--- a/pkgs/development/compilers/aldor/default.nix
+++ b/pkgs/development/compilers/aldor/default.nix
@@ -1,4 +1,5 @@
-{ fetchgit, stdenv, gmp, which, flex, bison, makeWrapper }:
+{ fetchgit, stdenv, gmp, which, flex, bison, makeWrapper
+, autoconf, automake, libtool, openjdk, perl }:
 
 stdenv.mkDerivation {
   name = "aldor-1.1.0";
@@ -6,21 +7,22 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = "https://github.com/pippijn/aldor";
     sha256 = "14xv3jl15ib2knsdz0bd7jx64zg1qrr33q5zcr8gli860ps8gkg3";
-    rev = "a02b088c8d5d06f16c50a83ddee4019e962d6673";
+    rev = "f7b95835cf709654744441ddb1c515bfc2bec998";
   };
 
-  buildInputs = [ gmp which flex bison makeWrapper ];
+  buildInputs = [ gmp which flex bison makeWrapper autoconf automake libtool
+                  openjdk perl ];
 
-  installPhase = ''
-    for d in bin include lib ;
-    do
-      ensureDir $out/$d ;
-      cp -r build/$d $out/ ;
-    done
+  preConfigure = ''
+    cd aldor ;
+    ./autogen.sh ;
+  '';
 
-    for prog in aldor unicl zacc ;
+  postInstall = ''
+    for prog in aldor unicl javagen ;
     do
       wrapProgram $out/bin/$prog --set ALDORROOT $out \
+        --prefix PATH : ${openjdk}/bin \
         --prefix PATH : ${stdenv.gcc}/bin ;
     done
   '';

From fa6314a955477d1865a730b304da8ba4441fe24d Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 25 Jul 2013 10:16:48 +0200
Subject: [PATCH 361/439] Add perl module HTML::FromANSI and its dependencies.
 Make Testuseok use the casing that comes out of nix-generate-from-cpan, to
 prevent needing to special-case it on next generations.

---
 pkgs/top-level/perl-packages.nix | 67 ++++++++++++++++++++++++--------
 1 file changed, 50 insertions(+), 17 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a66af2b4e968..c20f4efd9fc9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -513,7 +513,7 @@ rec {
       url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz";
       sha256 = "09mn0wjwfvnfi28y47g816nx50zdpvwvbxp0nrpsap0ir1m80wi3";
     };
-    buildInputs = [ TestWWWMechanizeCatalyst TestUseOk ];
+    buildInputs = [ TestWWWMechanizeCatalyst Testuseok ];
     propagatedBuildInputs =
       [ CatalystPluginAuthentication ClassAccessor CryptPasswdMD5 AuthenHtpasswd HTMLForm ];
   };
@@ -715,7 +715,7 @@ rec {
       url = mirror://cpan/authors/id/G/GR/GRAF/Catalyst-Plugin-Cache-HTTP-0.001000.tar.gz;
       sha256 = "0v5iphbq4csc4r6wkvxnqlh97p8g0yhjky9qqmsdyqczn87agbba";
     };
-    buildInputs = [ CatalystRuntime TestUseOk TestWWWMechanizeCatalyst ];
+    buildInputs = [ CatalystRuntime Testuseok TestWWWMechanizeCatalyst ];
     propagatedBuildInputs = [ ClassAccessorFast HTTPMessage MROCompat ];
     meta = {
       description = "HTTP/1.1 cache validators for Catalyst";
@@ -834,7 +834,7 @@ rec {
       url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz";
       sha256 = "1c6k4x6az0fkany16zlyaqhlp7bcx922vl4qzd3z707vs6pc06rz";
     };
-    buildInputs = [  TestWWWMechanizeCatalyst TestUseOk ];
+    buildInputs = [  TestWWWMechanizeCatalyst Testuseok ];
     propagatedBuildInputs = [ CatalystRuntime TextCSV XMLSimple ];
   };
 
@@ -1356,7 +1356,7 @@ rec {
       url = "mirror://cpan/authors/id/J/JR/JROCKWAY/${name}.tar.gz";
       sha256 = "0gssillawjknqks81x7fg7w2x94bnyklgd8ry2pr1k6ifkjhwz46";
     };
-    buildInputs = [ TestException TestUseOk ];
+    buildInputs = [ TestException Testuseok ];
   };
 
   CookieXS = buildPerlPackage rec {
@@ -1485,7 +1485,7 @@ rec {
       url = mirror://cpan/authors/id/N/NU/NUFFIN/Crypt-Random-Source-0.07.tar.gz;
       sha256 = "0kxcqcpknh9hhfnpiymxrjg74yj7nfr7k4fgrfmd9s2cw9p9mqdv";
     };
-    buildInputs = [ TestUseOk TestException ];
+    buildInputs = [ Testuseok TestException ];
     propagatedBuildInputs = [ AnyMoose CaptureTiny ModuleFind namespaceclean SubExporter ];
     meta = {
       homepage = http://search.cpan.org/dist/Crypt-Random-Source;
@@ -2193,7 +2193,7 @@ rec {
       url = mirror://cpan/authors/id/F/FL/FLORA/Devel-PartialDump-0.15.tar.gz;
       sha256 = "0xm42030qlbimay5x72sjj0na43ciniai2xdcdx8zf191jw5dz7n";
     };
-    propagatedBuildInputs = [ Moose namespaceclean SubExporter TestUseOk TestWarn ];
+    propagatedBuildInputs = [ Moose namespaceclean SubExporter Testuseok TestWarn ];
   };
 
   DevelStackTrace = buildPerlPackage {
@@ -3131,7 +3131,7 @@ rec {
       url = mirror://cpan/authors/id/N/NU/NUFFIN/Hash-Util-FieldHash-Compat-0.03.tar.gz;
       sha256 = "0pmai98a89j82fjksfax87brmpimjn74kr7bl874lc1k40dfhx47";
     };
-    propagatedBuildInputs = [ TestUseOk ];
+    propagatedBuildInputs = [ Testuseok ];
   };  
 
   HeapFibonacci = buildPerlPackage {
@@ -3151,6 +3151,17 @@ rec {
     buildInputs = [ pkgs.unzip ];
   };
 
+  HTMLFromANSI = buildPerlPackage {
+    name = "HTML-FromANSI-2.03";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/N/NU/NUFFIN/HTML-FromANSI-2.03.tar.gz;
+      sha256 = "21776345ed701b2c04c7b09380af943f9984cc7f99624087aea45db5fc09c359";
+    };
+    propagatedBuildInputs = [ HTMLParser TermVT102Boundless Testuseok ];
+    meta = {
+    };
+  };
+
   HTMLForm = buildPerlPackage {
     name = "HTML-Form-6.03";
     src = fetchurl {
@@ -4486,7 +4497,7 @@ rec {
       sha256 = "6d2d8fdc4f3f7fa76dc82c10d71b099f1572c054a72f373e5a9fa6237e48634a";
     };
     buildInputs = [ MooseXConfigFromFile TestOutput YAML ];
-    propagatedBuildInputs = [ AppCmd GetoptLongDescriptive Moose MooseXConfigFromFile MooseXGetopt MooseXHasOptions MooseXMarkAsMethods TestUseOk ];
+    propagatedBuildInputs = [ AppCmd GetoptLongDescriptive Moose MooseXConfigFromFile MooseXGetopt MooseXHasOptions MooseXMarkAsMethods Testuseok ];
     meta = {
       homepage = http://metacpan.org/release/MooseX-App-Cmd;
       description = "Mashes up MooseX::Getopt and App::Cmd";
@@ -4523,7 +4534,7 @@ rec {
       url = mirror://cpan/authors/id/N/NU/NUFFIN/MooseX-Clone-0.05.tar.gz;
       sha256 = "11pbw3zdbcn54hrj6z74qisnmj9k4qliy6yjj9d71qndq3xg3x0f";
     };
-    propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat Moose namespaceclean TestUseOk ];
+    propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat Moose namespaceclean Testuseok ];
   };
 
   MooseXConfigFromFile = buildPerlPackage {
@@ -4702,7 +4713,7 @@ rec {
       url = mirror://cpan/authors/id/J/JR/JROCKWAY/MooseX-Runnable-0.03.tar.gz;
       sha256 = "1hl3pnldjlbyj6gm3bzwj827qp54di14hp4zhypmrmbg1lscfdwc";
     };
-    buildInputs = [ TestUseOk TestTableDriven ];
+    buildInputs = [ Testuseok TestTableDriven ];
     propagatedBuildInputs = [ ListMoreUtils Moose MooseXGetopt MooseXTypes MooseXTypesPathClass namespaceautoclean ParamsUtil ];
   };
 
@@ -4754,7 +4765,7 @@ rec {
       url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";
       sha256 = "0sqmpf2kw25847fwrrwpcfhrq694bgs8jbix7qxp9qyjm769np6n";
     };
-    buildInputs = [ TestException TestUseOk ];
+    buildInputs = [ TestException Testuseok ];
     propagatedBuildInputs = [ ClassMOP Moose namespaceautoclean ];
   };
 
@@ -4800,7 +4811,7 @@ rec {
       url = mirror://cpan/authors/id/I/IL/ILMARI/MooseX-Types-DateTime-0.08.tar.gz;
       sha256 = "0q0d1dd8737rc3k3jb22wvybf03hg3lp1iyda0ivkd8020cib996";
     };
-    propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone Moose MooseXTypes namespaceclean TestException TestUseOk ];
+    propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone Moose MooseXTypes namespaceclean TestException Testuseok ];
   };
 
   MooseXTypesDateTimeMoreCoercions = buildPerlPackage {
@@ -4809,7 +4820,7 @@ rec {
       url = mirror://cpan/authors/id/I/IL/ILMARI/MooseX-Types-DateTime-MoreCoercions-0.11.tar.gz;
       sha256 = "c746a9284b7db49ce9acb2fbce26629fa816e6636e883d2ed6c62e336cfc52cb";
     };
-    buildInputs = [ TestException TestUseOk ];
+    buildInputs = [ TestException Testuseok ];
     propagatedBuildInputs = [ DateTime DateTimeXEasy Moose MooseXTypes MooseXTypesDateTime TimeDurationParse namespaceclean ];
     meta = {
       description = "Extensions to MooseX::Types::DateTime";
@@ -4890,7 +4901,7 @@ rec {
       url = mirror://cpan/authors/id/F/FL/FLORA/MooseX-Types-URI-0.03.tar.gz;
       sha256 = "056v08kzcd93h8l69iqdxbr05h85bgz6jvp6iwc0vv68dacr299s";
     };
-    propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathClass namespaceclean TestUseOk URI URIFromHash ];
+    propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathClass namespaceclean Testuseok URI URIFromHash ];
   };
 
   Mouse = buildPerlPackage rec {
@@ -6158,7 +6169,7 @@ rec {
       url = mirror://cpan/authors/id/B/BO/BOBTFISH/String-TT-0.03.tar.gz;
       sha256 = "1asjr79wqcl9wk96afxrm1yhpj8lk9bk8kyz78yi5ypr0h55yq7p";
     };
-    buildInputs = [ TestUseOk TestException TestTableDriven ];
+    buildInputs = [ Testuseok TestException TestTableDriven ];
     propagatedBuildInputs = [ PadWalker SubExporter TemplateToolkit ];
     meta = {
       description = "Use TT to interpolate lexical variables";
@@ -6505,6 +6516,28 @@ rec {
     doCheck = false;
   };
 
+  TermVT102 = buildPerlPackage {
+    name = "Term-VT102-0.91";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AJ/AJWOOD/Term-VT102-0.91.tar.gz;
+      sha256 = "f954e0310941d45c0fc3eb4a40f5d3a00d68119e277d303a1e6af11ded6fbd94";
+    };
+    meta = {
+    };
+  };
+
+  TermVT102Boundless = buildPerlPackage {
+    name = "Term-VT102-Boundless-0.04";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/N/NU/NUFFIN/Term-VT102-Boundless-0.04.tar.gz;
+      sha256 = "5bb88b5aecb44ebf56d3ac7240be80cd26def9dcf1ebeb4e77d9983dfc7a8f19";
+    };
+    propagatedBuildInputs = [ TermVT102 Testuseok ];
+    meta = {
+      license = "unknown";
+    };
+  };
+
   TestAssert = buildPerlPackage {
     name = "Test-Assert-0.0504";
     src = fetchurl {
@@ -6903,7 +6936,7 @@ rec {
     };
   };
 
-  TestUseOk = buildPerlPackage {
+  Testuseok = buildPerlPackage {
     name = "Test-use-ok-0.11";
     src = fetchurl {
       url = mirror://cpan/authors/id/A/AU/AUDREYT/Test-use-ok-0.11.tar.gz;
@@ -7226,7 +7259,7 @@ rec {
       url = mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz;
       sha256 = "1x1smn1kw383xc5h9wajxk9dlx92bgrbf7gk4abga57y6120s6m3";
     };
-    propagatedBuildInputs = [TestUseOk];
+    propagatedBuildInputs = [Testuseok];
   };
 
   TimeDate = buildPerlPackage {

From aa0ecfa5ac78c56c303352f1f93c8496296bf7b5 Mon Sep 17 00:00:00 2001
From: Zef Hemel <zef@zef.me>
Date: Thu, 25 Jul 2013 10:21:22 +0200
Subject: [PATCH 362/439] Added httrack, website copier tool

---
 pkgs/tools/backup/httrack/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/tools/backup/httrack/default.nix

diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix
new file mode 100644
index 000000000000..ecdf40be0a5a
--- /dev/null
+++ b/pkgs/tools/backup/httrack/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, zlib, openssl }:
+
+stdenv.mkDerivation rec {
+  version = "3.47.21";
+  name = "httrack-${version}";
+
+  src = fetchurl {
+    url = "http://mirror.httrack.com/httrack-${version}.tar.gz";
+    sha256 = "1jqw0zx74jpi0svivvqhja3ixcrfkh9sbi9fwfw83jga27bc1sp0";
+  };
+
+  buildInputs = [ zlib openssl ];
+
+  meta = {
+    homepage = "http://www.httrack.com";
+    description = "HTTrack is a free (GPL, libre/free software) and easy-to-use offline browser utility.";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25af46702ed0..239ece821113 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9869,4 +9869,6 @@ let
 
   dart = callPackage ../development/interpreters/dart { };
 
+  httrack = callPackage ../tools/backup/httrack { };
+
 }; in pkgs

From 2accfa17d31ac92fa561218f2a15db1d38926ce8 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 25 Jul 2013 10:53:18 +0200
Subject: [PATCH 363/439] Updated nodejs packages

---
 pkgs/top-level/node-packages-generated.nix | 374 +++++++++++++--------
 1 file changed, 228 insertions(+), 146 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 564dff15ad75..f8238b52a659 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -237,31 +237,42 @@
     sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
     tarball = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
   }
+  {
+    name = "async";
+    spec = "~0.2.9";
+    version = "0.2.9";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
+    tarball = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
+  }
   {
     name = "aws-sdk";
     spec = "*";
-    version = "1.4.0";
+    version = "1.4.1";
     topLevel = true;
     dependencies = [
       { name = "xml2js"; spec = "0.2.4"; }
       { name = "xmlbuilder"; spec = "*"; }
     ];
     patchLatest = true;
-    sha1 = "57a3291994d2b2b484ebd39e1ecb216a05c1c60e";
-    tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.4.0.tgz";
+    sha1 = "e429d77c09f94aa2e295b7e83678d818ae5621e9";
+    tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.4.1.tgz";
   }
   {
     name = "aws-sdk";
     spec = ">=1.2.0 <2";
-    version = "1.4.0";
+    version = "1.4.1";
     topLevel = false;
     dependencies = [
       { name = "xml2js"; spec = "0.2.4"; }
       { name = "xmlbuilder"; spec = "*"; }
     ];
     patchLatest = true;
-    sha1 = "57a3291994d2b2b484ebd39e1ecb216a05c1c60e";
-    tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.4.0.tgz";
+    sha1 = "e429d77c09f94aa2e295b7e83678d818ae5621e9";
+    tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.4.1.tgz";
   }
   {
     name = "aws-sign";
@@ -356,14 +367,26 @@
   {
     name = "block-stream";
     spec = "*";
-    version = "0.0.6";
+    version = "0.0.7";
     topLevel = false;
     dependencies = [
-      { name = "inherits"; spec = "~1.0.0"; }
+      { name = "inherits"; spec = "~2.0.0"; }
     ];
     patchLatest = false;
-    sha1 = "f7027aea2ecc357153fa3bad6caeaf25f391aa4f";
-    tarball = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.6.tgz";
+    sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed";
+    tarball = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz";
+  }
+  {
+    name = "block-stream";
+    spec = "0.0.7";
+    version = "0.0.7";
+    topLevel = false;
+    dependencies = [
+      { name = "inherits"; spec = "~2.0.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed";
+    tarball = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz";
   }
   {
     name = "boom";
@@ -677,16 +700,16 @@
   }
   {
     name = "cmd-shim";
-    spec = "~1.1.0";
-    version = "1.1.0";
+    spec = "~1.0.1";
+    version = "1.0.1";
     topLevel = false;
     dependencies = [
       { name = "mkdirp"; spec = "~0.3.3"; }
-      { name = "graceful-fs"; spec = "1.2"; }
+      { name = "graceful-fs"; spec = "2"; }
     ];
     patchLatest = false;
-    sha1 = "e69fe26e9a8b9040c7b61dc8ad6b04d7dbabe767";
-    tarball = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.0.tgz";
+    sha1 = "75e917c2185240854718c686346770640083d7bc";
+    tarball = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.0.1.tgz";
   }
   {
     name = "coffee-script";
@@ -1733,6 +1756,20 @@
     sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed";
     tarball = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz";
   }
+  {
+    name = "form-data";
+    spec = "~0.1.0";
+    version = "0.1.0";
+    topLevel = false;
+    dependencies = [
+      { name = "combined-stream"; spec = "~0.0.4"; }
+      { name = "mime"; spec = "~1.2.9"; }
+      { name = "async"; spec = "~0.2.9"; }
+    ];
+    patchLatest = false;
+    sha1 = "d36b59baf9b292bb2e5034d7a6079b2bd1e9df83";
+    tarball = "http://registry.npmjs.org/form-data/-/form-data-0.1.0.tgz";
+  }
   {
     name = "formidable";
     spec = "1.0.11";
@@ -1791,62 +1828,62 @@
   {
     name = "fstream";
     spec = "0";
-    version = "0.1.23";
+    version = "0.1.24";
     topLevel = false;
     dependencies = [
       { name = "rimraf"; spec = "2"; }
       { name = "mkdirp"; spec = "0.3"; }
       { name = "graceful-fs"; spec = "~2.0.0"; }
-      { name = "inherits"; spec = "~1.0.0"; }
+      { name = "inherits"; spec = "~2.0.0"; }
     ];
     patchLatest = false;
-    sha1 = "e1ac8d0945a7f27789e71f00a6d86575d14fc4ec";
-    tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.23.tgz";
+    sha1 = "267fe9d034f46bc99f824789d38b987ad01be884";
+    tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz";
   }
   {
     name = "fstream";
     spec = "~0.1.17";
-    version = "0.1.23";
+    version = "0.1.24";
     topLevel = false;
     dependencies = [
       { name = "rimraf"; spec = "2"; }
       { name = "mkdirp"; spec = "0.3"; }
       { name = "graceful-fs"; spec = "~2.0.0"; }
-      { name = "inherits"; spec = "~1.0.0"; }
+      { name = "inherits"; spec = "~2.0.0"; }
     ];
     patchLatest = false;
-    sha1 = "e1ac8d0945a7f27789e71f00a6d86575d14fc4ec";
-    tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.23.tgz";
+    sha1 = "267fe9d034f46bc99f824789d38b987ad01be884";
+    tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz";
   }
   {
     name = "fstream";
     spec = "~0.1.23";
-    version = "0.1.23";
+    version = "0.1.24";
     topLevel = false;
     dependencies = [
       { name = "rimraf"; spec = "2"; }
       { name = "mkdirp"; spec = "0.3"; }
       { name = "graceful-fs"; spec = "~2.0.0"; }
-      { name = "inherits"; spec = "~1.0.0"; }
+      { name = "inherits"; spec = "~2.0.0"; }
     ];
     patchLatest = false;
-    sha1 = "e1ac8d0945a7f27789e71f00a6d86575d14fc4ec";
-    tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.23.tgz";
+    sha1 = "267fe9d034f46bc99f824789d38b987ad01be884";
+    tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz";
   }
   {
     name = "fstream";
     spec = "~0.1.8";
-    version = "0.1.23";
+    version = "0.1.24";
     topLevel = false;
     dependencies = [
       { name = "rimraf"; spec = "2"; }
       { name = "mkdirp"; spec = "0.3"; }
       { name = "graceful-fs"; spec = "~2.0.0"; }
-      { name = "inherits"; spec = "~1.0.0"; }
+      { name = "inherits"; spec = "~2.0.0"; }
     ];
     patchLatest = false;
-    sha1 = "e1ac8d0945a7f27789e71f00a6d86575d14fc4ec";
-    tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.23.tgz";
+    sha1 = "267fe9d034f46bc99f824789d38b987ad01be884";
+    tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz";
   }
   {
     name = "fstream-ignore";
@@ -1889,16 +1926,15 @@
   {
     name = "glob";
     spec = "3";
-    version = "3.2.3";
+    version = "3.2.6";
     topLevel = false;
     dependencies = [
       { name = "minimatch"; spec = "~0.2.11"; }
-      { name = "graceful-fs"; spec = "~2.0.0"; }
       { name = "inherits"; spec = "2"; }
     ];
     patchLatest = false;
-    sha1 = "e313eeb249c7affaa5c475286b0e115b59839467";
-    tarball = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
+    sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2";
+    tarball = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz";
   }
   {
     name = "glob";
@@ -1917,55 +1953,41 @@
   {
     name = "glob";
     spec = ">= 3.1.4";
-    version = "3.2.3";
+    version = "3.2.6";
     topLevel = false;
     dependencies = [
       { name = "minimatch"; spec = "~0.2.11"; }
-      { name = "graceful-fs"; spec = "~2.0.0"; }
       { name = "inherits"; spec = "2"; }
     ];
     patchLatest = false;
-    sha1 = "e313eeb249c7affaa5c475286b0e115b59839467";
-    tarball = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
+    sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2";
+    tarball = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz";
   }
   {
     name = "glob";
     spec = "~3.2.1";
-    version = "3.2.3";
+    version = "3.2.6";
     topLevel = false;
     dependencies = [
       { name = "minimatch"; spec = "~0.2.11"; }
-      { name = "graceful-fs"; spec = "~2.0.0"; }
       { name = "inherits"; spec = "2"; }
     ];
     patchLatest = false;
-    sha1 = "e313eeb249c7affaa5c475286b0e115b59839467";
-    tarball = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
+    sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2";
+    tarball = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz";
   }
   {
     name = "glob";
     spec = "~3.2.3";
-    version = "3.2.3";
+    version = "3.2.6";
     topLevel = false;
     dependencies = [
       { name = "minimatch"; spec = "~0.2.11"; }
-      { name = "graceful-fs"; spec = "~2.0.0"; }
       { name = "inherits"; spec = "2"; }
     ];
     patchLatest = false;
-    sha1 = "e313eeb249c7affaa5c475286b0e115b59839467";
-    tarball = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
-  }
-  {
-    name = "graceful-fs";
-    spec = "1.2";
-    version = "1.2.3";
-    topLevel = false;
-    dependencies = [
-    ];
-    patchLatest = false;
-    sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
-    tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+    sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2";
+    tarball = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz";
   }
   {
     name = "graceful-fs";
@@ -2113,6 +2135,21 @@
     sha1 = "3617958821f58311e4d7f6de291fca662b412ef4";
     tarball = "http://registry.npmjs.org/hawk/-/hawk-0.13.1.tgz";
   }
+  {
+    name = "hawk";
+    spec = "~1.0.0";
+    version = "1.0.0";
+    topLevel = false;
+    dependencies = [
+      { name = "hoek"; spec = "0.9.x"; }
+      { name = "boom"; spec = "0.4.x"; }
+      { name = "cryptiles"; spec = "0.2.x"; }
+      { name = "sntp"; spec = "0.2.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
+    tarball = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
+  }
   {
     name = "hiredis";
     spec = "*";
@@ -2338,6 +2375,17 @@
     sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48";
     tarball = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz";
   }
+  {
+    name = "inherits";
+    spec = "~2.0.0";
+    version = "2.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "76c81b3b1c10ddee3a60bf2c247162bc369f8ba8";
+    tarball = "http://registry.npmjs.org/inherits/-/inherits-2.0.0.tgz";
+  }
   {
     name = "ini";
     spec = "1";
@@ -2461,13 +2509,14 @@
   {
     name = "jayschema";
     spec = "*";
-    version = "0.1.5";
+    version = "0.2.0";
     topLevel = true;
     dependencies = [
+      { name = "when"; spec = "~2.2.1"; }
     ];
     patchLatest = false;
-    sha1 = "348a83baaec3b5fb9901c7efe7e64cdd1a8f46e2";
-    tarball = "http://registry.npmjs.org/jayschema/-/jayschema-0.1.5.tgz";
+    sha1 = "ab250dd51224ef36ac8119ce143e0525300d99d4";
+    tarball = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.0.tgz";
   }
   {
     name = "js-yaml";
@@ -2542,6 +2591,17 @@
     sha1 = "77c271aaea54302e68efeaccb56abbf06a9b1a54";
     tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-4.0.0.tgz";
   }
+  {
+    name = "json-stringify-safe";
+    spec = "~5.0.0";
+    version = "5.0.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "156515f55e62ed4cd912ec13bfc79d5013dfd1e7";
+    tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
+  }
   {
     name = "jsontool";
     spec = "*";
@@ -3366,14 +3426,14 @@
   {
     name = "nijs";
     spec = "*";
-    version = "0.0.9";
+    version = "0.0.10";
     topLevel = true;
     dependencies = [
       { name = "optparse"; spec = ">= 1.0.3"; }
     ];
     patchLatest = false;
-    sha1 = "26f0165431664b3518c2576f78397f27054e03aa";
-    tarball = "http://registry.npmjs.org/nijs/-/nijs-0.0.9.tgz";
+    sha1 = "79d09c5c9a2f1f3e96708c9dc6b4547b89cf8177";
+    tarball = "http://registry.npmjs.org/nijs/-/nijs-0.0.10.tgz";
   }
   {
     name = "node-expat";
@@ -3589,7 +3649,7 @@
   }
   {
     name = "nopt";
-    spec = "~2.1.1";
+    spec = "~2.1.2";
     version = "2.1.2";
     topLevel = false;
     dependencies = [
@@ -3602,20 +3662,20 @@
   {
     name = "normalize-package-data";
     spec = "~0.2";
-    version = "0.2.0";
+    version = "0.2.1";
     topLevel = false;
     dependencies = [
       { name = "semver"; spec = "2"; }
       { name = "github-url-from-git"; spec = "~1.1.1"; }
     ];
     patchLatest = false;
-    sha1 = "b9349e2db3242912e6ab3d180823309b63a74a92";
-    tarball = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.0.tgz";
+    sha1 = "6c13a4b7ab1bca0323265418d354666da2e5ad43";
+    tarball = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.1.tgz";
   }
   {
     name = "npm";
     spec = "*";
-    version = "1.3.4";
+    version = "1.3.5";
     topLevel = true;
     dependencies = [
       { name = "semver"; spec = "~2.0.8"; }
@@ -3624,14 +3684,13 @@
       { name = "abbrev"; spec = "~1.0.4"; }
       { name = "graceful-fs"; spec = "~2.0.0"; }
       { name = "minimatch"; spec = "~0.2.12"; }
-      { name = "nopt"; spec = "~2.1.1"; }
+      { name = "nopt"; spec = "~2.1.2"; }
       { name = "rimraf"; spec = "~2.2.0"; }
       { name = "request"; spec = "~2.21.0"; }
       { name = "which"; spec = "1"; }
-      { name = "tar"; spec = "~0.1.17"; }
+      { name = "tar"; spec = "~0.1.18"; }
       { name = "fstream"; spec = "~0.1.23"; }
-      { name = "block-stream"; spec = "*"; }
-      { name = "inherits"; spec = "1"; }
+      { name = "block-stream"; spec = "0.0.7"; }
       { name = "mkdirp"; spec = "~0.3.3"; }
       { name = "read"; spec = "~1.0.4"; }
       { name = "lru-cache"; spec = "~2.3.0"; }
@@ -3651,18 +3710,18 @@
       { name = "lockfile"; spec = "~0.4.0"; }
       { name = "retry"; spec = "~0.6.0"; }
       { name = "once"; spec = "~1.1.1"; }
-      { name = "npmconf"; spec = "~0.1.1"; }
+      { name = "npmconf"; spec = "~0.1.2"; }
       { name = "opener"; spec = "~1.3.0"; }
       { name = "chmodr"; spec = "~0.1.0"; }
-      { name = "cmd-shim"; spec = "~1.1.0"; }
-      { name = "sha"; spec = "~1.0.1"; }
+      { name = "cmd-shim"; spec = "~1.0.1"; }
+      { name = "sha"; spec = "~1.2.1"; }
       { name = "editor"; spec = "0.0.4"; }
       { name = "child-process-close"; spec = "~0.1.1"; }
       { name = "npm-user-validate"; spec = "0.0.3"; }
     ];
     patchLatest = false;
-    sha1 = "1dacc91458f2197c362d774d2cbf111680f86ec2";
-    tarball = "http://registry.npmjs.org/npm/-/npm-1.3.4.tgz";
+    sha1 = "05d6c4d01d2bc3f1adf15948adf2f7110553f471";
+    tarball = "http://registry.npmjs.org/npm/-/npm-1.3.5.tgz";
   }
   {
     name = "npm-registry-client";
@@ -3754,12 +3813,12 @@
   }
   {
     name = "npmconf";
-    spec = "~0.1.1";
-    version = "0.1.1";
+    spec = "~0.1.2";
+    version = "0.1.2";
     topLevel = false;
     dependencies = [
       { name = "config-chain"; spec = "~1.1.1"; }
-      { name = "inherits"; spec = "~1.0.0"; }
+      { name = "inherits"; spec = "~2.0.0"; }
       { name = "once"; spec = "~1.1.1"; }
       { name = "mkdirp"; spec = "~0.3.3"; }
       { name = "osenv"; spec = "0.0.3"; }
@@ -3768,8 +3827,8 @@
       { name = "ini"; spec = "~1.1.0"; }
     ];
     patchLatest = false;
-    sha1 = "7a254182591ca22d77b2faecc0d17e0f9bdf25a1";
-    tarball = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz";
+    sha1 = "99af8122f0067802436a5b71dbf8c3539697e62c";
+    tarball = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.2.tgz";
   }
   {
     name = "npmlog";
@@ -4438,6 +4497,17 @@
     sha1 = "5d679b34ddf53ac3bc232aeb421f6b6857f925e5";
     tarball = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.1.tgz";
   }
+  {
+    name = "readable-stream";
+    spec = "1.0";
+    version = "1.0.2";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "213ce36864fc1f0d4e98e03b9eb92c64042299d4";
+    tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.2.tgz";
+  }
   {
     name = "readable-stream";
     spec = "~1.0.2";
@@ -4533,71 +4603,71 @@
   {
     name = "request";
     spec = "2";
-    version = "2.23.0";
+    version = "2.25.0";
     topLevel = false;
     dependencies = [
       { name = "qs"; spec = "~0.6.0"; }
-      { name = "json-stringify-safe"; spec = "~4.0.0"; }
+      { name = "json-stringify-safe"; spec = "~5.0.0"; }
       { name = "forever-agent"; spec = "~0.5.0"; }
       { name = "tunnel-agent"; spec = "~0.3.0"; }
       { name = "http-signature"; spec = "~0.10.0"; }
-      { name = "hawk"; spec = "~0.13.0"; }
+      { name = "hawk"; spec = "~1.0.0"; }
       { name = "aws-sign"; spec = "~0.3.0"; }
       { name = "oauth-sign"; spec = "~0.3.0"; }
       { name = "cookie-jar"; spec = "~0.3.0"; }
       { name = "node-uuid"; spec = "~1.4.0"; }
       { name = "mime"; spec = "~1.2.9"; }
-      { name = "form-data"; spec = "0.0.8"; }
+      { name = "form-data"; spec = "~0.1.0"; }
     ];
     patchLatest = false;
-    sha1 = "121742874bf40b3c149fe113b7a35847597fc885";
-    tarball = "http://registry.npmjs.org/request/-/request-2.23.0.tgz";
+    sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
+    tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
   }
   {
     name = "request";
     spec = "2 >=2.14";
-    version = "2.23.0";
+    version = "2.25.0";
     topLevel = false;
     dependencies = [
       { name = "qs"; spec = "~0.6.0"; }
-      { name = "json-stringify-safe"; spec = "~4.0.0"; }
+      { name = "json-stringify-safe"; spec = "~5.0.0"; }
       { name = "forever-agent"; spec = "~0.5.0"; }
       { name = "tunnel-agent"; spec = "~0.3.0"; }
       { name = "http-signature"; spec = "~0.10.0"; }
-      { name = "hawk"; spec = "~0.13.0"; }
+      { name = "hawk"; spec = "~1.0.0"; }
       { name = "aws-sign"; spec = "~0.3.0"; }
       { name = "oauth-sign"; spec = "~0.3.0"; }
       { name = "cookie-jar"; spec = "~0.3.0"; }
       { name = "node-uuid"; spec = "~1.4.0"; }
       { name = "mime"; spec = "~1.2.9"; }
-      { name = "form-data"; spec = "0.0.8"; }
+      { name = "form-data"; spec = "~0.1.0"; }
     ];
     patchLatest = false;
-    sha1 = "121742874bf40b3c149fe113b7a35847597fc885";
-    tarball = "http://registry.npmjs.org/request/-/request-2.23.0.tgz";
+    sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
+    tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
   }
   {
     name = "request";
     spec = "2 >=2.20.0";
-    version = "2.23.0";
+    version = "2.25.0";
     topLevel = false;
     dependencies = [
       { name = "qs"; spec = "~0.6.0"; }
-      { name = "json-stringify-safe"; spec = "~4.0.0"; }
+      { name = "json-stringify-safe"; spec = "~5.0.0"; }
       { name = "forever-agent"; spec = "~0.5.0"; }
       { name = "tunnel-agent"; spec = "~0.3.0"; }
       { name = "http-signature"; spec = "~0.10.0"; }
-      { name = "hawk"; spec = "~0.13.0"; }
+      { name = "hawk"; spec = "~1.0.0"; }
       { name = "aws-sign"; spec = "~0.3.0"; }
       { name = "oauth-sign"; spec = "~0.3.0"; }
       { name = "cookie-jar"; spec = "~0.3.0"; }
       { name = "node-uuid"; spec = "~1.4.0"; }
       { name = "mime"; spec = "~1.2.9"; }
-      { name = "form-data"; spec = "0.0.8"; }
+      { name = "form-data"; spec = "~0.1.0"; }
     ];
     patchLatest = false;
-    sha1 = "121742874bf40b3c149fe113b7a35847597fc885";
-    tarball = "http://registry.npmjs.org/request/-/request-2.23.0.tgz";
+    sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
+    tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
   }
   {
     name = "request";
@@ -4635,25 +4705,25 @@
   {
     name = "request";
     spec = "~2";
-    version = "2.23.0";
+    version = "2.25.0";
     topLevel = false;
     dependencies = [
       { name = "qs"; spec = "~0.6.0"; }
-      { name = "json-stringify-safe"; spec = "~4.0.0"; }
+      { name = "json-stringify-safe"; spec = "~5.0.0"; }
       { name = "forever-agent"; spec = "~0.5.0"; }
       { name = "tunnel-agent"; spec = "~0.3.0"; }
       { name = "http-signature"; spec = "~0.10.0"; }
-      { name = "hawk"; spec = "~0.13.0"; }
+      { name = "hawk"; spec = "~1.0.0"; }
       { name = "aws-sign"; spec = "~0.3.0"; }
       { name = "oauth-sign"; spec = "~0.3.0"; }
       { name = "cookie-jar"; spec = "~0.3.0"; }
       { name = "node-uuid"; spec = "~1.4.0"; }
       { name = "mime"; spec = "~1.2.9"; }
-      { name = "form-data"; spec = "0.0.8"; }
+      { name = "form-data"; spec = "~0.1.0"; }
     ];
     patchLatest = false;
-    sha1 = "121742874bf40b3c149fe113b7a35847597fc885";
-    tarball = "http://registry.npmjs.org/request/-/request-2.23.0.tgz";
+    sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
+    tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
   }
   {
     name = "request";
@@ -4861,13 +4931,13 @@
   {
     name = "semver";
     spec = "*";
-    version = "2.0.10";
+    version = "2.0.11";
     topLevel = true;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31";
-    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz";
+    sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
   }
   {
     name = "semver";
@@ -4894,68 +4964,68 @@
   {
     name = "semver";
     spec = "2";
-    version = "2.0.10";
+    version = "2.0.11";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31";
-    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz";
+    sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
   }
   {
     name = "semver";
     spec = "2.x";
-    version = "2.0.10";
+    version = "2.0.11";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31";
-    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz";
+    sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
   }
   {
     name = "semver";
     spec = ">=2.0.10 <3.0.0";
-    version = "2.0.10";
+    version = "2.0.11";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31";
-    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz";
+    sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
   }
   {
     name = "semver";
     spec = "~2.0.5";
-    version = "2.0.10";
+    version = "2.0.11";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31";
-    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz";
+    sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
   }
   {
     name = "semver";
     spec = "~2.0.7";
-    version = "2.0.10";
+    version = "2.0.11";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31";
-    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz";
+    sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
   }
   {
     name = "semver";
     spec = "~2.0.8";
-    version = "2.0.10";
+    version = "2.0.11";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31";
-    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz";
+    sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
   }
   {
     name = "send";
@@ -5015,15 +5085,16 @@
   }
   {
     name = "sha";
-    spec = "~1.0.1";
-    version = "1.0.1";
+    spec = "~1.2.1";
+    version = "1.2.1";
     topLevel = false;
     dependencies = [
-      { name = "graceful-fs"; spec = "1.2"; }
+      { name = "graceful-fs"; spec = "2"; }
+      { name = "readable-stream"; spec = "1.0"; }
     ];
     patchLatest = false;
-    sha1 = "9b87a92113103e7406f7e7ef00006f3fa1975122";
-    tarball = "http://registry.npmjs.org/sha/-/sha-1.0.1.tgz";
+    sha1 = "30bd5f770852fa6ac2b110ab3698fd4840f7f1cd";
+    tarball = "http://registry.npmjs.org/sha/-/sha-1.2.1.tgz";
   }
   {
     name = "shelljs";
@@ -5427,30 +5498,30 @@
   {
     name = "tar";
     spec = "*";
-    version = "0.1.17";
+    version = "0.1.18";
     topLevel = true;
     dependencies = [
-      { name = "inherits"; spec = "1.x"; }
+      { name = "inherits"; spec = "2"; }
       { name = "block-stream"; spec = "*"; }
       { name = "fstream"; spec = "~0.1.8"; }
     ];
     patchLatest = false;
-    sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc";
-    tarball = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
+    sha1 = "b76c3b23c5e90f9e3e344462f537047c695ba635";
+    tarball = "http://registry.npmjs.org/tar/-/tar-0.1.18.tgz";
   }
   {
     name = "tar";
     spec = "0";
-    version = "0.1.17";
+    version = "0.1.18";
     topLevel = false;
     dependencies = [
-      { name = "inherits"; spec = "1.x"; }
+      { name = "inherits"; spec = "2"; }
       { name = "block-stream"; spec = "*"; }
       { name = "fstream"; spec = "~0.1.8"; }
     ];
     patchLatest = false;
-    sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc";
-    tarball = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
+    sha1 = "b76c3b23c5e90f9e3e344462f537047c695ba635";
+    tarball = "http://registry.npmjs.org/tar/-/tar-0.1.18.tgz";
   }
   {
     name = "tar";
@@ -5468,17 +5539,17 @@
   }
   {
     name = "tar";
-    spec = "~0.1.17";
-    version = "0.1.17";
+    spec = "~0.1.18";
+    version = "0.1.18";
     topLevel = false;
     dependencies = [
-      { name = "inherits"; spec = "1.x"; }
+      { name = "inherits"; spec = "2"; }
       { name = "block-stream"; spec = "*"; }
       { name = "fstream"; spec = "~0.1.8"; }
     ];
     patchLatest = false;
-    sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc";
-    tarball = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
+    sha1 = "b76c3b23c5e90f9e3e344462f537047c695ba635";
+    tarball = "http://registry.npmjs.org/tar/-/tar-0.1.18.tgz";
   }
   {
     name = "temp";
@@ -5915,6 +5986,17 @@
     sha1 = "998bc1855d8cd0d1e9aa8f8056b83b46ac3e81ef";
     tarball = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.2.2.tgz";
   }
+  {
+    name = "when";
+    spec = "~2.2.1";
+    version = "2.2.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "b1def994017350b8087f6e9a7596ab2833bdc712";
+    tarball = "http://registry.npmjs.org/when/-/when-2.2.1.tgz";
+  }
   {
     name = "which";
     spec = "1";

From 9afc8bb1e08a83e6f1174ff72168a56ce6511aca Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 25 Jul 2013 11:35:51 +0200
Subject: [PATCH 364/439] Add colormake

---
 .../build-managers/colormake/default.nix      | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/colormake/default.nix

diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix
new file mode 100644
index 000000000000..358390077bc8
--- /dev/null
+++ b/pkgs/development/tools/build-managers/colormake/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchgit, perl}:
+
+stdenv.mkDerivation rec {
+  name = "colormake-${version}";
+  version = "2.1.0";
+
+  buildInputs = [perl];
+
+  src = fetchgit {
+    url = https://github.com/pagekite/Colormake.git;
+    rev = "66544f40d";
+    sha256 = "8e714c5540305d169989d9387dbac47b8b9fb2cfb424af7bcd412bfe684dc6d7";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -fa colormake.pl colormake colormake-short clmake clmake-short $out/bin
+  '';
+ 
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 239ece821113..343b394ffe43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -615,6 +615,8 @@ let
 
   convertlit = callPackage ../tools/text/convertlit { };
 
+  colormake = callPackage ../development/tools/build-managers/colormake { };
+
   cowsay = callPackage ../tools/misc/cowsay { };
 
   cuetools = callPackage ../tools/cd-dvd/cuetools { };

From d568ff324a3b8144aeff30c7ed67c0eb52117725 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 25 Jul 2013 11:38:13 +0200
Subject: [PATCH 365/439] Add meta attribute to colormake.

---
 pkgs/development/tools/build-managers/colormake/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix
index 358390077bc8..9d62b4e187b1 100644
--- a/pkgs/development/tools/build-managers/colormake/default.nix
+++ b/pkgs/development/tools/build-managers/colormake/default.nix
@@ -16,5 +16,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp -fa colormake.pl colormake colormake-short clmake clmake-short $out/bin
   '';
- 
+
+  meta = {
+    description = "A simple wrapper around make to colorize the output.";
+    license = "GPLv2";
+  };
 }

From 7a6b6799d9583e61b93971e9f107085d4eb932a2 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Thu, 25 Jul 2013 12:38:08 +0200
Subject: [PATCH 366/439] pypy: fix some tests, add install phase

---
 .../interpreters/pypy/2.0/default.nix         | 62 +++++++++----------
 1 file changed, 28 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix
index 711c27fabf22..d903dab02c03 100644
--- a/pkgs/development/interpreters/pypy/2.0/default.nix
+++ b/pkgs/development/interpreters/pypy/2.0/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
-, sqlite, openssl, ncurses, pythonFull }:
+, sqlite, openssl, ncurses, pythonFull, expat }:
 
 assert zlibSupport -> zlib != null;
 
@@ -8,46 +8,24 @@ let
   majorVersion = "2.0";
   version = "${majorVersion}.2";
 
-  src = fetchurl {
-    url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2";
-    sha256 = "0g2cajs6m3yf0lak5f18ccs6j77cf5xvbm4h6y5l1qlqdc6wk48r";
-  };
-
-  #patches =
-  #  [ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
-  #    ./search-path.patch
-
-      # Python recompiles a Python if the mtime stored *in* the
-      # pyc/pyo file differs from the mtime of the source file.  This
-      # doesn't work in Nix because Nix changes the mtime of files in
-      # the Nix store to 1.  So treat that as a special case.
-  #    ./nix-store-mtime.patch
-
-      # patch python to put zero timestamp into pyc
-      # if DETERMINISTIC_BUILD env var is set
-  #    ./deterministic-build.patch
-  #  ];
-  #'';
-
-  install = ''
-    cd ./pypy/pypy/tool/release/
-    ${pythonFull}/bin/python package.py ../../.. pypy-my-own-package-name
-  '';
-
-  buildInputs =
-    stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
-    [ bzip2 openssl pkgconfig pythonFull libffi ncurses ]
-    ++ stdenv.lib.optional zlibSupport zlib;
-
   pypy = stdenv.mkDerivation rec {
     name = "pypy-${version}";
 
-    inherit majorVersion version src buildInputs;
+    inherit majorVersion version;
+
+    src = fetchurl {
+      url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2";
+      sha256 = "0g2cajs6m3yf0lak5f18ccs6j77cf5xvbm4h6y5l1qlqdc6wk48r";
+    };
+
+    buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses sqlite ]
+      ++ stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc
+      ++ stdenv.lib.optional zlibSupport zlib;
 
     preConfigure = ''
       substituteInPlace Makefile \
         --replace "-Ojit" "-Ojit --batch" \
-        --replace "pypy/goal/targetpypystandalone.py" "pypy/goal/targetpypystandalone.py --withmod-_minimal_curses"
+        --replace "pypy/goal/targetpypystandalone.py" "pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2"
 
       # we are using cpython and not pypy to do translation
       substituteInPlace rpython/bin/rpython \
@@ -67,6 +45,22 @@ let
       #  --replace "return library_dirs" "return tuple(\"{expat}\", *library_dirs)"
     '';
 
+    TERMINFO = "${ncurses}/share/terminfo/";
+
+    doCheck = true;
+    checkPhase = ''
+       export HOME="$TMPDIR"
+      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k "not shutil" lib-python
+    '';
+
+    installPhase = ''
+       mkdir -p $out/bin
+       cp -R {include,lib_pypy,lib-python,pypy-c} $out/
+       ln -s $out/pypy-c $out/bin/pypy
+       chmod +x $out/bin/pypy
+       # TODO: compile python files?
+    '';
+
     passthru = {
       inherit zlibSupport;
       libPrefix = "pypy${majorVersion}";

From 4c4f1ca3a53e62792de82dd7addcffc8a6792e2a Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 25 Jul 2013 12:42:36 +0200
Subject: [PATCH 367/439] python-plumbum-1.2.0

---
 pkgs/top-level/python-packages.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3444045b1474..1cd743e51225 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3473,6 +3473,17 @@ pythonPackages = python.modules // rec {
     };
   };
 
+  plumbum = buildPythonPackage rec {
+    name = "plumbum-1.2.0";
+
+    buildInputs = [ pythonPackages.six ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/p/plumbum/plumbum-1.2.0.tar.gz";
+      md5 = "18b7f888dfaf62a48df937abffe07897";
+    };
+  };
+
 
   polib = buildPythonPackage rec {
     name = "polib-${version}";

From 7b4b03616ce72283547983316be375759d8fc26b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 25 Jul 2013 12:43:40 +0200
Subject: [PATCH 368/439] bmon: new package

bmon is a ncurses network bandwidth monitor.

Homepage: http://www.carisma.slowglass.com/~tgr/bmon/
---
 pkgs/tools/misc/bmon/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/misc/bmon/default.nix

diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix
new file mode 100644
index 000000000000..29a6db4e6d27
--- /dev/null
+++ b/pkgs/tools/misc/bmon/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, ncurses, confuse, libnl }:
+
+stdenv.mkDerivation {
+  name = "bmon-3.1";
+
+  src = fetchurl {
+    url = http://www.carisma.slowglass.com/~tgr/bmon/files/bmon-3.1.tar.gz;
+    sha256 = "005ib7c3g3cva0rdwsgl6hfakxd5yp88sf4bjxb6iarcm3ax18ky";
+  };
+
+  buildInputs = [ pkgconfig ncurses confuse libnl ];
+
+  meta = with stdenv.lib; {
+    description = "Network bandwidth monitor";
+    homepage = http://www.carisma.slowglass.com/~tgr/bmon/;
+    # Neither the homepage nor the source archive has license info, but in the
+    # latest git version there is a LICENSE file that is the 2-clause BSD
+    # license.
+    #  - https://github.com/tgraf/bmon/blob/master/LICENSE
+    #  - http://opensource.org/licenses/BSD-2-Clause
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 343b394ffe43..6678b0abc23b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -503,6 +503,8 @@ let
 
   bfr = callPackage ../tools/misc/bfr { };
 
+  bmon = callPackage ../tools/misc/bmon { };
+
   boomerang = callPackage ../development/tools/boomerang { };
 
   bootchart = callPackage ../tools/system/bootchart { };

From 4e723ca53744ec2403f6b1a817e196d1f35e333b Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Thu, 25 Jul 2013 06:49:25 -0400
Subject: [PATCH 369/439] Update tarsnap to version 1.0.35

---
 pkgs/tools/backup/tarsnap/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index 052b1416e074..ae432c6122a0 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, zlib, e2fsprogs }:
 
 stdenv.mkDerivation {
-  name = "tarsnap-1.0.34";
+  name = "tarsnap-1.0.35";
 
   src = fetchurl {
-    url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.34.tgz";
-    sha256 = "049q0mbz9i4m87n1r78zf62mcxd04wm49rjqpiy5yzy4z8m1gh0l";
+    url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz";
+    sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc";
   };
 
   buildInputs = [ openssl zlib e2fsprogs ];

From a8f11fcba5e296897388e1eb747749e4e7517ce7 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 25 Jul 2013 13:42:20 +0200
Subject: [PATCH 370/439] Update pypy build with sqlite and expat support. Fix
 the installPhase.

---
 .../development/interpreters/pypy/2.0/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix
index d903dab02c03..6be1b5a2b7d3 100644
--- a/pkgs/development/interpreters/pypy/2.0/default.nix
+++ b/pkgs/development/interpreters/pypy/2.0/default.nix
@@ -18,10 +18,14 @@ let
       sha256 = "0g2cajs6m3yf0lak5f18ccs6j77cf5xvbm4h6y5l1qlqdc6wk48r";
     };
 
-    buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses sqlite ]
+    buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ]
       ++ stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc
       ++ stdenv.lib.optional zlibSupport zlib;
 
+    C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/include") buildInputs);
+    LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
+    LD_LIBRARY_PATH = LIBRARY_PATH;
+
     preConfigure = ''
       substituteInPlace Makefile \
         --replace "-Ojit" "-Ojit --batch" \
@@ -39,10 +43,6 @@ let
         --replace "ncurses/curses.h" "${ncurses}/include/curses.h" \
         --replace "ncurses/term.h" "${ncurses}/include/term.h" \
         --replace "libraries = ['curses']" "libraries = ['ncurses']"
-
-      #substituteInPlace rpython/translator/platform/__init__.py \
-      #  --replace "return include_dirs" "return tuple(\"{expat}\", *include_dirs)" \
-      #  --replace "return library_dirs" "return tuple(\"{expat}\", *library_dirs)"
     '';
 
     TERMINFO = "${ncurses}/share/terminfo/";
@@ -55,8 +55,9 @@ let
 
     installPhase = ''
        mkdir -p $out/bin
-       cp -R {include,lib_pypy,lib-python,pypy-c} $out/
-       ln -s $out/pypy-c $out/bin/pypy
+       mkdir -p $out/pypy-c
+       cp -R {include,lib_pypy,lib-python,pypy-c} $out/pypy-c
+       ln -s $out/pypy-c/pypy-c $out/bin/pypy
        chmod +x $out/bin/pypy
        # TODO: compile python files?
     '';

From eb0b6f82414ee42fe93a363456271ee15486336f Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Thu, 25 Jul 2013 16:25:55 +0200
Subject: [PATCH 371/439] pypy: correctly skip tests

---
 pkgs/development/interpreters/pypy/2.0/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix
index 6be1b5a2b7d3..0f2a34336cfa 100644
--- a/pkgs/development/interpreters/pypy/2.0/default.nix
+++ b/pkgs/development/interpreters/pypy/2.0/default.nix
@@ -50,7 +50,7 @@ let
     doCheck = true;
     checkPhase = ''
        export HOME="$TMPDIR"
-      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k "not shutil" lib-python
+      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -m "not shutil" lib-python
     '';
 
     installPhase = ''

From b0a12396ef8c0b2b57abe64f2dd5ad35b8707a0d Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Thu, 25 Jul 2013 20:45:57 +0200
Subject: [PATCH 372/439] fix ignore param for tests

---
 pkgs/development/interpreters/pypy/2.0/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix
index 0f2a34336cfa..7522020582c2 100644
--- a/pkgs/development/interpreters/pypy/2.0/default.nix
+++ b/pkgs/development/interpreters/pypy/2.0/default.nix
@@ -50,7 +50,7 @@ let
     doCheck = true;
     checkPhase = ''
        export HOME="$TMPDIR"
-      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -m "not shutil" lib-python
+      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c --ignore lib-python/2.7/test/test_shutil.py lib-python
     '';
 
     installPhase = ''

From 6b495e9251edf626429d143f9fd209884926f44c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 25 Jul 2013 23:50:14 +0200
Subject: [PATCH 373/439] Add nixpkgs-lint

This is a simple tool to scan Nixpkgs for violations of the packaging
guidelines, such as multiple packages with the same name, packages
that lack a description or license, and so on.

To use:

$ nix-env -i nixpkgs-lint
$ cd .../nixpkgs
$ nixpkgs-lint

Current statistics:

Number of packages: 8666
Number of missing maintainers: 3711
Number of missing licenses: 6159
Number of missing descriptions: 1337
Number of bad descriptions: 633
Number of name collisions: 277
---
 maintainers/scripts/nixpkgs-lint.nix |  22 +++++
 maintainers/scripts/nixpkgs-lint.pl  | 115 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |   2 +
 3 files changed, 139 insertions(+)
 create mode 100644 maintainers/scripts/nixpkgs-lint.nix
 create mode 100755 maintainers/scripts/nixpkgs-lint.pl

diff --git a/maintainers/scripts/nixpkgs-lint.nix b/maintainers/scripts/nixpkgs-lint.nix
new file mode 100644
index 000000000000..5eb7649d58da
--- /dev/null
+++ b/maintainers/scripts/nixpkgs-lint.nix
@@ -0,0 +1,22 @@
+{ stdenv, makeWrapper, perl, perlPackages }:
+
+stdenv.mkDerivation {
+  name = "nixpkgs-lint-1";
+
+  buildInputs = [ makeWrapper perl perlPackages.XMLSimple ];
+
+  unpackPhase = "true";
+  buildPhase = "true";
+
+  installPhase =
+    ''
+      mkdir -p $out/bin
+      cp ${./nixpkgs-lint.pl} $out/bin/nixpkgs-lint
+      wrapProgram $out/bin/nixpkgs-lint --set PERL5LIB $PERL5LIB
+    '';
+
+  meta = {
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    description = "A utility for Nixpkgs contributors to check Nixpkgs for common errors";
+  };
+}
diff --git a/maintainers/scripts/nixpkgs-lint.pl b/maintainers/scripts/nixpkgs-lint.pl
new file mode 100755
index 000000000000..0b1519ef15cb
--- /dev/null
+++ b/maintainers/scripts/nixpkgs-lint.pl
@@ -0,0 +1,115 @@
+#! /run/current-system/sw/bin/perl -w
+
+use strict;
+use List::Util qw(min);
+use XML::Simple qw(:strict);
+use Data::Dumper;
+
+my $filter = "*";
+
+my $xml = `nix-env -f . -qa '$filter' --xml --meta --drv-path`;
+
+my $info = XMLin($xml, KeyAttr => { 'item' => '+attrPath', 'meta' => 'name' }, ForceArray => 1, SuppressEmpty => '' ) or die "cannot parse XML output";
+
+#print Dumper($info);
+
+my %pkgsByName;
+
+foreach my $attr (sort keys %{$info->{item}}) {
+    my $pkg = $info->{item}->{$attr};
+    #print STDERR "attr = $attr, name = $pkg->{name}\n";
+    $pkgsByName{$pkg->{name}} //= [];
+    push @{$pkgsByName{$pkg->{name}}}, $pkg;
+}
+
+# Check meta information.
+print "=== Package meta information ===\n\n";
+my $nrMissingMaintainers = 0;
+my $nrMissingDescriptions = 0;
+my $nrBadDescriptions = 0;
+my $nrMissingLicenses = 0;
+
+foreach my $attr (sort keys %{$info->{item}}) {
+    my $pkg = $info->{item}->{$attr};
+
+    my $pkgName = $pkg->{name};
+    $pkgName =~ s/-[0-9].*//;
+
+    # Check the maintainers.
+    my @maintainers;
+    my $x = $pkg->{meta}->{maintainers};
+    if (defined $x && $x->{type} eq "strings") {
+        @maintainers = map { $_->{value} } @{$x->{string}};
+    } elsif (defined $x->{value}) {
+        @maintainers = ($x->{value});
+    }
+
+    if (scalar @maintainers == 0) {
+        print "$attr: Lacks a maintainer\n";
+        $nrMissingMaintainers++;
+    }
+
+    # Check the license.
+    if (!defined $pkg->{meta}->{license}) {
+        print "$attr: Lacks a license\n";
+        $nrMissingLicenses++;
+    }
+
+    # Check the description.
+    my $description = $pkg->{meta}->{description}->{value};
+    if (!$description) {
+        print "$attr: Lacks a description\n";
+        $nrMissingDescriptions++;
+    } else {
+        my $bad = 0;
+        if ($description =~ /^\s/) {
+            print "$attr: Description starts with whitespace\n";
+            $bad = 1;
+        }
+        if ($description =~ /\s$/) {
+            print "$attr: Description ends with whitespace\n";
+            $bad = 1;
+        }
+        if ($description =~ /\.$/) {
+            print "$attr: Description ends with a period\n";
+            $bad = 1;
+        }
+        if (index(lc($description), lc($attr)) != -1) {
+            print "$attr: Description contains package name\n";
+            $bad = 1;
+        }
+        $nrBadDescriptions++ if $bad;
+    }
+}
+print "\n";
+
+# Find packages that have the same name.
+print "=== Package name collisions ===\n\n";
+
+my $nrCollisions = 0;
+foreach my $name (sort keys %pkgsByName) {
+    my @pkgs = @{$pkgsByName{$name}};
+
+    # Filter attributes that are aliases of each other (e.g. yield the
+    # same derivation path).
+    my %drvsSeen;
+    @pkgs = grep { my $x = $drvsSeen{$_->{drvPath}}; $drvsSeen{$_->{drvPath}} = 1; !defined $x } @pkgs;
+
+    # Filter packages that have a lower priority.
+    my $highest = min (map { $_->{priority} // 0 } @pkgs);
+    @pkgs = grep { ($_->{priority} // 0) == $highest } @pkgs;
+
+    next if scalar @pkgs == 1;
+
+    $nrCollisions++;
+    print "The following attributes evaluate to a package named ‘$name’:\n";
+    print "  ", join(", ", map { $_->{attrPath} } @pkgs), "\n\n";
+}
+
+print "=== Bottom line ===\n";
+print "Number of packages: ", scalar(keys %{$info->{item}}), "\n";
+print "Number of missing maintainers: $nrMissingMaintainers\n";
+print "Number of missing licenses: $nrMissingLicenses\n";
+print "Number of missing descriptions: $nrMissingDescriptions\n";
+print "Number of bad descriptions: $nrBadDescriptions\n";
+print "Number of name collisions: $nrCollisions\n";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bffffad649d4..300c4bc23fee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -206,6 +206,8 @@ let
 
   nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { };
 
+  nixpkgs-lint = callPackage ../../maintainers/scripts/nixpkgs-lint.nix { };
+
 
   ### STANDARD ENVIRONMENT
 

From 1d0e666eed79af32ca77999232cac27b0abf7a69 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 25 Jul 2013 17:38:10 +0200
Subject: [PATCH 374/439] python-hetzner: Update to new version 0.5.0.

This introduces the following changes:

 - New subcommand "show" for hetznerctl which shows additional
   information about one or more servers.
 - Allow to get subnets of a specific server through the "subnets"
   attribute.
 - Allow te get IP addresses of a specific server through the "ips"
   attribute.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1cd743e51225..d08eaa23da56 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2148,12 +2148,12 @@ pythonPackages = python.modules // rec {
 
   hetzner = buildPythonPackage rec {
     name = "hetzner-${version}";
-    version = "0.4.1";
+    version = "0.5.0";
 
     src = fetchurl {
       url = "https://github.com/RedMoonStudios/hetzner/archive/"
           + "v${version}.tar.gz";
-      sha256 = "1x48r3n818iyzyb0a5jpcrq1rgdrpj3549kcv76wgpw4f7hi0b76";
+      sha256 = "0i8b2nx4mf87qn4zz7kz321cl1bxlvjdwm7yh8md5hrhqbya4jw5";
     };
 
     # not there yet, but coming soon.

From 311c96ac0fd86762c68c5080dbb833cce2c239fb Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 26 Jul 2013 01:32:31 +0200
Subject: [PATCH 375/439] hetzner-nixops-installer: Remove package.

This package now is in NixOps directly, so we don't need it here
anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../misc/hetzner-nixops-installer/default.nix | 108 ------------------
 pkgs/top-level/all-packages.nix               |   3 -
 2 files changed, 111 deletions(-)
 delete mode 100644 pkgs/tools/misc/hetzner-nixops-installer/default.nix

diff --git a/pkgs/tools/misc/hetzner-nixops-installer/default.nix b/pkgs/tools/misc/hetzner-nixops-installer/default.nix
deleted file mode 100644
index 772f679b9570..000000000000
--- a/pkgs/tools/misc/hetzner-nixops-installer/default.nix
+++ /dev/null
@@ -1,108 +0,0 @@
-{ stdenv, perl, gnutar, pathsFromGraph, nix, pythonPackages }:
-
-let
-  nixpart = pythonPackages.nixpart.override {
-    useNixUdev = false;
-    udevSoMajor = 0;
-  };
-
-  base = stdenv.mkDerivation {
-    name = "hetzner-nixops-base";
-
-    buildCommand = ''
-      ensureDir "$out/bin"
-      ln -s "${nix}"/bin/* "$out/bin/"
-      ln -s "${stdenv.shell}" "$out/bin/sh"
-    '';
-  };
-in stdenv.mkDerivation {
-  name = "hetzner-nixops-installer";
-
-  exportReferencesGraph = [
-    "refs-base" base
-    "refs-nixpart" nixpart
-  ];
-
-  buildCommand = ''
-    ensureDir "usr/bin"
-
-    # Create the chroot wrappers for Nix
-    for path in "${nix}"/bin/*; do
-      base="$(basename "$path")"
-      wrapper="usr/bin/$base"
-      echo "#!/bin/sh" > "$wrapper"
-      echo "chroot /mnt \"$path\" \$@" >> "$wrapper"
-      chmod +x "$wrapper"
-    done
-
-    # Only a symlink that is goint to be put into the Tar file.
-    ln -ns "${nixpart}/bin/nixpart" usr/bin/nixpart
-
-    base_storepaths="$("${perl}/bin/perl" "${pathsFromGraph}" refs-base)"
-    base_registration="$(printRegistration=1 \
-      "${perl}/bin/perl" "${pathsFromGraph}" refs-base)"
-
-    ( # Don't use stdenv.shell here, we're NOT on NixOS!
-      echo "#!/bin/sh"
-      # Do not quote because we want to inline the paths!
-      echo 'mkdir -m 1777 -p "/mnt/nix/store"'
-      echo "cp -a" $base_storepaths "/mnt/nix/store/"
-      echo "chroot /mnt \"${base}/bin/nix-store\" --load-db <<'REGINFO'"
-      echo "$base_registration"
-      echo "REGINFO"
-      echo 'ln -sn "${stdenv.shell}" /mnt/bin/sh'
-    ) > "usr/bin/activate-remote"
-    chmod +x "usr/bin/activate-remote"
-
-    full_storepaths="$("${perl}/bin/perl" "${pathsFromGraph}" refs-*)"
-    stripped_full_storepaths="$(echo "$full_storepaths" | sed 's|/*||')"
-
-    # Reset timestamps to those of 'nix-store' to prevent annoying warnings.
-    find usr -exec touch -h -r "${nix}/bin/nix-store" {} +
-
-    ( echo "#!${stdenv.shell}"
-      echo 'tarfile="$(mktemp)"'
-      echo 'trap "rm -f $tarfile" EXIT'
-      echo "lnum=\"\$(grep -m1 -an '^EXISTING_TAR${"\$"}' \"$out\")\""
-      echo 'tail -n +$((''${lnum%%:*} + 1)) "'"$out"'" > "$tarfile"'
-      # As before, don't quote here!
-      echo '${gnutar}/bin/tar rf "$tarfile" -C /' $stripped_full_storepaths
-      echo 'cat "$tarfile"'
-      echo "exit 0"
-      echo EXISTING_TAR
-      tar c usr
-    ) > "$out"
-    chmod +x "$out"
-  '';
-
-  meta = {
-    description = "Basic Nix bootstrap installer for NixOps";
-    longDescription = ''
-      It works like this:
-
-      Preapare a base image with reference graph, which is to be copied over to
-      the mount point and contains wrappers for the system outside the mount
-      point. Those wrappers basically just chroot into the mountpoint path and
-      execute the corresponding counterparts over there. The base derivation
-      itself only contains everything necessary in order to get a Nix
-      bootstrapped, like Nix itself and a shell linked to /mnt/bin/sh.
-
-      From outside the mountpoint, we just provide a small derivation which
-      contains a partitioner, an activate-remote and a script which is the
-      output of this derivation. In detail:
-
-      $out: Creates a tarball of of the full closure of the base derivation and
-            its reference information, the partitioner and activate-remote. The
-            script outputs the tarball on stdout, so it's easy for NixOps to
-            pipe it to the remote system.
-
-      activate-remote: Copies the base derivation into /mnt and registers it
-                       with the Nix database. Afterwards, it creates the
-                       mentioned chroot wrappers and puts them into /usr/bin
-                       (remember, we're on a non-NixOS system here), together
-                       with the partitioner.
-    '';
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.aszlig ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 300c4bc23fee..49b38074f35d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7749,9 +7749,6 @@ let
 
   hexedit = callPackage ../applications/editors/hexedit { };
 
-  hetznerNixOpsInstaller =
-    callPackage ../tools/misc/hetzner-nixops-installer { };
-
   hipchat = callPackage_i686 ../applications/networking/instant-messengers/hipchat { };
 
   homebank = callPackage ../applications/office/homebank { };

From 120e3fc16794b39482b4d88eaeabbd4d57837a58 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 26 Jul 2013 06:14:07 +0200
Subject: [PATCH 376/439] chromium: Update beta and dev release channels.

Introduces the following new versions:

beta: 29.0.1547.22 -> 29.0.1547.32 (builds fine, tested)
dev:  30.0.1568.0  -> 30.0.1573.2  (builds fine, tested)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/sources.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index 47840ac3ebba..31d9ed10b4cd 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,14 +1,14 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "30.0.1568.0";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1568.0.tar.xz";
-    sha256 = "0c30mbaj98ibyvg855zsqggy3mzhpwkaiw3x37na5hw6qabqizbf";
+    version = "30.0.1573.2";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1573.2.tar.xz";
+    sha256 = "1pbph4jz0svaawk06zajq73x0xm73f9kdiflhad2709f4y23gzjz";
   };
   beta = {
-    version = "29.0.1547.22";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.22.tar.xz";
-    sha256 = "1vaz1abhs0x5frkx3xcgcdpi1n0mmrijfh57kqz54mw7xjlh71vm";
+    version = "29.0.1547.32";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.32.tar.xz";
+    sha256 = "14p5s1xn15mdrlf87hv4y9kczw5r8s461a56kkdzb5xzyq25ph8w";
   };
   stable = {
     version = "28.0.1500.71";

From ac91adf4e36bdfd01cd3a1d24de4b7aa12281987 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 25 Jul 2013 12:02:02 +0200
Subject: [PATCH 377/439] linux-3.10: upgrade to 3.10.3

---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index c0242406075e..dc7d6a1a9d93 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -259,7 +259,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.10.1";
+    version = "3.10.3";
     testing = false;
 
     preConfigure = ''
@@ -268,7 +268,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "1gqrafyzi381pbd4719g853hgi17q79nvzwdja2gk1d9jiq69f6s";
+      sha256 = "195mlc628a9iyz57kibndzylgkz00cffkd982svi2fdfzxpxfm9r";
     };
 
     config = configWithPlatform stdenv.platform;

From ef16799c9c54889d60774d4b811a95cdb6e821e7 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 26 Jul 2013 11:03:25 +0200
Subject: [PATCH 378/439] pypy: try to fix remaining 4 tests

---
 pkgs/development/interpreters/pypy/2.0/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix
index 7522020582c2..614d3fdb378f 100644
--- a/pkgs/development/interpreters/pypy/2.0/default.nix
+++ b/pkgs/development/interpreters/pypy/2.0/default.nix
@@ -45,12 +45,15 @@ let
         --replace "libraries = ['curses']" "libraries = ['ncurses']"
     '';
 
-    TERMINFO = "${ncurses}/share/terminfo/";
 
     doCheck = true;
     checkPhase = ''
-       export HOME="$TMPDIR"
-      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c --ignore lib-python/2.7/test/test_shutil.py lib-python
+       export TERMINFO = "${ncurses}/share/terminfo/";
+       export TERM = "xterm";
+       export HOME = "$TMPDIR"
+       # disable shutils because it assumes gid 0 exists
+       # disable socket because it has two actual network tests that fail
+      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c --ignore lib-python/2.7/test/test_shutil.py --ignore lib-python/2.7/test_socket.py lib-python
     '';
 
     installPhase = ''

From f6a60d664037278a629fdbc8912f037be2a20c8f Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 26 Jul 2013 13:18:08 +0200
Subject: [PATCH 379/439] calibre: upgrade to 0.9.11 (fixes #777)

---
 pkgs/applications/misc/calibre/default.nix | 24 +++++++++++-----------
 pkgs/top-level/python-packages.nix         | 15 ++++++++++++++
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 23b5092cd4d8..01060909f3de 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite
-, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, udisks, libusb1, libmtp
+, imagemagick, libjpeg, fontconfig, podofo, qt48, icu, sqlite
+, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-0.8.70";
-  # 0.9.* versions won't build: https://bugs.launchpad.net/calibre/+bug/1094719
+  name = "calibre-0.9.11";
+  # 0.9.12+ versions won't build due to missing qt4 private headers: https://bugs.launchpad.net/calibre/+bug/1094719
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "12avwp8r6cnrw6c32gmd2hksa9rszdb76zs6fcmr3n8r1wkwa71g";
+    sha256 = "0jjs2cx222pbv4nrivlxag5fxa0v9m63x7arcll6xi173zdn4gg8";
   };
 
   inherit python;
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg
-      fontconfig podofo qt4 pil chmlib icu
+      fontconfig podofo qt48 pil chmlib icu
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
-      pythonPackages.cssutils pythonPackages.beautifulsoup
-      pythonPackages.sqlite3 sqlite udisks libusb1 libmtp
+      pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
+      pythonPackages.sqlite3 pythonPackages.netifaces sqlite libusb1 libmtp
     ];
 
   installPhase = ''
@@ -46,11 +46,11 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Comprehensive e-book software";
     homepage = http://calibre-ebook.com;
-    license = "GPLv3";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ viric iElectric ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d08eaa23da56..0ca03b1082c0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2908,6 +2908,21 @@ pythonPackages = python.modules // rec {
     };
   };
 
+  netifaces = buildPythonPackage rec {
+    version = "0.8";
+    name = "netifaces-${version}";
+
+    src = fetchurl {
+      url = "http://alastairs-place.net/projects/netifaces/${name}.tar.gz";
+      sha256 = "1v5i39kx4yz1pwgjfbzi63w55l2z318zgmi9f77ybmmkil1i39sk";
+    };
+
+    meta = {
+      homepage = http://alastairs-place.net/projects/netifaces/;
+      description = "Portable access to network interfaces from Python";
+    };
+  };
+
   netlib = buildPythonPackage rec {
     baseName = "netlib";
     name = "${baseName}-${meta.version}";

From dbdde8b23184a77795d672380966ac8c95a028e1 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 26 Jul 2013 14:36:53 +0200
Subject: [PATCH 380/439] pypy: currectly use bash

---
 pkgs/development/interpreters/pypy/2.0/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix
index 614d3fdb378f..07082cf012b1 100644
--- a/pkgs/development/interpreters/pypy/2.0/default.nix
+++ b/pkgs/development/interpreters/pypy/2.0/default.nix
@@ -48,9 +48,9 @@ let
 
     doCheck = true;
     checkPhase = ''
-       export TERMINFO = "${ncurses}/share/terminfo/";
-       export TERM = "xterm";
-       export HOME = "$TMPDIR"
+       export TERMINFO="${ncurses}/share/terminfo/";
+       export TERM="xterm";
+       export HOME="$TMPDIR";
        # disable shutils because it assumes gid 0 exists
        # disable socket because it has two actual network tests that fail
       ./pypy-c ./pypy/test_all.py --pypy=./pypy-c --ignore lib-python/2.7/test/test_shutil.py --ignore lib-python/2.7/test_socket.py lib-python

From 60761e94b8ec58a096321776012f054badd45bcb Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Fri, 26 Jul 2013 17:03:18 +0400
Subject: [PATCH 381/439] urxvt: Enable Gdk_pixbuf to be able to set custom
 icons/images

---
 pkgs/applications/misc/rxvt_unicode/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix                 | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index d52fd178165e..2afa6c086961 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl,
-  fontconfig, freetype, pkgconfig, libXrender }:
+  fontconfig, freetype, pkgconfig, libXrender, gdkPixbufSupport, gdk_pixbuf }:
 
 let 
   name = "rxvt-unicode";
@@ -19,7 +19,8 @@ stdenv.mkDerivation (rec {
   buildInputs =
     [ libX11 libXt libXft ncurses /* required to build the terminfo file */ 
       fontconfig freetype pkgconfig libXrender ]
-    ++ stdenv.lib.optional perlSupport perl;
+    ++ stdenv.lib.optional perlSupport perl
+    ++ stdenv.lib.optional gdkPixbufSupport gdk_pixbuf;
 
   preConfigure =
     ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f942843eef04..26d8be488622 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8289,6 +8289,7 @@ let
   # = urxvt
   rxvt_unicode = callPackage ../applications/misc/rxvt_unicode {
     perlSupport = true;
+    gdkPixbufSupport = true;
   };
 
   sakura = callPackage ../applications/misc/sakura {

From ef540f3df78bd0b77dc489264ba95cea4884b715 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 26 Jul 2013 19:05:21 +0200
Subject: [PATCH 382/439] properly use & when ignoring tests

---
 pkgs/development/interpreters/pypy/2.0/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix
index 07082cf012b1..11e262f17164 100644
--- a/pkgs/development/interpreters/pypy/2.0/default.nix
+++ b/pkgs/development/interpreters/pypy/2.0/default.nix
@@ -53,7 +53,7 @@ let
        export HOME="$TMPDIR";
        # disable shutils because it assumes gid 0 exists
        # disable socket because it has two actual network tests that fail
-      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c --ignore lib-python/2.7/test/test_shutil.py --ignore lib-python/2.7/test_socket.py lib-python
+      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_socket -test_shutil' lib-python
     '';
 
     installPhase = ''

From 49335abfd25b688ede92ca676a76dee1be741781 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 25 Jul 2013 10:29:22 +0200
Subject: [PATCH 383/439] haskell-git-annex: update to version 4.20130723

---
 .../version-management/git-and-tools/git-annex/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 78c33a24d345..e53f60c9be0f 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -14,8 +14,8 @@
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "4.20130709";
-  sha256 = "1xsv5wi0sipp71p7yw90cwd4spm4sr0kcqj47zyd19mgdyd80p9i";
+  version = "4.20130723";
+  sha256 = "1fc8kz4n2g4x9fzvdx4bz4d8gkbajdnqphldcglwl23g97vyrn6i";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 88cb67fc889ef7b57fdd09b68b0962a3f26f61a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 25 Jul 2013 10:29:22 +0200
Subject: [PATCH 384/439] haskell-dns: update to version 0.3.7

---
 pkgs/development/libraries/haskell/dns/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix
index 0854f39efcef..e6c18872ed3d 100644
--- a/pkgs/development/libraries/haskell/dns/default.nix
+++ b/pkgs/development/libraries/haskell/dns/default.nix
@@ -1,15 +1,19 @@
 { cabal, attoparsec, attoparsecConduit, binary, blazeBuilder
-, conduit, iproute, mtl, network, networkConduit, random
+, conduit, hspec, iproute, mtl, network, networkConduit, random
 }:
 
 cabal.mkDerivation (self: {
   pname = "dns";
-  version = "0.3.6";
-  sha256 = "0dpwy94id9rxxjpji47nazinm8i1ihm0606dmi5iqqhbl5h2jara";
+  version = "0.3.7";
+  sha256 = "1wly3h36j9gjyx6p2vzand5019m6rs0qkcf1h4q61igks65xs674";
   buildDepends = [
     attoparsec attoparsecConduit binary blazeBuilder conduit iproute
     mtl network networkConduit random
   ];
+  testDepends = [
+    attoparsec attoparsecConduit binary blazeBuilder conduit hspec
+    iproute mtl network networkConduit random
+  ];
   meta = {
     description = "DNS library in Haskell";
     license = self.stdenv.lib.licenses.bsd3;

From 93b8532f17df91f1e348ca7aac2bf89b6e5a40fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 25 Jul 2013 10:29:22 +0200
Subject: [PATCH 385/439] haskell-hinotify: update to version 0.3.6

---
 pkgs/development/libraries/haskell/hinotify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hinotify/default.nix b/pkgs/development/libraries/haskell/hinotify/default.nix
index de1c0e127597..bd706339c029 100644
--- a/pkgs/development/libraries/haskell/hinotify/default.nix
+++ b/pkgs/development/libraries/haskell/hinotify/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hinotify";
-  version = "0.3.5";
-  sha256 = "00pzvqw2w3gbz8j4hiz8zxm7rki07g1iamjlbazz3kmpwcgjxi0l";
+  version = "0.3.6";
+  sha256 = "0vzn9z90z9zk7g9pvbrgm6xyb4b5x2dai1c70fvmdi3w4h2x17zw";
   meta = {
     homepage = "https://github.com/kolmodin/hinotify.git";
     description = "Haskell binding to inotify";

From 37e428f2293b116b8df55d9926145669c264d88f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 25 Jul 2013 10:29:22 +0200
Subject: [PATCH 386/439] haskell-splot: update to version 0.3.9

---
 pkgs/development/tools/haskell/splot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix
index 4bd47b8decd4..f1b15a731d54 100644
--- a/pkgs/development/tools/haskell/splot/default.nix
+++ b/pkgs/development/tools/haskell/splot/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "splot";
-  version = "0.3.8";
-  sha256 = "188v9c070wn6gr47k5q55gsiph0lj96d96bss76gz7znknfj9rm3";
+  version = "0.3.9";
+  sha256 = "039k6lgwdvpyc8w74zh98wxi1wj2jmin69jnwp7gnmv43kjpbgh5";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From b04d577dcb8bb8276ab43f85adf0ad7303387a1b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 26 Jul 2013 10:28:03 +0200
Subject: [PATCH 387/439] haskell-language-java: update to version 0.2.5

---
 .../development/libraries/haskell/language-java/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-java/default.nix b/pkgs/development/libraries/haskell/language-java/default.nix
index 5464826788bd..bf5cef0ddfd5 100644
--- a/pkgs/development/libraries/haskell/language-java/default.nix
+++ b/pkgs/development/libraries/haskell/language-java/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-java";
-  version = "0.2.4";
-  sha256 = "1fb36xq75mzmbsh25s0pscazvz6nvfy2mn1270653m7s3gdgcs5f";
+  version = "0.2.5";
+  sha256 = "1l3q156m3l3fawsrgj3fr16qxr0apwg2si410j0f5hsgfmkhdrm6";
   buildDepends = [ cpphs parsec syb ];
   testDepends = [
     filepath HUnit mtl QuickCheck testFramework testFrameworkHunit
@@ -14,7 +14,7 @@ cabal.mkDerivation (self: {
   buildTools = [ alex ];
   doCheck = false;
   meta = {
-    homepage = "http://github.com/vincenthz/language-java";
+    homepage = "http://github.com/jkoppel/language-java";
     description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From 9d7cb9b593431e0f9abc440fd15fcf9823cbadb8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 26 Jul 2013 10:28:04 +0200
Subject: [PATCH 388/439] haskell-unix-process-conduit: update to version
 0.2.1.1

---
 .../libraries/haskell/unix-process-conduit/default.nix    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
index 6ee4304ac174..d12167ac4280 100644
--- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
@@ -1,10 +1,10 @@
-{ cabal, conduit, hspec, transformers }:
+{ cabal, conduit, filepath, hspec, stm, time, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "unix-process-conduit";
-  version = "0.2.0.2";
-  sha256 = "1n9ja7dlxhsxyglfzk397xdgvdny766y1isrb5d065srxprsj2g6";
-  buildDepends = [ conduit transformers ];
+  version = "0.2.1.1";
+  sha256 = "038z99gzwqhig65zzb3hc9zisnvzslvvy86wjgx6wz90p6vbxzn4";
+  buildDepends = [ conduit filepath stm time transformers ];
   testDepends = [ conduit hspec transformers ];
   meta = {
     homepage = "https://github.com/snoyberg/conduit";

From 5ff9c0c06720fde744e44219e5633213919d383e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 26 Jul 2013 10:35:30 +0200
Subject: [PATCH 389/439] haskell-dns: disable the test suite to fix the build

The test suite assumes that it can read /etc/resolv.conf.
---
 pkgs/development/libraries/haskell/dns/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix
index e6c18872ed3d..e4756eeb2dd9 100644
--- a/pkgs/development/libraries/haskell/dns/default.nix
+++ b/pkgs/development/libraries/haskell/dns/default.nix
@@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
     attoparsec attoparsecConduit binary blazeBuilder conduit hspec
     iproute mtl network networkConduit random
   ];
+  doCheck = false;
   meta = {
     description = "DNS library in Haskell";
     license = self.stdenv.lib.licenses.bsd3;

From b9d933ba24f9ced5e163f72060cbc79cecfbc711 Mon Sep 17 00:00:00 2001
From: kikic <luka@informeri.com>
Date: Mon, 10 Jun 2013 13:52:45 +0200
Subject: [PATCH 390/439] Added nose-cprof for profiling

---
 pkgs/top-level/python-packages.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0ca03b1082c0..188116eb52b7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3040,6 +3040,22 @@ pythonPackages = python.modules // rec {
     buildInputs = [ nose ];
   };
 
+  nose-cprof = buildPythonPackage rec {
+    name = "nose-cprof-0.1-0";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/n/nose-cprof/${name}.tar.gz";
+      md5 = "5db27c3b8f01915335ae6fc5fd3afd44";
+    };
+
+    meta = {
+      description = "A python nose plugin to profile using cProfile rather than the default Hotshot profiler.";
+    };
+
+    buildInputs = [ nose ];
+  };
+
+
   notify = pkgs.stdenv.mkDerivation (rec {
     name = "python-notify-0.1.1";
 

From 8e3fa9f56a522f95b20a558a09a8866e0717a4b9 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Fri, 26 Jul 2013 20:35:20 +0200
Subject: [PATCH 391/439] waitress test fail for me

---
 pkgs/top-level/python-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 188116eb52b7..d974ff902dc3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5414,6 +5414,8 @@ pythonPackages = python.modules // rec {
       md5 = "7a3094d812c0dffb948d1334ef5fd56f";
     };
 
+    doCheck = false;
+
     meta = {
        maintainers = [
          stdenv.lib.maintainers.garbas

From 0f98ddf8fd805616f0e6a4f777c9bd2aacb7abb8 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 26 Jul 2013 23:09:50 +0200
Subject: [PATCH 392/439] Revert "networkmanager: we dont need networkmanager
 group anymore, just use at_console policy"

This reverts commit 52fe6943603ee39e41a0af9b7ff85c50953a87a6.
---
 pkgs/tools/networking/network-manager/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index ce372d495b6b..af35e3f71da2 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -56,6 +56,9 @@ stdenv.mkDerivation rec {
   postInstall =
     ''
       mkdir -p $out/lib/NetworkManager
+      
+      # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy
+      substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"'
     '';
 
   meta = with stdenv.lib; {

From 51a6bee01233102ea49fefce51be876cc448e8c4 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 26 Jul 2013 23:12:05 +0200
Subject: [PATCH 393/439] pypy: multiprocessing tests are failing, try with
 internal module

---
 pkgs/development/interpreters/pypy/2.0/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix
index 11e262f17164..969746d3a34e 100644
--- a/pkgs/development/interpreters/pypy/2.0/default.nix
+++ b/pkgs/development/interpreters/pypy/2.0/default.nix
@@ -29,7 +29,7 @@ let
     preConfigure = ''
       substituteInPlace Makefile \
         --replace "-Ojit" "-Ojit --batch" \
-        --replace "pypy/goal/targetpypystandalone.py" "pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2"
+        --replace "pypy/goal/targetpypystandalone.py" "pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2 --withmod-_multiprocessing"
 
       # we are using cpython and not pypy to do translation
       substituteInPlace rpython/bin/rpython \

From 082ea1414802a5f0434e3c4e3faa805319d68d69 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 27 Jul 2013 01:02:57 +0200
Subject: [PATCH 394/439] virtualenv: upgrade to 1.10

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d974ff902dc3..617401189836 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5366,10 +5366,10 @@ pythonPackages = python.modules // rec {
   });
 
   virtualenv = buildPythonPackage rec {
-    name = "virtualenv-1.9.1";
+    name = "virtualenv-1.10";
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz";
-      md5 = "07e09df0adfca0b2d487e39a4bf2270a";
+      md5 = "9745c28256c70c76d36adb3767a00212";
     };
 
     patches = [ ../development/python-modules/virtualenv-change-prefix.patch ];

From 828b1de8f48b1bc9371c2bf787e0d333ccbee922 Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Sat, 27 Jul 2013 10:21:14 +0200
Subject: [PATCH 395/439] Add jailbreak to  Elm server

---
 pkgs/development/compilers/elm/elm-server.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix
index 1750213ac8af..bce0e933732f 100644
--- a/pkgs/development/compilers/elm/elm-server.nix
+++ b/pkgs/development/compilers/elm/elm-server.nix
@@ -3,6 +3,7 @@
 }:
 
 cabal.mkDerivation (self: {
+  jailbreak = true;
   pname = "elm-server";
   version = "0.8";
   sha256 = "0mnxayfg54f5mr27sd1zw3xrdijppgvrz2yzzmhp07qc1jiyfald";

From 30e9f13d81885289d4f492b9dc92c53d4b023956 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 27 Jul 2013 11:05:59 +0200
Subject: [PATCH 396/439] smartmontools: update to version 6.2

---
 pkgs/tools/system/smartmontools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index b901bd3b78e7..be34fc52c7aa 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -8,15 +8,15 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "smartmontools-6.1";
+  name = "smartmontools-6.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
-    sha256 = "01yfv6hqsqandg6x8mnwa4g42hhqvc7dfxnfb3v849n8rj5kn059";
+    sha256 = "0nq6jvfh8nqwfrvp6fb6qs2rdydi3i9xgpi7p7vb83xvg42ncvs8";
   };
 
   patchPhase = ''
-    cp ${driverdb} drivedb.h
+    : cp ${driverdb} drivedb.h
     sed -i -e 's@which which >/dev/null || exit 1@alias which="type -p"@' update-smart-drivedb.in
   '';
 

From 595937318ff72dda48ea58ec68a8d426542ba9fc Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 27 Jul 2013 12:06:45 +0200
Subject: [PATCH 397/439] update release-python.nix from python branch

---
 pkgs/top-level/release-python.nix | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 2ed725e68ce2..e09c3a76ddcd 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -1,13 +1,15 @@
 /*
-  This file will be evaluated by hydra with a call like this:
-  hydra_eval_jobs --gc-roots-dir \
-    /nix/var/nix/gcroots/per-user/hydra/hydra-roots --argstr \
-    system i686-linux --argstr system x86_64-linux --arg \
-    nixpkgs "{outPath = ./}" .... release.nix
-
-  Hydra can be installed with "nix-env -i hydra".
+   test for example like this
+   $ nix-build pkgs/top-level/release-python.nix
 */
-with (import ./release-lib.nix);
+
+{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
+, officialRelease ? false
+, # The platforms for which we build Nixpkgs.
+  supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ]
+}:
+
+with import ./release-lib.nix {inherit supportedSystems; };
 
 let
   jobsForDerivations = attrset: pkgs.lib.attrsets.listToAttrs
@@ -19,12 +21,13 @@ let
           (n: v: (v.type or null) == "derivation")
           attrset)));
 
-in
-{
 
-  tarball = import ./make-tarball.nix;
+  jobs =
+    {
 
-} // (mapTestOn rec {
+   # } // (mapTestOn ((packagesWithMetaPlatform pkgs) // rec {
+
+    } // (mapTestOn rec {
 
   a2jmidid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   aacskeys = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@@ -1992,4 +1995,6 @@ in
   zsnes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   zynaddsubfx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   zziplib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-})
+});
+
+in jobs

From 5a0710b36ba7194d28e266c8aa184d7adf465bda Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 27 Jul 2013 17:43:17 +0200
Subject: [PATCH 398/439] pavucontrol 2.0

---
 pkgs/applications/audio/pavucontrol/default.nix | 14 +++++++-------
 pkgs/top-level/all-packages.nix                 |  5 ++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index a73744ebbe85..9e0b50b5c0dc 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -1,18 +1,18 @@
-{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm, libsigcxx
-, libglademm, libcanberra, intltool, gettext }:
+{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm3
+, libcanberra_gtk3, intltool, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "pavucontrol-1.0";
+  name = "pavucontrol-2.0";
 
   src = fetchurl {
     url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz";
-    sha256 = "1plcyrc7p6gqxjhxx2xh6162bkb29wixjrqrjnl9b8g3nrjjigix";
+    sha256 = "02s775m1531sshwlbvfddk3pz8zjmwkv1sgzggn386ja3gc9vwi2";
   };
 
-  buildInputs = [ pkgconfig pulseaudio gtkmm libsigcxx libglademm libcanberra
+  buildInputs = [ pkgconfig pulseaudio gtkmm3 libcanberra_gtk3
     intltool gettext ];
 
-  configureFlags = "--disable-lynx --disable-gtk3";
+  configureFlags = "--disable-lynx";
 
   meta = {
     description = "PulseAudio Volume Control";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       easily control the volume of all clients, sinks, etc.
     '';
 
-    homepage = http://0pointer.de/lennart/projects/pavucontrol/;
+    homepage = http://freedesktop.org/software/pulseaudio/pavucontrol/ ;
 
     license = "GPLv2+";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 760a84c48a29..eff36f43d6be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4433,6 +4433,7 @@ let
   libcaca = callPackage ../development/libraries/libcaca { };
 
   libcanberra = callPackage ../development/libraries/libcanberra { };
+  libcanberra_gtk3 = libcanberra.override { gtk = gtk3; };
   libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true)
     then libcanberra.override { gtk = null; }
     else libcanberra;
@@ -8192,9 +8193,7 @@ let
 
   panotools = callPackage ../applications/graphics/panotools { };
 
-  pavucontrol = callPackage ../applications/audio/pavucontrol {
-    inherit (gnome) libglademm;
-  };
+  pavucontrol = callPackage ../applications/audio/pavucontrol { };
 
   paraview = callPackage ../applications/graphics/paraview { };
 

From 93cdc526c3201135f46097d166563b610e1d2fad Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 27 Jul 2013 13:23:35 -0400
Subject: [PATCH 399/439] buildNodePackages: Move /node_modules to
 /lib/node_modules to make nix profiles usable as an npm prefix

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../web/nodejs/build-node-package.nix         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index 415f2209597c..27e114ee40bc 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation ({
     runHook preConfigure
     mkdir node_modules
     ${stdenv.lib.concatStrings (map (dep: ''
-      ln -sv ${dep}/node_modules/${(builtins.parseDrvName dep.name).name} node_modules/
+      ln -sv ${dep}/lib/node_modules/${(builtins.parseDrvName dep.name).name} node_modules/
     '') deps)}
     export HOME=$(pwd)
     runHook postConfigure
@@ -35,25 +35,25 @@ stdenv.mkDerivation ({
 
   installPhase = ''
     runHook preInstall
-    mkdir -p $out/node_modules
-    mv node_modules/${requireName} $out/node_modules
-    mv node_modules/.bin $out/node_modules 2>/dev/null || true
-    rm -fR $out/node_modules/${requireName}/node_modules
-    mv node_modules $out/node_modules/${requireName}
-    if [ -d "$out/node_modules/.bin" ]; then
+    mkdir -p $out/lib/node_modules
+    mv node_modules/${requireName} $out/lib/node_modules
+    mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true
+    rm -fR $out/lib/node_modules/${requireName}/node_modules
+    mv node_modules $out/lib/node_modules/${requireName}
+    if [ -d "$out/lib/node_modules/.bin" ]; then
       ln -sv node_modules/.bin $out/bin
       node=`type -p node`
       coffee=`type -p coffee || true`
-      find -L $out/node_modules/.bin/* -type f -print0 | \
+      find -L $out/lib/node_modules/.bin/* -type f -print0 | \
         xargs -0 sed --follow-symlinks -i \
           -e 's@#!/usr/bin/env node@#!'"$node"'@' \
           -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \
           -e 's@#!/.*/node@#!'"$node"'@' \
           -e 's@#!/.*/coffee@#!'"$coffee"'@'
     fi
-    if [ -e "$out/node_modules/${requireName}/man" ]; then
+    if [ -e "$out/lib/node_modules/${requireName}/man" ]; then
       mkdir $out/share
-      ln -sv node_modules/${requireName}/man $out/share/man
+      ln -sv $out/lib/node_modules/${requireName}/man $out/share/man
     fi
     runHook postInstall
   '';

From 2762b0667dfd0fe7cb5828b9246094ed9815e80a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 27 Jul 2013 13:33:18 -0400
Subject: [PATCH 400/439] node-packages.nix: Actually use nativeDeps

Wonder how long that's been broken...

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/node-packages.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index 206dd1c87ce8..5719967c4c5c 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -5,6 +5,15 @@ let
 
   importGeneratedPackages = generated: nativeDeps: self:
     let
+      nativeDepsList = { name, spec, ... }:
+        let
+          nameOr = if builtins.hasAttr name nativeDeps
+            then builtins.getAttr name nativeDeps
+            else {};
+          depsOr = if builtins.hasAttr spec nameOr
+            then builtins.getAttr spec nameOr
+            else [];
+        in depsOr;
       all = pkgs.lib.fold (pkg: { top-level, full }: {
         top-level = top-level ++ pkgs.lib.optional pkg.topLevel {
           name = pkg.name;
@@ -25,6 +34,7 @@ let
                 sha256 = pkg.sha256 or "";
               };
               deps = map (dep: builtins.getAttr dep.spec (builtins.getAttr dep.name self.full)) pkg.dependencies;
+              buildInputs = nativeDepsList pkg;
             };
           } ];
         } ];
@@ -34,8 +44,8 @@ in {
   inherit importGeneratedPackages;
 
   nativeDeps = {
-    "node-expat-*" = [ pkgs.expat ];
-    "rbytes-0.0.2" = [ pkgs.openssl ];
+    "node-expat"."*" = [ pkgs.expat ];
+    "rbytes"."0.0.2" = [ pkgs.openssl ];
   };
 
   buildNodePackage = import ../development/web/nodejs/build-node-package.nix {

From b43d1c014ae676af24c045495baff960af926cc4 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 14 Jul 2013 07:30:18 +1000
Subject: [PATCH 401/439] sdcv: fix build on darwin (close #744)

* add -lintl flag to NIX_CFLAGS_COMPILE
---
 pkgs/applications/misc/sdcv/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix
index 8ac4730de9a7..3859d2c82abd 100644
--- a/pkgs/applications/misc/sdcv/default.nix
+++ b/pkgs/applications/misc/sdcv/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
     sed -i 's/guint32 page_size/size_t page_size/' src/lib/lib.cpp
   '';
 
-  NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__";
+  NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"
+    + stdenv.lib.optionalString stdenv.isDarwin " -lintl";
 }
 

From 75dedeb8bdaae815bb85fb155655e7372cee9b68 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 14 Jul 2013 11:52:30 +1000
Subject: [PATCH 402/439] gtk2: fix build on darwin (close #749)

* add xlibs.libXi to build inputs
---
 pkgs/development/libraries/gtk+/2.x.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 8c6e76726af5..6debf2a807b3 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"
     + stdenv.lib.optionalString (libintlOrEmpty != []) " -lintl";
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin xlibs.libXi;
+
   nativeBuildInputs = [ perl pkgconfig gettext ];
 
   propagatedBuildInputs = with xlibs; with stdenv.lib;

From 1fa3afeb9118200c8007b6bb06896cedfe6dce47 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Fri, 26 Jul 2013 18:15:22 +0400
Subject: [PATCH 403/439] wmctrl: command-line window-manipulation tool

---
 pkgs/tools/X11/wmctrl/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/X11/wmctrl/default.nix

diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix
new file mode 100644
index 000000000000..901eab0d1a64
--- /dev/null
+++ b/pkgs/tools/X11/wmctrl/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, libX11, glib, pkgconfig, libXmu }:
+
+stdenv.mkDerivation rec {
+  
+  name = "wmctrl-1.07";
+ 
+  src = fetchurl {
+    url = "http://tomas.styblo.name/wmctrl/dist/${name}.tar.gz";
+    sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np";
+  };
+ 
+  buildInputs = [ libX11 libXmu glib pkgconfig ];
+
+  meta = {
+    homepage = http://tomas.styblo.name/wmctrl/;
+    description = "wmctrl is a UNIX/Linux command line tool to interact with an EWMH/NetWM compatible X Window Manager";
+    license = "GPL";
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 760a84c48a29..5a1f97a6953f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8648,6 +8648,8 @@ let
 
   wmname = callPackage ../applications/misc/wmname { };
 
+  wmctrl = callPackage ../tools/X11/wmctrl { };
+
   # I'm keen on wmiimenu only  >wmii-3.5 no longer has it...
   wmiimenu = import ../applications/window-managers/wmii31 {
     libixp = libixp_for_wmii;

From 5b4e0207ba57e100c3cbd78b8ffe2884a1ff3097 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Sat, 27 Jul 2013 00:48:07 +0400
Subject: [PATCH 404/439] wmctrl: add command-line window-manipulation tool
 (close #781)

---
 pkgs/tools/X11/wmctrl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix
index 901eab0d1a64..f4705bdb0d41 100644
--- a/pkgs/tools/X11/wmctrl/default.nix
+++ b/pkgs/tools/X11/wmctrl/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://tomas.styblo.name/wmctrl/;
     description = "wmctrl is a UNIX/Linux command line tool to interact with an EWMH/NetWM compatible X Window Manager";
-    license = "GPL";
+    license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; all;
   };
 }

From b4105cfaff70e88058c179b0f9cac87af6e034fe Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 14 Jul 2013 11:47:14 +1000
Subject: [PATCH 405/439] php53: fix build on darwin (close #748)

* add empty unix.h header
* build with kerberos
* ensure the binary has no extension
---
 pkgs/development/interpreters/php-xdebug/default.nix |  3 +++
 pkgs/development/interpreters/php/5.3.nix            | 10 ++++++++--
 pkgs/tools/networking/uwimap/default.nix             | 10 ++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/php-xdebug/default.nix b/pkgs/development/interpreters/php-xdebug/default.nix
index fe7bbb869da8..99c5ad663af4 100644
--- a/pkgs/development/interpreters/php-xdebug/default.nix
+++ b/pkgs/development/interpreters/php-xdebug/default.nix
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     phpize
     ./configure --prefix=$out
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    # looks for this file for some reason -- isn't needed
+    touch unix.h
   '';
 
   buildPhase = ''
diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index a84927a20f3d..caa673b31a92 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -134,8 +134,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
       };
 
       imap = {
-        configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ];
-        buildInputs = [ uwimap openssl pam ];
+        configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ]
+          # uwimap builds with kerberos on darwin
+          ++ stdenv.lib.optional (stdenv.isDarwin) "--with-kerberos";
+        buildInputs = [ uwimap openssl ]
+          ++ stdenv.lib.optional (!stdenv.isDarwin) pam;
       };
 
       intl = {
@@ -205,6 +208,9 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
     ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
     echo configurePhase end
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    # don't build php.dSYM as the php binary
+    sed -i 's/EXEEXT = \.dSYM/EXEEXT =/' Makefile
   '';
 
   installPhase = ''
diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix
index 5ffeb53dd29e..54390d4f9eee 100644
--- a/pkgs/tools/networking/uwimap/default.nix
+++ b/pkgs/tools/networking/uwimap/default.nix
@@ -8,17 +8,23 @@ stdenv.mkDerivation {
     sha256 = "0a2a00hbakh0640r2wdpnwr8789z59wnk7rfsihh3j0vbhmmmqak";
   };
 
-  makeFlags = "lnp" # Linux with PAM modules
+  makeFlags = if stdenv.isDarwin
+    then "osx"
+    else "lnp" # Linux with PAM modules;
     # -fPIC is required to compile php with imap on x86_64 systems
     + stdenv.lib.optionalString stdenv.isx86_64 " EXTRACFLAGS=-fPIC";
 
-  buildInputs = [ pam openssl ];
+  buildInputs = [ openssl ]
+    ++ stdenv.lib.optional (!stdenv.isDarwin) pam;
 
   patchPhase = ''
     sed -i -e s,/usr/local/ssl,${openssl}, \
       src/osdep/unix/Makefile
   '';
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
+    "-I${openssl}/include/openssl";
+
   installPhase = ''
     mkdir -p $out/bin $out/lib $out/include
     cp c-client/*.h c-client/linkage.c $out/include

From a0fbee619dbd220a65bbfd381dffa4b9354c65bd Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 28 Jul 2013 11:12:13 +0200
Subject: [PATCH 406/439] Jinja2: 2.6 -> 2.7, rename MarkupSafe to markupsafe

---
 pkgs/top-level/python-packages.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 617401189836..1c439c93223e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2295,14 +2295,16 @@ pythonPackages = python.modules // rec {
     };
   });
 
-  jinja2 = buildPythonPackage {
-    name = "jinja2-2.6";
+  jinja2 = buildPythonPackage rec {
+    name = "Jinja2-2.7";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.6.tar.gz";
-      md5 = "1c49a8825c993bfdcf55bb36897d28a2";
+      url = "http://pypi.python.org/packages/source/J/Jinja2/${name}.tar.gz";
+      sha256 = "0kgsd7h27jl2jpqa1ks88h93z50bsg0yr7qkicqpxbl9s4c1aks7";
     };
 
+    propagatedBuildInputs = [ pythonPackages.markupsafe ];
+
     meta = {
       homepage = http://jinja.pocoo.org/;
       description = "Stand-alone template engine";
@@ -2517,8 +2519,8 @@ pythonPackages = python.modules // rec {
       md5 = "daf7cc50f997533b573f9b40193139a2";
     };
 
-    buildInputs = [ MarkupSafe nose ];
-    propagatedBuildInputs = [ MarkupSafe ];
+    buildInputs = [ markupsafe nose ];
+    propagatedBuildInputs = [ markupsafe ];
 
     meta = {
       description = "Super-fast templating language.";
@@ -2529,8 +2531,8 @@ pythonPackages = python.modules // rec {
   };
 
 
-  MarkupSafe = buildPythonPackage rec {
-    name = "MarkupSafe-0.15";
+  markupsafe = buildPythonPackage rec {
+    name = "markupsafe-0.15";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/M/MarkupSafe/${name}.tar.gz";
@@ -6367,7 +6369,7 @@ pythonPackages = python.modules // rec {
       md5 = "32749ffadfc40fea51075a7def32588b";
     };
 
-    buildInputs = [ routes MarkupSafe webob nose ];
+    buildInputs = [ routes markupsafe webob nose ];
 
     # TODO: failing tests https://bitbucket.org/bbangert/webhelpers/pull-request/1/fix-error-on-webob-123/diff
     doCheck = false;

From f34a79ad358315f90778c304a379c4df4651487a Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 28 Jul 2013 11:31:41 +0200
Subject: [PATCH 407/439] nose: 1.2.1 -> 1.3.0

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1c439c93223e..13fddeb8655f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2991,11 +2991,11 @@ pythonPackages = python.modules // rec {
   });
 
   nose = buildPythonPackage rec {
-    name = "nose-1.2.1";
+    name = "nose-1.3.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz";
-      md5 = "735e3f1ce8b07e70ee1b742a8a53585a";
+      sha256 = "0q2j9zz39h3liwbp6lb94kl3sxb9z9rbwh5dzyccyxfy4lrwqqsf";
     };
 
     meta = {

From 3ee369ce5ad14d7e830da0ebd6d370084401f9c8 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 28 Jul 2013 12:30:11 +0200
Subject: [PATCH 408/439] sqlalchemy: 0.7.9 -> 0.7.10, apply patch to fix tests

---
 pkgs/top-level/python-packages.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 13fddeb8655f..048ddee396ed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5002,14 +5002,21 @@ pythonPackages = python.modules // rec {
   });
 
 
-  sqlalchemy = buildPythonPackage {
-    name = "sqlalchemy-0.7.9";
+  sqlalchemy = buildPythonPackage rec {
+    name = "sqlalchemy-${version}";
+    version = "0.7.10";
 
     src = fetchurl {
-      url = mirror://sourceforge/sqlalchemy/0.7.9/SQLAlchemy-0.7.9.tar.gz;
-      md5 = "c4852d586d95a59fbc9358f4467875d5";
+      url = "http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz";
+      sha256 = "0rhxgr85xdhjn467qfs0dkyj8x46zxcv6ad3dfx3w14xbkb3kakp";
     };
 
+    patches = [
+      # see https://groups.google.com/forum/#!searchin/sqlalchemy/module$20logging$20handlers/sqlalchemy/ukuGhmQ2p6g/2_dOpBEYdDYJ
+      # waiting for 0.7.11 release
+      ../development/python-modules/sqlalchemy-0.7.10-test-failures.patch
+    ];
+
     buildInputs = [ nose ];
 
     propagatedBuildInputs = [ python.modules.sqlite3 ];

From 516377c0b6c61305f743ba02ea19214af49948ba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 28 Jul 2013 13:50:00 +0200
Subject: [PATCH 409/439] bind: update to 9.9.3-p2 to fix CVE-2013-4854

---
 pkgs/servers/dns/bind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 4d256f926266..6c4841dc8afb 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, openssl, libtool, perl, libxml2 }:
 
-let version = "9.9.3-P1"; in
+let version = "9.9.3-P2"; in
 
 stdenv.mkDerivation rec {
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "0ddlvdxsyibm24v1wzbknywvalsrvl06gbvsrigpqc1vgkj25ahv";
+    sha256 = "0y66ns28n3bcq8hp8srgpaxi9ix7myh2rlcsrr3qpwvkgdnb12jy";
   };
 
   patchPhase = ''

From 386bef322d6e086883297b9e34d54ae206e005f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 28 Jul 2013 14:04:44 +0200
Subject: [PATCH 410/439] iftop: improve meta attributes

- The description attribute is very long, so rename it to
  longDescription and add a short text in the description attribute.
- Use licenses.gpl2Plus instead of free form text "GPLv2+".
- Add platforms attribute so that hydra will build the package.
---
 pkgs/tools/networking/iftop/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix
index 3a9c0e10a784..a1f5026fb28b 100644
--- a/pkgs/tools/networking/iftop/default.nix
+++ b/pkgs/tools/networking/iftop/default.nix
@@ -18,10 +18,15 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ncurses libpcap];
 
-  meta = {
-    description = "iftop does for network usage what top(1) does for CPU usage. It listens to network traffic on a named interface and displays a table of current bandwidth usage by pairs of hosts.";
-
-    license = "GPLv2+";
+  meta = with stdenv.lib; {
+    description = "Display bandwidth usage on a network interface";
+    longDescription = ''
+      iftop does for network usage what top(1) does for CPU usage. It listens
+      to network traffic on a named interface and displays a table of current
+      bandwidth usage by pairs of hosts.
+    '';
+    license = licenses.gpl2Plus;
     homepage = http://ex-parrot.com/pdw/iftop/;
+    platforms = platforms.linux;
   };
 }

From 7186fd3f7110823508a3c2342f6de04978f89377 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 28 Jul 2013 15:56:38 +0200
Subject: [PATCH 411/439] pillow: 1.7.8 -> 2.1.0, add webp and tiff support

---
 pkgs/top-level/python-packages.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 048ddee396ed..ba6155ffff1b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3470,20 +3470,23 @@ pythonPackages = python.modules // rec {
 
 
   pillow = buildPythonPackage rec {
-    name = "Pillow-1.7.8";
+    name = "Pillow-2.1.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/P/Pillow/${name}.zip";
-      md5 = "41d8688d4db72673069a6dc63b5289d6";
+      md5 = "ec630d8ae15d4a3c4ae7b7efdeac8200";
     };
 
-    buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.unzip pkgs.zlib ];
+    buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.unzip pkgs.zlib pkgs.libtiff pkgs.libwebp ];
 
+    # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.
     configurePhase = ''
       sed -i "setup.py" \
           -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ;
               s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ;
-              s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ;'
+              s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ;
+              s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ;
+              s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;'
     '';
 
     doCheck = true;

From 8525695a72743ce694a91abfc011ecfaca9f32c6 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 28 Jul 2013 17:13:19 +0200
Subject: [PATCH 412/439] sqlalchemy: add the patch so that things work, you
 know

---
 .../sqlalchemy-0.7.10-test-failures.patch     | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch

diff --git a/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch b/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch
new file mode 100644
index 000000000000..cca4a2021042
--- /dev/null
+++ b/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch
@@ -0,0 +1,62 @@
+From abd9f52ade78c737571be69f21dba384be3edf4e Mon Sep 17 00:00:00 2001
+From: Mike Bayer <mike_mp@zzzcomputing.com>
+Date: Sat, 2 Mar 2013 16:24:50 -0500
+Subject: [PATCH] - Fixed an import of "logging" in test_execute which was not
+ working on some linux platforms. [ticket:2669]
+
+---
+ doc/build/changelog/changelog_07.rst | 10 ++++++++++
+ lib/sqlalchemy/__init__.py           |  2 +-
+ test/engine/test_execute.py          |  2 +-
+ 3 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/doc/build/changelog/changelog_07.rst b/doc/build/changelog/changelog_07.rst
+index 416df5a..f07c9ec 100644
+--- a/doc/build/changelog/changelog_07.rst
++++ b/doc/build/changelog/changelog_07.rst
+@@ -3,6 +3,16 @@
+ 0.7 Changelog
+ ==============
+ 
++.. changelog::
++    :version: 0.7.11
++
++    .. change::
++        :tags: bug, tests
++        :tickets: 2669
++        :pullreq: 41
++
++      Fixed an import of "logging" in test_execute which was not
++      working on some linux platforms.
+ 
+ .. changelog::
+     :version: 0.7.10
+diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
+index 9a21a70..6523ccb 100644
+--- a/lib/sqlalchemy/__init__.py
++++ b/lib/sqlalchemy/__init__.py
+@@ -120,7 +120,7 @@
+ __all__ = sorted(name for name, obj in locals().items()
+                  if not (name.startswith('_') or inspect.ismodule(obj)))
+ 
+-__version__ = '0.7.10'
++__version__ = '0.7.11'
+ 
+ del inspect, sys
+ 
+diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
+index 69b94f1..a37f684 100644
+--- a/test/engine/test_execute.py
++++ b/test/engine/test_execute.py
+@@ -9,7 +9,7 @@
+ import sqlalchemy as tsa
+ from test.lib import testing, engines
+ from test.lib.engines import testing_engine
+-import logging
++import logging.handlers
+ from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam
+ from sqlalchemy.engine import base, default
+ from sqlalchemy.engine.base import Connection, Engine
+-- 
+1.8.1.6
+

From 5c66a46bc6f4cffd993763e0b80203ff4f5a8ba7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 28 Jul 2013 11:46:40 -0400
Subject: [PATCH 413/439] buildNodePackage: Fix $out/bin symlink

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/web/nodejs/build-node-package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index 27e114ee40bc..5c080ee315a8 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation ({
     rm -fR $out/lib/node_modules/${requireName}/node_modules
     mv node_modules $out/lib/node_modules/${requireName}
     if [ -d "$out/lib/node_modules/.bin" ]; then
-      ln -sv node_modules/.bin $out/bin
+      ln -sv $out/lib/node_modules/.bin $out/bin
       node=`type -p node`
       coffee=`type -p coffee || true`
       find -L $out/lib/node_modules/.bin/* -type f -print0 | \

From 5405636bb1479f98dd0e254724f2b3b28d887c4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 28 Jul 2013 22:06:00 +0200
Subject: [PATCH 414/439] Add recurseIntoAttrs for gnome3

So that we can search for gnome3.* packages like this:

  nix-env -qaP \* | grep gnome3
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 713bfa45a02b..19afc66ad57d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9127,10 +9127,10 @@ let
     inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils;
   };
 
-  gnome3 = callPackage ../desktops/gnome-3 {
+  gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 {
     callPackage = pkgs.newScope pkgs.gnome3;
     self = pkgs.gnome3;
-  };
+  });
 
   gnome = recurseIntoAttrs gnome2;
 

From 2e57a1621921233ffe65255033b8eef27efba66b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 28 Jul 2013 20:16:16 -0400
Subject: [PATCH 415/439] Linux 3.10.4

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index dc7d6a1a9d93..7de8aa85392b 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -259,7 +259,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.10.3";
+    version = "3.10.4";
     testing = false;
 
     preConfigure = ''
@@ -268,7 +268,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "195mlc628a9iyz57kibndzylgkz00cffkd982svi2fdfzxpxfm9r";
+      sha256 = "1f0ynk37bhkllx2ahzp587yr8cvn809v2ad0sn7z92yv48vl4nly";
     };
 
     config = configWithPlatform stdenv.platform;

From 7c23a254761e0929bcf90a24a7e3b277b0a463d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Mon, 29 Jul 2013 10:45:39 +0200
Subject: [PATCH 416/439] google-talk-plugin: Upgrade to 4.2.10

---
 .../browsers/mozilla-plugins/google-talk-plugin/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 110f95220308..4f7d3feb8ad6 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -47,18 +47,18 @@ stdenv.mkDerivation rec {
   name = "google-talk-plugin-${version}";
   # Use the following to determine the current upstream version:
   # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p'
-  version = "3.17.0.0";
+  version = "4.2.1.0";
 
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb";
-        sha256 = "1annx2zhxgn3wl468w7sk93k4xhmnx5bbdjr0d1ar7979hvrdl1x";
+        sha256 = "1g7kpz2lzzz1gri5rd3isp7cfyls6gzwcw2kc8jgrgrixq9iixfd";
       }
     else if stdenv.system == "i686-linux" then
       fetchurl {
         url = "${baseURL}/google-talkplugin_${version}-1_i386.deb";
-        sha256 = "13fza920vg3qig2pnlr65mzcmmy3izla95zdpa3pk28qlfij0ryc";
+        sha256 = "1z0zbblzlky9nyifxmnl49v4zafpqp3l08b9v1486sinm35rf58r";
       }
     else throw "Google Talk does not support your platform.";
 

From 2777f77f18b1c85d4539ca43d09257675a7bbfe8 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Mon, 29 Jul 2013 12:13:58 +0300
Subject: [PATCH 417/439] Soprano: revert clucene update because it isn't found
 by the build system

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19afc66ad57d..82fb66a89082 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5352,7 +5352,7 @@ let
 
   sofia_sip = callPackage ../development/libraries/sofia-sip { };
 
-  soprano = callPackage ../development/libraries/soprano { clucene_core = clucene_core_2; };
+  soprano = callPackage ../development/libraries/soprano { };
 
   soqt = callPackage ../development/libraries/soqt { };
 

From 416bd743f086f77f0d0b31e0fcd9edbe80dd0e92 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 29 Jul 2013 10:49:04 +0200
Subject: [PATCH 418/439] haskell-language-java: update to version 0.2.5.1

---
 pkgs/development/libraries/haskell/language-java/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-java/default.nix b/pkgs/development/libraries/haskell/language-java/default.nix
index bf5cef0ddfd5..aad46d4e0179 100644
--- a/pkgs/development/libraries/haskell/language-java/default.nix
+++ b/pkgs/development/libraries/haskell/language-java/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-java";
-  version = "0.2.5";
-  sha256 = "1l3q156m3l3fawsrgj3fr16qxr0apwg2si410j0f5hsgfmkhdrm6";
+  version = "0.2.5.1";
+  sha256 = "06jzski25840jk3775ia7nx11mjkyp9cmmb7y81djcndliblbyhc";
   buildDepends = [ cpphs parsec syb ];
   testDepends = [
     filepath HUnit mtl QuickCheck testFramework testFrameworkHunit

From b253eb0d593cb1041bd9c87ab03dbf72295c79d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 29 Jul 2013 10:49:29 +0200
Subject: [PATCH 419/439] haskell-elm-server: re-generate expression with
 cabal2nix

---
 pkgs/development/compilers/elm/elm-server.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix
index bce0e933732f..f86c6688eb82 100644
--- a/pkgs/development/compilers/elm/elm-server.nix
+++ b/pkgs/development/compilers/elm/elm-server.nix
@@ -3,7 +3,6 @@
 }:
 
 cabal.mkDerivation (self: {
-  jailbreak = true;
   pname = "elm-server";
   version = "0.8";
   sha256 = "0mnxayfg54f5mr27sd1zw3xrdijppgvrz2yzzmhp07qc1jiyfald";
@@ -13,6 +12,7 @@ cabal.mkDerivation (self: {
     blazeHtml deepseq Elm filepath happstackServer HTTP mtl parsec
     transformers
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://elm-lang.org";
     description = "The Elm language server";

From 5ec6cf37566107f01af013abbd100d8c9aa9ec75 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 27 Jul 2013 20:51:54 +0200
Subject: [PATCH 420/439] add python3 support to pythonPackages

---
 .../interpreters/pypy/2.0/default.nix         |  2 ++
 .../interpreters/python/2.6/default.nix       |  1 +
 .../interpreters/python/2.7/default.nix       |  1 +
 .../interpreters/python/3.2/default.nix       |  5 ++-
 .../interpreters/python/3.3/default.nix       |  5 ++-
 .../interpreters/python/3.3/setup-hook.sh     |  4 +--
 .../python-modules/generic/default.nix        |  2 +-
 .../python-modules/setuptools/default.nix     | 24 ++++++++-----
 ...kip-sdist_with_utf8_encoded_filename.patch | 28 +++++++++++++++
 pkgs/top-level/all-packages.nix               | 14 ++++++++
 pkgs/top-level/python-packages.nix            | 34 +++++++++++--------
 11 files changed, 91 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch

diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix
index 969746d3a34e..f3d1e4e9ade7 100644
--- a/pkgs/development/interpreters/pypy/2.0/default.nix
+++ b/pkgs/development/interpreters/pypy/2.0/default.nix
@@ -59,6 +59,7 @@ let
     installPhase = ''
        mkdir -p $out/bin
        mkdir -p $out/pypy-c
+       # TODO: make libPrefix work
        cp -R {include,lib_pypy,lib-python,pypy-c} $out/pypy-c
        ln -s $out/pypy-c/pypy-c $out/bin/pypy
        chmod +x $out/bin/pypy
@@ -68,6 +69,7 @@ let
     passthru = {
       inherit zlibSupport;
       libPrefix = "pypy${majorVersion}";
+      executable = "pypy";
     };
 
     enableParallelBuilding = true;
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index f264e4179e70..61c997206c1a 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -75,6 +75,7 @@ let
     passthru = {
       inherit zlibSupport;
       libPrefix = "python${majorVersion}";
+      executable = "python2.6";
     };
 
     enableParallelBuilding = true;
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 76ef7399812b..f5a39a3b242b 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -85,6 +85,7 @@ let
     passthru = {
       inherit zlibSupport;
       libPrefix = "python${majorVersion}";
+      executable = "python2.7";
     };
 
     enableParallelBuilding = true;
diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
index b3f5a17b0641..4c858c992729 100644
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ b/pkgs/development/interpreters/python/3.2/default.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation {
     sha256 = "0pxs234g08v3lar09lvzxw4vqdpwkbqmvkv894j2w7aklskcjd6v";
   };
 
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+
   preConfigure = ''
     for i in /usr /sw /opt /pkg; do	# improve purity
       substituteInPlace ./setup.py --replace $i /no-such-path
@@ -58,7 +60,8 @@ stdenv.mkDerivation {
     readlineSupport = readline != null;
     opensslSupport = openssl != null;
     tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
-    libPrefix = "python${majorVersion}m";
+    libPrefix = "python${majorVersion}";
+    executable = "python3.2m";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index 84f4ec184aa6..7d3ede6594f8 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation {
     sha256 = "16myvina7nakyyg7r5gnjyydk8bzar988vmxsw2k485w5gz04wpp";
   };
 
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+
   preConfigure = ''
     for i in /usr /sw /opt /pkg; do	# improve purity
       substituteInPlace ./setup.py --replace $i /no-such-path
@@ -58,7 +60,8 @@ stdenv.mkDerivation {
     readlineSupport = readline != null;
     opensslSupport = openssl != null;
     tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
-    libPrefix = "python${majorVersion}m";
+    libPrefix = "python${majorVersion}";
+    executable = "python3.3m";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/interpreters/python/3.3/setup-hook.sh b/pkgs/development/interpreters/python/3.3/setup-hook.sh
index e6fa34bf54ba..c272c87daf1c 100644
--- a/pkgs/development/interpreters/python/3.3/setup-hook.sh
+++ b/pkgs/development/interpreters/python/3.3/setup-hook.sh
@@ -1,12 +1,12 @@
 addPythonPath() {
-    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.2/site-packages
+    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.3/site-packages
 }
 
 toPythonPath() {
     local paths="$1"
     local result=
     for i in $paths; do
-        p="$i/lib/python3.2/site-packages"
+        p="$i/lib/python3.3/site-packages"
         result="${result}${result:+:}$p"
     done
     echo $result
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index d32c6818bb26..71b5c1952a05 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -33,7 +33,7 @@
 , checkPhase ?
     ''
       runHook preCheck
-      python setup.py test
+      ${python}/bin/${python.executable} setup.py test
       runHook postCheck
     ''
 
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 92c39afc249e..3dcaaca4c250 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -2,31 +2,37 @@
 
 stdenv.mkDerivation rec {
   shortName = "setuptools-${version}";
-  name = "python-${shortName}";
+  name = "${python.executable}-${shortName}";
 
-  version = "0.6c11";
+  version = "0.9.8";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz";
-    sha256 = "1lx1hwxkhipyh206bgl90ddnfcnb68bzcvyawczbf833fadyl3v3";
+    sha256 = "037b8x3fdhx8s6xafqndi3yr8x2vr42n1kzs7jxk6j9s9fd65gs2";
   };
 
+  patches = [
+    # https://bitbucket.org/pypa/setuptools/issue/55/1-failure-lc_all-c-python33m-setuppy-test
+    ./distribute-skip-sdist_with_utf8_encoded_filename.patch
+  ];
+
   buildInputs = [ python wrapPython ];
 
-  buildPhase = "python setup.py build --build-base $out";
+  buildPhase = "${python}/bin/${python.executable} setup.py build --build-base $out";
 
   installPhase =
     ''
       dst=$out/lib/${python.libPrefix}/site-packages
       mkdir -p $dst
-      PYTHONPATH=$dst:$PYTHONPATH
-      python setup.py install --prefix=$out
+      PYTHONPATH="$dst:$PYTHONPATH"
+      ${python}/bin/${python.executable} setup.py install --prefix=$out
       wrapPythonPrograms
     '';
 
-  doCheck = false; # doesn't work with Python 2.7
-
-  checkPhase = "python setup.py test";
+  doCheck = true;
+  checkPhase = ''
+    ${python}/bin/${python.executable} setup.py test
+  '';
 
   meta = {
     description = "Utilities to facilitate the installation of Python packages";
diff --git a/pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch b/pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch
new file mode 100644
index 000000000000..96a4f81ee581
--- /dev/null
+++ b/pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch
@@ -0,0 +1,28 @@
+diff -r f5ac515f062a setuptools/tests/test_sdist.py
+--- a/setuptools/tests/test_sdist.py	Fri Jul 26 09:52:26 2013 +0200
++++ b/setuptools/tests/test_sdist.py	Sat Jul 27 20:22:17 2013 +0200
+@@ -3,12 +3,14 @@
+ 
+ 
+ import os
++import locale
+ import shutil
+ import sys
+ import tempfile
+ import unittest
+ import unicodedata
+ 
++from setuptools.tests.py26compat import skipIf
+ from setuptools.compat import StringIO, unicode
+ from setuptools.command.sdist import sdist
+ from setuptools.command.egg_info import manifest_maker
+@@ -318,6 +320,9 @@
+             filename = filename.decode('latin-1')
+             self.assertFalse(filename in cmd.filelist.files)
+ 
++
++    @skipIf(sys.version_info >= (3,) and locale.getpreferredencoding() != 'UTF-8',
++            'Unittest fails if locale is not utf-8 but the manifests is recorded correctly')
+     def test_sdist_with_utf8_encoded_filename(self):
+         # Test for #303.
+         dist = Distribution(SETUP_ATTRS)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82fb66a89082..90102796ccb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5750,6 +5750,20 @@ let
     python = python26;
   };
 
+  python3Packages = python33Packages;
+
+  python33Packages = import ./python-packages.nix {
+    inherit pkgs;
+    inherit (lib) lowPrio;
+    python = python33;
+  };
+
+  python32Packages = import ./python-packages.nix {
+    inherit pkgs;
+    inherit (lib) lowPrio;
+    python = python32;
+  };
+
   python27Packages = recurseIntoAttrs (import ./python-packages.nix {
     inherit pkgs;
     inherit (lib) lowPrio;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ba6155ffff1b..b5b64843faf2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5,8 +5,9 @@ isPy26 = python.majorVersion == "2.6";
 isPy27 = python.majorVersion == "2.7";
 optional = pkgs.lib.optional;
 optionals = pkgs.lib.optionals;
+modules = python.modules or { readline = null; sqlite3 = null; curses = null; ssl = null; };
 
-pythonPackages = python.modules // rec {
+pythonPackages = modules // rec {
 
   inherit python;
   inherit (pkgs) fetchurl fetchsvn fetchgit stdenv;
@@ -444,8 +445,8 @@ pythonPackages = python.modules // rec {
         pythonPackages.mutagen
         pythonPackages.munkres
         pythonPackages.musicbrainzngs
-        python.modules.sqlite3
-        python.modules.readline
+        modules.sqlite3
+        modules.readline
       ];
 
     meta = {
@@ -506,7 +507,7 @@ pythonPackages = python.modules // rec {
        sha256 = "02dkmsmgy04l33nyw54rlxkjwff0yf3cy2kvdx8s5w344mqkkkv0";
      };
 
-     propagatedBuildInputs = [ python.modules.curses pygments ];
+     propagatedBuildInputs = [ modules.curses pygments ];
      doCheck = false;
 
      meta = {
@@ -606,7 +607,7 @@ pythonPackages = python.modules // rec {
   #     rev = "refs/tags/0.9.3";
   #   };
   #
-  #   propagatedBuildInputs = [ pythonPackages.argparse python.modules.ssl ];
+  #   propagatedBuildInputs = [ pythonPackages.argparse modules.ssl ];
   #
   #   doCheck = false;
   #
@@ -2387,7 +2388,7 @@ pythonPackages = python.modules // rec {
       sha256 = "0xfaa6h8css3yhsmx5vcffizrz6mvmgm46q7449z3hq7g3793184";
     };
 
-    propagatedBuildInputs = [ python.modules.sqlite3 ];
+    propagatedBuildInputs = [ modules.sqlite3 ];
 
     doCheck = false;
 
@@ -2754,7 +2755,7 @@ pythonPackages = python.modules // rec {
 
     buildInputs = [ pkgs.unzip ];
 
-    propagatedBuildInputs = [ argparse jinja2 six python.modules.readline ] ++
+    propagatedBuildInputs = [ argparse jinja2 six modules.readline ] ++
                             (optionals isPy26 [ importlib ordereddict ]);
 
     meta = {
@@ -3273,7 +3274,7 @@ pythonPackages = python.modules // rec {
     };
 
     buildInputs = [ nose ];
-    propagatedBuildInputs = [ dateutil numpy pytz python.modules.sqlite3 ];
+    propagatedBuildInputs = [ dateutil numpy pytz modules.sqlite3 ];
 
     # Tests require networking to pass
     doCheck = false;
@@ -4629,7 +4630,7 @@ pythonPackages = python.modules // rec {
 
     propagatedBuildInputs =
       [ recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments
-        djblets django_1_3 django_evolution pycrypto python.modules.sqlite3
+        djblets django_1_3 django_evolution pycrypto modules.sqlite3
         pysvn pil psycopg2
       ];
   };
@@ -5022,7 +5023,7 @@ pythonPackages = python.modules // rec {
 
     buildInputs = [ nose ];
 
-    propagatedBuildInputs = [ python.modules.sqlite3 ];
+    propagatedBuildInputs = [ modules.sqlite3 ];
 
     meta = {
       homepage = http://www.sqlalchemy.org/;
@@ -5201,7 +5202,7 @@ pythonPackages = python.modules // rec {
 
     PYTHON_EGG_CACHE = "`pwd`/.egg-cache";
 
-    propagatedBuildInputs = [ genshi pkgs.setuptools python.modules.sqlite3 ];
+    propagatedBuildInputs = [ genshi pkgs.setuptools modules.sqlite3 ];
 
     meta = {
       description = "Enhanced wiki and issue tracking system for software development projects";
@@ -5384,9 +5385,12 @@ pythonPackages = python.modules // rec {
       md5 = "9745c28256c70c76d36adb3767a00212";
     };
 
+    inherit recursivePthLoader;
+    pythonPath = [ recursivePthLoader ];
+
     patches = [ ../development/python-modules/virtualenv-change-prefix.patch ];
 
-    propagatedBuildInputs = [ python.modules.readline python.modules.sqlite3 ];
+    propagatedBuildInputs = [ modules.readline modules.sqlite3 modules.curses ];
 
     buildInputs = [ mock nose ];
 
@@ -5446,7 +5450,7 @@ pythonPackages = python.modules // rec {
       md5 = "11825b7074ba7043e157805e4e6e0f55";
     };
 
-    propagatedBuildInputs = [ nose python.modules.ssl ];
+    propagatedBuildInputs = [ nose modules.ssl ];
 
     meta = {
       description = "WSGI request and response object";
@@ -6237,7 +6241,7 @@ pythonPackages = python.modules // rec {
     };
 
     buildInputs = [ pkgs.unzip unittest2 nose mock ];
-    propagatedBuildInputs = [ python.modules.curses libarchive ];
+    propagatedBuildInputs = [ modules.curses libarchive ];
 
     # two tests fail
     doCheck = false;
@@ -6478,7 +6482,7 @@ pythonPackages = python.modules // rec {
       sha256 = "1gj8i6j2i172cldqw98395235bn78ciagw6v17fgv01rmind3lag";
     };
 
-    buildInputs = [ django pkgs.pycairo ldap memcached python.modules.sqlite3 ];
+    buildInputs = [ django pkgs.pycairo ldap memcached modules.sqlite3 ];
 
     # error: invalid command 'test'
     doCheck = false;

From 4993f07feecc5650f58713866cbec57fa4c4d0a0 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 28 Jul 2013 11:23:57 +0200
Subject: [PATCH 421/439] python: include python version when prefixing python
 packages

---
 pkgs/development/python-modules/generic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 71b5c1952a05..cc80388e6899 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -5,7 +5,7 @@
 
 { python, setuptools, wrapPython, lib, offlineDistutils, recursivePthLoader }:
 
-{ name, namePrefix ? "python-"
+{ name, namePrefix ? python.libPrefix + "-"
 
 , buildInputs ? []
 

From 918e5efb99a790362c8aa8fc70edc39f2b284575 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 29 Jul 2013 14:52:19 +0200
Subject: [PATCH 422/439] recurse into python33 and pypy packages

---
 .../interpreters/pypy/2.0/default.nix         | 15 +++--
 .../interpreters/python/3.2/default.nix       |  2 +
 .../interpreters/python/3.3/default.nix       |  2 +
 .../python-modules/generic/default.nix        |  2 +-
 pkgs/top-level/all-packages.nix               | 11 +++-
 pkgs/top-level/python-packages.nix            | 61 ++++++++++---------
 6 files changed, 57 insertions(+), 36 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix
index f3d1e4e9ade7..2dd681239a60 100644
--- a/pkgs/development/interpreters/pypy/2.0/default.nix
+++ b/pkgs/development/interpreters/pypy/2.0/default.nix
@@ -7,6 +7,8 @@ let
 
   majorVersion = "2.0";
   version = "${majorVersion}.2";
+  pythonVersion = "2.7";
+  libPrefix = "pypy${majorVersion}";
 
   pypy = stdenv.mkDerivation rec {
     name = "pypy-${version}";
@@ -57,18 +59,21 @@ let
     '';
 
     installPhase = ''
-       mkdir -p $out/bin
-       mkdir -p $out/pypy-c
-       # TODO: make libPrefix work
+       mkdir -p $out/{bin,include,lib,pypy-c}
+
        cp -R {include,lib_pypy,lib-python,pypy-c} $out/pypy-c
        ln -s $out/pypy-c/pypy-c $out/bin/pypy
        chmod +x $out/bin/pypy
+
+       # other packages expect to find stuff according to libPrefix
+       ln -s $out/pypy-c/include $out/include/${libPrefix}
+       ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix}
+
        # TODO: compile python files?
     '';
 
     passthru = {
-      inherit zlibSupport;
-      libPrefix = "pypy${majorVersion}";
+      inherit zlibSupport libPrefix;
       executable = "pypy";
     };
 
diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
index 4c858c992729..e09602e7381e 100644
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ b/pkgs/development/interpreters/python/3.2/default.nix
@@ -51,6 +51,7 @@ stdenv.mkDerivation {
 
   postInstall = ''
     rm -rf "$out/lib/python${majorVersion}/test"
+    ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
   '';
 
   passthru = {
@@ -62,6 +63,7 @@ stdenv.mkDerivation {
     tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
     libPrefix = "python${majorVersion}";
     executable = "python3.2m";
+    is_py3k = true;
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index 7d3ede6594f8..509249b7f240 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -51,6 +51,7 @@ stdenv.mkDerivation {
 
   postInstall = ''
     rm -rf "$out/lib/python${majorVersion}/test"
+    ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
   '';
 
   passthru = {
@@ -62,6 +63,7 @@ stdenv.mkDerivation {
     tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
     libPrefix = "python${majorVersion}";
     executable = "python3.3m";
+    is_py3k = true;
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index cc80388e6899..6a7d5e5f3d5e 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -55,7 +55,7 @@ python.stdenv.mkDerivation (attrs // {
   meta = {
     platforms = python.meta.platforms;
   } // meta // {
-    maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow ];
+    maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow lib.maintainers.iElectric ];
   };
 
   # checkPhase after installPhase to run tests on installed packages
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90102796ccb1..43f0af27ab07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5736,6 +5736,7 @@ let
 
   ### DEVELOPMENT / PYTHON MODULES
 
+  # python function with default python interpreter
   buildPythonPackage = pythonPackages.buildPythonPackage;
 
   pythonPackages = python27Packages;
@@ -5752,11 +5753,11 @@ let
 
   python3Packages = python33Packages;
 
-  python33Packages = import ./python-packages.nix {
+  python33Packages = recurseIntoAttrs (import ./python-packages.nix {
     inherit pkgs;
     inherit (lib) lowPrio;
     python = python33;
-  };
+  });
 
   python32Packages = import ./python-packages.nix {
     inherit pkgs;
@@ -5770,6 +5771,12 @@ let
     python = python27;
   });
 
+  pypyPackages = recurseIntoAttrs (import ./python-packages.nix {
+    inherit pkgs;
+    inherit (lib) lowPrio;
+    python = pypy;
+  });
+
   plone41Packages = recurseIntoAttrs (import ../development/web/plone/4.1.nix {
     inherit pkgs;
     pythonPackages = python26Packages;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b5b64843faf2..d455a68e9b29 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -302,8 +302,6 @@ pythonPackages = modules // rec {
       sha256 = "b0c12b8c48ed9180c7475fab18de50d63e1b517cfb46da4d2c66fc406fe902bc";
     };
 
-    installCommand = "python setup.py install --prefix=$out";
-
     # error: invalid command 'test'
     doCheck = false;
 
@@ -501,10 +499,10 @@ pythonPackages = modules // rec {
   };
 
   bpython = buildPythonPackage rec {
-     name = "bpython-0.11";
+     name = "bpython-0.12";
      src = fetchurl {
-       url = "http://www.bpython-interpreter.org/releases/bpython-0.11.tar.gz";
-       sha256 = "02dkmsmgy04l33nyw54rlxkjwff0yf3cy2kvdx8s5w344mqkkkv0";
+       url = "http://www.bpython-interpreter.org/releases/bpython-0.12.tar.gz";
+       sha256 = "1ilf58qq7sazmcgg4f1wswbhcn2gb8qbbrpgm6gf0j2lbm60gabl";
      };
 
      propagatedBuildInputs = [ modules.curses pygments ];
@@ -1491,7 +1489,7 @@ pythonPackages = modules // rec {
       PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
       export PYTHONPATH="$dst:$PYTHONPATH"
 
-      python setup.py install --prefix="$out"
+      ${python}/bin/${python.executable} setup.py install --prefix="$out"
 
       eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth
       if [ -e "$eapth" ]; then
@@ -1692,7 +1690,7 @@ pythonPackages = modules // rec {
 
     buildPhase = "make build";
     installCommand = ''
-      python setup.py install --prefix="$out" --root=/ --record="$out/lib/${python.libPrefix}/site-packages/dulwich/list.txt" --single-version-externally-managed
+      ${python}/bin/${python.executable} setup.py install --prefix="$out" --root=/ --record="$out/lib/${python.libPrefix}/site-packages/dulwich/list.txt" --single-version-externally-managed
     '';
 
     # For some reason "python setup.py test" doesn't work with Python 2.6.
@@ -2477,10 +2475,10 @@ pythonPackages = modules // rec {
 
     configurePhase = "cd python";
 
-    buildPhase = "python setup.py build";
+    buildPhase = "${python}/bin/${python.executable} setup.py build";
 
     installPhase = ''
-      python setup.py install --prefix=$out
+      ${python}/bin/${python.executable} setup.py install --prefix=$out
     '';
 
     meta = {
@@ -2501,7 +2499,7 @@ pythonPackages = modules // rec {
 
     buildInputs = [ pkgs.swig pkgs.openssl ];
 
-    buildPhase = "python setup.py build_ext --openssl=${pkgs.openssl}";
+    buildPhase = "${python}/bin/${python.executable} setup.py build_ext --openssl=${pkgs.openssl}";
 
     doCheck = false; # another test that depends on the network.
 
@@ -3125,8 +3123,8 @@ pythonPackages = modules // rec {
     # TODO: add ATLAS=${pkgs.atlas}
     installCommand = ''
       export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack}
-      python setup.py build --fcompiler="gnu95"
-      python setup.py install --prefix=$out
+      ${python}/bin/${python.executable} setup.py build --fcompiler="gnu95"
+      ${python}/bin/${python.executable} setup.py install --prefix=$out
     '';
 
     # error: invalid command 'test'
@@ -3704,12 +3702,12 @@ pythonPackages = modules // rec {
     buildInputs = [ python pkgs.portaudio ];
 
     buildPhase = if stdenv.isDarwin then ''
-      PORTAUDIO_PATH="${pkgs.portaudio}" python setup.py build --static-link
+      PORTAUDIO_PATH="${pkgs.portaudio}" ${python}/bin/${python.executable} setup.py build --static-link
     '' else ''
-      python setup.py build
+      ${python}/bin/${python.executable} setup.py build
     '';
 
-    installPhase = "python setup.py install --prefix=$out";
+    installPhase = "${python}/bin/${python.executable} setup.py install --prefix=$out";
 
     meta = {
       description = "Python bindings for PortAudio";
@@ -3965,7 +3963,7 @@ pythonPackages = modules // rec {
     buildInputs = [ python ];
 
     installPhase = ''
-      python setup.py install --prefix=$out
+      ${python}/bin/${python.executable} setup.py install --prefix=$out
     '';
 
     meta = {
@@ -3994,7 +3992,7 @@ pythonPackages = modules // rec {
     propagatedBuildInputs = [ urlgrabber ];
 
     checkPhase = ''
-      python tests/baseclass.py -vv
+      ${python}/bin/${python.executable} tests/baseclass.py -vv
     '';
 
     meta = {
@@ -4072,7 +4070,7 @@ pythonPackages = modules // rec {
     propagatedBuildInputs = [ pkgs.parted ];
 
     checkPhase = ''
-      python -m unittest discover -v
+      ${python}/bin/${python.executable} -m unittest discover -v
     '';
 
     meta = {
@@ -4744,8 +4742,8 @@ pythonPackages = modules // rec {
     # TODO: add ATLAS=${pkgs.atlas}
     installCommand = ''
       export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack}
-      python setup.py build --fcompiler="gnu95"
-      python setup.py install --prefix=$out
+      ${python}/bin/${python.executable} setup.py build --fcompiler="gnu95"
+      ${python}/bin/${python.executable} setup.py install --prefix=$out
     '';
 
     meta = {
@@ -5323,12 +5321,18 @@ pythonPackages = modules // rec {
 
 
   unittest2 = buildPythonPackage rec {
-    name = "unittest2-0.5.1";
+    version = "0.5.1";
+    name = "unittest2-${version}";
 
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/u/unittest2/${name}.tar.gz";
-      md5 = "a0af5cac92bbbfa0c3b0e99571390e0f";
-    };
+    src = if python.is_py3k or false
+       then fetchurl {
+           url = "http://pypi.python.org/packages/source/u/unittest2py3k/unittest2py3k-${version}.tar.gz";
+           sha256 = "00yl6lskygcrddx5zspkhr0ibgvpknl4678kkm6s626539grq93q";
+         }
+       else fetchurl {
+           url = "http://pypi.python.org/packages/source/u/unittest2/unittest2-${version}.tar.gz";
+           md5 = "a0af5cac92bbbfa0c3b0e99571390e0f";
+         };
 
     meta = {
       description = "A backport of the new features added to the unittest testing framework in Python 2.7";
@@ -6104,13 +6108,14 @@ pythonPackages = modules // rec {
 
   zope_testing = buildPythonPackage rec {
     name = "zope.testing-${version}";
-    version = "4.1.1";
+    version = "4.1.2";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz";
-      md5 = "2e3829841090d6adff718b8b73c87b6b";
+      url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.zip";
+      md5 = "01c30c342c6a18002a762bd5d320a6e9";
     };
 
+    buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ];
 
     meta = {

From c5243b6e7d565bdc036046da2f80c5c8122957b7 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 29 Jul 2013 16:38:29 +0200
Subject: [PATCH 423/439] python-markdown: 2.0.3 -> 2.3.1

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d455a68e9b29..982503b99d3f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2565,12 +2565,12 @@ pythonPackages = modules // rec {
   };
 
   markdown = buildPythonPackage rec {
-    version = "2.0.3";
+    version = "2.3.1";
     name = "markdown-${version}";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.3.tar.gz";
-      md5 = "751e8055be2433dfd1a82e0fb1b12f13";
+      url = "http://pypi.python.org/packages/source/M/Markdown/Markdown-${version}.tar.gz";
+      sha256 = "147j9hznv2r187a86d28glmg3pckfrdp0nz9yh7s1aqpawwdkszz";
     };
 
     # error: invalid command 'test'

From cc98ea4a84e8a8f88a42a161b52cfcbfda09949a Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 29 Jul 2013 17:10:40 +0200
Subject: [PATCH 424/439] numpy: 1.6.1 -> 1.7.1

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 982503b99d3f..9fc187f93024 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3109,11 +3109,11 @@ pythonPackages = modules // rec {
   };
 
   numpy = buildPythonPackage ( rec {
-    name = "numpy-1.6.1";
+    name = "numpy-1.7.1";
 
     src = fetchurl {
       url = "mirror://sourceforge/numpy/${name}.tar.gz";
-      sha256 = "1pawfmf7j7pd3mjzhmmw9hkglc2qdirrkvv29m5nsmpf2b3ip2vq";
+      sha256 = "0jh832j439jj2b7m1z5a4rv5cpdn1yiw1r6gwrhdihw562d029am";
     };
 
     preConfigure = ''

From eabf34703310a730d565066e1745d3beaaab9d2d Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 29 Jul 2013 17:48:49 +0200
Subject: [PATCH 425/439] simplejson: 2.1.3 -> 3.3.0

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9fc187f93024..d5e410b006a6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4841,11 +4841,11 @@ pythonPackages = modules // rec {
 
 
   simplejson = buildPythonPackage (rec {
-    name = "simplejson-2.1.3";
+    name = "simplejson-3.3.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/s/simplejson/${name}.tar.gz";
-      md5 = "58d9b1d8fa17ea4ce205cea088607e02";
+      md5 = "0e29b393bceac8081fa4e93ff9f6a001";
     };
 
     meta = {

From 19993fcbf8c649c16fed5b7cf9d81343c3bf3421 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 29 Jul 2013 18:01:30 +0200
Subject: [PATCH 426/439] Logbook: 0.4.1 -> 0.4.2

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d5e410b006a6..a1b237d545ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6631,12 +6631,12 @@ pythonPackages = modules // rec {
 
   Logbook = buildPythonPackage rec {
     name = "Logbook-${version}";
-    version = "0.4.1";
+    version = "0.4.2";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/L/Logbook/${name}.tar.gz";
       # md5 = "143cb15af4c4a784ca785a1546ad1b93";
-      sha256 = "0iim9pcyl57c6z9i1kfw5nz92qrnpz2l0bz4lir2xrqi8m03q3d7";
+      sha256 = "1g2pnhxh7m64qsrs0ifwcmpfk7gqjvrawd8z66i001rsdnq778v0";
     };
 
     meta = {

From 662366e4f0e40a1d4b319936ba6dc64fe18b3cb7 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 29 Jul 2013 18:48:54 +0200
Subject: [PATCH 427/439] zope_testrunner: 4.0.4 -> 4.4.1

---
 pkgs/top-level/python-packages.nix | 60 +++++++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a1b237d545ca..1376ad729e99 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5078,11 +5078,11 @@ pythonPackages = modules // rec {
 
   subunit = buildPythonPackage rec {
     name = "subunit-${version}";
-    version = "0.0.9";
+    version = "0.0.13";
 
     src = fetchurl {
-      url = "https://launchpad.net/subunit/trunk/0.0.9/+download/python-${name}.tar.gz";
-      sha256 = "0g3bk8lfd52zjzg43h47h2kckchm3xyv1gcr85nca2i50rcrpj56";
+      url = "https://launchpad.net/subunit/trunk/${version}/+download/python-${name}.tar.gz";
+      sha256 = "0f3xni4z1hbmg4dqxak85ibpf9pajxn6qzw1xj79gwnr8xxb66zj";
     };
 
     propagatedBuildInputs = [ testtools ];
@@ -5157,13 +5157,15 @@ pythonPackages = modules // rec {
 
   testtools = buildPythonPackage rec {
     name = "testtools-${version}";
-    version = "0.9.24";
+    version = "0.9.32";
 
     src = fetchurl {
-      url = "https://launchpad.net/testtools/0.9/0.9.24/+download/${name}.tar.gz";
-      sha256 = "0mgkvd7c1aw34nlnz2nmll5k01aqhixxiikbs2nfyk3xfa4221x7";
+      url = "https://pypi.python.org/packages/source/t/testtools/${name}.tar.gz";
+      sha256 = "1smgk3y7xfzh5xk5wydb6n5lx4g5i6y4w8ajrdnskx1jqr67wyyq";
     };
 
+    propagatedBuildInputs = [ pythonPackages.python_mimeparse pythonPackages.extras ];
+
     meta = {
       description = "A set of extensions to the Python standard library's unit testing framework";
       homepage = http://pypi.python.org/pypi/testtools;
@@ -5172,6 +5174,46 @@ pythonPackages = modules // rec {
   };
 
 
+  python_mimeparse = buildPythonPackage rec {
+    name = "python-mimeparse-${version}";
+    version = "0.1.4";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/p/python-mimeparse/${name}.tar.gz";
+      sha256 = "1hyxg09kaj02ri0rmwjqi86wk4nd1akvv7n0dx77azz76wga4s9w";
+    };
+
+    # error: invalid command 'test'
+    doCheck = false;
+
+    meta = {
+      description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges.";
+      homepage = https://code.google.com/p/mimeparse/;
+      license = pkgs.lib.licenses.mit;
+    };
+  };
+
+
+  extras = buildPythonPackage rec {
+    name = "extras-${version}";
+    version = "0.0.3";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/e/extras/extras-${version}.tar.gz";
+      sha256 = "1h7zx4dfyclalg0fqnfjijpn0f793a9mx8sy3b27gd31nr6dhq3s";
+    };
+
+    # error: invalid command 'test'
+    doCheck = false;
+
+    meta = {
+      description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges.";
+      homepage = https://code.google.com/p/mimeparse/;
+      license = pkgs.lib.licenses.mit;
+    };
+  };
+
+
   # TODO
   # py.error.EACCES: [Permission denied]: mkdir('/homeless-shelter',)
   # builder for `/nix/store/0czwg0n3pfkmpjphqv1jxfjlgkbziwsx-python-tox-1.4.3.drv' failed with exit code 1
@@ -6129,16 +6171,16 @@ pythonPackages = modules // rec {
 
   zope_testrunner = buildPythonPackage rec {
     name = "zope.testrunner-${version}";
-    version = "4.0.4";
+    version = "4.4.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.testrunner/${name}.zip";
-      md5 = "cd648fc865a79aa0950e73342836dd4c";
+      md5 = "1d689abad000419891494b30dd7d8190";
     };
 
     buildInputs = [ pkgs.unzip ];
 
-    propagatedBuildInputs = [ subunit zope_interface zope_exceptions zope_testing ];
+    propagatedBuildInputs = [ subunit zope_interface zope_exceptions zope_testing six ];
 
     meta = {
       description = "A flexible test runner with layer support";

From 0f7a0411b2a9c67e7996d14e8732fbc1feea36b4 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 29 Jul 2013 18:52:04 +0200
Subject: [PATCH 428/439] psycopg2: 2.0.13 -> 2.5.1

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1376ad729e99..d96555a2b849 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3624,14 +3624,14 @@ pythonPackages = modules // rec {
 
 
   psycopg2 = buildPythonPackage rec {
-    name = "psycopg2-2.0.13";
+    name = "psycopg2-2.5.1";
 
     # error: invalid command 'test'
     doCheck = false;
 
     src = fetchurl {
-      url = "http://initd.org/pub/software/psycopg/PSYCOPG-2-0/${name}.tar.gz";
-      sha256 = "0arkaa1nbbd3pyn4l1bc75wi7nff3vxxh4s8sj5al5hv20p64pm1";
+      url = "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.1.tar.gz";
+      sha256 = "1v7glzzzykbaqj7dhpr0qds9cf4maxmn7f5aazpqnbg0ly40r9v5";
     };
 
     propagatedBuildInputs = [ pkgs.postgresql ];

From 4f5960e20d8e91db40aadd5722bfeeaae054791f Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 29 Jul 2013 19:09:12 +0200
Subject: [PATCH 429/439] distutils2: remove the package, nothing depends on it
 and it's obsolete

---
 pkgs/top-level/python-packages.nix | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d96555a2b849..123607cb1339 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1510,29 +1510,6 @@ pythonPackages = modules // rec {
   };
 
 
-  distutils2  = buildPythonPackage rec {
-    name = "distutils2-${version}";
-    version = "1.0a4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/D/Distutils2/Distutils2-${version}.tar.gz";
-      md5 = "52bc9dffb394970c27e02853ae3a3241";
-    };
-
-    patchPhase = ''
-      sed -e "s#html.entities#htmlentitydefs#g" -i distutils2/pypi/simple.py
-    '';
-
-    doCheck = false;
-
-    meta = {
-      description = "A Python Packaging Library";
-      homepage = http://pypi.python.org/pypi/Distutils2;
-      license = "PSF";
-    };
-  };
-
-
   distutils_extra = buildPythonPackage rec {
     name = "distutils-extra-2.26";
 

From 7458f29dc9515c51f86995528187b5182c37a14f Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 29 Jul 2013 19:31:58 +0200
Subject: [PATCH 430/439] don't wrap scripts in EGG-INFO/scripts since they are
 called from python

---
 pkgs/development/python-modules/generic/wrap.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index 6b02369927b7..a7c839799b1f 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -23,10 +23,13 @@ wrapPythonProgramsIn() {
         fi
         
         if head -n1 "$i" | grep -q /python; then
-            echo "wrapping \`$i'..."
-            wrapProgram "$i" \
-                --prefix PYTHONPATH ":" $program_PYTHONPATH \
-                --prefix PATH ":" $program_PATH
+            # dont wrap EGG-INFO scripts since they are called from python
+            if echo "$i" | grep -v EGG-INFO/scripts; then
+                echo "wrapping \`$i'..."
+                wrapProgram "$i" \
+                    --prefix PYTHONPATH ":" $program_PYTHONPATH \
+                    --prefix PATH ":" $program_PATH
+            fi
         fi
     done
 }

From 0be7ef35bb7d9d11e2a9cc42fa62b4a3815feb99 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 29 Jul 2013 21:16:35 +0200
Subject: [PATCH 431/439] gmvault: use logbook 0.4.2

---
 pkgs/tools/networking/gmvault/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix
index 1ea2b761fc89..8ab939481915 100644
--- a/pkgs/tools/networking/gmvault/default.nix
+++ b/pkgs/tools/networking/gmvault/default.nix
@@ -24,6 +24,7 @@ buildPythonPackage rec {
   patchPhase = ''
     cat ${startScript} > etc/scripts/gmvault
     chmod +x etc/scripts/gmvault
+    substituteInPlace setup.py --replace "Logbook==0.4.1" "Logbook==0.4.2"
   '';
 
   meta = {

From ae7adcb6e4365e008f01d3799b8488eb1badc406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 29 Jul 2013 23:40:54 +0200
Subject: [PATCH 432/439] git: find global configs in /etc/ instead of /etc

---
 .../version-management/git-and-tools/git/default.nix            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index fcd3b77889dd..dd603e755627 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   # required to support pthread_cancel()
   NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
 
-  makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
+  makeFlags = "prefix=\${out} sysconfdir=/etc/ PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
       + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1");
 
   # FIXME: "make check" requires Sparse; the Makefile must be tweaked

From 4c9ba428f9c08c000259a403b1bec5179d4f5428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 30 Jul 2013 00:20:42 +0200
Subject: [PATCH 433/439] nose: remove failing test

---
 pkgs/top-level/python-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 123607cb1339..df20982067fd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2980,6 +2980,10 @@ pythonPackages = modules // rec {
 
     buildInputs = [ coverage ];
 
+    preCheck = ''
+      # see https://github.com/nose-devs/nose/issues/627
+      rm functional_tests/test_multiprocessing/test_concurrent_shared.py
+    '';
     doCheck = ! stdenv.isDarwin;
   };
 

From cd4b5e1a35863f7c79c47c8dc874b23b423f71f8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 29 Jul 2013 07:33:58 +0200
Subject: [PATCH 434/439] fillDiskWithDebs: Create fake start-stop-daemon.

This is needed in order to prevent services from starting while
populating the image with the contents of the .deb files. The procedure
used here is exactly the same as used in debootstrap.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 987da5585195..063341ce1d7b 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -599,8 +599,17 @@ rec {
             debs="$debs /inst/$i";
           done
           chroot=$(type -tP chroot)
+
+          # Create a fake start-stop-daemon script, as done in debootstrap.
+          mv "/mnt/sbin/start-stop-daemon" "/mnt/sbin/start-stop-daemon.REAL"
+          echo "#!/bin/true" > "/mnt/sbin/start-stop-daemon"
+          chmod 755 "/mnt/sbin/start-stop-daemon"
+
           PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
             /usr/bin/dpkg --install --force-all $debs < /dev/null || true
+
+          # Move the real start-stop-daemon back into its place.
+          mv "/mnt/sbin/start-stop-daemon.REAL" "/mnt/sbin/start-stop-daemon"
         done
 
         echo "running post-install script..."

From b42eb45429a26cb900d8db2474a88058bf266e00 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 29 Jul 2013 07:38:59 +0200
Subject: [PATCH 435/439] thttpd: New package, version 2.25b.

We already have mini_httpd, but IMHO it is *too* minimal as in not very
flexible in configuration (for example, I haven't found any runtime
configuration for disabling logging), so that's why I decided to add
thttpd, which serves quite well as an ad-hoc HTTPd.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/servers/http/thttpd/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/servers/http/thttpd/default.nix

diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix
new file mode 100644
index 000000000000..e03183cbe49d
--- /dev/null
+++ b/pkgs/servers/http/thttpd/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "thttpd-${version}";
+  version = "2.25b";
+
+  src = fetchurl {
+    url = "http://acme.com/software/thttpd/${name}.tar.gz";
+    sha256 = "0q13sfkh6amn5wk0ccbmxq3mnhlm8g5pnyk910fa5xngn449nw87";
+  };
+
+  prePatch = ''
+    sed -i -e 's/getline/getlineX/' extras/htpasswd.c
+  '';
+
+  preInstall = ''
+    ensureDir "$out/man/man1"
+    sed -i -e 's/-o bin -g bin *//' Makefile
+    sed -i -e '/chgrp/d' extras/Makefile
+  '';
+
+  meta = {
+    description = "Tiny/turbo/throttling HTTP server";
+    homepage = "http://www.acme.com/software/thttpd/";
+    license = stdenv.lib.licenses.bsd2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43f0af27ab07..352d58393bca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6103,6 +6103,8 @@ let
   });
   squid = squids.squid31; # has ipv6 support
 
+  thttpd = callPackage ../servers/http/thttpd { };
+
   tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { };
 
   tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { };

From 69dccda3c003a167be151d5d264357cdb6e0aa33 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 29 Jul 2013 17:57:06 +0200
Subject: [PATCH 436/439] VM builds: Update debian Wheezy image to v7.1.

Wheezy has been released on June 15th and on all mirrors the SHA256 hash
of Packages.bz2 has changed to reflect the new release, so let's update.

Here is the release announcement from Debian:

http://www.debian.org/News/2013/20130615

It also seems that the versioning scheme has changed in version 7.x, so
they seem to have switched to a two digit versioning scheme. This means,
that the attribute name "debian70..." should really be something like
"debian7...", but I'm keeping the attribute as-is to not break
references.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 063341ce1d7b..dbab401d9baa 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1403,22 +1403,22 @@ rec {
     };
 
     debian70i386 = {
-      name = "debian-7.0.0-wheezy-i386";
-      fullName = "Debian 7.0.0 Wheezy (i386)";
+      name = "debian-7.1.0-wheezy-i386";
+      fullName = "Debian 7.1.0 Wheezy (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2;
-        sha256 = "712939639e2cc82615c85bdf81edf31edef0fda003ac2b32998e438aee403ab8";
+        sha256 = "c2751c48805b41c3eddd31cfe92ffa46df13a7d6ce7896b8dc5ce4b2f7f329c5";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
 
     debian70x86_64 = {
-      name = "debian-7.0.0-wheezy-amd64";
-      fullName = "Debian 7.0.0 Wheezy (amd64)";
+      name = "debian-7.1.0-wheezy-amd64";
+      fullName = "Debian 7.1.0 Wheezy (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2;
-        sha256 = "e79132f7db6655013be1f75feb9812b071386525246d8639679b322487d2732a";
+        sha256 = "9b15b4348cadbcf170c9e83d6fbcb64efac2b787ebdfef16ba21dd70dfca0001";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;

From 874019b3c4c1af32c5c2460c10b8776793670566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 30 Jul 2013 09:26:35 +0200
Subject: [PATCH 437/439] limnoria: add git as dependency, otherwise build
 fails

---
 pkgs/top-level/python-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index df20982067fd..8ad896af8eff 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2363,6 +2363,7 @@ pythonPackages = modules // rec {
       sha256 = "0xfaa6h8css3yhsmx5vcffizrz6mvmgm46q7449z3hq7g3793184";
     };
 
+    buildInputs = [ pkgs.git ];
     propagatedBuildInputs = [ modules.sqlite3 ];
 
     doCheck = false;

From 31ff9d9c68eed92cecd69847ff67171eb50fb589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 30 Jul 2013 09:35:36 +0200
Subject: [PATCH 438/439] Limnoria: update to 2013-06-01

Old build was hanging when building for python3, see
http://hydra.nixos.org/build/5615679/log/raw
---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8ad896af8eff..befb8ab88e79 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2358,9 +2358,9 @@ pythonPackages = modules // rec {
     name = "limnoria-20130327";
 
     src = fetchurl {
-      url = https://pypi.python.org/packages/source/l/limnoria/limnoria-2013-03-27T16:32:26+0100.tar.gz;
-      name = "limnoria-2013-03-27.tar.gz";
-      sha256 = "0xfaa6h8css3yhsmx5vcffizrz6mvmgm46q7449z3hq7g3793184";
+      url = https://pypi.python.org/packages/source/l/limnoria/limnoria-2013-06-01T10:32:51+0200.tar.gz;
+      name = "limnoria-2013-06-01.tar.gz";
+      sha256 = "1i8q9zzf43sr3n1q4h6h1z8nz31g4aa8dq94ywvfbh7hklmchq6n";
     };
 
     buildInputs = [ pkgs.git ];

From a0740092ce0f2be164151b6af29083147cf29163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 30 Jul 2013 09:51:43 +0200
Subject: [PATCH 439/439] nose: run tests as noted in
 https://code.google.com/p/python-nose/issues/detail?id=387#c4

---
 pkgs/top-level/python-packages.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index befb8ab88e79..c07129b8defe 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2981,11 +2981,12 @@ pythonPackages = modules // rec {
 
     buildInputs = [ coverage ];
 
-    preCheck = ''
-      # see https://github.com/nose-devs/nose/issues/627
-      rm functional_tests/test_multiprocessing/test_concurrent_shared.py
-    '';
     doCheck = ! stdenv.isDarwin;
+    checkPhase = if python.is_py3k or false then ''
+      ${python}/bin/${python.executable} setup.py build_tests
+    '' else "" + ''
+      ${python}/bin/${python.executable} selftest.py
+    '';
   };
 
   nose2 = if isPy26 then null else (buildPythonPackage rec {