diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 7bcbadd8ea9a..f0cabe425a3d 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -6,7 +6,7 @@
 
 
 <para>The standard build environment in the Nix Packages collection
-provides a environment for building Unix packages that does a lot of
+provides an environment for building Unix packages that does a lot of
 common build tasks automatically.  In fact, for Unix packages that use
 the standard <literal>./configure; make; make install</literal> build
 interface, you don’t need to write a build script at all; the standard
diff --git a/maintainers/docs/cross.txt b/maintainers/docs/cross.txt
index 32e09086b87e..9c117774fc4b 100644
--- a/maintainers/docs/cross.txt
+++ b/maintainers/docs/cross.txt
@@ -41,7 +41,7 @@ NB:
 
 Keep in mind that many programs are not very well suited for cross
 compilation. Either they are not intended to run on other platforms,
-because the code is highly platform specific, or the configuration proces
+because the code is highly platform specific, or the configuration process
 is not written with cross compilation in mind.
 
 Nix will not solve these problems for you!
@@ -290,7 +290,7 @@ this compiler and verified to be working on a HP Jornada 820 running Linux
 are "patch", "make" and "wget".
 
 If we want to build C++ programs it gets a lot more difficult. GCC has a
-three step compilation proces. In the first step a simple compiler, called
+three step compilation process. In the first step a simple compiler, called
 xgcc, that can compile only C programs is built. With that compiler it
 compiles itself two more times: one time to build a full compiler, and another
 time to build a full compiler once again with the freshly built compiler from
@@ -318,7 +318,7 @@ with compilation flags. This is still work in progress for Nix.
 
 ---
 
-After succesfully completing the whole toolchain you can start building
+After successfully completing the whole toolchain you can start building
 packages with the newly built tools. To make everything build correctly
 you will need a stdenv for your target platform. Setting up this platform
 will take some effort. Right now there is a very experimental setup for
diff --git a/maintainers/scripts/nixpkgs-lint.pl b/maintainers/scripts/nixpkgs-lint.pl
index 0b1519ef15cb..baf2cbf8ba7d 100755
--- a/maintainers/scripts/nixpkgs-lint.pl
+++ b/maintainers/scripts/nixpkgs-lint.pl
@@ -3,27 +3,46 @@
 use strict;
 use List::Util qw(min);
 use XML::Simple qw(:strict);
-use Data::Dumper;
+use Getopt::Long qw(:config gnu_getopt);
 
+# Parse the command line.
+my $path = "<nixpkgs>";
 my $filter = "*";
+my $maintainer;
 
-my $xml = `nix-env -f . -qa '$filter' --xml --meta --drv-path`;
+sub showHelp {
+    print <<EOF;
+Usage: $0 [--package=NAME] [--maintainer=REGEXP] [--file=PATH]
+
+Check Nixpkgs for common errors/problems.
+
+  -p, --package        filter packages by name (default is ‘*’)
+  -m, --maintainer     filter packages by maintainer (case-insensitive regexp)
+  -f, --file           path to Nixpkgs (default is ‘<nixpkgs>’)
+
+Examples:
+  \$ nixpkgs-lint -f /my/nixpkgs -p firefox
+  \$ nixpkgs-lint -f /my/nixpkgs -m eelco
+EOF
+    exit 0;
+}
+
+GetOptions("package|p=s" => \$filter,
+           "maintainer|m=s" => \$maintainer,
+           "file|f=s" => \$path,
+           "help" => sub { showHelp() }
+    )
+    or die("syntax: $0 ...\n");
+
+# Evaluate Nixpkgs into an XML representation.
+my $xml = `nix-env -f '$path' -qa '$filter' --xml --meta --drv-path`;
+die "$0: evaluation of ‘$path’ failed\n" if $? != 0;
 
 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 $nrBadNames = 0;
 my $nrMissingMaintainers = 0;
 my $nrMissingDescriptions = 0;
 my $nrBadDescriptions = 0;
@@ -33,7 +52,11 @@ foreach my $attr (sort keys %{$info->{item}}) {
     my $pkg = $info->{item}->{$attr};
 
     my $pkgName = $pkg->{name};
-    $pkgName =~ s/-[0-9].*//;
+    my $pkgVersion = "";
+    if ($pkgName =~ /(.*)(-[0-9].*)$/) {
+        $pkgName = $1;
+        $pkgVersion = $2;
+    }
 
     # Check the maintainers.
     my @maintainers;
@@ -44,11 +67,27 @@ foreach my $attr (sort keys %{$info->{item}}) {
         @maintainers = ($x->{value});
     }
 
+    if (defined $maintainer && scalar(grep { $_ =~ /$maintainer/i } @maintainers) == 0) {
+        delete $info->{item}->{$attr};
+        next;
+    }
+
     if (scalar @maintainers == 0) {
         print "$attr: Lacks a maintainer\n";
         $nrMissingMaintainers++;
     }
 
+    # Package names should not be capitalised.
+    if ($pkgName =~ /^[A-Z]/) {
+        print "$attr: package name ‘$pkgName’ should not be capitalised\n";
+        $nrBadNames++;
+    }
+
+    if ($pkgVersion eq "") {
+        print "$attr: package has no version\n";
+        $nrBadNames++;
+    }
+
     # Check the license.
     if (!defined $pkg->{meta}->{license}) {
         print "$attr: Lacks a license\n";
@@ -81,11 +120,21 @@ foreach my $attr (sort keys %{$info->{item}}) {
         $nrBadDescriptions++ if $bad;
     }
 }
+
 print "\n";
 
 # Find packages that have the same name.
 print "=== Package name collisions ===\n\n";
 
+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;
+}
+
 my $nrCollisions = 0;
 foreach my $name (sort keys %pkgsByName) {
     my @pkgs = @{$pkgsByName{$name}};
@@ -96,8 +145,8 @@ foreach my $name (sort keys %pkgsByName) {
     @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;
+    my $highest = min (map { $_->{meta}->{priority}->{value} // 0 } @pkgs);
+    @pkgs = grep { ($_->{meta}->{priority}->{value} // 0) == $highest } @pkgs;
 
     next if scalar @pkgs == 1;
 
@@ -108,6 +157,7 @@ foreach my $name (sort keys %pkgsByName) {
 
 print "=== Bottom line ===\n";
 print "Number of packages: ", scalar(keys %{$info->{item}}), "\n";
+print "Number of bad names: $nrBadNames\n";
 print "Number of missing maintainers: $nrMissingMaintainers\n";
 print "Number of missing licenses: $nrMissingLicenses\n";
 print "Number of missing descriptions: $nrMissingDescriptions\n";
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index 8a330800b9e1..6e20acab5239 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   pname = "amarok";
-  version = "2.6.0";
+  version = "2.7.1";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "1h6jzl0jnn8g05pz4mw01kz20wjjxwwz6iki7lvgj70qi3jq04m9";
+    sha256 = "12dvqnx6jniykbi6sz94xxlnxzafjsaxlf0mppk9w5wn61jwc3cy";
   };
 
   QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index dccb6571f4d5..1ce09a6dd884 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -1,16 +1,24 @@
 { stdenv, fetchurl, pythonPackages, gettext, pyqt4
-, pkgconfig, libdiscid, libofa, ffmpeg }:
+, pkgconfig, libdiscid, libofa, ffmpeg, acoustidFingerprinter
+}:
 
 pythonPackages.buildPythonPackage rec {
   name = "picard-${version}";
   namePrefix = "";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchurl {
     url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/${name}.tar.gz";
-    md5 = "57abb76632a423760f336ac11da5c149";
+    md5 = "d1086687b7f7b0d359a731b1a25e7b66";
   };
 
+  postPatch = let
+    fpr = "${acoustidFingerprinter}/bin/acoustid_fpcalc";
+  in ''
+    sed -ri -e 's|(TextOption.*"acoustid_fpcalc"[^"]*")[^"]*|\1${fpr}|' \
+      picard/ui/options/fingerprinting.py
+  '';
+
   buildInputs = [
     pkgconfig
     ffmpeg
diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
index 501826b82df2..0b8863752d2a 100644
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@@ -1,23 +1,43 @@
-{ stdenv, fetchurl, lightdm, pkgconfig, gtk3, intltool }:
+{ stdenv, fetchurl, lightdm, pkgconfig, intltool
+, hicolor_icon_theme, makeWrapper
+, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported
+}:
 
-stdenv.mkDerivation {
-  name = "lightdm-gtk-greeter";
+#ToDo: bad icons with gtk2;
+#  avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from
+
+#ToDo: Failed to open sessions directory: Error opening directory '${lightdm}/share/lightdm/remote-sessions': No such file or directory
+
+let
+  ver_branch = "1.6";
+  version = "1.5.1"; # 1.5.2 and 1.6.0 result into infinite cycling of X in restarts
+in
+stdenv.mkDerivation rec {
+  name = "lightdm-gtk-greeter-${version}";
 
   src = fetchurl {
-    url = "https://launchpad.net/lightdm-gtk-greeter/1.6/1.5.1/+download/lightdm-gtk-greeter-1.5.1.tar.gz";
-    sha256 = "ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621";
+    url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
+    sha256 = "08fnsbnay5jhd7ps8n91i6c227zq6xizpyn34qhqzykrga8pxkpc";
   };
 
-  buildInputs = [ pkgconfig gtk3 lightdm intltool ];
-
-  patches =
-    [ ./lightdm-gtk-greeter.patch
-    ];
-
+  patches = [ ./lightdm-gtk-greeter.patch ];
   patchFlags = "-p0";
 
+  buildInputs = [ pkgconfig lightdm intltool ]
+    ++ (if useGTK2 then [ gtk2 makeWrapper ] else [ gtk3 ]);
+
+  configureFlags = stdenv.lib.optional useGTK2 "--with-gtk2";
+
   postInstall = ''
       substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \
         --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"
+    '' + stdenv.lib.optionalString useGTK2 ''
+      wrapProgram "$out/sbin/lightdm-gtk-greeter" \
+        --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share"
     '';
+
+  meta = {
+    homepage = http://launchpad.net/lightdm-gtk-greeter;
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index ce1f4400b271..598c42199bec 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -1,25 +1,31 @@
-{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2, intltool, x11, libxklavier, libgcrypt, makeWrapper }:
+{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
+, intltool, x11, libxklavier, libgcrypt, dbus/*for tests*/ }:
 
-stdenv.mkDerivation {
-  name = "lightdm-1.5.1";
+let
+  ver_branch = "1.8";
+  version = "1.7.0";
+in
+stdenv.mkDerivation rec {
+  name = "lightdm-${version}";
 
   src = fetchurl {
-    url = https://launchpad.net/lightdm/1.6/1.5.1/+download/lightdm-1.5.1.tar.xz;
-    sha256 = "645db2d763cc514d6aecb1838f4a9c33c3dcf0c94567a7ef36c6b23d8aa56c86";
+    url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
+    sha256 = "0nwwjgc9xvwili6714ag88wsrf0lr5hv1i6z9f0xvin4ym18cbs5";
   };
 
-  buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt makeWrapper ];
-
-  configureFlags = [ "--enable-liblightdm-gobject" ];
-
-  patches =
-    [ ./lightdm.patch
-    ];
-
+  patches = [ ./lightdm.patch ];
   patchFlags = "-p0";
 
+  buildInputs = [
+    pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt
+  ] ++ stdenv.lib.optional doCheck dbus.daemon;
+
+  configureFlags = [ "--enable-liblightdm-gobject" "--localstatedir=/var" ];
+
+  doCheck = false; # some tests fail, don't know why
+
   meta = {
     homepage = http://launchpad.net/lightdm;
     platforms = stdenv.lib.platforms.linux;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix
new file mode 100644
index 000000000000..45b7de900e26
--- /dev/null
+++ b/pkgs/applications/editors/dhex/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "dhex-${version}";
+  version = "0.68";
+
+  src = fetchurl {
+    url = "http://www.dettus.net/dhex/dhex_${version}.tar.gz";
+    sha256 = "126c34745b48a07448cfe36fe5913d37ec562ad72d3f732b99bd40f761f4da08";
+  };
+
+  buildInputs = [ ncurses ];
+ 
+  installPhase = ''
+    ensureDir $out/bin
+    ensureDir $out/share/man/man1
+    ensureDir $out/share/man/man5
+
+    cp dhex $out/bin
+    cp dhex.1 $out/share/man/man1
+    cp dhexrc.5 $out/share/man/man5
+    cp dhex_markers.5 $out/share/man/man5
+    cp dhex_searchlog.5 $out/share/man/man5
+  '';
+
+  meta = {
+    description = "A themeable hex editor with diff mode";
+    homepage = http://www.dettus.net/dhex/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [qknight];
+  };
+}
diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
new file mode 100644
index 000000000000..ca481f1081d3
--- /dev/null
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, fltk13, ghostscript}:
+
+stdenv.mkDerivation {
+  name = "flpsed-0.7.0";
+
+  src = fetchurl {
+    url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.0.tar.gz";
+    sha1 = "7966fd3b6fb3aa2a376386533ed4421ebb66ad62";
+  };
+
+  buildInputs = [ fltk13 ghostscript ];
+
+  meta = {
+    description = "A WYSIWYG PostScript annotator.";
+    homepage = "http://http://flpsed.org/flpsed.html";
+    license = "GPLv3";
+    platforms = stdenv.lib.platforms.all;
+  };
+
+}
diff --git a/pkgs/applications/editors/mg/configure.patch b/pkgs/applications/editors/mg/configure.patch
new file mode 100644
index 000000000000..11105299eb4b
--- /dev/null
+++ b/pkgs/applications/editors/mg/configure.patch
@@ -0,0 +1,35 @@
+--- configure.old	2013-07-30 19:42:51.000000000 +0200
++++ configure	2013-07-30 19:47:26.000000000 +0200
+@@ -163,31 +163,7 @@
+     echo 'Fails.'
+ fi
+ 
+-
+-if [ ! -r /usr/include/term.h ]; then
+-    note 'term.h'
+-    if [ -r /usr/include/ncurses/term.h ]; then
+-	echo "Found in /usr/include/ncurses"
+-	extraflags="$extraflags -I/usr/include/ncurses"
+-    else
+-	for i in pkg local; do
+-	    if [ -r /usr/$i/include/term.h ]; then
+-		echo "Found in /usr/$i/include"
+-		extralibs="$extralibs -L/usr/$i/lib"
+-		extraflags="$extraflags -I/usr/$i/include"
+-		break
+-	    else
+-		false
+-	    fi
+-	done ||
+-	{
+-	    echo 'Not found!' >&2
+-	    echo 'Do you have the ncurses devel package installed?' >&2
+-	    echo 'If you know where term.h is, please email the author!' >&2
+-	    exit 1
+-	}
+-    fi
+-fi
++extraflags="$extraflags $NIX_CFLAGS_COMPILE"
+ 
+ note 'base and dirname'
+ if gcc_defines "__GLIBC__" || gcc_defines "__CYGWIN__" ; then
diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix
new file mode 100644
index 000000000000..ce69b5c0b5ae
--- /dev/null
+++ b/pkgs/applications/editors/mg/default.nix
@@ -0,0 +1,30 @@
+{ fetchurl, stdenv, ncurses }:
+stdenv.mkDerivation rec {
+  name = "mg-20110905";
+
+  src = fetchurl {
+    url = http://homepage.boetes.org/software/mg/mg-20110905.tar.gz;
+    sha256 = "0ac2c7wy5kkcflm7cmiqm5xhb5c4yfw3i33iln8civ1yd9z7vlqw";
+  };
+
+  dontAddPrefix = true;
+
+  patches = [ ./configure.patch ];
+  patchFlags = "-p0";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp mg $out/bin
+    mkdir -p $out/share/man/man1
+    cp mg.1 $out/share/man/man1
+  '';
+
+  buildInputs = [ ncurses ];
+
+  meta = {
+    homepage = http://homepage.boetes.org/software/mg/;
+    description = "mg is Micro GNU/emacs, this is a portable version of the mg maintained by the OpenBSD team.";
+    license = "public domain";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/applications/editors/tiled-qt/default.nix b/pkgs/applications/editors/tiled-qt/default.nix
new file mode 100644
index 000000000000..05020df01a0e
--- /dev/null
+++ b/pkgs/applications/editors/tiled-qt/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, qt }:
+
+stdenv.mkDerivation rec {
+  name = "tiled-qt-0.9.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/tiled/${name}.tar.gz";
+    sha256 = "09xm6ry56zsqbfl9fvlvc5kq9ikzdskm283r059q6rlc7crzhs38";
+  };
+
+  buildInputs = [ qt ];
+
+  preConfigure = "qmake -r PREFIX=$out";
+
+  meta = {
+    description = "A free, easy to use and flexible tile map editor";
+    homepage = "http://www.mapeditor.org/";
+    # libtiled and tmxviewer is licensed under 2-calause BSD license.
+    # The rest is GPL2 or later.
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  };
+}
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 066c8fddd960..b3992dfec304 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -1,6 +1,6 @@
 # TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
 # but I have gvim with python support now :) - Marc
-args@{source ? "latest", ...}: with args;
+args@{source ? "default", ...}: with args;
 
 
 let inherit (args.composableDerivation) composableDerivation edf; in
@@ -11,7 +11,7 @@ composableDerivation {
                    else stdenv ).mkDerivation;
 } (fix: {
 
-    name = "vim_configurable-7.3";
+    name = "vim_configurable-7.4";
 
     enableParallelBuilding = true; # test this
 
@@ -20,8 +20,8 @@ composableDerivation {
       "default" =
         # latest release
         args.fetchurl {
-            url = ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2;
-            sha256 = "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw";
+            url = ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2;
+            sha256 = "1pjaffap91l2rb9pjnlbrpvb3ay5yhhr3g91zabjvw1rqk9adxfh";
           };
       "vim-nox" =
           {
@@ -31,14 +31,7 @@ composableDerivation {
             name = "vim-nox-hg-2082fc3";
             # END
           }.src;
-      "latest" = {
-        # vim latest usually is vim + bug fixes. So it should be very stable
-         # REGION AUTO UPDATE: { name="vim"; type="hg"; url="https://vim.googlecode.com/hg"; }
-         src = (fetchurl { url = "http://mawercer.de/~nix/repos/vim-hg-7f98896.tar.bz2"; sha256 = "efcb8cc5924b530631a8e5fc2a0622045c2892210d32d300add24aded51866f1"; });
-         name = "vim-hg-7f98896";
-         # END
-      }.src;
-    };
+      };
 
     # if darwin support is enabled, we want to make sure we're not building with
     # OS-installed python framework
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index a3e40004550b..2a2b3dd6be4f 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -1,12 +1,14 @@
 { stdenv, fetchurl, ncurses, gettext, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "vim-7.3";
+  name = "vim-7.4";
  
   src = fetchurl {
     url = "ftp://ftp.vim.org/pub/vim/unix/${name}.tar.bz2";
-    sha256 = "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw";
+    sha256 = "1pjaffap91l2rb9pjnlbrpvb3ay5yhhr3g91zabjvw1rqk9adxfh";
   };
+
+  enableParallelBuilding = true;
  
   buildInputs = [ ncurses pkgconfig ];
   nativeBuildInputs = [ gettext ];
diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 1eb0949aeb41..cb594e494dba 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -1,15 +1,18 @@
-{ stdenv, fetchurl, coreutils , unzip, which, pkgconfig , dbus
+{ stdenv, fetchgit, coreutils , unzip, which, pkgconfig , dbus
 , freetype, xdg_utils , libXext, glib, pango , cairo, libX11, libnotify
 , libxdg_basedir , libXScrnSaver, xproto, libXinerama , perl, gdk_pixbuf
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.0";
-  name = "dunst-${version}";
+  rev = "6a3a855b48a3db64821d1cf8a91c5ee2815a2b2d";
+  name = "dunst-${rev}";
 
-  src = fetchurl {
-    url = "https://github.com/knopwob/dunst/archive/v${version}.zip";
-    sha256 = "1x6k6jrf219v8hmhqhnnfjycldvsnp7ag8a2y8adp5rhfmgyn671";
+  # 1.0.0 release doesn't include 100% CPU fix
+  # https://github.com/knopwob/dunst/issues/98
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/knopwob/dunst.git";
+    sha256 = "0m7yki16d72xm9n2m2fjszd8phqpn5b95q894cz75pmd0sv1j6bj";
   };
 
   patchPhase = ''
@@ -23,7 +26,7 @@ stdenv.mkDerivation rec {
     libXScrnSaver xproto libXinerama perl];
 
   buildPhase = ''
-    export VERSION=${version};
+    export VERSION=${rev};
     export PREFIX=$out;
     make dunst;
   '';
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 6d4fa97c8cb7..aac15789a2db 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -1,18 +1,25 @@
 { stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "pgadmin3-1.10.0";
+  name = "pgadmin3-${version}";
+  version = "1.16.1";
 
   src = fetchurl {
-    url = "http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org/pgadmin3/release/v1.10.0/src/pgadmin3-1.10.0.tar.gz";
-    sha256 = "1ndi951da3jw5800fjdgkbvl8n6k71x7x16ghihi1l88bilf2a16";
+    url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz";
+    sha256 = "13n2nyjnbmjbz9n0xp6627n3pavkqfp4n45l1mnqxhjdq8yj9fnl";
   };
 
   buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ];
 
-  meta = { 
+  preConfigure = ''
+    substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell"
+  '';
+
+  meta = with stdenv.lib; { 
     description = "PostgreSQL administration GUI tool";
     homepage = http://www.pgadmin.org;
-    license = "GPL2";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.iElectric ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index feced2f45384..e9fe255aea83 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "redshift";
-  version = "1.6";
+  version = "1.7";
   name = "${pname}-${version}";
   src = fetchurl {
     url = "http://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2";
-    sha256 = "0g46zhqnx3y2fssmyjgaardzhjw1j29l1dbc2kmccw9wxqfla1wi";
+    sha256 = "1j0hs0vnlic90cf4bryn11n4ani1x2s5l8z6ll3fmrlw98ykrylv";
   };
 
   buildInputs = [ libX11 libXrandr libXxf86vm libxcb pkgconfig python
diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix
index 6f270f5c7cf2..7230e84601e4 100644
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/pkgs/applications/misc/vifm/default.nix
@@ -1,48 +1,31 @@
-x@{builderDefsPackage
-  , ncurses
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ pkgs, fetchurl, stdenv, ncurses, utillinux, file, libX11 }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="vifm";
-    version="0.6.3";
-    name="${baseName}-${version}";
-    url="mirror://sourceforge/project/${baseName}/${baseName}/${name}.tar.bz2";
-    hash="1v5kiifjk7iyqrzjd94wn6a5dz4j3krl06pbp1ps9g3zdq2w2skv";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+let
+  name = "vifm-${version}";
+  version = "0.7.5";
+
+in stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url="mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2";
+    sha256 ="1r1d92zrff94rfx011dw2qsgdwd2ksqlz15la74d6h7sfcsnyd01";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  #phaseNames = ["doConfigure" "doMakeInstall"];
+  buildInputs = [ utillinux ncurses file libX11 ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
   meta = {
     description = "A vi-like file manager";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.gpl2;
+    maintainers = with pkgs.lib.maintainers; [ raskin garbas ];
+    platforms = pkgs.lib.platforms.linux;
+    license = pkgs.lib.licenses.gpl2;
   };
+
   passthru = {
     updateInfo = {
       downloadPage = "http://vifm.sf.net";
     };
   };
-}) x
+}
 
diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index db2b9eb94e38..42d11308267a 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -1,5 +1,5 @@
 { cabal, filepath, libXrandr, mtl, parsec, regexCompat, stm, time
-, utf8String, wirelesstools, X11, X11Xft
+, utf8String, X11, X11Xft
 }:
 
 cabal.mkDerivation (self: {
@@ -11,8 +11,8 @@ cabal.mkDerivation (self: {
   buildDepends = [
     filepath mtl parsec regexCompat stm time utf8String X11 X11Xft
   ];
-  extraLibraries = [ libXrandr wirelesstools ];
-  configureFlags = "-fwith_xft -fwith_iwlib";
+  extraLibraries = [ libXrandr ];
+  configureFlags = "-fwith_xft";
   meta = {
     homepage = "http://projects.haskell.org/xmobar/";
     description = "A Minimalistic Text Based Status Bar";
diff --git a/pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch b/pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch
deleted file mode 100644
index 4fd6a24cc143..000000000000
--- a/pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/printing/printing.gyp b/printing/printing.gyp
-index 19fa1b2..f11d76e 100644
---- a/printing/printing.gyp
-+++ b/printing/printing.gyp
-@@ -26,6 +26,9 @@
-       'include_dirs': [
-         '..',
-       ],
-+      'cflags': [
-+        '-Wno-deprecated-declarations',
-+      ],
-       'sources': [
-         'backend/print_backend.cc',
-         'backend/print_backend.h',
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 8188d5279a75..df2a8ca5ce78 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -127,14 +127,16 @@ in stdenv.mkDerivation rec {
 
   prePatch = "patchShebangs .";
 
-  patches = [ userns_patch ]
-         ++ optional cupsSupport ./cups_allow_deprecated.patch;
+  patches = [ userns_patch ];
 
   postPatch = ''
     sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi
     sed -i -e 's|/usr/bin/gcc|gcc|' third_party/WebKit/Source/core/core.gypi
   '' + optionalString useOpenSSL ''
     cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
+  '' + optionalString (versionOlder sourceInfo.version "29.0.0.0") ''
+    sed -i -e '/struct SECItemArray/,/^};/d' \
+      net/third_party/nss/ssl/bodge/secitem_array.c
   '';
 
   gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
@@ -213,7 +215,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Chromium, an open source web browser";
+    description = "An open source web browser from Google";
     homepage = http://www.chromium.org/;
     maintainers = with maintainers; [ goibhniu chaoflow aszlig ];
     license = licenses.bsd3;
diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index 31d9ed10b4cd..a4769d172cd7 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 = "30.0.1573.2";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1573.2.tar.xz";
-    sha256 = "1pbph4jz0svaawk06zajq73x0xm73f9kdiflhad2709f4y23gzjz";
+    version = "30.0.1588.0";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1588.0.tar.xz";
+    sha256 = "1jwc2pkd75gax8vj8wzahhpzl6ilgrlj3bcbah975yy67m7c8p13";
   };
   beta = {
-    version = "29.0.1547.32";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.32.tar.xz";
-    sha256 = "14p5s1xn15mdrlf87hv4y9kczw5r8s461a56kkdzb5xzyq25ph8w";
+    version = "29.0.1547.49";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.49.tar.xz";
+    sha256 = "03r64rydi2kbxgi2dcpslmpb716ppadqy1jzrbw39icz5xpgmg3k";
   };
   stable = {
-    version = "28.0.1500.71";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.71.tar.xz";
-    sha256 = "1w8hkbb17bwq9myhj7fig27pn50qlwdfrqs04xjvam4ah3w6qb0r";
+    version = "28.0.1500.95";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.95.tar.xz";
+    sha256 = "0d6pj57nyx7wfgxws98f6ly749flcyv7zg5sc3w16ggdxf5qhf1w";
   };
 }
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 912a193eec9a..b780152905d9 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -19,9 +19,9 @@ assert useSystemCairo -> cairo != null;
 let optional = stdenv.lib.optional;
 in rec {
 
-  firefoxVersion = "22.0";
+  firefoxVersion = "23.0";
 
-  xulVersion = "22.0"; # this attribute is used by other packages
+  xulVersion = "23.0"; # this attribute is used by other packages
 
 
   src = fetchurl {
@@ -31,7 +31,7 @@ in rec {
         # Fall back to this url for versions not available at releases.mozilla.org.
         "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
     ];
-    sha1 = "db2d5b028b6ea95b5f006b46e153f50f7a52bf80";
+    sha1 = "31936d2ddb727640c96a3ae697bf145c42a2a20e";
   };
 
   commonConfigureFlags =
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index b15c05c7b493..4d561737d276 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -12,6 +12,7 @@ let
     gtksourceview pkgconfig which gettext makeWrapper 
     file libidn sqlite docutils libnotify libsoup vala
     kbproto xproto scrnsaverproto libXScrnSaver dbus_glib
+    glib_networking
   ];
 in
 rec {
@@ -34,7 +35,11 @@ rec {
       
   shebangsHere = (doPatchShebangs ".");
   shebangsInstalled = (doPatchShebangs "$out/bin");
-  wrapWK = (makeManyWrappers "$out/bin/*" "--set WEBKIT_IGNORE_SSL_ERRORS 1");
+  wrapWK = (makeManyWrappers "$out/bin/*" 
+  ''
+    --set WEBKIT_IGNORE_SSL_ERRORS 1 \
+    --prefix GIO_EXTRA_MODULES : "${args.glib_networking}/lib/gio/modules" 
+  '');
 
   name = "midori-${version}.${release}";
   meta = {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index 10faa983cc1c..0363176257fd 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -44,9 +44,9 @@ let
         throw "no x86_64 debugging version available"
       else rec {
         # -> http://labs.adobe.com/downloads/flashplayer10.html
-        version = "11.2.202.273";
+        version = "11.2.202.297";
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "0c15nszgg7zsv00n2qxha5zf8hmyf8i6byvhalnh5x46mr0rkbv9";
+        sha256 = "0jfigq56p6zp61pmc4jl12p8gv2jhfmim18j1b30iikw3iv26lh8";
       }
     else if stdenv.system == "i686-linux" then
       if debug then {
@@ -55,9 +55,9 @@ let
         url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
         sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk";
       } else rec {
-        version = "11.2.202.273";
+        version = "11.2.202.297";
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "1gb14xv7gbq57qg1hxmrnryaw6xgmkg54ql5hr7q6szplj65wvmd";
+        sha256 = "0mpj25b2ar7gccqmw5lffdzlr3yyfalphpgwnl18s05wy1fx484y";
       }
     else throw "Flash Player is not supported on this platform";
 
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 7d537d3085d2..94d1d08b9e47 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -12,17 +12,17 @@
   enableOfficialBranding ? false
 }:
 
-let version = "17.0.7"; in
+let version = "17.0.8"; in
 
 stdenv.mkDerivation {
   name = "thunderbird-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
-    sha1 = "d6dca3e1cc4293f2e15d6b35056bd8dc319014ee";
+    sha1 = "4bcbb33f0b3ea050e805723680b5669d80438812";
   };
 
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   buildInputs =
     [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index fd391b988c9a..4c8204b37ee3 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -36,9 +36,15 @@ stdenv.mkDerivation rec {
       --with-system-pcre
       --with-system-xz
       --with-ICU
-      R_SHELL="${stdenv.shell}"
+      AR=$(type -p ar)
+      AWK=$(type -p gawk)
+      CC=$(type -p gcc)
+      CXX=$(type -p g++)
+      FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran"
       JAVA_HOME="${jdk}"
       LDFLAGS="-L${gfortran.gcc}/lib"
+      RANLIB=$(type -p ranlib)
+      R_SHELL="${stdenv.shell}"
     )
     echo "TCLLIBPATH=${tk}/lib" >>etc/Renviron.in
   '';
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 69aeba92fd8a..b5b3d4044c52 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -89,9 +89,5 @@ rec {
 
   svn2git_kde = callPackage ./svn2git-kde { };
 
-  gitSubtree = import ./git-subtree {
-    inherit stdenv fetchurl git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt;
-  };
-
   darcsToGit = callPackage ./darcs-to-git { };
 }
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 e53f60c9be0f..f7b0129da90f 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
@@ -1,7 +1,7 @@
 { cabal, aeson, async, blazeBuilder, bloomfilter, bup
 , caseInsensitive, clientsession, cryptoApi, curl, dataDefault
 , dataenc, DAV, dbus, dlist, dns, editDistance
-, extensibleExceptions, filepath, git, gnupg1, gnutls, hamlet
+, extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet
 , hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, HUnit
 , IfElse, json, lsof, MissingH, MonadCatchIOTransformers
 , monadControl, mtl, network, networkInfo, networkMulticast
@@ -14,15 +14,15 @@
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "4.20130723";
-  sha256 = "1fc8kz4n2g4x9fzvdx4bz4d8gkbajdnqphldcglwl23g97vyrn6i";
+  version = "4.20130802";
+  sha256 = "12dvmz88sbcvhyf7aldhpkrf4aqs0x39hky0hikmfd9zcqs6vbih";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     aeson async blazeBuilder bloomfilter caseInsensitive clientsession
     cryptoApi dataDefault dataenc DAV dbus dlist dns editDistance
-    extensibleExceptions filepath gnutls hamlet hinotify hS3 hslogger
-    HTTP httpConduit httpTypes HUnit IfElse json MissingH
+    extensibleExceptions feed filepath gnutls hamlet hinotify hS3
+    hslogger HTTP httpConduit httpTypes HUnit IfElse json MissingH
     MonadCatchIOTransformers monadControl mtl network networkInfo
     networkMulticast networkProtocolXmpp QuickCheck random regexTdfa
     SafeSemaphore SHA stm text time transformers unixCompat utf8String
diff --git a/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix
deleted file mode 100644
index dd00572b150c..000000000000
--- a/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, git, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt }:
-
-stdenv.mkDerivation {
-  name = "git-subtree-0.4-2-g2793ee6";
-
-  src = fetchurl {
-    url = "http://github.com/apenwarr/git-subtree/tarball/2793ee6ba6da57d97e9c313741041f7eb2e88974";
-    sha256 = "33fdba315cf8846f45dff7622c1099c386db960c7b43d5d8fbb382fd4d1acff6";
-    name = "git-subtree-0.4-2-g2793ee6.tar.gz";
-  };
-
-  buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ];
-
-  configurePhase = "export prefix=$out";
-
-  buildPhase = "true";
-
-  installPhase = "make install prefix=$out gitdir=$out/bin";
-
-  meta= {
-    description = "experimental alternative to the git-submodule command";
-    homepage = http://github.com/apenwarr/git-subtree;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.gnu;
-    maintainers = [ stdenv.lib.maintainers.simons ];
-  };
-}
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 9a08d665f998..5cacc165821c 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.3.2";
+  version = "1.8.3.4";
 
   svn = subversionClient.override { perlBindings = true; };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "0mfylhcdrh8prxkbs0gc877rmra2ks48bchg4hhaf2vpw9hpdf63";
+    sha256 = "1nfr4hgqs3b6k9wanqcix0wlw71q61h5irxiavlspd4jvzrcv8nz";
   };
 
   patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
@@ -51,6 +51,13 @@ stdenv.mkDerivation {
         chmod +x $1
       }
 
+      # Install git-subtree.
+      pushd contrib/subtree
+      make
+      make install install-doc
+      popd
+      rm -rf contrib/subtree
+
       # Install contrib stuff.
       mkdir -p $out/share/git
       mv contrib $out/share/git/
diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
index 963f4dd295b5..d92b49b9ef6c 100644
--- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
@@ -1,18 +1,18 @@
 {stdenv, fetchurl, qt, libXext, libX11}:
 
 stdenv.mkDerivation rec {
-  name = "qgit-2.3";
+  name = "qgit-2.5";
   meta =
   {
     license = "GPLv2";
-    homepage = "http://digilander.libero.it/mcostalba/";
+    homepage = "http://libre.tibirna.org/projects/qgit/wiki/QGit";
     description = "Graphical front-end to Git";
     inherit (qt.meta) platforms;
   };
   src = fetchurl
   {
-    url = "mirror://sourceforge/qgit/${name}.tar.bz2";
-    sha256 = "a5fdd7e27fea376790eed787e22f4863eb9d2fe0217fd98b9fdbcf47a45bdc64";
+    url = "http://libre.tibirna.org/attachments/download/9/${name}.tar.gz";
+    sha256 = "25f1ca2860d840d87b9919d34fc3a1b05d4163671ed87d29c3e4a8a09e0b2499";
   };
   buildInputs = [qt libXext libX11];
   configurePhase = "qmake PREFIX=$out";
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index c5a740425908..95b244e7d91e 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;
 
 stdenv.mkDerivation rec {
 
-  version = "1.7.10";
+  version = "1.7.11";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "mirror://apache/subversion//${name}.tar.bz2";
-    sha1 = "a4f3de0a13b034b0eab4d35512c6c91a4abcf4f5";
+    sha1 = "d82e187803043b74c072cd5a861ac02e4a027684";
   };
 
   buildInputs = [ zlib apr aprutil sqlite ]
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 1a35b8701929..dcf5b4e50097 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,22 +1,25 @@
 { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman
 , attr, libcap, vde2, alsaLib, texinfo, libuuid
+, makeWrapper
 , sdlSupport ? true, SDL
 , vncSupport ? true, libjpeg, libpng
 , spiceSupport ? true, spice, spice_protocol
 , x86Only ? false
 }:
 
+let n = "qemu-1.5.2"; in
+
 stdenv.mkDerivation rec {
-  name = "qemu-1.5.1";
+  name = n + (if x86Only then "-x86-only" else "");
 
   src = fetchurl {
-    url = "http://wiki.qemu.org/download/${name}.tar.bz2";
-    sha256 = "1s7316pgizpayr472la8p8a4vhv7ymmzd5qlbkmq6y9q5zpa25ac";
+    url = "http://wiki.qemu.org/download/${n}.tar.bz2";
+    sha256 = "0l52jwlxmwp9g3jpq0g7ix9dq4qgh46nd2h58lh47f0a35yi8qgn";
   };
 
   buildInputs =
     [ python zlib pkgconfig glib ncurses perl pixman attr libcap
-      vde2 alsaLib texinfo libuuid
+      vde2 alsaLib texinfo libuuid makeWrapper
     ]
     ++ stdenv.lib.optionals sdlSupport [ SDL ]
     ++ stdenv.lib.optionals vncSupport [ libjpeg libpng ]
@@ -31,6 +34,15 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional spiceSupport "--enable-spice"
     ++ stdenv.lib.optional x86Only "--target-list=i386-softmmu,x86_64-softmmu";
 
+  postInstall =
+    ''
+      # Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
+      p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}"
+      if [ -e "$p" ]; then
+        makeWrapper "$p" $out/bin/qemu-kvm --add-flags "-enable-kvm"
+      fi
+    '';
+
   meta = {
     homepage = http://www.qemu.org/;
     description = "A generic and open source machine emulator and virtualizer";
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 264f1259fe54..09b6e015a931 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -11,7 +11,7 @@ with stdenv.lib;
 
 let
 
-  version = "4.2.14"; # changes ./guest-additions as well
+  version = "4.2.16"; # changes ./guest-additions as well
 
   forEachModule = action: ''
     for mod in \
@@ -31,11 +31,13 @@ let
   '';
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "86644";
+  extpackRevision = "86992";
   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";
+    # IMPORTANT: Hash must be base16 encoded because it's used as an input to
+    # VBoxExtPackHelperApp!
+    # Tip: nix-hash --type sha256 --to-base16 "hash from nix-prefetch-url"
+    sha256 = "8f88b1ebe69b770103e9151bebf6681c5e049eb5fac45ae8d52c43440aa0fa0d";
     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:
@@ -54,7 +56,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "038k65cdvr80da5nfan5r3rjrnxqab2fbf2pr2jq8g1gc4cxrxpq";
+    sha256 = "0nnl8qh8j4sk5zn78hrp6ccidmk332p7qg6pv5a0a4irs0b8j3zz";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index e7843b07fc34..cca133685f60 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "9f08f13bbd818fb3ef9916658542ad0999c35e11afc1f6e8ff0b944405486e8a";
+    sha256 = "1id0rb2sdnn34rvjl2v3hp3z9g9c4s4f4kl1lx0myjlqv8i0fayg";
   };
 
   KERN_DIR = "${kernelDev}/lib/modules/*/build";
diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix
new file mode 100644
index 000000000000..2b146a78cb39
--- /dev/null
+++ b/pkgs/applications/window-managers/windowmaker/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, libX11, libXft, libXmu }:
+
+stdenv.mkDerivation rec {
+  name = "windowmaker-${version}";
+  version = "0.95.4";
+
+  src = fetchurl {
+    url = "http://windowmaker.org/pub/source/release/"
+        + "WindowMaker-${version}.tar.gz";
+    sha256 = "0icffqnmkkjjf412m27wljbf9vxb2ry4aiyi2pqmzw3h0pq9gsib";
+  };
+
+  buildInputs = [ pkgconfig libX11 libXft libXmu ];
+
+  meta = {
+    homepage = "http://windowmaker.org/";
+    description = "NeXTSTEP-like window manager";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh
index 4e34aad052b5..c1b0db895bc1 100644
--- a/pkgs/build-support/fetchmtn/builder.sh
+++ b/pkgs/build-support/fetchmtn/builder.sh
@@ -24,7 +24,7 @@ for source in $dbs; do
 			echo "selector $selector does not match any revision";
 		fi
 	else
-		echo "pulling branch $branch wasn't succesfull";
+		echo "pulling branch $branch wasn't successful";
 	fi;
 	if test -n "$done"; then
 		break;
diff --git a/pkgs/build-support/kernel/modules-closure.nix b/pkgs/build-support/kernel/modules-closure.nix
index cc197edbef19..cad0c7a21f94 100644
--- a/pkgs/build-support/kernel/modules-closure.nix
+++ b/pkgs/build-support/kernel/modules-closure.nix
@@ -4,12 +4,12 @@
 # Also generate an appropriate modules.dep.
 
 { stdenv, kernel, nukeReferences, rootModules
-, module_init_tools, allowMissing ? false }:
+, kmod, allowMissing ? false }:
 
 stdenv.mkDerivation {
   name = kernel.name + "-shrunk";
   builder = ./modules-closure.sh;
   buildInputs = [nukeReferences];
-  inherit kernel rootModules module_init_tools allowMissing;
+  inherit kernel rootModules kmod allowMissing;
   allowedReferences = ["out"];
 }
diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh
index aa2615eb578d..d0ac88f69247 100644
--- a/pkgs/build-support/kernel/modules-closure.sh
+++ b/pkgs/build-support/kernel/modules-closure.sh
@@ -2,24 +2,20 @@ source $stdenv/setup
 
 set -o pipefail
 
-PATH=$module_init_tools/sbin:$PATH
+PATH=$kmod/sbin:$PATH
 
 version=$(cd $kernel/lib/modules && ls -d *)
 
 echo "kernel version is $version"
 
-export MODULE_DIR=$(readlink -f $kernel/lib/modules/)
-
 # Determine the dependencies of each root module.
 closure=
 for module in $rootModules; do
     echo "root module: $module"
-    deps=$(modprobe --config /dev/null --set-version "$version" --show-depends "$module" \
+    deps=$(modprobe --config no-config -d $kernel --set-version "$version" --show-depends "$module" \
         | sed 's/^insmod //') \
         || if test -z "$allowMissing"; then exit 1; fi
-    #for i in $deps; do echo $i; done
-    if [[ "$deps" != builtin* ]]
-    then
+    if [[ "$deps" != builtin* ]]; then
         closure="$closure $deps"
     fi
 done
@@ -41,4 +37,4 @@ for module in $closure; do
     echo $target >> $out/insmod-list
 done
 
-MODULE_DIR=$out/lib/modules/ depmod -a $version
+depmod -b $out -a $version
diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix
index 20dcf2fbd0cd..8875a8594dc0 100644
--- a/pkgs/build-support/release/default.nix
+++ b/pkgs/build-support/release/default.nix
@@ -40,13 +40,21 @@ rec {
     } // args);
 
   aggregate =
-    { name, members, meta ? { } }:
+    { name, constituents, meta ? { } }:
     pkgs.runCommand name
-      { inherit members meta;
+      { inherit constituents meta;
         _hydraAggregate = true;
       }
       ''
-        echo $members > $out
+        mkdir -p $out/nix-support
+        echo $constituents > $out/nix-support/hydra-aggregate-constituents
+
+        # Propagate build failures.
+        for i in $constituents; do
+          if [ -e $i/nix-support/failed ]; then
+            touch $out/nix-support/failed
+          fi
+        done
       '';
 
 }
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index dbab401d9baa..996770d2fcc2 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1,5 +1,5 @@
 { pkgs
-, kernel ? pkgs.linux_3_9
+, kernel ? pkgs.linux_3_10
 , img ? "bzImage"
 , rootModules ?
     [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" ]
@@ -9,9 +9,9 @@ with pkgs;
 
 rec {
 
-  kvm = pkgs.qemu;
+  qemu = pkgs.qemu_kvm;
 
-  qemuProg = "${kvm}/bin/qemu-system-" + (if stdenv.system == "x86_64-linux" then "x86_64" else "i386");
+  qemuProg = "${qemu}/bin/qemu-kvm";
 
 
   modulesClosure = makeModulesClosure {
@@ -91,8 +91,8 @@ rec {
       esac
     done
 
+    echo "loading kernel modules..."
     for i in $(cat ${modulesClosure}/insmod-list); do
-      echo "loading module $(basename $i .ko)"
       insmod $i
     done
 
@@ -114,14 +114,14 @@ rec {
 
     echo "mounting Nix store..."
     mkdir -p /fs/nix/store
-    mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache
+    mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=loose
 
     mkdir -p /fs/tmp
     mount -t tmpfs -o "mode=755" none /fs/tmp
 
     echo "mounting host's temporary directory..."
     mkdir -p /fs/tmp/xchg
-    mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache
+    mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=262144,cache=loose
 
     mkdir -p /fs/proc
     mount -t proc none /fs/proc
@@ -133,7 +133,7 @@ rec {
     ln -sf /proc/mounts /fs/etc/mtab
     echo "127.0.0.1 localhost" > /fs/etc/hosts
 
-    echo "Now running: $command"
+    echo "starting stage 2 ($command)"
     test -n "$command"
 
     set +e
@@ -188,7 +188,6 @@ rec {
 
   qemuCommandLinux = ''
     ${qemuProg} \
-      -enable-kvm \
       ${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
       -nographic -no-reboot \
       -virtfs local,path=/nix/store,security_model=none,mount_tag=store \
@@ -196,7 +195,7 @@ rec {
       -drive file=$diskImage,if=virtio,cache=writeback,werror=report \
       -kernel ${kernel}/${img} \
       -initrd ${initrd}/initrd \
-      -append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk" \
+      -append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \
       $QEMU_OPTS
   '';
 
@@ -242,7 +241,7 @@ rec {
   createEmptyImage = {size, fullName}: ''
     mkdir $out
     diskImage=$out/disk-image.qcow2
-    ${kvm}/bin/qemu-img create -f qcow2 $diskImage "${toString size}M"
+    ${qemu}/bin/qemu-img create -f qcow2 $diskImage "${toString size}M"
 
     mkdir $out/nix-support
     echo "${fullName}" > $out/nix-support/full-name
@@ -362,7 +361,7 @@ rec {
       diskImage=$(pwd)/disk-image.qcow2
       origImage=${attrs.diskImage}
       if test -d "$origImage"; then origImage="$origImage/disk-image.qcow2"; fi
-      ${kvm}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage
+      ${qemu}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage
     '';
 
     /* Inside the VM, run the stdenv setup script normally, but at the
@@ -459,7 +458,7 @@ rec {
     fi
     diskImage="$1"
     if ! test -e "$diskImage"; then
-      ${kvm}/bin/qemu-img create -b ${image}/disk-image.qcow2 -f qcow2 "$diskImage"
+      ${qemu}/bin/qemu-img create -b ${image}/disk-image.qcow2 -f qcow2 "$diskImage"
     fi
     export TMPDIR=$(mktemp -d)
     export out=/dummy
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index f1bc98c26cc4..15b49a2a99e2 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "man-pages-3.50";
+  name = "man-pages-3.53";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "04fn7zzi75y79rkg57nkync3hf14m8708iw33s03f0x8ays6fajz";
+    sha256 = "0kzkjfrw65f7bv6laz3jism4yqajmfh3vdq2jb5d6gyp4n14sxnl";
   };
 
   preBuild =
diff --git a/pkgs/data/misc/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix
similarity index 100%
rename from pkgs/data/misc/hicolor-icon-theme/default.nix
rename to pkgs/data/icons/hicolor-icon-theme/default.nix
diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix
new file mode 100644
index 000000000000..57a6718669bd
--- /dev/null
+++ b/pkgs/data/icons/tango-icon-theme/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg }:
+
+stdenv.mkDerivation rec {
+  name = "tango-icon-theme-0.8.90";
+
+  src = fetchurl {
+    url = "http://tango.freedesktop.org/releases/${name}.tar.gz";
+    sha256 = "13n8cpml71w6zfm2jz5fa7r1z18qlzk4gv07r6n1in2p5l1xi63f";
+  };
+
+  patches = [ ./rsvg-convert.patch ];
+
+  buildInputs = [ intltool pkgconfig iconnamingutils imagemagick librsvg ];
+
+  configureFlags = "--enable-png-creation";
+
+  meta = {
+    description = "A basic set of icons";
+    homepage = http://tango.freedesktop.org/Tango_Icon_Library;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/data/icons/tango-icon-theme/rsvg-convert.patch b/pkgs/data/icons/tango-icon-theme/rsvg-convert.patch
new file mode 100644
index 000000000000..ee3d00ccf3ed
--- /dev/null
+++ b/pkgs/data/icons/tango-icon-theme/rsvg-convert.patch
@@ -0,0 +1,34 @@
+Based on https://build.opensuse.org/package/view_file?file=tango-icon-theme-rsvg-2_35_2.patch&package=tango-icon-theme&project=openSUSE%3A12.2&rev=faf71bf8278d5df6ec8a31726e5b8542
+
+diff -ru -x '*~' tango-icon-theme-0.8.90/configure tango-icon-theme-0.8.90-new/configure
+--- tango-icon-theme-0.8.90/configure	2009-02-26 04:08:00.000000000 +0100
++++ tango-icon-theme-0.8.90-new/configure	2013-08-15 17:54:24.167065399 +0200
+@@ -6554,7 +6554,7 @@
+   enable_large_bitmaps=no
+ fi
+    if test "x$enable_large_bitmaps" = "xyes"; then
+-      svgconvert_prog="rsvg"
++      svgconvert_prog="rsvg-convert"
+    else
+       svgconvert_prog="ksvgtopng"
+    fi
+diff -ru -x '*~' tango-icon-theme-0.8.90/svg2png.sh.in tango-icon-theme-0.8.90-new/svg2png.sh.in
+--- tango-icon-theme-0.8.90/svg2png.sh.in	2007-02-16 21:04:29.000000000 +0100
++++ tango-icon-theme-0.8.90-new/svg2png.sh.in	2013-08-15 17:54:08.275084837 +0200
+@@ -9,12 +9,14 @@
+ 
+ ICONFILE=`basename ${3}`
+ ICONNAME=`echo ${ICONFILE} | sed -e "s/.svg//"`
+-if test `basename $SVGCONVERT` = "rsvg"; then
++if test `basename $SVGCONVERT` = "rsvg-convert"; then
+     OPTIONS="-w ${1} -h ${1}"
++    OUTPUT="-o"
+ else
+     OPTIONS="${1} ${1}"
++    OUTPUT=""
+ fi
+ 
+ echo "${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png"
+-${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png
++${SVGCONVERT} ${OPTIONS} ${3} ${OUTPUT} ${2}/${ICONNAME}.png
+ 
diff --git a/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix
index 611c6a70f6bc..7c9846fbf9e8 100644
--- a/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix
+++ b/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix
@@ -1,7 +1,7 @@
 { kde, kdelibs }:
 
 kde rec {
-  name = "kde-wallpapers";
+  name = "kdeartwork-wallpapers";
 
   buildInputs = [ kdelibs ];
 
diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch
index 03df484b63e4..53257e836e04 100644
--- a/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch
+++ b/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch
@@ -1,46 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 79945c4..a244d0f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,10 +32,6 @@ set(generator_SRC
-     type.cpp
- )
+diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in
+--- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in	2013-06-28 17:14:50.000000000 +0000
++++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in	2013-07-30 21:26:33.000000000 +0000
+@@ -80,8 +80,7 @@
+ set(SMOKE_API_BIN "@SMOKE_API_BIN@")
  
--# force RPATH so that the binary is usable from within the build tree
--set (CMAKE_SKIP_BUILD_RPATH FALSE)
--set (CMAKE_SKIP_RPATH FALSE)
--
- configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
+ find_library(SMOKE_BASE_LIBRARY smokebase 
+-              PATHS "@SMOKE_LIBRARY_PREFIX@"
+-              NO_DEFAULT_PATH)
++              PATHS "@SMOKE_LIBRARY_PREFIX@")
  
- add_executable(smokegen ${generator_SRC})
-diff --git a/cmake/SmokeConfig.cmake.in b/cmake/SmokeConfig.cmake.in
-index 947315c..de8d66c 100644
---- a/cmake/SmokeConfig.cmake.in
-+++ b/cmake/SmokeConfig.cmake.in
-@@ -44,21 +44,19 @@ macro (find_smoke_component name)
-         set (SMOKE_${uppercase}_FOUND FALSE CACHE INTERNAL "")
- 
-         find_path(SMOKE_${uppercase}_INCLUDE_DIR 
--            ${lowercase}_smoke.h 
--            PATH ${SMOKE_INCLUDE_DIR}
--            NO_DEFAULT_PATH
-+            ${lowercase}_smoke.h
-+            HINTS ${SMOKE_INCLUDE_DIR}
-+            PATH_SUFFIXES smoke
-             )
-         if(WIN32)
- 		    # DLLs are in the bin directory.
-             find_library(SMOKE_${uppercase}_LIBRARY
-                 smoke${lowercase}
--                PATHS "@CMAKE_INSTALL_PREFIX@/bin"
--                NO_DEFAULT_PATH)
-+                PATHS "@CMAKE_INSTALL_PREFIX@/bin")
-         else(WIN32)
-             find_library(SMOKE_${uppercase}_LIBRARY
-                 smoke${lowercase}
--                PATHS "@SMOKE_LIBRARY_PREFIX@"
--                NO_DEFAULT_PATH)
-+                PATHS "@SMOKE_LIBRARY_PREFIX@")
-         endif(WIN32)
- 
-         if (NOT SMOKE_${uppercase}_INCLUDE_DIR OR NOT SMOKE_${uppercase}_LIBRARY)
+ if (NOT SMOKE_BASE_LIBRARY)
+     if (Smoke_FIND_REQUIRED)
diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix
index 9bc9634469c7..5248d6567d24 100644
--- a/pkgs/desktops/xfce/applications/mousepad.nix
+++ b/pkgs/desktops/xfce/applications/mousepad.nix
@@ -12,10 +12,14 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [
-    pkgconfig intltool libxfce4util libxfcegui4
-    gtk gtksourceview dbus dbus_glib
-  ];
+  buildInputs =
+    [ pkgconfig intltool libxfce4util libxfcegui4
+      gtk gtksourceview dbus dbus_glib
+    ];
+
+  # Propagate gtksourceview into $XDG_DATA_DIRS to provide syntax
+  # highlighting (in fact Mousepad segfaults without it).
+  propagatedUserEnvPkgs = [ gtksourceview ];
 
   meta = {
     homepage = http://www.xfce.org/;
diff --git a/pkgs/desktops/xfce/common.nix b/pkgs/desktops/xfce/common.nix
index 8be4ac09e145..a7e64707f916 100644
--- a/pkgs/desktops/xfce/common.nix
+++ b/pkgs/desktops/xfce/common.nix
@@ -52,11 +52,13 @@
     #### APPLICATIONS
     #TODO: correct links; more stuff
 
-    xfce4notifyd      = callPackage ./applications/xfce4-notifyd.nix      { v= "0.2.2"; h= "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn"; };
-    gigolo            = callPackage ./applications/gigolo.nix             { v= "0.4.1"; h= "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2"; };
-    xfce4taskmanager  = callPackage ./applications/xfce4-taskmanager.nix  { v= "1.0.0"; h= "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0"; };
-    mousepad          = callPackage ./applications/mousepad.nix           { v= "0.3.0"; h= "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh"; };
-    thunar_volman     = callPackage ./core/thunar-volman.nix              { };
+    xfce4notifyd           = callPackage ./applications/xfce4-notifyd.nix      { v= "0.2.2"; h= "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn"; };
+    gigolo                 = callPackage ./applications/gigolo.nix             { v= "0.4.1"; h= "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2"; };
+    xfce4taskmanager       = callPackage ./applications/xfce4-taskmanager.nix  { v= "1.0.0"; h= "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0"; };
+    mousepad               = callPackage ./applications/mousepad.nix           { v= "0.3.0"; h= "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh"; };
+    thunar_volman          = callPackage ./core/thunar-volman.nix              { };
+    thunar_archive_plugin  = callPackage ./core/thunar-archive-plugin.nix      { };
+
 
     #### ART
 
diff --git a/pkgs/desktops/xfce/core/thunar-archive-plugin.nix b/pkgs/desktops/xfce/core/thunar-archive-plugin.nix
new file mode 100644
index 000000000000..62b04caaa347
--- /dev/null
+++ b/pkgs/desktops/xfce/core/thunar-archive-plugin.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, thunar, intltool, exo, gtk, udev, libxfce4ui, libxfce4util, xfconf }:
+
+stdenv.mkDerivation rec {
+  name  = "thunar-archive-plugin-${version}";
+  maj_ver = "0.3";
+  version = "${maj_ver}.1";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/thunar-plugins/${name}/${maj_ver}/${name}.tar.bz2";
+    sha256 = "1sxw09fwyn5sr6ipxk7r8gqjyf41c2v7vkgl0l6mhy5mcb48f27z";
+  };
+
+  buildInputs = [ pkgconfig thunar intltool exo gtk udev libxfce4ui libxfce4util xfconf ];
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://foo-projects.org/~benny/projects/thunar-archive-plugin/;
+    description = "The Thunar Archive Plugin allows you to create and extract archive files using the file context menus in the Thunar file manager";
+    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.iElectric ];
+  };
+}
diff --git a/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch b/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch
new file mode 100644
index 000000000000..51ac265dcb1f
--- /dev/null
+++ b/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch
@@ -0,0 +1,12 @@
+diff -ru -x '*~' xfce4-settings-4.10.1/xfsettingsd/xsettings.xml xfce4-settings-4.10.1-new/xfsettingsd/xsettings.xml
+--- xfce4-settings-4.10.1/xfsettingsd/xsettings.xml	2013-05-05 18:12:54.000000000 +0200
++++ xfce4-settings-4.10.1-new/xfsettingsd/xsettings.xml	2013-08-15 15:57:48.538586286 +0200
+@@ -7,7 +7,7 @@
+ <channel name="xsettings" version="1.0">
+   <property name="Net" type="empty">
+     <property name="ThemeName" type="empty"/>
+-    <property name="IconThemeName" type="empty"/>
++    <property name="IconThemeName" type="string" value="Rodent"/>
+     <property name="DoubleClickTime" type="int" value="250"/>
+     <property name="DoubleClickDistance" type="int" value="5"/>
+     <property name="DndDragThreshold" type="int" value="8"/>
diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix
index d597237e32b2..2e76b22510f9 100644
--- a/pkgs/desktops/xfce/core/xfce4-settings.nix
+++ b/pkgs/desktops/xfce/core/xfce4-settings.nix
@@ -11,14 +11,18 @@ stdenv.mkDerivation rec {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "1m8k9s7qihwkkbjrrkmk103a6iwahxdfq65aswrsbqshx9cnk2hi";
   };
+
   name = "${p_name}-${ver_maj}.${ver_min}";
 
+  patches = [ ./xfce4-settings-default-icon-theme.patch ];
+
   buildInputs =
     [ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade
       xfconf xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon
-    #gtk libxfce4util libxfcegui4 libwnck dbus_glib
+      #gtk libxfce4util libxfcegui4 libwnck dbus_glib
       #xfconf libglade xorg.iceauth
     ];
+
   configureFlags = "--enable-pluggable-dialogs --enable-sound-settings";
 
   meta = {
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index e5daaca9d528..a6107d0a8707 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -24,6 +24,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   libxfcegui4     = callPackage ./core/libxfcegui4.nix { };
   thunar          = callPackage ./core/thunar.nix { };
   thunar_volman   = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now
+  thunar_archive_plugin  = callPackage ./core/thunar-archive-plugin.nix { };
   tumbler         = callPackage ./core/tumbler.nix { };
   xfce4panel      = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4
   xfce4session    = callPackage ./core/xfce4-session.nix { };
@@ -48,12 +49,10 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { };
   xfce4terminal   = callPackage ./applications/terminal.nix { };
 
-
   #### ART                  from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2"
 
   xfce4icontheme  = callPackage ./art/xfce4-icon-theme.nix { };
 
-
   #### PANEL PLUGINS        from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"
 
   xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { };
diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix
index 100b3aa87f13..e77c2251b36d 100644
--- a/pkgs/development/arduino/ino/default.nix
+++ b/pkgs/development/arduino/ino/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, buildPythonPackage, pythonPackages, minicom
 , avrdude, arduino_core, avrgcclibc }:
 
-buildPythonPackage {
-  name = "ino-0.3.4";
+buildPythonPackage rec {
+  name = "ino-0.3.5";
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://pypi.python.org/packages/source/i/ino/ino-0.3.4.tar.gz";
-    sha256 = "1v7z3da31cv212k28aci269qkg92p377fm7i76rymjjpjra7payv";
+    url = "http://pypi.python.org/packages/source/i/ino/${name}.tar.gz";
+    sha256 = "1j2qzcjp6r2an1v431whq9l47s81d5af6ni8j87gv294f53sl1ab";
   };
 
   # TODO: add avrgcclibc, it must be rebuild with C++ support
@@ -23,12 +23,17 @@ buildPythonPackage {
         requirements.txt
     sed -i -e 's@from ordereddict@from collections@' \
         ino/environment.py ino/utils.py
+
+    # Patch the upload command so it uses the correct avrdude
+    substituteInPlace ino/commands/upload.py \
+      --replace "self.e['avrdude']" "'${avrdude}/bin/avrdude'" \
+      --replace "'-C', self.e['avrdude.conf']," ""
   '';
  
   meta = {
     description = "Command line toolkit for working with Arduino hardware";
     homepage = http://inotool.org/;
-    license = "MIT";
-    maintainers = [ stdenv.lib.maintainers.antono ];
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ antono the-kenny ];
   };
 }
diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/development/compilers/avra/default.nix
new file mode 100644
index 000000000000..db9fafa42f10
--- /dev/null
+++ b/pkgs/development/compilers/avra/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, autoconf, automake }:
+stdenv.mkDerivation rec {
+  name = "avra-1.3.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/avra/${name}.tar.bz2";
+    sha256 = "04lp0k0h540l5pmnaai07637f0p4zi766v6sfm7cryfaca3byb56";
+  };
+
+  buildInputs = [ autoconf automake ];
+
+  preConfigure = ''
+    cd src/
+
+    aclocal
+    autoconf
+
+    touch NEWS README AUTHORS ChangeLog
+    automake -a
+  '';
+
+  meta = {
+    description = "Assember for the Atmel AVR microcontroller family";
+    homepage = http://avra.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+  };
+}
diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix
index f86c6688eb82..56924d589f4d 100644
--- a/pkgs/development/compilers/elm/elm-server.nix
+++ b/pkgs/development/compilers/elm/elm-server.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "elm-server";
-  version = "0.8";
-  sha256 = "0mnxayfg54f5mr27sd1zw3xrdijppgvrz2yzzmhp07qc1jiyfald";
+  version = "0.9.0.2";
+  sha256 = "0g362llb7jkwz8xhyhhsc8hz0vj7s7bgfz1az5qfh1cm4h8nynwr";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix
index 8196458c70d4..2c851ebbf3f6 100644
--- a/pkgs/development/compilers/elm/elm.nix
+++ b/pkgs/development/compilers/elm/elm.nix
@@ -1,18 +1,18 @@
-{ cabal, blazeHtml, blazeMarkup, cmdargs, deepseq, filepath, hjsmin
-, indents, json, mtl, pandoc, parsec, shakespeare, text
-, transformers
+{ cabal, binary, blazeHtml, blazeMarkup, cmdargs, filepath, hjsmin
+, indents, mtl, pandoc, parsec, transformers, unionFind, uniplate
 }:
 
 cabal.mkDerivation (self: {
   pname = "Elm";
-  version = "0.8.0.3";
-  sha256 = "0zai8glmkiqramivgz405zh385cz166gpry2yl29g37dxpwxffzb";
+  version = "0.9.0.2";
+  sha256 = "0yr395wsj0spi6h9d6lm5hvdryybpf8i1qpv4gz9dk0bwlyc8iwh";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    blazeHtml blazeMarkup cmdargs deepseq filepath hjsmin indents json
-    mtl pandoc parsec shakespeare text transformers
+    binary blazeHtml blazeMarkup cmdargs filepath hjsmin indents mtl
+    pandoc parsec transformers unionFind uniplate
   ];
+  doCheck = false;
   meta = {
     homepage = "http://elm-lang.org";
     description = "The Elm language module";
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 035ebc8b2683..1ea283f87fee 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "7.7";
+  version = "7.7.20130811";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
-    sha256 = "1f4grj1lw25vb5drn4sn8fc1as3hwhk8dl659spi5fnbrs5k4wgb";
+    url = "http://darcs.haskell.org/ghcBuilder/uploads/tn23/${name}-src.tar.bz2";
+    sha256 = "1jkks2nq9189vxim9lfiwmf3wrnxi834brv9kn9n31225f34qdyr";
   };
 
   buildInputs = [ ghc perl gmp ncurses ];
@@ -19,24 +19,16 @@ stdenv.mkDerivation rec {
     DYNAMIC_BY_DEFAULT = NO
   '';
 
-  # The tarball errorneously contains an executable that doesn't work in
-  # Nix. Deleting it will cause the program to be re-built locally.
-  postUnpack = ''
-    rm -v $sourceRoot/libraries/integer-gmp/cbits/mkGmpDerivedConstants
-  '';
-
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '';
 
-  configureFlags=[
-    "--with-gcc=${stdenv.gcc}/bin/gcc"
-  ];
+  configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc";
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags=["-S" "--keep-file-symbols"];
+  stripDebugFlags = [ "-S" "--keep-file-symbols" ];
 
   meta = {
     homepage = "http://haskell.org/ghc";
diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
new file mode 100644
index 000000000000..10945934d003
--- /dev/null
+++ b/pkgs/development/compilers/orc/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "orc-0.4.17";
+
+  src = fetchurl {
+    url = "http://code.entropywave.com/download/orc/${name}.tar.gz";
+    sha256 = "1s6psp8phrd1jmxz9j01cksh3q5xrm1bd3z7zqxg5zsrijjcrisg";
+  };
+
+  meta = {
+    description = "The Oil Runtime Compiler";
+    homepage = "http://code.entropywave.com/orc/";
+    # The source code implementing the Marsenne Twister algorithm is licensed
+    # under the 3-clause BSD license. The rest is 2-clause BSD license.
+    license = stdenv.lib.licenses.bsd3;
+    platform = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.iyzsong ];
+  };
+}
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
new file mode 100644
index 000000000000..ffa4402a72a7
--- /dev/null
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, erlang, rebar }:
+
+stdenv.mkDerivation {
+  name = "elixir-0.10.1";
+
+  src = fetchurl {
+    url = "https://github.com/elixir-lang/elixir/archive/v0.10.1.tar.gz";
+    sha256 = "0gfr2bz3mw7ag9z2wb2g22n2vlyrp8dwy78fj9zi52kzl5w3vc3w";
+  };
+
+  buildInputs = [ erlang rebar ];
+
+  preBuild = ''
+    substituteInPlace rebar \
+      --replace "/usr/bin/env escript" ${erlang}/bin/escript
+    substituteInPlace Makefile \
+      --replace '$(shell echo `pwd`/rebar)' ${rebar}/bin/rebar \
+      --replace "/usr/local" $out
+  '';
+
+  meta = {
+    homepage = "http://elixir-lang.org/";
+    description = "Elixir is a functional, meta-programming aware language built on top of the Erlang VM.";
+
+    longDescription = ''
+      Elixir is a functional, meta-programming
+      aware language built on top of the Erlang VM. It is a dynamic
+      language with flexible syntax and macro support that leverages
+      Erlang's abilities to build concurrent, distributed and
+      fault-tolerant applications with hot code upgrades.p
+    '';
+
+    platforms = stdenv.lib.platforms.linux;
+
+    maintainers = [ stdenv.lib.maintainers.the-kenny ];
+  };
+}
diff --git a/pkgs/development/interpreters/erlang/R16B01.nix b/pkgs/development/interpreters/erlang/R16B01.nix
new file mode 100644
index 000000000000..902af75d4949
--- /dev/null
+++ b/pkgs/development/interpreters/erlang/R16B01.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
+, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }:
+
+assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
+
+let version = "16B01"; in
+
+stdenv.mkDerivation {
+  name = "erlang-" + version;
+
+  src = fetchurl {
+    url = "http://www.erlang.org/download/otp_src_R16B01.tar.gz";
+    sha256 = "1h5b2mil79z307mc7ammi38qnd8f50n3sv5vyl4d1gcfgg08nf6s";
+  };
+
+  buildInputs =
+    [ perl gnum4 ncurses openssl
+    ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ];
+
+  patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
+
+  preConfigure = ''
+    export HOME=$PWD/../
+    sed -e s@/bin/pwd@pwd@g -i otp_build
+  '';
+
+  configureFlags = "--with-ssl=${openssl}";
+
+  meta = {
+    homepage = "http://www.erlang.org/";
+    description = "Programming language used for massively scalable soft real-time systems";
+
+    longDescription = ''
+      Erlang is a programming language used to build massively scalable
+      soft real-time systems with requirements on high availability.
+      Some of its uses are in telecoms, banking, e-commerce, computer
+      telephony and instant messaging. Erlang's runtime system has
+      built-in support for concurrency, distribution and fault
+      tolerance.
+    '';
+
+    platforms = stdenv.lib.platforms.linux;
+    # Note: Maintainer of prev. erlang version was simons. If he wants
+    # to continue maintaining erlang I'm totally ok with that.
+    maintainers = [ stdenv.lib.maintainers.the-kenny ];
+  };
+}
diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix
new file mode 100644
index 000000000000..63cf85bc506b
--- /dev/null
+++ b/pkgs/development/interpreters/lush/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchurl, libX11, xproto, indent, readline, gsl, freeglut, mesa, SDL
+, blas, binutils, intltool, gettext, zlib}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="lush";
+    version="2.0.1";
+    name="${baseName}-${version}";
+    hash="02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k";
+    url="mirror://sourceforge/project/lush/lush2/lush-2.0.1.tar.gz";
+    sha256="02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k";
+  };
+  buildInputs = [
+    libX11 xproto indent readline gsl freeglut mesa SDL blas binutils
+    intltool gettext zlib
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+  NIX_LDFLAGS=" -lz ";
+  meta = {
+    inherit (s) version;
+    description = ''Lisp Universal SHell'';
+    license = stdenv.lib.licenses.gpl2Plus ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/interpreters/lush/default.upstream b/pkgs/development/interpreters/lush/default.upstream
new file mode 100644
index 000000000000..6a3b3a8357c2
--- /dev/null
+++ b/pkgs/development/interpreters/lush/default.upstream
@@ -0,0 +1,3 @@
+url http://sourceforge.net/projects/lush/files/lush2/
+version_link '[.]tar[.]gz/download$'
+SF_redirect
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 521d0816678e..b99beca38923 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -149,6 +149,12 @@ let
       deps = [ db4 ];
     };
 
+    crypt = buildInternalPythonModule {
+      moduleName = "crypt";
+      internalName = "crypt";
+      deps = [ ];
+    };
+
     curses = buildInternalPythonModule {
       moduleName = "curses";
       deps = [ ncurses ];
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 96514a6de855..ce0613486757 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -164,6 +164,12 @@ let
       deps = [ ncurses ];
     };
 
+    crypt = buildInternalPythonModule {
+      moduleName = "crypt";
+      internalName = "crypt";
+      deps = [ ];
+    };
+
     gdbm = buildInternalPythonModule {
       moduleName = "gdbm";
       internalName = "gdbm";
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index da3390bb1e11..ddcf26340397 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   pname = "racket";
-  version = "5.3.5";
+  version = "5.3.6";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz";
-    sha256 = "0xrd25d2iskkih08ydcjqnasg84r7g32apvdw7qzlp4xs1xynjwk";
+    sha256 = "12pvgidaym1rwyyi69bd2gfmfwi1y0lf8xgih7a8r20z4g0zzq3z";
   };
 
   # Various racket executables do run-time searches for these.
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 5f6291127e93..8e49d3984606 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -9,11 +9,11 @@ assert bdbSupport -> db4 != null;
 assert ldapSupport -> openldap != null;
 
 stdenv.mkDerivation rec {
-  name = "apr-util-1.5.1";
+  name = "apr-util-1.5.2";
 
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    md5 = "9c1db8606e520f201c451ec9a0b095f6";
+    md5 = "89c1348aa79e898d7c34a6206311c9c2";
   };
 
   configureFlags = ''
diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 07a565596bbc..1893a2c94136 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -5,21 +5,19 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "apr-1.4.6";
+  name = "apr-1.4.8";
 
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    md5 = "ffee70a111fd07372982b0550bbb14b7";
+    md5 = "ce2ab01a0c3cdb71cf0a6326b8654f41";
   };
 
   patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ];
 
   configureFlags =
-    # Don't use accept4 because it's only supported on Linux >= 2.6.28.
-    [ "apr_cv_accept4=no" ]
     # Including the Windows headers breaks unistd.h.
     # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2
-    ++ stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no";
+    stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no";
 
   meta = {
     homepage = http://apr.apache.org/;
diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix
new file mode 100644
index 000000000000..2c712c5c20ed
--- /dev/null
+++ b/pkgs/development/libraries/chromaprint/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, cmake, fftw, boost }:
+
+stdenv.mkDerivation rec {
+  name = "chromaprint-${version}";
+  version = "0.7";
+
+  src = fetchurl {
+    url = "http://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz";
+    sha256 = "00amjzrr4230v3014141hg8k379zpba56xsm572ab49w8kyw6ljf";
+  };
+
+  buildInputs = [ cmake fftw boost ];
+
+  meta = {
+    homepage = "http://acoustid.org/chromaprint";
+    description = "AcoustID audio fingerprinting library";
+    license = stdenv.lib.licenses.lgpl21Plus;
+  };
+}
diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix
index 64943d5e1c1c..67e3a4157b7d 100644
--- a/pkgs/development/libraries/haskell/HFuse/default.nix
+++ b/pkgs/development/libraries/haskell/HFuse/default.nix
@@ -8,6 +8,11 @@ cabal.mkDerivation (self: {
 
   preConfigure = ''
     sed -i -e "s@  Extra-Lib-Dirs:         /usr/local/lib@  Extra-Lib-Dirs:         ${fuse}/lib@" HFuse.cabal
+    sed -i -e "s/LANGUAGE FlexibleContexts/LANGUAGE FlexibleContexts, RankNTypes/" System/Fuse.hsc
+    sed -i -e "s/E(Exception/E(catch, Exception, IOException/" System/Fuse.hsc
+    sed -i -e "s/IO(catch,/IO(/" System/Fuse.hsc
+    sed -i -e "s/IO.catch/ E.catch/" System/Fuse.hsc
+    sed -i -e "s/const exitFailure/\\\\(_ :: IOException) -> exitFailure/" System/Fuse.hsc
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix
index 659a1158d0f3..b87c47f04bed 100644
--- a/pkgs/development/libraries/haskell/MissingH/default.nix
+++ b/pkgs/development/libraries/haskell/MissingH/default.nix
@@ -1,16 +1,19 @@
-{ cabal, filepath, hslogger, HUnit, mtl, network, parsec, random
-, regexCompat, time
+{ cabal, filepath, hslogger, HUnit, mtl, network, parsec
+, QuickCheck, random, regexCompat, testpack, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "MissingH";
-  version = "1.2.0.0";
-  sha256 = "0bqg1j2pvm0ixrbnsxrr5kgibhbp191irhcavqlwfwgaxhrpqnm1";
-  isLibrary = true;
-  isExecutable = true;
+  version = "1.2.0.1";
+  sha256 = "0hxyf82g2rz36ks6n136p6brgs0r9cnxfkh4xgl6iw11wbq2rb5m";
   buildDepends = [
     filepath hslogger HUnit mtl network parsec random regexCompat time
   ];
+  testDepends = [
+    filepath hslogger HUnit mtl network parsec QuickCheck random
+    regexCompat testpack time
+  ];
+  doCheck = false;
   meta = {
     homepage = "http://software.complete.org/missingh";
     description = "Large utility library";
diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix
index 2dead8de40d4..9018bc603cf4 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.10";
-  sha256 = "0acx8vm43pd3wn5gp4rx9h24y08fcdy4bpack1sd0pxx2wmhi5qs";
+  version = "0.1.11";
+  sha256 = "107f3ch84riagxa9x6yk4gxq2vq5dsk63rd0780g1fdplnf1sky3";
   buildDepends = [ mtl random transformers ];
   meta = {
     description = "Random-number generation monad";
diff --git a/pkgs/development/libraries/haskell/bindings-posix/default.nix b/pkgs/development/libraries/haskell/bindings-posix/default.nix
index 23994140d6c0..8bdf30e36d19 100644
--- a/pkgs/development/libraries/haskell/bindings-posix/default.nix
+++ b/pkgs/development/libraries/haskell/bindings-posix/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bindings-posix";
-  version = "1.2.3";
-  sha256 = "0nj18lfpn8hmlaa7cmvdkjnk8fi2f6ysjbigkx7zbrpqnvbi63ba";
+  version = "1.2.6";
+  sha256 = "1yza3qbf0f5gfpg79pb6xfpw37zg191nmxa4r6h9x4xb5na0rzff";
   buildDepends = [ bindingsDSL ];
   meta = {
     description = "Low level bindings to posix";
diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix
index 6ad4db61cfdc..90fb53051e23 100644
--- a/pkgs/development/libraries/haskell/c2hs/default.nix
+++ b/pkgs/development/libraries/haskell/c2hs/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "c2hs";
-  version = "0.16.4";
-  sha256 = "0m8mzc19cgaqsi1skqimk22770xddxx0j024mgp76hl8vqc5rcgi";
+  version = "0.16.5";
+  sha256 = "19h4zppn7ry7p3f7qw1kgsrf6h2bjnknycfrj3ibxys82qpv8m8y";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ filepath languageC ];
   meta = {
-    homepage = "http://www.cse.unsw.edu.au/~chak/haskell/c2hs/";
+    homepage = "https://github.com/haskell/c2hs";
     description = "C->Haskell FFI tool that gives some cross-language type safety";
     license = self.stdenv.lib.licenses.gpl2;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index e670ff1a3d14..6cb8d26bd39a 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.9";
-  sha256 = "0cyw34vzvv1j7w094cjcf97g8bki7l9x82s8csaf96y6d9qws308";
+  version = "0.9.0.2";
+  sha256 = "0vl310nickavp8wkaad1wfnvm8gfsg9jcfw3rgjz7698avynv3ni";
   buildDepends = [
     base64Bytestring cereal cipherAes cprngAes cryptoApi entropy skein
     tagged
diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
index e180863e133b..1814ab99784a 100644
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ b/pkgs/development/libraries/haskell/cmdargs/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cmdargs";
-  version = "0.10.4";
-  sha256 = "0y8jmpm31z7dd02xa6b5i6gpdjb6pz4pg7m5wbqff7fhbipf0lk0";
+  version = "0.10.5";
+  sha256 = "013095w6xzkaj6c09vrkmf24gl07kc995c39yby5jdngpggdxc9h";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath transformers ];
diff --git a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
new file mode 100644
index 000000000000..3e93912b3a7b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
@@ -0,0 +1,24 @@
+{ cabal, byteable, cryptoCipherTypes, HUnit, mtl, QuickCheck
+, securemem, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "crypto-cipher-tests";
+  version = "0.0.2";
+  sha256 = "1jzci2a6827jgiklj8sh7pjl7g4igk2j6mim20619i4rk6x0lhgz";
+  buildDepends = [
+    byteable cryptoCipherTypes HUnit mtl QuickCheck securemem
+    testFramework testFrameworkHunit testFrameworkQuickcheck2
+  ];
+  testDepends = [
+    byteable cryptoCipherTypes HUnit mtl QuickCheck testFramework
+    testFrameworkHunit testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
+    description = "Generic cryptography cipher tests";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
new file mode 100644
index 000000000000..378ccf3dbcc2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
@@ -0,0 +1,14 @@
+{ cabal, byteable, securemem }:
+
+cabal.mkDerivation (self: {
+  pname = "crypto-cipher-types";
+  version = "0.0.2";
+  sha256 = "1vjf9g1w7ja8x42k6hq6pcw7jvviw9rq512ncdqd7j20411zjbf4";
+  buildDepends = [ byteable securemem ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
+    description = "Generic cryptography cipher types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix
index 50935a77a64e..6efca94a6517 100644
--- a/pkgs/development/libraries/haskell/cryptocipher/default.nix
+++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptocipher";
-  version = "0.5.0";
-  sha256 = "16gqsy23y3g9089ng94124g5pvc4d0vnh2r47ii789f8j96062nd";
+  version = "0.5.1";
+  sha256 = "118sabi90qjyqbvfincn737c4mi9mvjij1dzx7k9rsgad47p0753";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -17,7 +17,7 @@ cabal.mkDerivation (self: {
     testFrameworkQuickcheck2 vector
   ];
   meta = {
-    homepage = "http://github.com/vincenthz/hs-cryptocipher";
+    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
     description = "Symmetrical block and stream ciphers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index bc2abf5c16d5..a73b6d9fba85 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-cairo";
-  version = "0.6";
-  sha256 = "0fxqwkv2cpgpkr80q828rm91ybn7j0dwj1p5ysc3648w28jvhkil";
+  version = "0.7";
+  sha256 = "14ghcrzzpqdnvmpvykhf4r74sb9jgp69094mkwydslzmi8dsgdiy";
   buildDepends = [
     cairo cmdargs colour diagramsCore diagramsLib filepath mtl split
     time
diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
index 141a820b5d1a..023ac0906814 100644
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-contrib";
-  version = "0.6.1";
-  sha256 = "0z92sfgqpfk401lzkvnsg3ij05795qc61c4lx12glbmdpfhilcpi";
+  version = "0.7";
+  sha256 = "0dcj4rjvpgf0lmxgv50f8cpi6adkbfnsa4z4ay8khawhnn4af5ac";
   buildDepends = [
     arithmoi circlePacking colour dataDefault diagramsCore diagramsLib
     forceLayout lens MonadRandom mtl split vectorSpace
diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix
index ed23b092b02e..c2dbb27aebd1 100644
--- a/pkgs/development/libraries/haskell/diagrams/core.nix
+++ b/pkgs/development/libraries/haskell/diagrams/core.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-core";
-  version = "0.6.0.2";
-  sha256 = "1g4b1zabgfdpaf7y3804r3w04ll4sqqrf71rm9389dg17ghc1q85";
+  version = "0.7";
+  sha256 = "00ba31imq91w6lzy8blgxawr06igrjfrg4adrqy650wip8jafqwq";
   buildDepends = [
     dualTree MemoTrie monoidExtras newtype semigroups vectorSpace
     vectorSpacePoints
diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
index 6f201e7cd850..84d3d9bbf48c 100644
--- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix
+++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams";
-  version = "0.6";
-  sha256 = "1i62jbixjzw82y622ymp6lrp4kzgn7iv55arivvh0y46bbmybqvh";
+  version = "0.7";
+  sha256 = "08ibmxzykb9v8y7ars9jz2qyss8ln8i6j87sm31bq5g9kvpy287c";
   buildDepends = [
     diagramsContrib diagramsCore diagramsLib diagramsSvg
   ];
diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index 73c7ff8f8c47..50afb16f2823 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -1,14 +1,15 @@
-{ cabal, active, colour, dataDefault, diagramsCore, monoidExtras
-, newtype, NumInstances, semigroups, vectorSpace
+{ cabal, active, colour, dataDefaultClass, diagramsCore, fingertree
+, intervals, monoidExtras, newtype, NumInstances, semigroups
+, vectorSpace
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-lib";
-  version = "0.6.0.3";
-  sha256 = "0rc3m2v1bxlm5rz1pi1w4k37sbgmr9qv54rllsqan1kicafjaqw1";
+  version = "0.7";
+  sha256 = "02zb9j2qb5f26azscv1m4iivp1ixdhx6rcjns5smka1hdgyzld1j";
   buildDepends = [
-    active colour dataDefault diagramsCore monoidExtras newtype
-    NumInstances semigroups vectorSpace
+    active colour dataDefaultClass diagramsCore fingertree intervals
+    monoidExtras newtype NumInstances semigroups vectorSpace
   ];
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index 561f32118c22..644037e946ee 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-svg";
-  version = "0.6.0.1";
-  sha256 = "0x4yjm1wdhicknls1y3fhdg89m8wcvfk2svabww9075w6ras79qk";
+  version = "0.7";
+  sha256 = "0vfykrx29dxii9mdjjkia5a42jfg4hbzgxzv5rp7zvf3fz9w8w1x";
   buildDepends = [
     blazeSvg cmdargs colour diagramsCore diagramsLib filepath
     monoidExtras mtl split time vectorSpace
diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix
index b192c1e0c61e..fb8714f3e854 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.2";
-  sha256 = "0bx8yjg7bf18i7j7fnhidnms5a3v6hiwqqvr249fk03c86v20rla";
+  version = "0.3.3";
+  sha256 = "0ya9dn9j2nddpclj00w6jgmiq2xx500sws056fa2s4bdsl8vn5rh";
   buildDepends = [ blazeBuilder dateCache filepath text unixTime ];
   testDepends = [ hspec ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix
index d15906e0be51..a2c1ccde86bc 100644
--- a/pkgs/development/libraries/haskell/feed/default.nix
+++ b/pkgs/development/libraries/haskell/feed/default.nix
@@ -2,10 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "feed";
-  version = "0.3.8";
-  sha256 = "1yvigcvb8cvxfa8vb2i11xkrylqw57jwzkaji6m1wp03k80zf576";
+  version = "0.3.9.1";
+  sha256 = "1c7dj9w9qj8408qql1kfq8m28fwvfd7bpgkj32lmk5x9qm5iz04k";
   buildDepends = [ utf8String xml ];
   meta = {
+    homepage = "https://github.com/sof/feed";
     description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix
index 043156ab5e1f..f1a1ec837fd4 100644
--- a/pkgs/development/libraries/haskell/generic-deriving/default.nix
+++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "generic-deriving";
-  version = "1.5.0";
-  sha256 = "1m3hckwpzmarlvm2xq22za3386ady6p89kg7nd8cnjkifnnbz20r";
+  version = "1.6.1";
+  sha256 = "0c3b3xkjdfp14w48gfk3f6aqz4cgk6i3bl5mci23mbb3f33jcx1j";
   meta = {
     description = "Generic programming library for generalised deriving";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
index 62b07030a460..245208695510 100644
--- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
@@ -5,6 +5,10 @@ cabal.mkDerivation (self: {
   version = "0.5.1";
   sha256 = "1qi7f3phj2j63x1wd2cvk36945cxd84s12zs03hlrn49wzx2pf1n";
   buildDepends = [ binary transformers ];
+  postInstall = ''
+      ensureDir "$out/share/ghci"
+      ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
+    '';
   meta = {
     description = "Extract the heap representation of Haskell values and thunks";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix
index 856ec8104631..917158949714 100644
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix
@@ -10,6 +10,10 @@ cabal.mkDerivation (self: {
     cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
     transformers xdot
   ];
+  postInstall = ''
+      ensureDir "$out/share/ghci"
+      ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
+    '';
   meta = {
     homepage = "http://felsin9.de/nnis/ghc-vis";
     description = "Live visualization of data structures in GHCi";
diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix
index 78711cc7c449..511b1b70f289 100644
--- a/pkgs/development/libraries/haskell/github/default.nix
+++ b/pkgs/development/libraries/haskell/github/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "github";
-  version = "0.7.0";
-  sha256 = "0r803hpyyd0nfhlk5jn4ripzi2cpj708zp9g961g7wvvvi66013p";
+  version = "0.7.1";
+  sha256 = "0aipaamd7gn5f79f451v8ifjs5g8b40g9w4kvi1i62imsh0zhh90";
   buildDepends = [
     aeson attoparsec caseInsensitive conduit dataDefault failure HTTP
     httpConduit httpTypes network text time unorderedContainers vector
diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index a5984aef77c8..f397a60017fb 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.7.8.4";
-  sha256 = "06m90n0gxjhfdl2jalwzwsbgdg854bqw1qygkxbcfcknrpd2ampk";
+  version = "1.8.0.1";
+  sha256 = "17nnmv84pjls1my58yzifbin3pxcnlbpkprglad707rr4lrkkjvv";
   buildDepends = [ bmp GLUT OpenGL ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 766f56ee8e33..f3f2562a0735 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "4.3.1.0";
-  sha256 = "1cx5pf0wf49cylbcgy1di218qk0fw8rgzqri9lx1v8jfl31zvsg5";
+  version = "4.3.3.0";
+  sha256 = "11zfz55a7dr5l7xzknphqninyrb2pw2qmrs7v7ajq2gvbl0lf37n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
index 98dfff8505a2..7c9e76940462 100644
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-meta";
-  version = "0.6.0.2";
-  sha256 = "1msqnsavghsc5bil3mm9swpi9a54pki4162jdfwwvlzvdmfvk9hp";
+  version = "0.6.0.3";
+  sha256 = "1ag26pzppvqw9ch6jz1p0bhsld7fz0b01k7h9516hnmy215h7xai";
   buildDepends = [ haskellSrcExts syb thOrphans uniplate ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix
index 15d32de346df..c864c7e0a5ff 100644
--- a/pkgs/development/libraries/haskell/hastache/default.nix
+++ b/pkgs/development/libraries/haskell/hastache/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hastache";
-  version = "0.5.0";
-  sha256 = "1c1pphw7qx5l5fdfqchihvp2yrwwb0ln8dfshkvd1giv8cjmbyn8";
+  version = "0.5.1";
+  sha256 = "05lm7mjzc1hamxcj8akq06081bhp907hrjdkhas3wzm6ran6rwn3";
   buildDepends = [
     blazeBuilder filepath ieee754 mtl syb text transformers utf8String
   ];
diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index 1e0c9275a247..3b67310e1664 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.6.1";
-  sha256 = "089j6dpl856q3m1wyc7n822k7vppzb7pxdcwvzbhck2cadad3zn5";
+  version = "1.6.2";
+  sha256 = "1mw7a4215vl7fivi21kqi139swigzws09jrybmyyns0znv80fpbh";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 7b06ea9c21c6..d7925b41816a 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.6.1";
-  sha256 = "16gwzc5x04kj7847w4nw0msj7myk22hlfkpal9dcpdvslzzy44nh";
+  version = "1.7.0";
+  sha256 = "0cw24vmns06z5308wva9bb5czs9i5wm6qdhymgiyl2i47ibxp5bj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index d1cff617a82c..f6a06e335156 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.9.4.1";
-  sha256 = "181irzldrr554naq2yvs0yzmkkfk26n59snrsmxhr79d9kdp73l4";
+  version = "1.9.4.2";
+  sha256 = "13qjf3c3qkaqdi7qp1iqywvsbsiqq8brbzwh8idaj1bhl9jizwhx";
   buildDepends = [
     asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive certificate conduit cookie cprngAes dataDefault
diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix
new file mode 100644
index 000000000000..3cc44b05dbb5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/intervals/default.nix
@@ -0,0 +1,14 @@
+{ cabal, numericExtras }:
+
+cabal.mkDerivation (self: {
+  pname = "intervals";
+  version = "0.2.2";
+  sha256 = "059xmk373xz6nwk61iyhx4d7xd328jxb694qmq9plry3k77mdh5q";
+  buildDepends = [ numericExtras ];
+  meta = {
+    homepage = "http://github.com/ekmett/intervals";
+    description = "Interval Arithmetic";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix b/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix
deleted file mode 100644
index 154bc68c3c5c..000000000000
--- a/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ cabal, alex, filepath, happy, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "language-c";
-  version = "0.3.2.1";
-  sha256 = "1qk86p88p2jk1cbgl8p5g19ip3nh6z22ddj5jac58r5ny076iimx";
-  buildDepends = [ filepath syb ];
-  buildTools = [ alex happy ];
-  meta = {
-    homepage = "http://www.sivity.net/projects/language.c/";
-    description = "Analysis and generation of C code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-c/0.4.2.nix b/pkgs/development/libraries/haskell/language-c/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/language-c/0.4.2.nix
rename to pkgs/development/libraries/haskell/language-c/default.nix
diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 4531603214e0..8bc221f14933 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -26,6 +26,9 @@ cabal.mkDerivation (self: {
     transformers unorderedContainers vector
   ];
   doCheck = false;
+  patchPhase = ''
+    sed -i -e 's|generic-deriving.*,|generic-deriving,|' lens.cabal
+  '';
   meta = {
     homepage = "http://github.com/ekmett/lens/";
     description = "Lenses, Folds and Traversals";
diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix
index 0a03ed45fee6..9dc4b58797f1 100644
--- a/pkgs/development/libraries/haskell/logict/default.nix
+++ b/pkgs/development/libraries/haskell/logict/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "logict";
-  version = "0.6";
-  sha256 = "1np4wizvwlx458kq6mmdrh8qcp1794y1bs4mnnz951h6hay5z49f";
+  version = "0.6.0.1";
+  sha256 = "0sznrnx7l5sqnyvc2xwx1q33b4833qsnhppm06a3scp9gj3y1xp2";
   buildDepends = [ mtl ];
   meta = {
     homepage = "http://code.haskell.org/~dolio/logict";
diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix
index 5b21949d5faf..691029ac5de2 100644
--- a/pkgs/development/libraries/haskell/mime-mail/default.nix
+++ b/pkgs/development/libraries/haskell/mime-mail/default.nix
@@ -4,12 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "mime-mail";
-  version = "0.4.2";
-  sha256 = "1v9qdj53swhg8xg9s2x0m6d6xaff5ya6bpdifya2vsp08fmgn4l9";
+  version = "0.4.2.1";
+  sha256 = "1rpxx90k4dgz1b5ss6vqqgd9n1hjrv09q20myy16zzlj1gmn8k3g";
   buildDepends = [
     base64Bytestring blazeBuilder filepath random text
   ];
-  testDepends = [ blazeBuilder hspec ];
+  testDepends = [ blazeBuilder hspec text ];
   meta = {
     homepage = "http://github.com/snoyberg/mime-mail";
     description = "Compose MIME email messages";
diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.3.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.4.nix
similarity index 90%
rename from pkgs/development/libraries/haskell/monad-par/0.3.4.3.nix
rename to pkgs/development/libraries/haskell/monad-par/0.3.4.4.nix
index 22b9d359faf2..d682908dcf18 100644
--- a/pkgs/development/libraries/haskell/monad-par/0.3.4.3.nix
+++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.4.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-par";
-  version = "0.3.4.3";
-  sha256 = "1yf1s44r2mkqimi26g9y4zxqgs4yizfmigfx9mkfgbqsn2a8sff6";
+  version = "0.3.4.4";
+  sha256 = "0mqvrg2izqjrgzbmr6pcl9v9827fkr4mwxpdckm3gj1miljsj314";
   buildDepends = [
     abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
     parallel
diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
index e955bb14a727..bb0514575a86 100644
--- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
+++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
@@ -1,10 +1,11 @@
-{ cabal, cryptoApi, mtl, tagged, transformers }:
+{ cabal, fetchurl, cryptoApi, mtl, tagged, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "monadcryptorandom";
   version = "0.5.2";
   sha256 = "0a0qx331c1kvhmwwam7pbbrnq8ky3spfnw6zsz6rz7g1lk1hfawn";
   buildDepends = [ cryptoApi mtl tagged transformers ];
+  patches = [ (fetchurl { url = "https://github.com/TomMD/monadcryptorandom/pull/5.patch"; sha256 = "1mcil5w40gfy3hjnrpbgzciz65aygqpghgma0hckjb6xa694a71l"; }) ];
   meta = {
     homepage = "https://github.com/TomMD/monadcryptorandom";
     description = "A monad for using CryptoRandomGen";
diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix
index a0ba1fd9856e..969ab8bd0b80 100644
--- a/pkgs/development/libraries/haskell/monoid-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monoid-extras";
-  version = "0.2.2.3";
-  sha256 = "00yj7wdyznsis82fb7i07s0vz8vsn2mpqk7jkgl9xxa57gk1rsax";
+  version = "0.3.0.0";
+  sha256 = "1bb8yq2vja80177h3wfadkjkwvcrszx0nq6m5n10f4lh9spvr087";
   buildDepends = [ semigroups ];
   meta = {
     description = "Various extra monoid-related definitions and utilities";
diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
index 2785f9c5ab11..2b1a56940447 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.3";
-  sha256 = "0gaws4spd50dmqjsxdxvjk5n5l0ib4q0brwnxrk725d3b3hanpz1";
+  version = "1.0.1";
+  sha256 = "0h2svqllm85vambssq0j4ghx2b44cjg0kj04bamp72ly22mcg9d6";
   buildDepends = [
     aeson certificate conduit cryptoApi cryptoRandomApi network
     networkConduit pem systemFileio systemFilepath tls tlsExtra
diff --git a/pkgs/development/libraries/haskell/numeric-extras/default.nix b/pkgs/development/libraries/haskell/numeric-extras/default.nix
new file mode 100644
index 000000000000..76783dceb494
--- /dev/null
+++ b/pkgs/development/libraries/haskell/numeric-extras/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "numeric-extras";
+  version = "0.0.3";
+  sha256 = "18jyjrk6iizz3sgkwgbh1rxf6zdf166bkgs7wia8b4z7f6261nzg";
+  meta = {
+    homepage = "http://github.com/ekmett/numeric-extras";
+    description = "Useful tools from the C standard library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
index f6f4d420e2ab..9fb5d334a4d5 100644
--- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "numeric-prelude";
-  version = "0.4.0.1";
-  sha256 = "1j361gj7cw31x31vnjhxmy7a62ldvyyqfm7irhff7sf5gv4kr5wh";
+  version = "0.4.0.3";
+  sha256 = "0lgjnkvbz14cqsm5fjafl8g5mkclcdvpwa3kpz9radmg2x09rsnl";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude";
     description = "An experimental alternative hierarchy of numeric type classes";
-    license = "GPL";
+    license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 7ccbe145d708..a336ab4fb886 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.2.0";
-  sha256 = "18p3yz683ks0gdn1l4qys29jj7iqhlwh7i0s50bkl4x1w0mpa1kh";
+  version = "1.2.3.0";
+  sha256 = "0bil1932rnh3my9yjyc4sk24g0qwkkgv8b48nrn7fm007vyf173m";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
     liftedBase monadControl monadLogger pathPieces poolConduit
diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index 1ae1737e4b25..2b99bb2eb6c5 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.4.0";
-  sha256 = "1xqs5hpljsapgisr7q3yd8ir351196xrdrk51dsizvk4vcs85wgs";
+  version = "0.3.5.0";
+  sha256 = "09w9cdjn9jvmcwh63ydjl8p28xfhrhy448y211z3carx2zwryshi";
   buildDepends = [
     attoparsec blazeBuilder blazeTextual postgresqlLibpq text time
     transformers vector
diff --git a/pkgs/development/libraries/haskell/profunctor-extras/default.nix b/pkgs/development/libraries/haskell/profunctor-extras/default.nix
index 0094ec5a340d..6844bcc369a6 100644
--- a/pkgs/development/libraries/haskell/profunctor-extras/default.nix
+++ b/pkgs/development/libraries/haskell/profunctor-extras/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "profunctor-extras";
-  version = "3.3.1";
-  sha256 = "0z3lip0mjw0xyf516shdrnkkp9h53wglz6sjjqagpjj2viyqkprb";
+  version = "3.3.3.1";
+  sha256 = "16naa6ksgwy6fh8vwflcc9s0rpamn886as8qhjqrkpjlc8s83h7g";
   buildDepends = [
     comonad profunctors semigroupoidExtras semigroupoids tagged
     transformers
diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix
index 8d1ee0ffc959..0bf7747d46bf 100644
--- a/pkgs/development/libraries/haskell/reactive-banana/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reactive-banana";
-  version = "0.7.1.2";
-  sha256 = "1x4ln3dr937va0ii7lr86d6wsrh2qd1sxany4y9dkpcrsvb3db0l";
+  version = "0.7.1.3";
+  sha256 = "117y1sk97kpiq0cippq0ydl2zqb99q49y2m2m6pgg2nh6gz6a3zb";
   buildDepends = [ hashable transformers unorderedContainers vault ];
   testDepends = [
     hashable HUnit testFramework testFrameworkHunit transformers
diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
index acf9dc712f35..2ec3fb3172e0 100644
--- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix
+++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa-algorithms";
-  version = "3.2.3.1";
-  sha256 = "12w76npa52g7zxa0j9w8q9njacm2dn0hcd8a8386p9r6iy6lpjwc";
+  version = "3.2.4.1";
+  sha256 = "0xb2r726z73ghiqik39n99q5hal16y7ydk16q2rbycbvc37yq24b";
   buildDepends = [ repa vector ];
   extraLibraries = [ llvm ];
   jailbreak = true;
diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index 4b2defc79d71..3887abad71c7 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "0.4.7.1";
-  sha256 = "1x9njf5amxv04fvn7fsgpagvzl09sl6bnnx686i554frg66b2azh";
+  version = "0.4.7.2";
+  sha256 = "0gchdip4srilgqwxdzlamplwqsyrn4df0m72i8pjqpk7zwn96q1w";
   buildDepends = [
     liftedBase mmorph monadControl mtl transformers transformersBase
   ];
diff --git a/pkgs/development/libraries/haskell/securemem/default.nix b/pkgs/development/libraries/haskell/securemem/default.nix
new file mode 100644
index 000000000000..cc0314705939
--- /dev/null
+++ b/pkgs/development/libraries/haskell/securemem/default.nix
@@ -0,0 +1,14 @@
+{ cabal, byteable }:
+
+cabal.mkDerivation (self: {
+  pname = "securemem";
+  version = "0.1.2";
+  sha256 = "1szb530jw7666cnrfa8988p2b5scl2bfafi8kgslf7xi5yv7grqh";
+  buildDepends = [ byteable ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-securemem";
+    description = "abstraction to an auto scrubbing and const time eq, memory chunk";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 16ad7ffa44a6..4864adfe83a8 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "1.0.5";
-  sha256 = "1dc1yg35pxh45fv20fvnlpas0svqi18h6bdalpjaqjb164s114vf";
+  version = "1.0.5.1";
+  sha256 = "1qsg23jqv6lzwqk42yapqydx3fn6crkrzim8wr7ds55z6iblxbq6";
   buildDepends = [ parsec systemFileio systemFilepath text time ];
   testDepends = [
     hspec parsec systemFileio systemFilepath text time
diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index 3db59020b154..4a89019906f9 100644
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "15vzydywhwjdgybabvv6lfk1vjs7blvs3k2apwxjdjh2q7jmgkam";
   buildDepends = [ cereal cryptoApi tagged ];
   testDepends = [ cereal cryptoApi filepath hspec tagged ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/meteficha/skein";
     description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
index 79171aefb9f8..a2da329121b3 100644
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -1,13 +1,15 @@
-{ cabal, conduit, HUnit, QuickCheck, resourcet, stm, stmChans
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-, transformers
+{ cabal, async, conduit, HUnit, monadControl, QuickCheck, resourcet
+, stm, stmChans, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "stm-conduit";
-  version = "2.1.0";
-  sha256 = "0rxnw7kpxvhwmpbn2v9ps0b2hw9321817nyywjjq3x8fadg8w99l";
-  buildDepends = [ conduit resourcet stm stmChans transformers ];
+  version = "2.1.2";
+  sha256 = "1jkjnp1sjb4sqs6zkmmlm0s1126fkh54jkhwxairdwaxx9yh9y9k";
+  buildDepends = [
+    async conduit monadControl resourcet stm stmChans transformers
+  ];
   testDepends = [
     conduit HUnit QuickCheck stm stmChans testFramework
     testFrameworkHunit testFrameworkQuickcheck2 transformers
diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
index 1d2cea756ffb..5c1059e634c8 100644
--- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stylish-haskell";
-  version = "0.5.6.1";
-  sha256 = "0fxncnl9bvb7qjha3r06qli9qlzfljism6k688hrr9y6l06jdc2c";
+  version = "0.5.7.0";
+  sha256 = "12ka5lyp28fy8gablhymxdldl792ycr8d51lsknhldb54pmklf73";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix
index baf9703b161b..ee808800c55f 100644
--- a/pkgs/development/libraries/haskell/tagged/default.nix
+++ b/pkgs/development/libraries/haskell/tagged/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tagged";
-  version = "0.6.1";
-  sha256 = "1n3m1y06lhbsx9rfwwdx5xqnw4ni41b39iyysgj5894iz9rwrrnv";
+  version = "0.7";
+  sha256 = "1g78hl6sib1mhg016gy3fqw78x72jsgqizsgim8a1pysjzq0y6zm";
   meta = {
     homepage = "http://github.com/ekmett/tagged";
     description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index 8082e77d2824..ec8ccd01054a 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.6.1.5";
-  sha256 = "15cxki04khq29m9h5wxzxgppc3r58ccp2hgsslp2g1f59x2wm348";
+  version = "0.6.3";
+  sha256 = "1ajza3p4rj318l03rffscqs6rbk635drmdciv7hhl4nljc4qmnpz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ parsec syb xml ];
diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
index b53b948c41d7..55b2582017c5 100644
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
     certificate cipherAes cipherRc4 cryptohash cryptoPubkey
     cryptoRandomApi mtl network pem text time tls vector
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/vincenthz/hs-tls";
     description = "TLS extra default values and helpers";
diff --git a/pkgs/development/libraries/haskell/union-find/default.nix b/pkgs/development/libraries/haskell/union-find/default.nix
new file mode 100644
index 000000000000..b50713d5291e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/union-find/default.nix
@@ -0,0 +1,14 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "union-find";
+  version = "0.2";
+  sha256 = "1v7hj42j9w6jlzi56jg8rh4p58gfs1c5dx30wd1qqvn0p0mnihp6";
+  buildDepends = [ transformers ];
+  meta = {
+    homepage = "http://github.com/nominolo/union-find";
+    description = "Efficient union and equivalence testing of sets";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/unix-bytestring/default.nix b/pkgs/development/libraries/haskell/unix-bytestring/default.nix
new file mode 100644
index 000000000000..49022b12a29d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/unix-bytestring/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "unix-bytestring";
+  version = "0.3.6";
+  sha256 = "0m2ndw6r88vb4cqdkd8jg8dlk9h99mp3rand5j1gxxdjfv7q63ap";
+  meta = {
+    homepage = "http://code.haskell.org/~wren/";
+    description = "Unix/Posix-specific functions for ByteStrings";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
index d12167ac4280..1f04d939d9c1 100644
--- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-process-conduit";
-  version = "0.2.1.1";
-  sha256 = "038z99gzwqhig65zzb3hc9zisnvzslvvy86wjgx6wz90p6vbxzn4";
+  version = "0.2.2";
+  sha256 = "15n6n925avv51kr2avwkp8sq8mfl287i0445vl9iy6hyxjjgpgr6";
   buildDepends = [ conduit filepath stm time transformers ];
   testDepends = [ conduit hspec transformers ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix
index 691787e7f87c..846e3d888837 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.10";
-  sha256 = "0z8i02j295fi0y512bwhxfk2dr2s4i0xlgi80pnq680zdrahgwlf";
+  version = "0.2.0";
+  sha256 = "1gmchi6crbd3lpnw1j0zaaj7y0gib8dbqd8ip2s5p3f50qqlsxj8";
   testDepends = [ doctest hspec QuickCheck time ];
   meta = {
     description = "Unix time parser/formatter and utilities";
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 3192def654e5..270ca004c491 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "1.3.4.2";
-  sha256 = "14mrvh3av6dn4jx5q06b4lyjw8sr1ynygbncf5fbp3nzn8nmh17s";
+  version = "1.3.4.3";
+  sha256 = "19vj47awkazn6h4kf37f4sp4g8lhm125wjqnp1wa1wa8zlndp8wy";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive conduit dataDefault dateCache fastLogger httpTypes
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 91f51a76e2ac..2134077e61ab 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.3.9";
-  sha256 = "1gnsikk1z5q1mblwshg9pbaa1ijy64da7vscanzp70lw63jjk7cg";
+  version = "1.3.9.1";
+  sha256 = "0s8jrgn9pxqkjvdbgvrxd0bnclkhn3hix2mff66hqpx8x4znh0zv";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpAttoparsec httpTypes liftedBase network networkConduit
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 98166f80d31b..bd21eee5aa95 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -1,17 +1,17 @@
 { cabal, attoparsec, attoparsecConduit, blazeBuilder
 , blazeBuilderConduit, blazeHtml, blazeMarkup, conduit, dataDefault
-, failure, hspec, HUnit, monadControl, resourcet, systemFilepath
-, text, transformers, xmlTypes
+, deepseq, failure, hspec, HUnit, monadControl, resourcet
+, systemFilepath, text, transformers, xmlTypes
 }:
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "1.1.0.5";
-  sha256 = "1ryiacx42hdh564zy6dj5vxxl2l8flfffmdw8shb32w3gp11fzmp";
+  version = "1.1.0.6";
+  sha256 = "08kz982c95hcni6zbrflv8kqvy7wccb19plsmwczhzcsifam5a9k";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
-    blazeHtml blazeMarkup conduit dataDefault failure monadControl
-    resourcet systemFilepath text transformers xmlTypes
+    blazeHtml blazeMarkup conduit dataDefault deepseq failure
+    monadControl resourcet systemFilepath text transformers xmlTypes
   ];
   testDepends = [
     blazeMarkup conduit hspec HUnit text transformers xmlTypes
diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index ee8b28b94cba..1e22f1ae4bac 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.4";
-  sha256 = "0kdqhdiyy2mqc3rb3l7aaspalkj4z8jndyzhij8m06n43hfzbhhi";
+  version = "0.8.4.1";
+  sha256 = "0zbnyf5hp206ywqkdd7c1hsdbn4wxwk7p3rzn53m7rzxvfshlbbx";
   buildDepends = [
     aeson attoparsec conduit resourcet text transformers
     unorderedContainers vector
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 3327dc1c08cd..66ed9df2d20c 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -1,20 +1,20 @@
 { cabal, aeson, authenticate, blazeHtml, blazeMarkup, dataDefault
 , emailValidate, fileEmbed, hamlet, httpConduit, httpTypes
 , liftedBase, mimeMail, network, persistent, persistentTemplate
-, pureMD5, pwstoreFast, random, resourcet, SHA, shakespeareCss
-, shakespeareJs, text, transformers, unorderedContainers, wai
-, yesodCore, yesodForm, yesodPersistent
+, pureMD5, pwstoreFast, random, resourcet, safe, SHA
+, shakespeareCss, shakespeareJs, text, time, transformers
+, unorderedContainers, wai, yesodCore, yesodForm, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.2.0.2";
-  sha256 = "1vimv1zcpq167nd8fa3y0mrrwh1hqh2rqwmz5mg9zvqzz95wvhmh";
+  version = "1.2.1";
+  sha256 = "0xvb2v1c7zih4r1acd21s0fl18ygcajry5w6yiqqhnhx8wcniiqv";
   buildDepends = [
     aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate
     fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network
     persistent persistentTemplate pureMD5 pwstoreFast random resourcet
-    SHA shakespeareCss shakespeareJs text transformers
+    safe SHA shakespeareCss shakespeareJs text time transformers
     unorderedContainers wai yesodCore yesodForm yesodPersistent
   ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index a7925e82b107..3dfedd471fec 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.2";
-  sha256 = "03c53kgiqmjjihszmvqjgkcklq28mvyn4m2lhcbmqqzkkzyjb0rj";
+  version = "1.2.2.1";
+  sha256 = "0m68wm46qh8bwaccq2y8l4hh4xby0kczvhgd7caaxhmv6j3srrf2";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index c725ef53d3dc..3fcec1a7d9fb 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.3";
-  sha256 = "0b7rs5w7s88mv2mwg778dpkvcdwawq10i9r176fqi321g3170iwk";
+  version = "1.2.4";
+  sha256 = "0vgxspdxdjfdfgyx20lp460np7v1qjv6wzw95kj5cb5yiqv1nr9d";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit cookie dataDefault
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index d41dcb64b1fc..926cba46499f 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.0.1";
-  sha256 = "02qkx148yx7dm059h05xrrahsifckcjwgcfxfq1kjdiik45j7xiz";
+  version = "1.3.1";
+  sha256 = "0zkwpymxwxca2p8i0fhq58wq7ic0dlyc3z89ypqglnp6h2mv2lwx";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
     dataDefault emailValidate hamlet network persistent resourcet
diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix
index f32e90dab179..c4ad5b29acdc 100644
--- a/pkgs/development/libraries/haskell/yesod-test/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-test/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-test";
-  version = "1.2.0";
-  sha256 = "184hfhp62jq2icyn1l6s8kvdcsa6099vmykg2nxrafg9f83lb53q";
+  version = "1.2.1";
+  sha256 = "1f92q9wjj6npxfsjibw0qlg6pai721mwkjcadh121bwgrancflyr";
   buildDepends = [
     attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
     cookie hspec htmlConduit httpTypes HUnit monadControl network
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index d195d59dd312..fd68a161c68c 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.2.1.1";
-  sha256 = "1zx0r02k6znrm62wmhjcdlad3dil93kp6p862rvsvbkazwfy768a";
+  version = "1.2.2";
+  sha256 = "06ac99srh44rwj6mwyl7h0d0ckyb19dvpabylbawmks25v5ig0y3";
   buildDepends = [
     aeson blazeHtml blazeMarkup dataDefault hamlet monadControl
     networkConduit safe shakespeareCss shakespeareJs text transformers
diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix
index f49c885c066b..a22ae64dfde5 100644
--- a/pkgs/development/libraries/libjson/default.nix
+++ b/pkgs/development/libraries/libjson/default.nix
@@ -1,13 +1,16 @@
 { stdenv, fetchurl, unzip }:
-
-stdenv.mkDerivation rec {
-  name = "libjson-7.4.0";
+let
+  version = "7.6.1";
+in stdenv.mkDerivation rec {
+  name = "libjson-${version}";
   src = fetchurl {
-    url = "mirror://sourceforge/libjson/libjson_7.4.0.zip";
-    sha256 = "0rd6m3r3acm7xq6f0mbyyhc3dnwmiga60cws29yjl6nx2f9h3r0x";
+    url = "mirror://sourceforge/libjson/libjson_${version}.zip";
+    sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7";
   };
+  patches = [ ./install-fix.patch ];
   buildInputs = [ unzip ];
-  makeFlags = "prefix=$out";
+  makeFlags = [ "prefix=$(out)" ];
+  preInstall = "mkdir -p $out/lib";
   meta = {
     homepage = "http://libjson.sourceforge.net/";
     description = "A JSON reader and writer";
diff --git a/pkgs/development/libraries/libjson/install-fix.patch b/pkgs/development/libraries/libjson/install-fix.patch
new file mode 100644
index 000000000000..f074c8ba3aa5
--- /dev/null
+++ b/pkgs/development/libraries/libjson/install-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur libjson-orig/makefile libjson/makefile
+--- libjson-orig/makefile	2012-05-30 05:15:42.000000000 -0400
++++ libjson/makefile	2013-08-15 09:17:41.154245534 -0400
+@@ -266,7 +266,7 @@
+ 	cp -r ./$(srcdir)/JSONDefs $(include_path)/$(libname_hdr)/$(srcdir)
+ 	chmod -R a+r $(include_path)/$(libname_hdr)
+ 	find  $(include_path)/$(libname_hdr) -type d -exec chmod a+x {} \;
+-	cp -rv $(srcdir)/Dependencies/ $(include_path)/$(libname_hdr)/$(srcdir)
++	cp -rv $(srcdir)/../Dependencies/ $(include_path)/$(libname_hdr)/$(srcdir)/..
+ 	@echo "Install header files: Done."
+ 
+ clean: banner
diff --git a/pkgs/development/libraries/libkolab/default.nix b/pkgs/development/libraries/libkolab/default.nix
new file mode 100644
index 000000000000..3475b22d26d4
--- /dev/null
+++ b/pkgs/development/libraries/libkolab/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl,
+ cmake, qt4, clucene_core, librdf_redland, libiodbc
+, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "libkolab-0.4.2";
+
+  src = fetchurl {
+    url = "http://mirror.kolabsys.com/pub/releases/${name}.tar.gz";
+    sha256 = "1wdbg42s14p472dn35n6z638i6n64f6mjjxmjam1r54pzsdykks6";
+  };
+
+  # We disable the Java backend, since we do not need them and they make the closure size much bigger
+#  buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    homepage = http://soprano.sourceforge.net/;
+    description = "An object-oriented C++/Qt4 framework for RDF data";
+    license = "LGPL";
+    maintainers = with stdenv.lib.maintainers; [ phreedo ];
+    inherit (qt4.meta) platforms;
+  };
+}
diff --git a/pkgs/development/libraries/libkolabxml/default.nix b/pkgs/development/libraries/libkolabxml/default.nix
new file mode 100644
index 000000000000..c0217abd7863
--- /dev/null
+++ b/pkgs/development/libraries/libkolabxml/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, boost, curl, cmake, xercesc, qt4
+#, qt4, clucene_core, librdf_redland, libiodbc
+, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "libkolabxml-0.8.4";
+
+  src = fetchurl {
+    url = "http://mirror.kolabsys.com/pub/releases/${name}.tar.gz";
+    sha256 = "08gdhimnrhizpbvddj7cyz4jwwxrx5a70vz29cy989qgym2vn72q";
+  };
+
+  buildInputs = [ boost curl xercesc ];
+#  buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    homepage = http://soprano.sourceforge.net/;
+    description = "An object-oriented C++/Qt4 framework for RDF data";
+    license = "LGPL";
+    maintainers = with stdenv.lib.maintainers; [ phreedo ];
+    inherit (qt4.meta) platforms;
+  };
+}
diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix
new file mode 100644
index 000000000000..9cf8decf4c83
--- /dev/null
+++ b/pkgs/development/libraries/libtxc_dxtn/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, autoconf, automake, libtool, mesa }:
+
+let version = "1.0.1"; in
+
+stdenv.mkDerivation rec {
+  name = "libtxc_dxtn-${version}";
+
+  src = fetchurl {
+    url = "http://cgit.freedesktop.org/~mareko/${name}.tar.gz";
+    sha256 = "0g6lymik9cs7nbzigwzaf49fnhhfsvjanhg92wykw7rfq9zvkhvv";
+  };
+
+  buildInputs = [ autoconf automake libtool mesa ];
+
+  preConfigure = "autoreconf -vfi";
+
+  meta = {
+    homepage = http://dri.freedesktop.org/wiki/S3TC;
+  };
+}
diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix
new file mode 100644
index 000000000000..74c6b8fa615e
--- /dev/null
+++ b/pkgs/development/libraries/liburcu/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "0.7.7";
+  name = "liburcu-${version}";
+
+  src = fetchurl {
+    url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
+    sha256 = "1yxxnhrsy6sv6bmp7j96jjynnqns01zjgj94mk70jz54zvcagf4a";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Userspace RCU (read-copy-update) library";
+    homepage = http://lttng.org/urcu;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+
+}
diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix
new file mode 100644
index 000000000000..b831fd9bdd33
--- /dev/null
+++ b/pkgs/development/libraries/libvisual/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, glib }:
+
+stdenv.mkDerivation rec {
+  name = "libvisual-0.4.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libvisual/${name}.tar.gz";
+    sha256 = "1my1ipd5k1ixag96kwgf07bgxkjlicy9w22jfxb2kq95f6wgsk8b";
+  };
+
+  buildInputs = [ pkgconfig glib ];
+
+  meta = {
+    description = "An abstraction library for audio visualisations";
+    homepage = "http://sourceforge.net/projects/libvisual/";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platform = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/libxml2/setup-hook.sh b/pkgs/development/libraries/libxml2/setup-hook.sh
index f8e4f5e0fd64..112dbe0c5136 100644
--- a/pkgs/development/libraries/libxml2/setup-hook.sh
+++ b/pkgs/development/libraries/libxml2/setup-hook.sh
@@ -11,7 +11,7 @@ addXMLCatalogs () {
 if test -z "$libxmlHookDone"; then
     libxmlHookDone=1
 
-    # Set http_proxy and ftp_proxy to a invalid host to prevent
+    # Set http_proxy and ftp_proxy to an invalid host to prevent
     # xmllint and xsltproc from trying to download DTDs from the
     # network even when --nonet is not given.  That would be impure.
     # (Note that .invalid is a reserved domain guaranteed not to
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index d38fc19f40e1..de980d718f33 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -1,68 +1,58 @@
-{ stdenv, fetchurl, fetchgit, nspr, perl, zlib, sqlite
+{ stdenv, fetchurl, nspr, perl, zlib, sqlite
 , includeTools ? false
 }:
 
 let
 
-  nssPEM = fetchgit {
-    url = "git://git.fedorahosted.org/git/nss-pem.git";
-    rev = "07a683505d4a0a1113c4085c1ce117425d0afd80";
-    sha256 = "e4a9396d90e50e8b3cceff45f312eda9aaf356423f4eddd354a0e1afbbfd4cf8";
+  nssPEM = fetchurl {
+    url = http://dev.gentoo.org/~anarchy/patches/nss-3.15-pem-support-20130617.patch.xz;
+    sha256 = "1k1m8lsgqwxx251943hks1dd13hz1adpqqb0hxwn011by5vmi201";
   };
 
   secLoadPatch = fetchurl {
     name = "security_load.patch";
-    urls = [
-      # "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.6-1/85_security_load.patch"
-      # "http://anonscm.debian.org/gitweb/?p=pkg-mozilla/nss.git;a=blob_plain;f=debian/patches/85_security_load.patch;hb=HEAD"
-      "http://www.parsix.org/export/7797/pkg/security/raul/main/nss/trunk/debian/patches/85_security_load.patch"
-    ];
-    sha256 = "8a8d0ae4ebbd7c389973fa5d26d8bc5f473046c6cb1d8283cb9a3c1f4c565c47";
+    urls = http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.1-1/85_security_load.patch;
+    sha256 = "041c6v4cxwsy14qr5m9qs0gkv3w24g632cwpz27kacxpa886r1ds";
   };
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.14.3";
+  version = "3.15.1";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_3_RTM/src/${name}.tar.gz";
-    sha1 = "94d8781d1fa29cfbd37453dda3e9488709b82c4c";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_1_RTM/src/${name}.tar.gz";
+    sha1 = "1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];
 
-  postUnpack = ''
-    cp -rdv "${nssPEM}/mozilla/security/nss/lib/ckfw/pem" \
-            "$sourceRoot/mozilla/security/nss/lib/ckfw/"
-    chmod -R u+w "$sourceRoot/mozilla/security/nss/lib/ckfw/pem"
+  prePatch = ''
+    xz -d < ${nssPEM} | patch -p1
   '';
 
-  patches = [
-    ./nss-3.14.1-gentoo-fixups-r1.patch
-    secLoadPatch
-    ./nix_secload_fixup.patch
-    ./sync-up-with-upstream-softokn-changes.patch
-  ];
+  patches =
+    [ ./nss-3.15-gentoo-fixups.patch
+      secLoadPatch
+      ./nix_secload_fixup.patch
+    ];
 
   postPatch = ''
-    sed -i -e 's/^DIRS.*$/& pem/' mozilla/security/nss/lib/ckfw/manifest.mn
-
-    # Fix up the patch from Gentoo
+    # Fix up the patch from Gentoo.
     sed -i \
       -e "/^PREFIX =/s|= /usr|= $out|" \
       -e '/@libdir@/s|gentoo/nss|lib|' \
       -e '/ln -sf/d' \
-      mozilla/security/nss/config/Makefile
+      nss/config/Makefile
 
     # Note for spacing/tab nazis: The TAB characters are intentional!
-    cat >> mozilla/security/nss/config/Makefile <<INSTALL_TARGET
+    cat >> nss/config/Makefile <<INSTALL_TARGET
     install:
     	mkdir -p \$(DIST)/lib/pkgconfig
     	cp nss.pc \$(DIST)/lib/pkgconfig
     INSTALL_TARGET
   '';
 
-  preConfigure = "cd mozilla/security/nss";
+  preConfigure = "cd nss";
 
   makeFlags = [
     "NSPR_INCLUDE_DIR=${nspr}/include/nspr"
@@ -74,8 +64,6 @@ in stdenv.mkDerivation rec {
     "NSS_USE_SYSTEM_SQLITE=1"
   ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1";
 
-  buildFlags = [ "build_coreconf" "build_dbm" "all" ];
-
   postInstall = ''
     rm -rf $out/private
     mv $out/public $out/include
@@ -83,6 +71,8 @@ in stdenv.mkDerivation rec {
     rmdir $out/*.OBJ
 
     cp -av config/nss-config $out/bin/nss-config
+
+    ln -s lib $out/lib64
   '';
 
   postFixup = ''
@@ -94,4 +84,9 @@ in stdenv.mkDerivation rec {
   '' + stdenv.lib.optionalString (!includeTools) ''
     find $out/bin -type f \( -name nss-config -o -delete \)
   '';
+
+  meta = {
+    homepage = https://developer.mozilla.org/en-US/docs/NSS;
+    description = "A set of libraries for development of security-enabled client and server applications";
+  };
 }
diff --git a/pkgs/development/libraries/nss/nix_secload_fixup.patch b/pkgs/development/libraries/nss/nix_secload_fixup.patch
index 960fe0ef7a75..89c82f1b87d4 100644
--- a/pkgs/development/libraries/nss/nix_secload_fixup.patch
+++ b/pkgs/development/libraries/nss/nix_secload_fixup.patch
@@ -1,18 +1,7 @@
-diff --git a/mozilla/security/coreconf/config.mk b/mozilla/security/coreconf/config.mk
-index 72557c6..bdcbf88 100644
---- a/mozilla/security/coreconf/config.mk
-+++ b/mozilla/security/coreconf/config.mk
-@@ -207,3 +207,5 @@ endif
- DEFINES += -DUSE_UTIL_DIRECTLY
- USE_UTIL_DIRECTLY = 1
- 
-+# nix specific stuff:
-+DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
-diff --git a/mozilla/security/nss/cmd/shlibsign/shlibsign.c b/mozilla/security/nss/cmd/shlibsign/shlibsign.c
-index 5ce626e..e1e8039 100644
---- a/mozilla/security/nss/cmd/shlibsign/shlibsign.c
-+++ b/mozilla/security/nss/cmd/shlibsign/shlibsign.c
-@@ -770,7 +770,7 @@ int main(int argc, char **argv)
+diff -ru -x '*~' nss-3.15.1-orig/nss/cmd/shlibsign/shlibsign.c nss-3.15.1/nss/cmd/shlibsign/shlibsign.c
+--- nss-3.15.1-orig/nss/cmd/shlibsign/shlibsign.c	2013-08-07 16:03:40.013256377 +0200
++++ nss-3.15.1/nss/cmd/shlibsign/shlibsign.c	2013-08-07 16:04:21.128410153 +0200
+@@ -853,7 +853,7 @@
      assert(libname != NULL);
      lib = PR_LoadLibrary(libname);
      if (!lib)
@@ -21,11 +10,20 @@ index 5ce626e..e1e8039 100644
      assert(lib != NULL);
      PR_FreeLibraryName(libname);
  
-diff --git a/mozilla/security/nss/lib/util/secload.c b/mozilla/security/nss/lib/util/secload.c
-index 7d6fc22..0b7759b 100644
---- a/mozilla/security/nss/lib/util/secload.c
-+++ b/mozilla/security/nss/lib/util/secload.c
-@@ -105,9 +105,9 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name)
+diff -ru -x '*~' nss-3.15.1-orig/nss/coreconf/config.mk nss-3.15.1/nss/coreconf/config.mk
+--- nss-3.15.1-orig/nss/coreconf/config.mk	2013-06-27 19:58:08.000000000 +0200
++++ nss-3.15.1/nss/coreconf/config.mk	2013-08-07 16:11:27.364608802 +0200
+@@ -181,3 +181,6 @@
+ 
+ # Build with NO_NSPR_10_SUPPORT to avoid using obsolete NSPR features
+ DEFINES += -DNO_NSPR_10_SUPPORT
++
++# Nix specific stuff.
++DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
+diff -ru -x '*~' nss-3.15.1-orig/nss/lib/util/secload.c nss-3.15.1/nss/lib/util/secload.c
+--- nss-3.15.1-orig/nss/lib/util/secload.c	2013-08-07 16:03:40.014256381 +0200
++++ nss-3.15.1/nss/lib/util/secload.c	2013-08-07 16:05:02.453563064 +0200
+@@ -70,9 +70,9 @@
      /* Remove the trailing filename from referencePath and add the new one */
      c = strrchr(referencePath, PR_GetDirectorySeparator());
      if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0]
@@ -38,7 +36,7 @@ index 7d6fc22..0b7759b 100644
      }
      if (c) {
          size_t referencePathSize = 1 + c - referencePath;
-@@ -125,8 +125,7 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name)
+@@ -90,8 +90,7 @@
                  (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) {
                  memcpy(fullName + referencePathSize -4, "lib", 3);
              }
diff --git a/pkgs/development/libraries/nss/nss-3.14.1-gentoo-fixups-r1.patch b/pkgs/development/libraries/nss/nss-3.15-gentoo-fixups.patch
similarity index 70%
rename from pkgs/development/libraries/nss/nss-3.14.1-gentoo-fixups-r1.patch
rename to pkgs/development/libraries/nss/nss-3.15-gentoo-fixups.patch
index bc3a98ec1438..b3e35b1d2d19 100644
--- a/pkgs/development/libraries/nss/nss-3.14.1-gentoo-fixups-r1.patch
+++ b/pkgs/development/libraries/nss/nss-3.15-gentoo-fixups.patch
@@ -1,9 +1,8 @@
-diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/Makefile
---- a/mozilla/security/nss/config/Makefile	1969-12-31 18:00:00.000000000 -0600
-+++ b/mozilla/security/nss/config/Makefile	2012-12-15 07:27:20.650148987 -0600
+--- a/nss/config/Makefile
++++ b/nss/config/Makefile
 @@ -0,0 +1,40 @@
-+CORE_DEPTH = ../..
-+DEPTH      = ../..
++CORE_DEPTH = ..
++DEPTH      = ..
 +
 +include $(CORE_DEPTH)/coreconf/config.mk
 +
@@ -19,14 +18,14 @@ diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/M
 +	mkdir -p $(DIST)/lib/pkgconfig
 +	sed -e "s,@prefix@,$(PREFIX)," \
 +	    -e "s,@exec_prefix@,\$${prefix}," \
-+	    -e "s,@libdir@,\$${prefix}/gentoo/nss," \
++	    -e "s,@libdir@,\$${prefix}/lib64," \
 +	    -e "s,@includedir@,\$${prefix}/include/nss," \
 +	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
 +	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
 +	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
 +	    nss.pc.in > nss.pc
 +	chmod 0644 nss.pc
-+	ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
++	ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig
 +
 +	# Create the nss-config script
 +	mkdir -p $(DIST)/bin
@@ -36,15 +35,14 @@ diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/M
 +	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
 +	    nss-config.in > nss-config
 +	chmod 0755 nss-config
-+	ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin
++	ln -sf ../../../config/nss-config $(DIST)/bin
 +
 +libs:
 +
 +dummy: all export libs
 +
-diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/config/nss-config.in
---- a/mozilla/security/nss/config/nss-config.in	1969-12-31 18:00:00.000000000 -0600
-+++ b/mozilla/security/nss/config/nss-config.in	2012-12-15 07:27:20.651148959 -0600
+--- a/nss/config/nss-config.in
++++ b/nss/config/nss-config.in
 @@ -0,0 +1,145 @@
 +#!/bin/sh
 +
@@ -191,9 +189,8 @@ diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/con
 +      echo $libdirs
 +fi      
 +
-diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/nss.pc.in
---- a/mozilla/security/nss/config/nss.pc.in	1969-12-31 18:00:00.000000000 -0600
-+++ b/mozilla/security/nss/config/nss.pc.in	2012-12-15 07:27:20.651148959 -0600
+--- a/nss/config/nss.pc.in
++++ b/nss/config/nss.pc.in
 @@ -0,0 +1,12 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -207,37 +204,35 @@ diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/
 +Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
 +Cflags: -I${includedir}
 +
-diff -urN a/mozilla/security/nss/Makefile b/mozilla/security/nss/Makefile
---- a/mozilla/security/nss/Makefile	2012-11-13 19:14:07.000000000 -0600
-+++ b/mozilla/security/nss/Makefile	2012-12-15 07:27:57.235162137 -0600
+--- a/nss/Makefile
++++ b/nss/Makefile
 @@ -44,7 +44,7 @@
  # (7) Execute "local" rules. (OPTIONAL).                              #
  #######################################################################
  
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf build_dbm all
+-nss_build_all: build_nspr all
++nss_build_all: all
  
- nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
+ nss_clean_all: clobber_nspr clobber
  
-@@ -106,12 +106,6 @@
+@@ -103,12 +103,6 @@
  	--with-dist-prefix='$(NSPR_PREFIX)' \
  	--with-dist-includedir='$(NSPR_PREFIX)/include'
  
 -build_nspr: $(NSPR_CONFIG_STATUS)
--	$(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)
+-	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
 -
 -clobber_nspr: $(NSPR_CONFIG_STATUS)
--	$(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) clobber
+-	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
 -
- build_dbm:
- ifdef NSS_DISABLE_DBM
- 	@echo "skipping the build of DBM"
-diff -urN a/mozilla/security/nss/manifest.mn b/mozilla/security/nss/manifest.mn
---- a/mozilla/security/nss/manifest.mn	2012-03-20 09:46:49.000000000 -0500
-+++ b/mozilla/security/nss/manifest.mn	2012-12-15 07:27:20.652148933 -0600
-@@ -10,6 +10,6 @@
+ build_docs:
+ 	$(MAKE) -C $(CORE_DEPTH)/doc
+ 
+--- a/nss/manifest.mn
++++ b/nss/manifest.mn
+@@ -10,4 +10,4 @@
  
  RELEASE = nss
  
--DIRS = lib cmd
-+DIRS = lib cmd config
+-DIRS = coreconf lib cmd
++DIRS = coreconf lib cmd config
diff --git a/pkgs/development/libraries/nss/sync-up-with-upstream-softokn-changes.patch b/pkgs/development/libraries/nss/sync-up-with-upstream-softokn-changes.patch
deleted file mode 100644
index 4942debcd302..000000000000
--- a/pkgs/development/libraries/nss/sync-up-with-upstream-softokn-changes.patch
+++ /dev/null
@@ -1,406 +0,0 @@
-From d6dbecfea317a468be12423595e584f43d84d8ec Mon Sep 17 00:00:00 2001
-From: Elio Maldonado <emaldona@redhat.com>
-Date: Sat, 9 Feb 2013 17:11:00 -0500
-Subject: [PATCH] Sync up with upstream softokn changes
-
-- Disable RSA OEP case in FormatBlock, RSA_OAEP support is experimental and in a state of flux
-- Numerous change upstream due to the work for TLS/DTLS 'Lucky 13' vulnerability CVE-2013-0169
-- It now compiles with the NSS_3_14_3_BETA1 source
----
- mozilla/security/nss/lib/ckfw/pem/rsawrapr.c |  338 +++++++-------------------
- 1 files changed, 82 insertions(+), 256 deletions(-)
-
-diff --git a/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c b/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
-index 5ac4f39..3780d30 100644
---- a/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
-+++ b/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
-@@ -46,6 +46,7 @@
- #include "sechash.h"
- #include "base.h"
- 
-+#include "lowkeyi.h"
- #include "secerr.h"
- 
- #define RSA_BLOCK_MIN_PAD_LEN		8
-@@ -54,9 +55,8 @@
- #define RSA_BLOCK_PRIVATE_PAD_OCTET	0xff
- #define RSA_BLOCK_AFTER_PAD_OCTET	0x00
- 
--#define OAEP_SALT_LEN		8
--#define OAEP_PAD_LEN		8
--#define OAEP_PAD_OCTET		0x00
-+/* Needed for RSA-PSS functions */
-+static const unsigned char eightZeros[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
- 
- #define FLAT_BUFSIZE 512        /* bytes to hold flattened SHA1Context. */
- 
-@@ -78,127 +78,39 @@ pem_PublicModulusLen(NSSLOWKEYPublicKey *pubk)
-     return 0;
- }
- 
--static SHA1Context *SHA1_CloneContext(SHA1Context * original)
--{
--    SHA1Context *clone = NULL;
--    unsigned char *pBuf;
--    int sha1ContextSize = SHA1_FlattenSize(original);
--    SECStatus frv;
--    unsigned char buf[FLAT_BUFSIZE];
--
--    PORT_Assert(sizeof buf >= sha1ContextSize);
--    if (sizeof buf >= sha1ContextSize) {
--        pBuf = buf;
--    } else {
--        pBuf = nss_ZAlloc(NULL, sha1ContextSize);
--        if (!pBuf)
--            goto done;
--    }
--
--    frv = SHA1_Flatten(original, pBuf);
--    if (frv == SECSuccess) {
--        clone = SHA1_Resurrect(pBuf, NULL);
--        memset(pBuf, 0, sha1ContextSize);
--    }
--  done:
--    if (pBuf != buf)
--        nss_ZFreeIf(pBuf);
--    return clone;
-+/* Constant time comparison of a single byte.
-+ * Returns 1 iff a == b, otherwise returns 0.
-+ * Note: For ranges of bytes, use constantTimeCompare.
-+ */
-+static unsigned char constantTimeEQ8(unsigned char a, unsigned char b) {
-+    unsigned char c = ~(a - b | b - a);
-+    c >>= 7;
-+    return c;
- }
- 
--/*
-- * Modify data by XORing it with a special hash of salt.
-+/* Constant time comparison of a range of bytes.
-+ * Returns 1 iff len bytes of a are identical to len bytes of b, otherwise
-+ * returns 0.
-  */
--static SECStatus
--oaep_xor_with_h1(unsigned char *data, unsigned int datalen,
--                 unsigned char *salt, unsigned int saltlen)
--{
--    SHA1Context *sha1cx;
--    unsigned char *dp, *dataend;
--    unsigned char end_octet;
--
--    sha1cx = SHA1_NewContext();
--    if (sha1cx == NULL) {
--        return SECFailure;
--    }
--
--    /*
--     * Get a hash of salt started; we will use it several times,
--     * adding in a different end octet (x00, x01, x02, ...).
--     */
--    SHA1_Begin(sha1cx);
--    SHA1_Update(sha1cx, salt, saltlen);
--    end_octet = 0;
--
--    dp = data;
--    dataend = data + datalen;
--
--    while (dp < dataend) {
--        SHA1Context *sha1cx_h1;
--        unsigned int sha1len, sha1off;
--        unsigned char sha1[SHA1_LENGTH];
--
--        /*
--         * Create hash of (salt || end_octet)
--         */
--        sha1cx_h1 = SHA1_CloneContext(sha1cx);
--        SHA1_Update(sha1cx_h1, &end_octet, 1);
--        SHA1_End(sha1cx_h1, sha1, &sha1len, sizeof(sha1));
--        SHA1_DestroyContext(sha1cx_h1, PR_TRUE);
--        PORT_Assert(sha1len == SHA1_LENGTH);
--
--        /*
--         * XOR that hash with the data.
--         * When we have fewer than SHA1_LENGTH octets of data
--         * left to xor, use just the low-order ones of the hash.
--         */
--        sha1off = 0;
--        if ((dataend - dp) < SHA1_LENGTH)
--            sha1off = SHA1_LENGTH - (dataend - dp);
--        while (sha1off < SHA1_LENGTH)
--            *dp++ ^= sha1[sha1off++];
--
--        /*
--         * Bump for next hash chunk.
--         */
--        end_octet++;
--    }
--
--    SHA1_DestroyContext(sha1cx, PR_TRUE);
--    return SECSuccess;
-+static unsigned char constantTimeCompare(const unsigned char *a,
-+                                         const unsigned char *b,
-+                                         unsigned int len) {
-+    unsigned char tmp = 0;
-+    unsigned int i;
-+    for (i = 0; i < len; ++i, ++a, ++b)
-+        tmp |= *a ^ *b;
-+    return constantTimeEQ8(0x00, tmp);
- }
- 
--/*
-- * Modify salt by XORing it with a special hash of data.
-+/* Constant time conditional.
-+ * Returns a if c is 1, or b if c is 0. The result is undefined if c is
-+ * not 0 or 1.
-  */
--static SECStatus
--oaep_xor_with_h2(unsigned char *salt, unsigned int saltlen,
--                 unsigned char *data, unsigned int datalen)
-+static unsigned int constantTimeCondition(unsigned int c,
-+                                          unsigned int a,
-+                                          unsigned int b)
- {
--    unsigned char sha1[SHA1_LENGTH];
--    unsigned char *psalt, *psha1, *saltend;
--    SECStatus rv;
--
--    /*
--     * Create a hash of data.
--     */
--    rv = SHA1_HashBuf(sha1, data, datalen);
--    if (rv != SECSuccess) {
--        return rv;
--    }
--
--    /*
--     * XOR the low-order octets of that hash with salt.
--     */
--    PORT_Assert(saltlen <= SHA1_LENGTH);
--    saltend = salt + saltlen;
--    psalt = salt;
--    psha1 = sha1 + SHA1_LENGTH - saltlen;
--    while (psalt < saltend) {
--        *psalt++ ^= *psha1++;
--    }
--
--    return SECSuccess;
-+    return (~(c - 1) & a) | ((c - 1) & b);
- }
- 
- /*
-@@ -212,7 +124,7 @@ static unsigned char *rsa_FormatOneBlock(unsigned modulusLen,
-     unsigned char *block;
-     unsigned char *bp;
-     int padLen;
--    int i;
-+    int i, j;
-     SECStatus rv;
- 
-     block = (unsigned char *) nss_ZAlloc(NULL, modulusLen);
-@@ -260,124 +172,58 @@ static unsigned char *rsa_FormatOneBlock(unsigned modulusLen,
-          */
-     case RSA_BlockPublic:
- 
--        /*
--         * 0x00 || BT || Pad || 0x00 || ActualData
--         *   1      1   padLen    1      data->len
--         * Pad is all non-zero random bytes.
--         */
--        padLen = modulusLen - data->len - 3;
--        PORT_Assert(padLen >= RSA_BLOCK_MIN_PAD_LEN);
--        if (padLen < RSA_BLOCK_MIN_PAD_LEN) {
--            nss_ZFreeIf(block);
--            return NULL;
--        }
--        for (i = 0; i < padLen; i++) {
--            /* Pad with non-zero random data. */
--            do {
--                rv = RNG_GenerateGlobalRandomBytes(bp + i, 1);
--            } while (rv == SECSuccess
--                     && bp[i] == RSA_BLOCK_AFTER_PAD_OCTET);
--            if (rv != SECSuccess) {
--                nss_ZFreeIf(block);
--                return NULL;
--            }
--        }
--        bp += padLen;
--        *bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
--        nsslibc_memcpy(bp, data->data, data->len);
--
--        break;
--
--        /*
--         * Blocks intended for public-key operation, using
--         * Optimal Asymmetric Encryption Padding (OAEP).
--         */
--    case RSA_BlockOAEP:
--        /*
--         * 0x00 || BT || Modified2(Salt) || Modified1(PaddedData)
--         *   1      1     OAEP_SALT_LEN     OAEP_PAD_LEN + data->len [+ N]
--         *
--         * where:
--         *   PaddedData is "Pad1 || ActualData [|| Pad2]"
--         *   Salt is random data.
--         *   Pad1 is all zeros.
--         *   Pad2, if present, is random data.
--         *   (The "modified" fields are all the same length as the original
--         * unmodified values; they are just xor'd with other values.)
--         *
--         *   Modified1 is an XOR of PaddedData with a special octet
--         * string constructed of iterated hashing of Salt (see below).
--         *   Modified2 is an XOR of Salt with the low-order octets of
--         * the hash of Modified1 (see farther below ;-).
--         *
--         * Whew!
--         */
--
--
--        /*
--         * Salt
--         */
--        rv = RNG_GenerateGlobalRandomBytes(bp, OAEP_SALT_LEN);
--        if (rv != SECSuccess) {
--            nss_ZFreeIf(block);
--            return NULL;
--        }
--        bp += OAEP_SALT_LEN;
--
--        /*
--         * Pad1
--         */
--        nsslibc_memset(bp, OAEP_PAD_OCTET, OAEP_PAD_LEN);
--        bp += OAEP_PAD_LEN;
--
--        /*
--         * Data
--         */
--        nsslibc_memcpy(bp, data->data, data->len);
--        bp += data->len;
--
--        /*
--         * Pad2
--         */
--        if (bp < (block + modulusLen)) {
--            rv = RNG_GenerateGlobalRandomBytes(bp,
--                                               block - bp + modulusLen);
--            if (rv != SECSuccess) {
--                nss_ZFreeIf(block);
--                return NULL;
--            }
--        }
--
--        /*
--         * Now we have the following:
--         * 0x00 || BT || Salt || PaddedData
--         * (From this point on, "Pad1 || Data [|| Pad2]" is treated
--         * as the one entity PaddedData.)
--         *
--         * We need to turn PaddedData into Modified1.
--         */
--        if (oaep_xor_with_h1(block + 2 + OAEP_SALT_LEN,
--                             modulusLen - 2 - OAEP_SALT_LEN,
--                             block + 2, OAEP_SALT_LEN) != SECSuccess) {
--            nss_ZFreeIf(block);
--            return NULL;
--        }
--
--        /*
--         * Now we have:
--         * 0x00 || BT || Salt || Modified1(PaddedData)
--         *
--         * The remaining task is to turn Salt into Modified2.
--         */
--        if (oaep_xor_with_h2(block + 2, OAEP_SALT_LEN,
--                             block + 2 + OAEP_SALT_LEN,
--                             modulusLen - 2 - OAEP_SALT_LEN) !=
--            SECSuccess) {
--            nss_ZFreeIf(block);
--            return NULL;
--        }
--
--        break;
-+	/*
-+	 * 0x00 || BT || Pad || 0x00 || ActualData
-+	 *   1      1   padLen    1      data->len
-+	 * Pad is all non-zero random bytes.
-+	 *
-+	 * Build the block left to right.
-+	 * Fill the entire block from Pad to the end with random bytes.
-+	 * Use the bytes after Pad as a supply of extra random bytes from 
-+	 * which to find replacements for the zero bytes in Pad.
-+	 * If we need more than that, refill the bytes after Pad with 
-+	 * new random bytes as necessary.
-+	 */
-+	padLen = modulusLen - (data->len + 3);
-+	PORT_Assert (padLen >= RSA_BLOCK_MIN_PAD_LEN);
-+	if (padLen < RSA_BLOCK_MIN_PAD_LEN) {
-+	    nss_ZFreeIf (block);
-+	    return NULL;
-+	}
-+	j = modulusLen - 2;
-+	rv = RNG_GenerateGlobalRandomBytes(bp, j);
-+	if (rv == SECSuccess) {
-+	    for (i = 0; i < padLen; ) {
-+		unsigned char repl;
-+		/* Pad with non-zero random data. */
-+		if (bp[i] != RSA_BLOCK_AFTER_PAD_OCTET) {
-+		    ++i;
-+		    continue;
-+		}
-+		if (j <= padLen) {
-+		    rv = RNG_GenerateGlobalRandomBytes(bp + padLen,
-+					  modulusLen - (2 + padLen));
-+		    if (rv != SECSuccess)
-+		    	break;
-+		    j = modulusLen - 2;
-+		}
-+		do {
-+		    repl = bp[--j];
-+		} while (repl == RSA_BLOCK_AFTER_PAD_OCTET && j > padLen);
-+		if (repl != RSA_BLOCK_AFTER_PAD_OCTET) {
-+		    bp[i++] = repl;
-+		}
-+	    }
-+	}
-+	if (rv != SECSuccess) {
-+	    /*sftk_fatalError = PR_TRUE;*/
-+	    nss_ZFreeIf (block);
-+	    return NULL;
-+	}
-+	bp += padLen;
-+	*bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
-+	nsslibc_memcpy(bp, data->data, data->len);
-+	break;
- 
-     default:
-         PORT_Assert(0);
-@@ -427,26 +273,6 @@ rsa_FormatBlock(SECItem * result, unsigned modulusLen,
- 
-         break;
- 
--    case RSA_BlockOAEP:
--        /*
--         * 0x00 || BT || M1(Salt) || M2(Pad1||ActualData[||Pad2])
--         *
--         * The "2" below is the first octet + the second octet.
--         * (The other fields do not contain the clear values, but are
--         * the same length as the clear values.)
--         */
--        PORT_Assert(data->len <= (modulusLen - (2 + OAEP_SALT_LEN
--                                                + OAEP_PAD_LEN)));
--
--        result->data = rsa_FormatOneBlock(modulusLen, blockType, data);
--        if (result->data == NULL) {
--            result->len = 0;
--            return SECFailure;
--        }
--        result->len = modulusLen;
--
--        break;
--
-     case RSA_BlockRaw:
-         /*
-          * Pad || ActualData
--- 
-1.7.1
-
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index e54eaba4f15a..f1c99397452d 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -38,7 +38,10 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Linear Algebra PACKage";
-    license = "revised-BSD";
     homepage = "http://www.netlib.org/lapack/";
+    license = "revised-BSD";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/development/libraries/webkit/svn.nix b/pkgs/development/libraries/webkit/svn.nix
deleted file mode 100644
index db6fe1ba55c8..000000000000
--- a/pkgs/development/libraries/webkit/svn.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-args : with args; 
-let 
-  s = import ./src-for-default.nix;
-  version = lib.attrByPath ["version"] s.version args;
-in
-rec {
-  src = fetchurl {
-    url = s.url;
-    sha256 = s.hash;
-  };
-
-  buildInputs = [gtk glib atk cairo curl fontconfig freetype
-    gettext libjpeg libpng libtiff libxml2 libxslt pango
-    sqlite icu gperf bison flex autoconf automake libtool 
-    perl intltool pkgconfig libsoup gtkdoc libXt libproxy
-    enchant python ruby which renderproto libXrender geoclue
-    ];
-
-  propagatedBuildInputs = [
-    gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good
-    ];
-
-  configureCommand = "./autogen.sh ";
-  configureFlags = [
-    "--enable-3D-transforms"
-    "--enable-web-sockets"
-    "--enable-web-timing"
-    
-    # https://bugs.webkit.org/show_bug.cgi?id=55294
-    "--enable-image-resizer"
-
-    "--enable-geolocation"
-
-    # Not implemented?
-    # "--enable-web-audio"
-
-    "--enable-mathml"
-
-    "--enable-wml"
-    
-    # https://bugs.webkit.org/show_bug.cgi?id=45110
-    # "--enable-indexed-database"
-
-    "--enable-xhtmlmp"
-
-    # "--enable-input-speech"
-
-    "--enable-file-writer"
-    "--enable-blob"
-
-    # https://bugs.webkit.org/show_bug.cgi?id=59430
-    # "--enable-directory-upload"
-
-    # https://bugs.webkit.org/show_bug.cgi?id=58443
-    # "--enable-file-system"
-    ];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["setVars" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") 
-    "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
-
-  setVars = fullDepEntry (''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lXt"
-  '') ["minInit"];
-
-  doReplaceUsrBin = fullDepEntry (''
-    for i in $(find . -name '*.pl') $(find . -name '*.pm'); do 
-        sed -e 's@/usr/bin/gcc@gcc@' -i $i
-    done
-  '') ["minInit" "doUnpack"];
-
-  doAddPrograms = fullDepEntry (''
-    mkdir -p $out/bin
-    for i in Programs/.libs/* Programs/*; do 
-        cp $i $out/bin/webkit-program-$(basename $i) || true
-    done
-  '') ["minInit" "doMake" "defEnsureDir"];
-      
-  paranoidFixComments = fullDepEntry (''
-    sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h')
-  '') ["minInit" "doUnpack"];
-
-  name = s.name;
-  meta = {
-    description = "WebKit - a fast and correct HTML renderer";
-    maintainers = [stdenv.lib.maintainers.raskin];
-  };
-  passthru = {
-    inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg;
-  };
-}
diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
index fb5d324d7789..635d0ae964f6 100644
--- a/pkgs/development/mobile/androidenv/addon.xml
+++ b/pkgs/development/mobile/androidenv/addon.xml
@@ -731,13 +731,63 @@ August 15, 2011
     </sdk:add-on>
 
     <sdk:add-on>
-        <!-- Generated at Mon Nov 12 17:15:51 2012 from git_jb-mr1-dev @ 526865 -->
+        <sdk:vendor-id>google</sdk:vendor-id>
+        <sdk:vendor-display>Google Inc.</sdk:vendor-display>
+        <sdk:name-id>google_tv_addon</sdk:name-id>
+        <sdk:name-display>Google TV Addon</sdk:name-display>
+        <sdk:api-level>13</sdk:api-level>
+        <sdk:revision>1</sdk:revision>
+        <sdk:description>Android + Google TV, API 13</sdk:description>
+        <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
+        <sdk:uses-license ref="android-googletv-license"/>
+        <sdk:archives>
+            <sdk:archive os="any">
+                <sdk:size>87721879</sdk:size>
+                <sdk:checksum type="sha1">b73f7c66011ac8180b44aa4e83b8d78c66ea9a09</sdk:checksum>
+                <sdk:url>google_tv-13_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:libs/>
+    </sdk:add-on>
+
+    <sdk:add-on>
+        <!-- Generated at Tue May 14 08:07:47 2013 from git_jb-mr1.1-dev @ 673949 -->
         <sdk:vendor-id>google</sdk:vendor-id>
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:name-id>google_apis</sdk:name-id>
         <sdk:name-display>Google APIs</sdk:name-display>
         <sdk:description>Android + Google APIs</sdk:description>
         <sdk:api-level>17</sdk:api-level>
+        <sdk:revision>3</sdk:revision>
+        <sdk:libs>
+            <sdk:lib>
+                <sdk:name>com.google.android.maps</sdk:name>
+            </sdk:lib>
+            <sdk:lib>
+                <sdk:name>com.android.future.usb.accessory</sdk:name>
+            </sdk:lib>
+            <sdk:lib>
+                <sdk:name>com.google.android.media.effects</sdk:name>
+            </sdk:lib>
+        </sdk:libs>
+        <sdk:archives>
+            <sdk:archive arch="any" os="any">
+                <sdk:size>137156978</sdk:size>
+                <sdk:checksum type="sha1">8246f61d24f0408c8e7bc352a1e522b7e2b619ba</sdk:checksum>
+                <sdk:url>google_apis-17_r03.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:add-on>
+
+    <sdk:add-on>
+        <!-- Generated at Tue Jul 23 17:14:07 2013 from git_jb-mr2-release @ 737497 -->
+        <sdk:vendor-id>google</sdk:vendor-id>
+        <sdk:vendor-display>Google Inc.</sdk:vendor-display>
+        <sdk:name-id>google_apis</sdk:name-id>
+        <sdk:name-display>Google APIs</sdk:name-display>
+        <sdk:description>Android + Google APIs</sdk:description>
+        <sdk:api-level>18</sdk:api-level>
         <sdk:revision>1</sdk:revision>
         <sdk:libs>
             <sdk:lib>
@@ -752,9 +802,9 @@ August 15, 2011
         </sdk:libs>
         <sdk:archives>
             <sdk:archive arch="any" os="any">
-                <sdk:size>132568033</sdk:size>
-                <sdk:checksum type="sha1">62cb086f11e15713878c8834d58ef1a2454c19a4</sdk:checksum>
-                <sdk:url>google_apis-17_r01.zip</sdk:url>
+                <sdk:size>147899839</sdk:size>
+                <sdk:checksum type="sha1">5c0c24f04e6b65c61da83408b7aee79228c24a40</sdk:checksum>
+                <sdk:url>google_apis-18_r01.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -763,8 +813,8 @@ August 15, 2011
     <!-- EXTRAS VENDOR=ANDROID ........................ -->
 
     <sdk:extra>
-        <!-- Generated at Mon Nov 12 17:16:25 2012 from git_jb-mr1-dev @ 526865 -->
-        <sdk:revision>11</sdk:revision>
+        <!-- Generated at Tue Jul 23 17:18:50 2013 from git_jb-mr2-ub-dev @ 751786 -->
+        <sdk:revision>18</sdk:revision>
         <sdk:vendor-display>Android</sdk:vendor-display>
         <sdk:vendor-id>android</sdk:vendor-id>
         <sdk:name-display>Android Support Library</sdk:name-display>
@@ -772,9 +822,27 @@ August 15, 2011
         <sdk:old-paths>compatibility</sdk:old-paths>
         <sdk:archives>
             <sdk:archive arch="any" os="any">
-                <sdk:size>1264808</sdk:size>
-                <sdk:checksum type="sha1">d30d182d8e4c86bb4464c03a83ccffce7bc84ecd</sdk:checksum>
-                <sdk:url>support_r11.zip</sdk:url>
+                <sdk:size>4438319</sdk:size>
+                <sdk:checksum type="sha1">bd67b4b8a6bac629f24c8aea75c3619a26d9a568</sdk:checksum>
+                <sdk:url>support_r18.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:extra>
+
+    <sdk:extra>
+        <!-- Generated from git_jb-mr2-ub-dev @ 751786 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:vendor-display>Android</sdk:vendor-display>
+        <sdk:vendor-id>android</sdk:vendor-id>
+        <sdk:name-display>Android Support Repository</sdk:name-display>
+        <sdk:description>Local Maven repository for Support Libraries</sdk:description>
+        <sdk:path>m2repository</sdk:path>
+        <sdk:archives>
+            <sdk:archive arch="any" os="any">
+                <sdk:size>3705797</sdk:size>
+                <sdk:checksum type="sha1">c4284e4bf17a1e8bafc96a18de36984022d5a46a</sdk:checksum>
+                <sdk:url>android_m2repository_r02.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -782,6 +850,23 @@ August 15, 2011
 
     <!-- EXTRAS VENDOR=GOOGLE ....................... -->
 
+    <sdk:extra>
+        <sdk:vendor-id>google</sdk:vendor-id>
+        <sdk:vendor-display>Google Inc.</sdk:vendor-display>
+        <sdk:name-display>Google Repository</sdk:name-display>
+        <sdk:path>m2repository</sdk:path>
+        <sdk:revision>1</sdk:revision>
+        <sdk:description>Local Maven repository for Google Libraries</sdk:description>
+        <sdk:uses-license ref="android-sdk-license"/>
+        <sdk:archives>
+            <sdk:archive os="any">
+                <sdk:size>660833</sdk:size>
+                <sdk:checksum type="sha1">d9a20d960f0d9a8de61a9ced5fc6c2c605f6c6c0</sdk:checksum>
+                <sdk:url>google_m2repository_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+    </sdk:extra>
+
     <sdk:extra>
         <sdk:vendor-id>google</sdk:vendor-id>
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
@@ -807,14 +892,14 @@ August 15, 2011
         <sdk:name-display>Google Play APK Expansion Library</sdk:name-display>
         <sdk:path>play_apk_expansion</sdk:path>
         <sdk:old-paths>market_apk_expansion</sdk:old-paths>
-        <sdk:revision>2</sdk:revision>
+        <sdk:revision>3</sdk:revision>
         <sdk:description>Google Play APK Expansion library</sdk:description>
         <sdk:desc-url>http://developer.android.com/guide/market/expansion-files.html</sdk:desc-url>
         <sdk:archives>
             <sdk:archive os="any">
-                <sdk:size>111636</sdk:size>
-                <sdk:checksum type="sha1">47fa8c691fcc8cf815e7ebbf140f12e94495f73b</sdk:checksum>
-                <sdk:url>market_apk_expansion-r02.zip</sdk:url>
+                <sdk:size>110201</sdk:size>
+                <sdk:checksum type="sha1">5305399dc1a56814e86b8459ce24871916f78b8c</sdk:checksum>
+                <sdk:url>market_apk_expansion-r03.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -825,34 +910,34 @@ August 15, 2011
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:name-display>Google Play services</sdk:name-display>
         <sdk:path>google_play_services</sdk:path>
-        <sdk:revision>4</sdk:revision>
+        <sdk:revision>9</sdk:revision>
         <sdk:description>Google Play Services client library and sample code</sdk:description>
         <sdk:desc-url>https://developers.google.com/android/google-play-services/index</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
             <sdk:archive os="any">
-                <sdk:size>3732458</sdk:size>
-                <sdk:checksum type="sha1">bbb3d11225fcf60a0bae75afa2c4737010468bf6</sdk:checksum>
-                <sdk:url>google_play_services_2012110_r04.zip</sdk:url>
+                <sdk:size>5125755</sdk:size>
+                <sdk:checksum type="sha1">3e31fc0b982f938edf216afe9e532774db12607a</sdk:checksum>
+                <sdk:url>google_play_services_3159130_r09.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
     </sdk:extra>
 
     <sdk:extra>
-        <!-- Generated at Tue Aug 28 11:07:05 2012 from git_master @ 449897 -->
+        <!-- Generated at Thu Jul 18 16:46:04 PDT 2013 from git_master @ 745409 -->
         <sdk:vendor-id>google</sdk:vendor-id>
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:name-display>Google USB Driver</sdk:name-display>
         <sdk:path>usb_driver</sdk:path>
-        <sdk:revision>7</sdk:revision>
-        <sdk:description>USB Driver for Windows, revision 7</sdk:description>
+        <sdk:revision>8</sdk:revision>
+        <sdk:description>USB Driver for Windows, revision 8</sdk:description>
         <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
         <sdk:uses-license ref="android-sdk-license"/>
         <sdk:archives>
             <sdk:archive os="windows">
-                <sdk:size>8681704</sdk:size>
-                <sdk:checksum type="sha1">147c339fde22f98ae41b15349a8303d39a2cf6e5</sdk:checksum>
-                <sdk:url>usb_driver_r07-windows.zip</sdk:url>
+                <sdk:size>8682230</sdk:size>
+                <sdk:checksum type="sha1">2b2f91098a984a865a70f0bd841a843fb54462fc</sdk:checksum>
+                <sdk:url>usb_driver_r08-windows.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
     </sdk:extra>
@@ -863,14 +948,14 @@ August 15, 2011
         <sdk:name-display>Google Play Billing Library</sdk:name-display>
         <sdk:path>play_billing</sdk:path>
         <sdk:old-paths>market_billing</sdk:old-paths>
-        <sdk:revision>3</sdk:revision>
+        <sdk:revision>4</sdk:revision>
         <sdk:description>Google Play Billing files and sample code</sdk:description>
         <sdk:desc-url>http://developer.android.com/google/play/billing/index.html</sdk:desc-url>
         <sdk:archives>
             <sdk:archive os="any">
-                <sdk:size>435718</sdk:size>
-                <sdk:checksum type="sha1">a133d454c992ef2a18e62fa810e8185f1be4b054</sdk:checksum>
-                <sdk:url>play_billing_r03.zip</sdk:url>
+                <sdk:size>437084</sdk:size>
+                <sdk:checksum type="sha1">38fdae51dadb6d1e63e177adba3e4d96b751686e</sdk:checksum>
+                <sdk:url>play_billing_r04.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -881,14 +966,14 @@ August 15, 2011
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
         <sdk:name-display>Google AdMob Ads SDK</sdk:name-display>
         <sdk:path>admob_ads_sdk</sdk:path>
-        <sdk:revision>8</sdk:revision>
+        <sdk:revision>11</sdk:revision>
         <sdk:description>AdMob Ads SDK</sdk:description>
         <sdk:desc-url>https://developers.google.com/mobile-ads-sdk/docs/</sdk:desc-url>
         <sdk:archives>
             <sdk:archive os="any">
-                <sdk:size>545547</sdk:size>
-                <sdk:checksum type="sha1">031476aa5a491239d2624e8de8c9e46e40d93e3f</sdk:checksum>
-                <sdk:url>https://dl-ssl.google.com/googleadmobadssdk/googleadmobadssdkandroid-6.2.1.zip</sdk:url>
+                <sdk:size>704512</sdk:size>
+                <sdk:checksum type="sha1">0102859d9575baa0bf4fd5eb422af2ad0fe6cb82</sdk:checksum>
+                <sdk:url>https://dl-ssl.google.com/googleadmobadssdk/googleadmobadssdkandroid-6.4.1.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -897,16 +982,16 @@ August 15, 2011
     <sdk:extra>
         <sdk:vendor-id>google</sdk:vendor-id>
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
-        <sdk:name-display>Google Analytics SDK</sdk:name-display>
-        <sdk:path>analytics_sdk</sdk:path>
-        <sdk:revision>2</sdk:revision>
-        <sdk:description>Analytics SDK</sdk:description>
-        <sdk:desc-url>http://code.google.com/mobile/analytics/</sdk:desc-url>
+        <sdk:name-display>Google Analytics App Tracking SDK</sdk:name-display>
+        <sdk:path>analytics_sdk_v2</sdk:path>
+        <sdk:revision>3</sdk:revision>
+        <sdk:description>Analytics App Tracking SDK</sdk:description>
+        <sdk:desc-url>http://developers.google.com/analytics/devguides/collection/</sdk:desc-url>
         <sdk:archives>
             <sdk:archive os="any">
-                <sdk:size>53055</sdk:size>
-                <sdk:checksum type="sha1">328bcdc6c241879ebb04d6edc6fec1052a171004</sdk:checksum>
-                <sdk:url>https://dl.google.com/gaformobileapps/GoogleAnalyticsAndroid_1.4.2.zip</sdk:url>
+                <sdk:size>211432</sdk:size>
+                <sdk:checksum type="sha1">dc14026bf0ce78315cb5dd00552607de0894de83</sdk:checksum>
+                <sdk:url>https://dl.google.com/gaformobileapps/GoogleAnalyticsAndroid_2.0beta5.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -933,10 +1018,10 @@ August 15, 2011
     <sdk:extra>
         <sdk:vendor-id>google</sdk:vendor-id>
         <sdk:vendor-display>Google Inc.</sdk:vendor-display>
-        <sdk:name-display>Google Cloud Messaging for Android Library</sdk:name-display>
+        <sdk:name-display>[Deprecated] Google Cloud Messaging for Android Library</sdk:name-display>
         <sdk:path>gcm</sdk:path>
         <sdk:revision>3</sdk:revision>
-        <sdk:description>Google Cloud Messaging for Android library and sample code</sdk:description>
+        <sdk:description>GCM library has been moved to Google Play Services (com.google.android.gms.gcm) and this standalone version is no longer supported</sdk:description>
         <sdk:desc-url>https://developers.google.com/android/gcm/index</sdk:desc-url>
         <sdk:archives>
             <sdk:archive os="any">
diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix
index f26db5c2cb73..651c84533f06 100644
--- a/pkgs/development/mobile/androidenv/addons.nix
+++ b/pkgs/development/mobile/androidenv/addons.nix
@@ -185,8 +185,20 @@ in
   google_apis_17 = buildGoogleApis {
     name = "google_apis-17";
       src = fetchurl {
-        url = https://dl-ssl.google.com/android/repository/google_apis-17_r01.zip;
-        sha1 = "62cb086f11e15713878c8834d58ef1a2454c19a4";
+        url = https://dl-ssl.google.com/android/repository/google_apis-17_r03.zip;
+        sha1 = "8246f61d24f0408c8e7bc352a1e522b7e2b619ba";
+      };
+      meta = {
+        description = "Android + Google APIs";
+        
+      };
+    };
+    
+  google_apis_18 = buildGoogleApis {
+    name = "google_apis-18";
+      src = fetchurl {
+        url = https://dl-ssl.google.com/android/repository/google_apis-18_r01.zip;
+        sha1 = "5c0c24f04e6b65c61da83408b7aee79228c24a40";
       };
       meta = {
         description = "Android + Google APIs";
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index e8e1f919fe4e..38377cf8bbb4 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -1,23 +1,23 @@
 { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper
-, platformTools, support, platforms, sysimages, addons
+, platformTools, buildTools, support, platforms, sysimages, addons
 , zlib_32bit
-, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit
-, libX11, libXext, libXrender, libxcb, libXau, libXdmcp
-, freetype, fontconfig, gtk, atk
+, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit
+, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib
+, freetype, fontconfig, glib, gtk, atk, file, jdk
 }:
-{platformVersions, useGoogleAPIs}:
+{platformVersions, abiVersions, useGoogleAPIs}:
 
 stdenv.mkDerivation {
-  name = "android-sdk-21";
+  name = "android-sdk-22.05";
   
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
-      url = http://dl.google.com/android/android-sdk_r21-linux.tgz;
-      md5 = "7f8d73b629f808cdcfc9f9900bbd7580";
+      url = http://dl.google.com/android/android-sdk_r22.0.5-linux.tgz;
+      md5 = "8201b10c21510f082c54f58a9bb082c8";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
-      url = http://dl.google.com/android/android-sdk_r21-macosx.zip;
-      md5 = "67e46adca90dd18d7291443f6c15d6af";
+      url = http://dl.google.com/android/android-sdk_r22.0.5-macosx.zip;
+      md5 = "94f3cbe896c332b94ee0408ae610a4b8";
     }
     else throw "platform not ${stdenv.system} supported!";
   
@@ -56,19 +56,30 @@ stdenv.mkDerivation {
           patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i
       done
     
-      # The emulators need additional libraries, which are not in the RPATH => let's wrap them
+      # The android script has a hardcoded reference to /bin/ls that must be patched
+      sed -i -e "s|/bin/ls|ls|" android
+      
+      # The android script used SWT and wants to dynamically load some GTK+ stuff.
+      # The following wrapper ensures that they can be found:
+      wrapProgram `pwd`/android \
+        --prefix PATH : ${jdk}/bin \
+        --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib
+    
+      # The emulators need additional libraries, which are dynamically loaded => let's wrap them
     
       for i in emulator emulator-arm emulator-mips emulator-x86
       do
           wrapProgram `pwd`/$i \
-            --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib
+            --prefix PATH : ${file}/bin \
+            --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib
       done
       
       ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
         for i in emulator64-arm emulator64-mips emulator64-x86
         do
             wrapProgram `pwd`/$i \
-            --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib
+              --prefix PATH : ${file}/bin \
+              --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib:${alsaLib}/lib
         done
       ''}
     ''}
@@ -107,6 +118,7 @@ stdenv.mkDerivation {
     
     cd ..
     ln -s ${platformTools}/platform-tools
+    ln -s ${buildTools}/build-tools
     ln -s ${support}/support
     
     # Symlink required Google API add-ons
@@ -147,19 +159,21 @@ stdenv.mkDerivation {
     mkdir -p system-images
     cd system-images
     
-    ${stdenv.lib.concatMapStrings (platformVersion:
-      if (builtins.hasAttr ("sysimg_"+platformVersion) sysimages) then
-        let
-          sysimg = builtins.getAttr ("sysimg_"+platformVersion) sysimages;
-        in
-        ''
-          mkdir -p android-${platformVersion}
-          cd android-${platformVersion}
-          ln -s ${sysimg}/*
-          cd ..
-        ''
-      else ""
-    ) platformVersions}
+    ${stdenv.lib.concatMapStrings (abiVersion:
+      stdenv.lib.concatMapStrings (platformVersion:
+        if (builtins.hasAttr ("sysimg_" + abiVersion + "_" + platformVersion) sysimages) then
+          let
+            sysimg = builtins.getAttr ("sysimg_" + abiVersion + "_" + platformVersion) sysimages;
+          in
+          ''
+            mkdir -p android-${platformVersion}
+            cd android-${platformVersion}
+            ln -s ${sysimg}/*
+            cd ..
+          ''
+        else ""
+      ) platformVersions
+    ) abiVersions}
     
     # Create wrappers to the most important tools and platform tools so that we can run them if the SDK is in our PATH
     
@@ -169,11 +183,7 @@ stdenv.mkDerivation {
     do
         if [ ! -d $i ] && [ -x $i ]
         then
-            ( echo '#! ${stdenv.shell} -e'
-              echo "cd $out/libexec/android-sdk-*/tools"
-              echo "exec ./$(basename $i) \"\$@\"" ) > $out/bin/$(basename $i)
-          
-              chmod +x $out/bin/$(basename $i)
+            ln -sf $i $out/bin/$(basename $i)
         fi
     done
     
@@ -181,11 +191,7 @@ stdenv.mkDerivation {
     do
         if [ ! -d $i ] && [ -x $i ]
         then
-            ( echo '#! ${stdenv.shell} -e'
-              echo "cd $out/libexec/android-sdk-*/platform-tools"
-              echo "exec ./$(basename $i) \"\$@\"") > $out/bin/$(basename $i)
-          
-              chmod +x $out/bin/$(basename $i)
+            ln -sf $i $out/bin/$(basename $i)
         fi
     done
   '';
diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix
index 8b770ede0fc7..2792d364f15c 100644
--- a/pkgs/development/mobile/androidenv/build-app.nix
+++ b/pkgs/development/mobile/androidenv/build-app.nix
@@ -1,5 +1,5 @@
 { stdenv, androidsdk, jdk, ant }:
-{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false
+{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? ""
 , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null
 }:
 
@@ -10,7 +10,10 @@ let
     else if stdenv.system == "x86_64-darwin" then "macosx"
     else throw "Platform: ${stdenv.system} is not supported!";
 
-  androidsdkComposition = androidsdk { inherit platformVersions useGoogleAPIs; };
+  androidsdkComposition = androidsdk {
+    inherit platformVersions useGoogleAPIs;
+    abiVersions = [];
+  };
 in
 stdenv.mkDerivation {
   name = stdenv.lib.replaceChars [" "] [""] name;
@@ -32,7 +35,7 @@ stdenv.mkDerivation {
     ''}
   
     export ANDROID_SDK_HOME=`pwd` # Key files cannot be stored in the user's home directory. This overrides it.
-    ant ${if release then "release" else "debug"}
+    ant ${antFlags} ${if release then "release" else "debug"}
   '';
   
   installPhase = ''
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
new file mode 100644
index 000000000000..0d9cbc220803
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -0,0 +1,54 @@
+{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}:
+
+stdenv.mkDerivation {
+  name = "android-build-tools-r18.0.1";
+  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
+    then fetchurl {
+      url = https://dl-ssl.google.com/android/repository/build-tools_r18.0.1-linux.zip;
+      sha1 = "f11618492b0d2270c332325d45d752d3656a9640";
+    }
+    else if stdenv.system == "x86_64-darwin" then fetchurl {
+      url = https://dl-ssl.google.com/android/repository/build-tools_r18.0.1-macosx.zip;
+      sha1 = "d84f5692fb44d60fc53e5b2507cebf9f24626902";
+    }
+    else throw "System ${stdenv.system} not supported!";
+  
+  buildCommand = ''
+    mkdir -p $out/build-tools
+    cd $out/build-tools
+    unzip $src
+    
+    ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
+      ''
+        cd android-*
+        
+        # Patch the interpreter
+        for i in aapt aidl dexdump llvm-rs-cc
+        do
+            patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
+        done
+        
+        # These binaries need to find libstdc++ and libgcc_s
+        for i in aidl libLLVM.so
+        do
+            patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i
+        done
+        
+        # These binaries need to find libstdc++, libgcc_s and libraries in the current folder
+        for i in libbcc.so libbcinfo.so libclang.so llvm-rs-cc
+        do
+            patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:`pwd` $i
+        done
+        
+        # These binaries need to find libstdc++, libgcc_s, and zlib
+        for i in aapt dexdump
+        do
+            patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i
+        done
+      ''}
+      
+      patchShebangs .
+  '';
+  
+  buildInputs = [ unzip ];
+}
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index a76deb98b6ee..3339a065e2ae 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -3,10 +3,15 @@
 rec {
   platformTools = import ./platform-tools.nix {
     inherit (pkgs) stdenv fetchurl unzip;
-    inherit (pkgs_i686) zlib ncurses;
     stdenv_32bit = pkgs_i686.stdenv;
   };
   
+  buildTools = import ./build-tools.nix {
+    inherit (pkgs) stdenv fetchurl unzip;
+    stdenv_32bit = pkgs_i686.stdenv;
+    zlib_32bit = pkgs_i686.zlib;
+  };
+  
   support = import ./support.nix {
     inherit (pkgs) stdenv fetchurl unzip;
   };
@@ -31,10 +36,10 @@ rec {
 
   androidsdk = import ./androidsdk.nix {
     inherit (pkgs) stdenv fetchurl unzip makeWrapper;
-    inherit (pkgs) freetype fontconfig gtk atk;
-    inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp;
+    inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib jdk;
+    inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst;
     
-    inherit platformTools support platforms sysimages addons;
+    inherit platformTools buildTools support platforms sysimages addons;
     
     stdenv_32bit = pkgs_i686.stdenv;
     zlib_32bit = pkgs_i686.zlib;
@@ -43,10 +48,19 @@ rec {
     libXau_32bit = pkgs_i686.xorg.libXau;
     libXdmcp_32bit = pkgs_i686.xorg.libXdmcp;
     libXext_32bit = pkgs_i686.xorg.libXext;
+    mesa_32bit = pkgs_i686.mesa;
+    alsaLib_32bit = pkgs_i686.alsaLib;
   };
   
   androidsdk_4_1 = androidsdk {
     platformVersions = [ "16" ];
+    abiVersions = [ "armeabi-v7a" ];
+    useGoogleAPIs = true;
+  };
+  
+  androidsdk_4_2 = androidsdk {
+    platformVersions = [ "17" ];
+    abiVersions = [ "armeabi-v7a" ];
     useGoogleAPIs = true;
   };
   
diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
index 3cbe57238066..9c843fa8c373 100644
--- a/pkgs/development/mobile/androidenv/emulate-app.nix
+++ b/pkgs/development/mobile/androidenv/emulate-app.nix
@@ -1,8 +1,17 @@
 {stdenv, androidsdk}:
-{name, app, platformVersion ? "8", useGoogleAPIs ? false, package, activity}:
+{ name, app ? null
+, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false
+, enableGPU ? false, extraAVDFiles ? []
+, package ? null, activity ? null}:
+
+assert app != null -> package != null && activity != null;
 
 let
-  androidsdkComposition = androidsdk { inherit useGoogleAPIs; platformVersions = [ platformVersion ]; };
+  androidsdkComposition = androidsdk {
+    inherit useGoogleAPIs;
+    platformVersions = [ platformVersion ];
+    abiVersions = [ abiVersion ];
+  };
 in
 stdenv.mkDerivation {
   inherit name;
@@ -24,7 +33,7 @@ stdenv.mkDerivation {
     
     # We have to look for a free TCP port
     
-    echo "Looking for a free TCP port in range 5554-5584"
+    echo "Looking for a free TCP port in range 5554-5584" >&2
     
     for i in $(seq 5554 2 5584)
     do
@@ -37,51 +46,61 @@ stdenv.mkDerivation {
     
     if [ -z "$port" ]
     then
-        echo "Unfortunately, the emulator port space is exhausted!"
+        echo "Unfortunately, the emulator port space is exhausted!" >&2
         exit 1
     else
-        echo "We have a free TCP port: $port"
+        echo "We have a free TCP port: $port" >&2
     fi
     
     export ANDROID_SERIAL="emulator-$port"
     
     # Create a virtual android device
-    ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion}
+    yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} $NIX_ANDROID_AVD_FLAGS
+    
+    ${stdenv.lib.optionalString enableGPU ''
+      # Enable GPU acceleration
+      echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini
+    ''}
+    
+    ${stdenv.lib.concatMapStrings (extraAVDFile: ''
+      ln -sf ${extraAVDFile} $ANDROID_SDK_HOME/.android/avd/device.avd
+    '') extraAVDFiles}
     
     # Launch the emulator
-    ${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port &
+    ${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS &
 
     # Wait until the device has completely booted
     
-    echo "Waiting until the emulator has booted the device and the package manager is ready..."
+    echo "Waiting until the emulator has booted the device and the package manager is ready..." >&2
     
     ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port wait-for-device
     
-    echo "Device state has been reached"
+    echo "Device state has been reached" >&2
     
     while [ -z "$(${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ]
     do
         sleep 5
     done
     
-    echo "dev.bootcomplete property is 1"
+    echo "dev.bootcomplete property is 1" >&2
     
     #while [ -z "$(${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ]
     #do
         #sleep 5
     #done
     
-    #echo "sys.boot_completed property is 1"
+    #echo "sys.boot_completed property is 1" >&2
     
-    echo "ready"
+    echo "ready" >&2
     
-    # Install the App through the debugger
-    ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install ${app}/*.apk
+    ${stdenv.lib.optionalString (app != null) ''
+      # Install the App through the debugger
+      ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install ${app}/*.apk
     
-    # Start the application
-    ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity}
+      # Start the application
+      ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity}
+    ''}
     EOF
-    
     chmod +x $out/bin/run-test-emulator
   '';
 }
diff --git a/pkgs/development/mobile/androidenv/generate-platforms.sh b/pkgs/development/mobile/androidenv/generate-platforms.sh
index 983d8bde87b9..8ac4ad328f44 100755
--- a/pkgs/development/mobile/androidenv/generate-platforms.sh
+++ b/pkgs/development/mobile/androidenv/generate-platforms.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -e
 
-xsltproc --stringparam os linux generate-platforms.xsl repository-7.xml > platforms-linux.nix
-xsltproc --stringparam os macosx generate-platforms.xsl repository-7.xml > platforms-macosx.nix
+xsltproc --stringparam os linux generate-platforms.xsl repository-8.xml > platforms-linux.nix
+xsltproc --stringparam os macosx generate-platforms.xsl repository-8.xml > platforms-macosx.nix
diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl
index 1802ae63efe1..249f044550b1 100644
--- a/pkgs/development/mobile/androidenv/generate-platforms.xsl
+++ b/pkgs/development/mobile/androidenv/generate-platforms.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:sdk="http://schemas.android.com/sdk/android/repository/7">
+  xmlns:sdk="http://schemas.android.com/sdk/android/repository/8">
 
   <xsl:param name="os" />
   <xsl:output omit-xml-declaration="yes" indent="no" />
diff --git a/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl b/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl
new file mode 100644
index 000000000000..31ab72add364
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:str="http://exslt.org/strings"
+  xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <xsl:param name="abi" />
+  <xsl:output omit-xml-declaration="yes" indent="no" />
+
+  <xsl:template match="/sdk:sdk-sys-img">
+    <xsl:for-each select="sdk:system-image">
+  sysimg_<xsl:value-of select="sdk:abi" />_<xsl:value-of select="sdk:api-level" /> = buildSystemImage {
+    name = "<xsl:value-of select="sdk:abi" />-<xsl:value-of select="sdk:api-level" />";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/sys-img/<xsl:value-of select="$abi" />/<xsl:value-of select="sdk:archives/sdk:archive[@os='any']/sdk:url" />;
+      sha1 = "<xsl:value-of select="sdk:archives/sdk:archive[@os='any']/sdk:checksum[@type='sha1']" />";
+    };
+  };
+    </xsl:for-each>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh
index dc28c27f45f0..90b1e04c2297 100755
--- a/pkgs/development/mobile/androidenv/generate-sysimages.sh
+++ b/pkgs/development/mobile/androidenv/generate-sysimages.sh
@@ -1,3 +1,26 @@
 #!/bin/sh -e
 
-xsltproc generate-sysimages.xsl repository-7.xml > sysimages.nix
+cat > sysimages.nix << "EOF"
+{stdenv, fetchurl, unzip}:
+
+let
+  buildSystemImage = args:
+    stdenv.mkDerivation (args // {
+      buildInputs = [ unzip ];
+      buildCommand = ''
+        mkdir -p $out
+        cd $out
+        unzip $src
+    '';
+  });
+in
+{
+EOF
+
+xsltproc generate-sysimages.xsl repository-8.xml >> sysimages.nix
+xsltproc --stringparam abi x86 generate-sysimages-others.xsl sys-img-x86.xml >> sysimages.nix
+xsltproc --stringparam abi mips generate-sysimages-others.xsl sys-img-mips.xml >> sysimages.nix
+
+cat >> sysimages.nix << "EOF"
+}
+EOF
diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl
index 1224ebbd4e8d..be9947d536a9 100644
--- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl
+++ b/pkgs/development/mobile/androidenv/generate-sysimages.xsl
@@ -2,27 +2,13 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:str="http://exslt.org/strings"
-  xmlns:sdk="http://schemas.android.com/sdk/android/repository/7">
+  xmlns:sdk="http://schemas.android.com/sdk/android/repository/8">
 
   <xsl:output omit-xml-declaration="yes" indent="no" />
 
   <xsl:template match="/sdk:sdk-repository">
-{stdenv, fetchurl, unzip}:
-
-let
-  buildSystemImage = args:
-    stdenv.mkDerivation (args // {   
-      buildInputs = [ unzip ];
-      buildCommand = ''
-        mkdir -p $out
-        cd $out
-        unzip $src
-    '';
-  });
-in
-{
     <xsl:for-each select="sdk:system-image">
-  sysimg_<xsl:value-of select="sdk:api-level" /> = buildSystemImage {
+  sysimg_<xsl:value-of select="sdk:abi" />_<xsl:value-of select="sdk:api-level" /> = buildSystemImage {
     name = "<xsl:value-of select="sdk:abi" />-<xsl:value-of select="sdk:api-level" />";
     src = fetchurl {
       url = https://dl-ssl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive[@os='any']/sdk:url" />;
@@ -30,7 +16,5 @@ in
     };
   };
     </xsl:for-each>
-}
   </xsl:template>
-
 </xsl:stylesheet>
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index 554996082909..bf263741bddd 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -1,15 +1,15 @@
-{stdenv, stdenv_32bit, fetchurl, unzip, zlib, ncurses}:
+{stdenv, stdenv_32bit, fetchurl, unzip}:
 
 stdenv.mkDerivation {
-  name = "android-platform-tools-r16";
+  name = "android-platform-tools-r18.0.1";
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
-      url = https://dl-ssl.google.com/android/repository/platform-tools_r16-linux.zip;
-      sha1 = "84d563ae5e324f223f335f11bf511bf6207c05fb";
+      url = https://dl-ssl.google.com/android/repository/platform-tools_r18.0.1-linux.zip;
+      sha1 = "cf9bdbbaa34da37b59724f914dad907c2c74a387";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
-      url = https://dl-ssl.google.com/android/repository/platform-tools_r16-macosx.zip;
-      sha1 = "fbb0f8d2786a83b8c3eb6df402e706e136db8fed";
+      url = https://dl-ssl.google.com/android/repository/platform-tools_r18.0.1-macosx.zip;
+      sha1 = "126325cbb55928c38acbb9c7bb5d9145d94fad56";
     }
     else throw "System ${stdenv.system} not supported!";
   
@@ -21,20 +21,12 @@ stdenv.mkDerivation {
     
     ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
       ''
-        for i in aapt adb aidl dexdump fastboot llvm-rs-cc
+        for i in adb fastboot
         do
             patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
+            patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i
         done
-    
-        patchelf --set-rpath ${zlib}/lib:${stdenv_32bit.gcc.gcc}/lib aapt
-        patchelf --set-rpath ${ncurses}/lib:${stdenv_32bit.gcc.gcc}/lib adb
-        patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib aidl
-        patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib fastboot
-        patchelf --set-rpath ${zlib}/lib:${stdenv_32bit.gcc.gcc}/lib dexdump
-        patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib llvm-rs-cc
     ''}
-    
-    patchShebangs .
   '';
   
   buildInputs = [ unzip ];
diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix
index f544fcc08bed..2ca937b5534e 100644
--- a/pkgs/development/mobile/androidenv/platforms-linux.nix
+++ b/pkgs/development/mobile/androidenv/platforms-linux.nix
@@ -185,23 +185,35 @@ in
   platform_16 = buildPlatform {
     name = "android-platform-4.1.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-16_r03.zip;
-      sha1 = "80d9ffef58168f9bccd862830e2ee51f686b167e";
+      url = https://dl-ssl.google.com/android/repository/android-16_r04.zip;
+      sha1 = "90b9157b8b45f966be97e11a22fba4591b96c2ee";
     };
     meta = {
-      description = "Android SDK Platform 4.1";
+      description = "Android SDK Platform 4.1.2";
       
     };
   };
     
   platform_17 = buildPlatform {
-    name = "android-platform-4.2";
+    name = "android-platform-4.2.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-17_r01.zip;
-      sha1 = "c2e7c8c8db40e06b804ddb1725ac2c3555b55025";
+      url = https://dl-ssl.google.com/android/repository/android-17_r02.zip;
+      sha1 = "c442c32c1b702173ab0929a74486e4f86fe528ec";
     };
     meta = {
-      description = "Android SDK Platform 4.2";
+      description = "Android SDK Platform 4.2.2";
+      
+    };
+  };
+    
+  platform_18 = buildPlatform {
+    name = "android-platform-4.3";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/android-18_r01.zip;
+      sha1 = "c24de91d6f296cf453701aef281609779fffb379";
+    };
+    meta = {
+      description = "Android SDK Platform 4.3";
       
     };
   };
diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix
index a1434bbe56c1..c89cb9ed1272 100644
--- a/pkgs/development/mobile/androidenv/platforms-macosx.nix
+++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix
@@ -185,23 +185,35 @@ in
   platform_16 = buildPlatform {
     name = "android-platform-4.1.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-16_r03.zip;
-      sha1 = "80d9ffef58168f9bccd862830e2ee51f686b167e";
+      url = https://dl-ssl.google.com/android/repository/android-16_r04.zip;
+      sha1 = "90b9157b8b45f966be97e11a22fba4591b96c2ee";
     };
     meta = {
-      description = "Android SDK Platform 4.1";
+      description = "Android SDK Platform 4.1.2";
       
     };
   };
     
   platform_17 = buildPlatform {
-    name = "android-platform-4.2";
+    name = "android-platform-4.2.2";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/android-17_r01.zip;
-      sha1 = "c2e7c8c8db40e06b804ddb1725ac2c3555b55025";
+      url = https://dl-ssl.google.com/android/repository/android-17_r02.zip;
+      sha1 = "c442c32c1b702173ab0929a74486e4f86fe528ec";
     };
     meta = {
-      description = "Android SDK Platform 4.2";
+      description = "Android SDK Platform 4.2.2";
+      
+    };
+  };
+    
+  platform_18 = buildPlatform {
+    name = "android-platform-4.3";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/android-18_r01.zip;
+      sha1 = "c24de91d6f296cf453701aef281609779fffb379";
+    };
+    meta = {
+      description = "Android SDK Platform 4.3";
       
     };
   };
diff --git a/pkgs/development/mobile/androidenv/repository-7.xml b/pkgs/development/mobile/androidenv/repository-8.xml
similarity index 85%
rename from pkgs/development/mobile/androidenv/repository-7.xml
rename to pkgs/development/mobile/androidenv/repository-8.xml
index 7bbbaf1e3620..4e180ac4b3e6 100644
--- a/pkgs/development/mobile/androidenv/repository-7.xml
+++ b/pkgs/development/mobile/androidenv/repository-8.xml
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-<sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
     <sdk:license id="android-sdk-license" type="text">Terms and Conditions
 
@@ -570,33 +570,33 @@ November 13, 2012
     </sdk:platform>
 
     <sdk:platform>
-        <!-- Generated at Tue Oct  9 13:42:01 2012 from git_jb-dev @ 495790 -->
-        <sdk:revision>3</sdk:revision>
-        <sdk:description>Android SDK Platform 4.1</sdk:description>
+        <!-- Generated at Thu Dec  6 10:54:05 2012 from git_jb-dev @ 543062 -->
+        <sdk:revision>4</sdk:revision>
+        <sdk:description>Android SDK Platform 4.1.2</sdk:description>
         <sdk:version>4.1.2</sdk:version>
         <sdk:api-level>16</sdk:api-level>
         <sdk:min-tools-rev>
-            <sdk:major>20</sdk:major>
+            <sdk:major>21</sdk:major>
         </sdk:min-tools-rev>
         <sdk:layoutlib>
-            <sdk:api>8</sdk:api>
+            <sdk:api>9</sdk:api>
             <sdk:revision>1</sdk:revision>
         </sdk:layoutlib>
         <sdk:archives>
             <sdk:archive arch="any" os="any">
-                <sdk:size>47995505</sdk:size>
-                <sdk:checksum type="sha1">80d9ffef58168f9bccd862830e2ee51f686b167e</sdk:checksum>
-                <sdk:url>android-16_r03.zip</sdk:url>
+                <sdk:size>48005140</sdk:size>
+                <sdk:checksum type="sha1">90b9157b8b45f966be97e11a22fba4591b96c2ee</sdk:checksum>
+                <sdk:url>android-16_r04.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:platform>
 
     <sdk:platform>
-        <!-- Generated at Mon Nov 12 17:12:35 2012 from git_jb-mr1-dev @ 526865 -->
-        <sdk:revision>1</sdk:revision>
-        <sdk:description>Android SDK Platform 4.2</sdk:description>
-        <sdk:version>4.2</sdk:version>
+        <!-- Generated at Wed Feb 13 11:27:09 2013 from git_jb-mr1.1-dev @ 576024 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:description>Android SDK Platform 4.2.2</sdk:description>
+        <sdk:version>4.2.2</sdk:version>
         <sdk:api-level>17</sdk:api-level>
         <sdk:min-tools-rev>
             <sdk:major>21</sdk:major>
@@ -607,9 +607,32 @@ November 13, 2012
         </sdk:layoutlib>
         <sdk:archives>
             <sdk:archive arch="any" os="any">
-                <sdk:size>47886130</sdk:size>
-                <sdk:checksum type="sha1">c2e7c8c8db40e06b804ddb1725ac2c3555b55025</sdk:checksum>
-                <sdk:url>android-17_r01.zip</sdk:url>
+                <sdk:size>48057484</sdk:size>
+                <sdk:checksum type="sha1">c442c32c1b702173ab0929a74486e4f86fe528ec</sdk:checksum>
+                <sdk:url>android-17_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:platform>
+
+    <sdk:platform>
+        <!-- Generated at Tue Jul 23 17:16:25 2013 from git_jb-mr2-release @ 737497 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:description>Android SDK Platform 4.3</sdk:description>
+        <sdk:version>4.3</sdk:version>
+        <sdk:api-level>18</sdk:api-level>
+        <sdk:min-tools-rev>
+            <sdk:major>21</sdk:major>
+        </sdk:min-tools-rev>
+        <sdk:layoutlib>
+            <sdk:api>9</sdk:api>
+            <sdk:revision>1</sdk:revision>
+        </sdk:layoutlib>
+        <sdk:archives>
+            <sdk:archive arch="any" os="any">
+                <sdk:size>48752456</sdk:size>
+                <sdk:checksum type="sha1">c24de91d6f296cf453701aef281609779fffb379</sdk:checksum>
+                <sdk:url>android-18_r01.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -666,16 +689,32 @@ November 13, 2012
     </sdk:system-image>
 
     <sdk:system-image>
-        <!-- Generated at Mon Nov 12 17:14:39 2012 from git_jb-mr1-dev @ 526865 -->
-        <sdk:revision>1</sdk:revision>
-        <sdk:description>Android SDK Platform 4.2</sdk:description>
+        <!-- Generated at Wed Feb 13 11:29:12 2013 from git_jb-mr1.1-dev @ 576024 -->
+        <sdk:revision>2</sdk:revision>
+        <sdk:description>Android SDK Platform 4.2.2</sdk:description>
         <sdk:api-level>17</sdk:api-level>
         <sdk:abi>armeabi-v7a</sdk:abi>
         <sdk:archives>
             <sdk:archive arch="any" os="any">
-                <sdk:size>116831648</sdk:size>
-                <sdk:checksum type="sha1">45b9344473e0a6d063c2b1fe58d8cd47d307905e</sdk:checksum>
-                <sdk:url>sysimg_armv7a-17_r01.zip</sdk:url>
+                <sdk:size>116553808</sdk:size>
+                <sdk:checksum type="sha1">1c321cda1af793b84d47d1a8d15f85444d265e3c</sdk:checksum>
+                <sdk:url>sysimg_armv7a-17_r02.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <!-- Generated at Tue Jul 23 17:18:11 2013 from git_jb-mr2-release @ 737497 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:description>Android SDK Platform 4.3</sdk:description>
+        <sdk:api-level>18</sdk:api-level>
+        <sdk:abi>armeabi-v7a</sdk:abi>
+        <sdk:archives>
+            <sdk:archive arch="any" os="any">
+                <sdk:size>125597583</sdk:size>
+                <sdk:checksum type="sha1">5a9b8ac5b57dd0e3278f47deb5ee58e1db6f1f9e</sdk:checksum>
+                <sdk:url>sysimg_armv7a-18_r01.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -866,89 +905,134 @@ November 13, 2012
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:sample>
 
+    <sdk:sample>
+        <!-- Generated at Tue Jul 23 17:17:22 2013 from git_jb-mr2-ub-dev @ 751786 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:api-level>18</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive arch="any" os="any">
+                <sdk:size>19897793</sdk:size>
+                <sdk:checksum type="sha1">73e879ce46c04a6e63ad1a9107018b4782945007</sdk:checksum>
+                <sdk:url>samples-18_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:sample>
+
     <!-- PLATFORM-TOOLS ........................ -->
 
     <sdk:platform-tool>
-        <!-- Generated at Mon Nov 12 17:13:48 2012 from git_jb-mr1-dev @ 527242 -->
+        <!-- Generated at Mon Jul 29 15:56:24 2013 from git_jb-mr2-dev @ 754669 -->
         <sdk:revision>
-            <sdk:major>16</sdk:major>
+            <sdk:major>18</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>1</sdk:micro>
         </sdk:revision>
         <sdk:archives>
             <sdk:archive arch="any" os="windows">
-                <sdk:size>11938435</sdk:size>
-                <sdk:checksum type="sha1">0d6245b685c7d303cf4a054a3d373c4427b7ad01</sdk:checksum>
-                <sdk:url>platform-tools_r16-windows.zip</sdk:url>
+                <sdk:size>954769</sdk:size>
+                <sdk:checksum type="sha1">b40fea3ed72296dd42dd616a7abf536b8dace20d</sdk:checksum>
+                <sdk:url>platform-tools_r18.0.1-windows.zip</sdk:url>
             </sdk:archive>
             <sdk:archive arch="any" os="linux">
-                <sdk:size>12676089</sdk:size>
-                <sdk:checksum type="sha1">84d563ae5e324f223f335f11bf511bf6207c05fb</sdk:checksum>
-                <sdk:url>platform-tools_r16-linux.zip</sdk:url>
+                <sdk:size>1011194</sdk:size>
+                <sdk:checksum type="sha1">cf9bdbbaa34da37b59724f914dad907c2c74a387</sdk:checksum>
+                <sdk:url>platform-tools_r18.0.1-linux.zip</sdk:url>
             </sdk:archive>
             <sdk:archive arch="any" os="macosx">
-                <sdk:size>13147351</sdk:size>
-                <sdk:checksum type="sha1">fbb0f8d2786a83b8c3eb6df402e706e136db8fed</sdk:checksum>
-                <sdk:url>platform-tools_r16-macosx.zip</sdk:url>
+                <sdk:size>971087</sdk:size>
+                <sdk:checksum type="sha1">126325cbb55928c38acbb9c7bb5d9145d94fad56</sdk:checksum>
+                <sdk:url>platform-tools_r18.0.1-macosx.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:platform-tool>
 
-    <!-- TOOLS ........................ -->
+    <!-- BUILD-TOOLS ........................ -->
 
-    <sdk:tool>
-        <!-- Generated at Mon Nov 12 17:07:47 2012 from git_tools_r21 @ 519525 -->
+    <sdk:build-tool>
+        <!-- Generated at Tue May 14 16:40:25 2013 from git_jb-mr1.1-dev @ 673949 -->
         <sdk:revision>
-            <sdk:major>21</sdk:major>
+            <sdk:major>17</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>0</sdk:micro>
         </sdk:revision>
-        <sdk:min-platform-tools-rev>
-            <sdk:major>16</sdk:major>
-        </sdk:min-platform-tools-rev>
         <sdk:archives>
             <sdk:archive arch="any" os="windows">
-                <sdk:size>98982670</sdk:size>
-                <sdk:checksum type="sha1">57bbfadcedbef44fc322e5e037666393668cf3fe</sdk:checksum>
-                <sdk:url>tools_r21-windows.zip</sdk:url>
+                <sdk:size>11004914</sdk:size>
+                <sdk:checksum type="sha1">899897d327b0bad492d3a40d3db4d96119c15bc0</sdk:checksum>
+                <sdk:url>build-tools_r17-windows.zip</sdk:url>
             </sdk:archive>
             <sdk:archive arch="any" os="linux">
-                <sdk:size>91495104</sdk:size>
-                <sdk:checksum type="sha1">013b9c04407a9d73b8bf3c574327fbe870acd264</sdk:checksum>
-                <sdk:url>tools_r21-linux.zip</sdk:url>
+                <sdk:size>11696007</sdk:size>
+                <sdk:checksum type="sha1">2c2872bc3806aabf16a12e3959c2183ddc866e6d</sdk:checksum>
+                <sdk:url>build-tools_r17-linux.zip</sdk:url>
             </sdk:archive>
             <sdk:archive arch="any" os="macosx">
-                <sdk:size>65767130</sdk:size>
-                <sdk:checksum type="sha1">fcfa3a6932f2ed0d970a0ca959bb2b4972f7d46d</sdk:checksum>
-                <sdk:url>tools_r21-macosx.zip</sdk:url>
+                <sdk:size>12208114</sdk:size>
+                <sdk:checksum type="sha1">602ee709be9dbb8f179b1e4075148a57f9419930</sdk:checksum>
+                <sdk:url>build-tools_r17-macosx.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
-    </sdk:tool>
+    </sdk:build-tool>
 
-    <sdk:tool>
-        <!-- Generated at Fri Nov 30 13:45:55 2012 from git_tools_r21 @ 539280 -->
+    <!-- Build tools version 18.0.0 was broken for renderscript, so it has been removed -->
+
+    <sdk:build-tool>
+        <!-- Generated at Mon Jul 29 15:14:00 2013 from git_jb-mr2-dev @ 754669 -->
         <sdk:revision>
-            <sdk:major>21</sdk:major>
+            <sdk:major>18</sdk:major>
             <sdk:minor>0</sdk:minor>
             <sdk:micro>1</sdk:micro>
-            <sdk:preview>1</sdk:preview>
+        </sdk:revision>
+        <sdk:archives>
+            <sdk:archive arch="any" os="windows">
+                <sdk:size>15413527</sdk:size>
+                <sdk:checksum type="sha1">a6c2afd0b6289d589351956d2f5212b37014ca7d</sdk:checksum>
+                <sdk:url>build-tools_r18.0.1-windows.zip</sdk:url>
+            </sdk:archive>
+            <sdk:archive arch="any" os="linux">
+                <sdk:size>16627330</sdk:size>
+                <sdk:checksum type="sha1">f11618492b0d2270c332325d45d752d3656a9640</sdk:checksum>
+                <sdk:url>build-tools_r18.0.1-linux.zip</sdk:url>
+            </sdk:archive>
+            <sdk:archive arch="any" os="macosx">
+                <sdk:size>16633121</sdk:size>
+                <sdk:checksum type="sha1">d84f5692fb44d60fc53e5b2507cebf9f24626902</sdk:checksum>
+                <sdk:url>build-tools_r18.0.1-macosx.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:build-tool>
+
+    <!-- TOOLS ........................ -->
+
+    <sdk:tool>
+        <!-- Generated at Mon Jul 29 16:02:44 2013 from git_tools_r22 @ 757759 -->
+        <sdk:revision>
+            <sdk:major>22</sdk:major>
+            <sdk:minor>0</sdk:minor>
+            <sdk:micro>5</sdk:micro>
         </sdk:revision>
         <sdk:min-platform-tools-rev>
-            <sdk:major>16</sdk:major>
+            <sdk:major>18</sdk:major>
         </sdk:min-platform-tools-rev>
         <sdk:archives>
             <sdk:archive arch="any" os="windows">
-                <sdk:size>98998088</sdk:size>
-                <sdk:checksum type="sha1">1503aaf2c91cb07c0240a2db3af0de027941a4f6</sdk:checksum>
-                <sdk:url>tools_r21.0.1_rc1-windows.zip</sdk:url>
+                <sdk:size>113389691</sdk:size>
+                <sdk:checksum type="sha1">a3f450706b5374122f0edb76a4488462ba5171ca</sdk:checksum>
+                <sdk:url>tools_r22.0.5-windows.zip</sdk:url>
             </sdk:archive>
             <sdk:archive arch="any" os="linux">
-                <sdk:size>91510079</sdk:size>
-                <sdk:checksum type="sha1">183670a7f9878d8d3693d5fcf32e1357b69f0fed</sdk:checksum>
-                <sdk:url>tools_r21.0.1_rc1-linux.zip</sdk:url>
+                <sdk:size>105904090</sdk:size>
+                <sdk:checksum type="sha1">06a3e1d66b9280cba49c7ba1893ea14beae072d2</sdk:checksum>
+                <sdk:url>tools_r22.0.5-linux.zip</sdk:url>
             </sdk:archive>
             <sdk:archive arch="any" os="macosx">
-                <sdk:size>65777178</sdk:size>
-                <sdk:checksum type="sha1">109d4f287904875f067e021be3fd1f549e6afb67</sdk:checksum>
-                <sdk:url>tools_r21.0.1_rc1-macosx.zip</sdk:url>
+                <sdk:size>77191184</sdk:size>
+                <sdk:checksum type="sha1">318947edef0ab46603eb7f4d21333ee4b4fa1ff3</sdk:checksum>
+                <sdk:url>tools_r22.0.5-macosx.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -957,14 +1041,14 @@ November 13, 2012
     <!-- DOCS ........................ -->
 
     <sdk:doc>
-        <!-- Generated at Mon Nov 12 17:17:53 2012 from git_jb-mr1-dev @ 528390 -->
+        <!-- Generated at Tue Jul 23 17:15:55 2013 from git_jb-mr2-release @ 737497 -->
         <sdk:revision>1</sdk:revision>
-        <sdk:api-level>17</sdk:api-level>
+        <sdk:api-level>18</sdk:api-level>
         <sdk:archives>
             <sdk:archive arch="any" os="any">
-                <sdk:size>171564393</sdk:size>
-                <sdk:checksum type="sha1">fb988cdd2beaac0dd47dc630821ccc30557c67e5</sdk:checksum>
-                <sdk:url>docs-17_r01.zip</sdk:url>
+                <sdk:size>142332266</sdk:size>
+                <sdk:checksum type="sha1">83632d157781d31f2a8e52acad5c4c5d0f307cba</sdk:checksum>
+                <sdk:url>docs-18_r01.zip</sdk:url>
             </sdk:archive>
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
@@ -1027,4 +1111,18 @@ November 13, 2012
         </sdk:archives>
         <sdk:uses-license ref="android-sdk-license"/>
     </sdk:source>
+
+    <sdk:source>
+        <!-- Generated at Tue Jul 23 17:18:30 2013 from git_jb-mr2-release @ 737497 -->
+        <sdk:revision>1</sdk:revision>
+        <sdk:api-level>18</sdk:api-level>
+        <sdk:archives>
+            <sdk:archive arch="any" os="any">
+                <sdk:size>20226735</sdk:size>
+                <sdk:checksum type="sha1">8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78</sdk:checksum>
+                <sdk:url>sources-18_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+        <sdk:uses-license ref="android-sdk-license"/>
+    </sdk:source>
 </sdk:sdk-repository>
diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix
index 2e9690de7a26..ca1988527e2c 100644
--- a/pkgs/development/mobile/androidenv/support.nix
+++ b/pkgs/development/mobile/androidenv/support.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
-  name = "android-support-r11";
+  name = "android-support-r18";
   src = fetchurl {
-    url = https://dl-ssl.google.com/android/repository/support_r11.zip;
-    sha1 = "d30d182d8e4c86bb4464c03a83ccffce7bc84ecd";
+    url = https://dl-ssl.google.com/android/repository/support_r18.zip;
+    sha1 = "bd67b4b8a6bac629f24c8aea75c3619a26d9a568";
   };
   
   buildCommand = ''
diff --git a/pkgs/development/mobile/androidenv/sys-img-mips.xml b/pkgs/development/mobile/androidenv/sys-img-mips.xml
new file mode 100644
index 000000000000..c839d283f4ea
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/sys-img-mips.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+<sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <sdk:license id="mips-android-sysimage-license" type="text">
+    <![CDATA[
+MIPS Technologies, Inc. (“MIPS”) Internal Evaluation License Agreement for MIPS Android™ System Images for Android Software Development Kit (SDK):
+This Internal Evaluation License Agreement (this "Agreement") is entered into by and between MIPS and you (as an individual developer or a legal entity -- identified below as “Recipient”). MIPS shall make the Evaluation Software available to Recipient as described in accordance with the terms and conditions set forth below.
+ 
+By clicking on the “Accept” button, downloading, installing, or otherwise using the Evaluation Materials (defined below), you agree to be bound by the terms of this Agreement effective as of the date you click “Accept” (the “Effective Date”), and if doing so on behalf of an entity, you represent that you are authorized to bind the entity to the terms and conditions of this Agreement. If you do not agree to be bound by the terms and conditions of this Agreement, do not download, install, or use the Evaluation Materials.
+ 
+1. DEFINITIONS. These terms shall have the following meanings:
+ 
+1.1 “MIPS” shall mean MIPS Technologies, Inc., a Delaware corporation having a principal place of business at: 955 East Arques Ave., Sunnyvale, CA 94085
+ 
+1.2 “Evaluation Software” shall mean MIPS Android™ emulator system images for Android Software Development Kit (SDK), as made available to Recipient.
+ 
+1.3 “Evaluation Materials" means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications, reference manuals, and other related materials) related to the Evaluation Software as made available to Recipient.
+ 
+1.4 “Open Source Software” means any software that requires (as a condition of use, modification and/or distribution of such software) that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL).
+ 
+1.5 “Pre-Release Materials” means “alpha” or “beta” designated pre-release features, which may not be fully functional, which MIPS may substantially modify in producing any production version of the Evaluation Materials, and/or which is still under development by MIPS and/or MIPS’ suppliers.
+ 
+2. PURPOSE. MIPS desires to make the Evaluation Materials available to Recipient solely for Recipient's internal evaluation of the Evaluation Software to evaluate the desirability of cooperating with MIPS in developing products that are compatible with the Evaluation Software and/or to advise MIPS as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute, modify (except to facilitate the above-mentioned internal evaluation), or make commercial use of the Evaluation Materials or any modifications of the Evaluation Materials.
+ 
+THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE MODIFIED (EXCEPT TO FACILITATE THE INTERNAL EVALUATION) OR DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT A MIPS SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERCIAL VERSION OF THE EVALUATION SOFTWARE.
+ 
+3. TITLE. Title to the Evaluation Materials remains with MIPS or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement.
+ 
+4. LICENSE. MIPS grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above and only for a period beginning on the Effective Date and extending to the first anniversary of the Effective Date (the “Evaluation Period”). Unless otherwise communicated in writing by MIPS to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a “Release”) the license grant in this Section 4 and the Evaluation Period shall apply to each Release, in which case the Evaluation Period shall begin on the date that the Release is made generally available and continue to the first anniversary of such date. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software that is not provided to Recipient in source code form.
+
+
+EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER MIPS INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT. OTHER THAN AS EXPLICITLY SET FORTH IN PARAGRAPH 2 ABOVE, NO RIGHT TO COPY, TO REPRODUCE, TO MODIFY, OR TO CREATE DERIVATIVE WORKS OF, THE EVALUATION MATERIALS IS GRANTED HEREIN.
+ 
+5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from MIPS. MIPS and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it.
+ 
+6. MODIFICATIONS. This Agreement does not obligate Recipient to provide MIPS with comments or suggestions regarding Evaluation Materials. However, should Recipient provide MIPS with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) MIPS products or processes which may embody the Evaluation Materials, then Recipient agrees to grant and hereby grants to MIPS a non-exclusive, irrevocable, worldwide, fully paid-up, royalty-free license, with the right to sublicense MIPS’ licensees and customers, under Recipient’s Intellectual property rights, to use and disclose such comments and suggestions in any manner MIPS chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of MIPS’ and its sublicensee’s products embodying such comments and suggestions in any manner and via any media MIPS chooses, without reference to the source.
+ 
+7. WARRANTY DISCLAIMER. MIPS AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT WITH RESPECT TO THIRD PARTY INTELLECTUAL PROPERTY. RECIPIENT ACKNOWLEDGES AND AGREES THAT THE EVALUATION MATERIALS ARE PROVIDED “AS IS,” WITHOUT WARRANTY OF ANY KIND.
+ 
+8. LIMITATION OF LIABILITY. MIPS AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR FOR ANY DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED OR ALLEGED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE, INCLUDING WITHOUT LIMITATION, UNDER TORT OR OTHER LEGAL THEORY. MIPS AND ITS SUPPLIERS DISCLAIM ANY AND ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS OF ANY KIND RELATING TO THE EVALUATION MATERIALS.
+ 
+9. EXPIRATION. MIPS may terminate this Agreement immediately after a breach by Recipient or otherwise at MIPS’ reasonable discretion and upon five (5) business days’ notice to Recipient.
+ 
+10. GENERAL.
+ 
+10.1 Controlling Law. This Agreement shall be governed by California law excluding its choice of law rules. With the exception of MIPS’ rights to enforce its intellectual property rights and any confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, all disputes and any claims arising under or relating to this Agreement shall be subject to the exclusive jurisdiction and venue of the state and federal courts located in Santa Clara County, California. Each party hereby agrees to jurisdiction and venue in the courts set forth in the preceding sentence. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts.
+ 
+10.2 Remedies. Recipient acknowledges and agrees that any breach of confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, as well as any disclosure, commercialization, or public use of the Evaluation Materials, would cause irreparable injury to MIPS, and therefore Recipient agrees to consent to, and hereby consents to, the grant of an injunction by any court of competent jurisdiction in the event of an actual or threatened breach.
+ 
+10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights, obligations, or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without MIPS’ express prior written consent, shall be ineffective, null and void. MIPS may freely assign this Agreement, and its rights and obligations hereunder, in its sole discretion.
+ 
+10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and MIPS and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and MIPS with respect to the subject matter hereof. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed or otherwise accepted by duly authorized representatives of Recipient and MIPS.
+ 
+10.5 Severability. In the event that any provision of this Agreement is finally adjudicated to be unenforceable or invalid under any applicable law, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such unenforceable or invalid provision shall be interpreted so as to best accomplish the objectives of such provision within the limits of applicable law or applicable court decisions.
+ 
+10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other necessary approval from the U.S. Department of Commerce or any other governing agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all applicable laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is "deemed" to take place when information is released to a foreign national wherever located.
+ 
+10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments or may not be suitable for certain applications and (iv) MIPS can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . MIPS is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person.
+ 
+ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS” AND “AS AVAILABLE”, POSSIBLY WITH FAULTS, AND WITHOUT REPRESENTATION OR WARRANTY OF ANY KIND.
+ 
+10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header as indicated in the Evaluation Software. Additional detail may be available (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement.
+    ]]>
+    </sdk:license>
+
+    <sdk:system-image>
+        <sdk:revision>1</sdk:revision>
+        <sdk:description>Android 4.0.4</sdk:description>
+        <sdk:api-level>15</sdk:api-level>
+        <sdk:abi>mips</sdk:abi>
+        <sdk:uses-license ref="mips-android-sysimage-license"/>
+        <sdk:archives>
+            <sdk:archive os="any">
+                <sdk:size>117503178</sdk:size>
+                <sdk:checksum type="sha1">a753bb4a6783124dad726c500ce9aec9d2c1b2d9</sdk:checksum>
+                <sdk:url>sysimg_mips-15_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <sdk:revision>4</sdk:revision>
+        <!-- mipsia repo tag qa-dev-mips-jb-20130123,
+             github.com/MIPS branch dev-mips-jb, tag mips-jb-4.1.2_r1m1
+             repo init -u git://github.com/MIPS/manifests.git
+                 -b dev-mips-jb -m mips-jb-4.1.2_r1m1.xml           -->
+        <sdk:description>Android 4.1.2</sdk:description>
+        <sdk:api-level>16</sdk:api-level>
+        <sdk:abi>mips</sdk:abi>
+        <sdk:uses-license ref="mips-android-sysimage-license"/>
+        <sdk:archives>
+            <sdk:archive os="any">
+                <sdk:size>122482530</sdk:size>
+                <sdk:checksum type="sha1">67943c54fb3943943ffeb05fdd39c0b753681f6e</sdk:checksum>
+                <sdk:url>sysimg_mips-16_r04.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+    </sdk:system-image>
+
+    <sdk:system-image>
+        <sdk:revision>1</sdk:revision>
+        <!-- mipsia repo tag qa-dev-mips-jb-mr1-20121219,
+             github.com/MIPS tag mips-jb-4.2.1_r1 -->
+        <sdk:description>Android 4.2.1</sdk:description>
+        <sdk:api-level>17</sdk:api-level>
+        <sdk:abi>mips</sdk:abi>
+        <sdk:uses-license ref="mips-android-sysimage-license"/>
+        <sdk:archives>
+            <sdk:archive os="any">
+                <sdk:size>131781761</sdk:size>
+                <sdk:checksum type="sha1">f0c6e153bd584c29e51b5c9723cfbf30f996a05d</sdk:checksum>
+                <sdk:url>sysimg_mips-17_r01.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+    </sdk:system-image>
+
+</sdk:sdk-sys-img>
diff --git a/pkgs/development/mobile/androidenv/sys-img-x86.xml b/pkgs/development/mobile/androidenv/sys-img-x86.xml
new file mode 100644
index 000000000000..f0e8347f6db4
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/sys-img-x86.xml
@@ -0,0 +1,139 @@
+<!--
+* Copyright (C) 2012 The Android Open Source Project * * Licensed under the Apache License, version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License.
+-->
+<sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+<sdk:license id="intel-android-sysimage-license" type="text">
+<![CDATA[
+Intel Corporation Internal Evaluation License Agreement for x86 Android* System Images for Android Software Development Kit (SDK)
+This Internal Evaluation License Agreement (this "Agreement") is entered into by and between Intel and you (as an individual developer or a legal entity -- identified below as Recipient). Intel shall provide the Evaluation Software to Recipient as described in accordance with the Internal Evaluation License Terms and Conditions.
+
+Definitions.
+These terms shall have the following meanings:
+
+"Intel" or "INTEL"
+Intel Corporation
+With an Address of:
+2200 Mission College Blvd.
+Santa Clara, CA 95052
+Office of the General Counsel
+Mail Stop: RNB-4-51
+Attn: Software and Services Group Legal
+
+"Evaluation Software"
+The x86 Android* emulator system images for Android  Software Development Kit (SDK), as provided by Intel.
+
+INTERNAL EVALUATION LICENSE TERMS AND CONDITIONS
+
+1. DEFINITIONS.
+
+1.1 Additional Defined Terms. "Agreement", "Evaluation Software",  "Intel", "Non-disclosure Agreement", "Recipient", and "Effective Date" shall have the meanings ascribed to them on the signature page(s) of this Agreement.
+
+1.2 Evaluation Materials means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications and other related materials) related to the Evaluation Software.
+
+1.3 "Open Source Software" means any software that requires as a condition of use, modification and/or distribution of such software that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL).
+
+1.4 "Pre-Release Materials" means "alpha" or "beta" designated pre-release features, which may not be fully functional, which Intel may substantially modify in producing any production version of the Evaluation Materials and/or is still under development by Intel and/or Intel’s suppliers.
+
+2. PURPOSE. Intel desires to provide the Evaluation Materials to Recipient solely for Recipient's internal evaluation of the Evaluation Software and other Intel products, to evaluate the desirability of cooperating with Intel in developing products based on the Evaluation Software and/or to advise Intel as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute or make commercial use of the Evaluation Materials or any modifications to the Evaluation Materials.
+THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT AN INTEL SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERICAL VERSION OF THE EVALUATION SOFTWARE.
+
+3. TITLE. Title to the Evaluation Materials remains with Intel or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement.
+
+4. LICENSE. Intel grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above. Unless otherwise communicated in writing by Intel to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a "Release") the license grant in this Section 4 and the Evaluation Period shall apply to each Release. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software not provided to Recipient in source code form.
+EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT.
+
+5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from Intel. Intel and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it.
+
+6. MODIFICATIONS. This Agreement does NOT obligate Recipient to provide Intel with comments or suggestions regarding Evaluation Materials. However, should Recipient provide Intel with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) Intel products or processes which may embody the Evaluation Materials, Recipient grants to Intel a non-exclusive, irrevocable, worldwide, royalty-free license, with the right to sublicense Intel’s licensees and customers, under Recipient intellectual property rights, the rights to use and disclose such comments and suggestions in any manner Intel chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of Intel’s and its sublicensee’s products embodying such comments and suggestions in any manner and via any media Intel chooses, without reference to the source.
+
+7. WARRANTY DISCLAIMER. INTEL AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT. THE EVALUATION MATERIALS ARE PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND.
+
+8. LIMITATION OF LIABILITY. INTEL AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR ANY SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE. INTEL AND ITS SUPPLIERS DISCLAIM ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS RELATING TO THE EVALUATION MATERIALS.
+
+9. EXPIRATION. Intel may terminate this Agreement immediately after a breach by Recipient.
+
+10. GENERAL.
+
+10.1 Controlling Law. Any claims arising under or relating to this Agreement shall be governed by the internal substantive laws of the State of Delaware or federal courts located in Delaware, without regard to principles of conflict of laws. Each party hereby agrees to jurisdiction and venue in the courts of the State of Delaware for all disputes and litigation arising under or relating to this Agreement. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts.
+
+10.2 Remedies. Recipient acknowledges that any disclosure, commercialization, or public use of the Evaluation Materials would cause irreparable injury to Intel and consents to the grant of an injunction by any court of competent jurisdiction in the event of a threatened breach.
+
+10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without Intel’s express prior written consent, shall be null and void. Intel may assign this Agreement, and its rights and obligations hereunder, in its sole discretion.
+
+10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and Intel and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and Intel with respect to the subject matter hereof. This Agreement supersedes any and all "click-to-accept" or shrink-wrapped licenses, in hard-copy or electronic form, embedded in or included with the Evaluation Materials. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed by duly authorized representatives of Recipient and Intel. Without limiting the foregoing, terms and conditions on any purchase orders or similar materials submitted by Recipient to Intel, and any terms contained in Intel’s standard acknowledgment form that are in conflict with these terms, shall be of no force or effect.
+
+10.5 Severability. In the event that any provision of this Agreement shall be unenforceable or invalid under any applicable law or be so held by applicable court decision, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such provision shall be changed and interpreted so as to best accomplish the objectives of such unenforceable or invalid provision within the limits of applicable law or applicable court decisions.
+
+10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other approval from the U.S. Department of Commerce or any other agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is "deemed" to take place when information is released to a foreign national wherever located.
+
+10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments and (iv) Intel can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . Intel is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person.
+
+10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header provided with Evaluation Software. Additional detail may be provided (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement.
+ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED POSSIBLY WITH FAULTS
+]]>
+</sdk:license>
+
+<!-- SYSTEM IMAGES ........................ -->
+
+<sdk:system-image>
+    <sdk:description>Android SDK Platform 2.3.7</sdk:description>
+    <sdk:revision>2</sdk:revision>
+    <sdk:api-level>10</sdk:api-level>
+    <sdk:abi>x86</sdk:abi>
+    <sdk:uses-license ref="intel-android-sysimage-license"/>
+    <sdk:archives>
+      <sdk:archive arch="any" os="any">
+        <sdk:size>55463895</sdk:size>
+        <sdk:checksum type="sha1">34e2436f69606cdfe35d3ef9112f0c64e3ff021d</sdk:checksum>
+        <sdk:url>sysimg_x86-10_r02.zip</sdk:url>
+      </sdk:archive>
+    </sdk:archives>
+</sdk:system-image>
+
+<sdk:system-image>
+    <sdk:description>Android SDK Platform 4.0.4</sdk:description>
+    <sdk:revision>1</sdk:revision>
+    <sdk:api-level>15</sdk:api-level>
+    <sdk:abi>x86</sdk:abi>
+    <sdk:uses-license ref="intel-android-sysimage-license"/>
+    <sdk:archives>
+      <sdk:archive arch="any" os="any">
+        <sdk:size>112619605</sdk:size>
+        <sdk:checksum type="sha1">d540325952e0f097509622b9e685737584b83e40</sdk:checksum>
+        <sdk:url>sysimg_x86-15_r01.zip</sdk:url>
+      </sdk:archive>
+    </sdk:archives>
+</sdk:system-image>
+
+<sdk:system-image>
+    <sdk:description>Android SDK Platform 4.1.1</sdk:description>
+    <sdk:revision>1</sdk:revision>
+    <sdk:api-level>16</sdk:api-level>
+    <sdk:abi>x86</sdk:abi>
+    <sdk:uses-license ref="intel-android-sysimage-license"/>
+    <sdk:archives>
+      <sdk:archive arch="any" os="any">
+        <sdk:size>131840348</sdk:size>
+        <sdk:checksum type="sha1">9d35bcaa4f9b40443941f32b8a50337f413c021a</sdk:checksum>
+        <sdk:url>sysimg_x86-16_r01.zip</sdk:url>
+      </sdk:archive>
+    </sdk:archives>
+</sdk:system-image>
+
+<sdk:system-image>
+    <sdk:description>Android SDK Platform 4.2</sdk:description>
+    <sdk:revision>1</sdk:revision>
+    <sdk:api-level>17</sdk:api-level>
+    <sdk:abi>x86</sdk:abi>
+    <sdk:uses-license ref="intel-android-sysimage-license"/>
+    <sdk:archives>
+        <sdk:archive arch="any" os="any">
+            <sdk:size>138799122</sdk:size>
+            <sdk:checksum type="sha1">ddb3313e8dcd07926003f7b828eafea1115ea35b</sdk:checksum>
+            <sdk:url>sysimg_x86-17_r01.zip</sdk:url>
+        </sdk:archive>
+    </sdk:archives>
+</sdk:system-image>
+
+</sdk:sdk-sys-img>
diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix
index b35b42989838..bc78ea11e6f7 100644
--- a/pkgs/development/mobile/androidenv/sysimages.nix
+++ b/pkgs/development/mobile/androidenv/sysimages.nix
@@ -1,9 +1,8 @@
-
 {stdenv, fetchurl, unzip}:
 
 let
   buildSystemImage = args:
-    stdenv.mkDerivation (args // {   
+    stdenv.mkDerivation (args // {
       buildInputs = [ unzip ];
       buildCommand = ''
         mkdir -p $out
@@ -13,8 +12,8 @@ let
   });
 in
 {
-    
-  sysimg_14 = buildSystemImage {
+
+  sysimg_armeabi-v7a_14 = buildSystemImage {
     name = "armeabi-v7a-14";
     src = fetchurl {
       url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-14_r02.zip;
@@ -22,7 +21,7 @@ in
     };
   };
     
-  sysimg_15 = buildSystemImage {
+  sysimg_armeabi-v7a_15 = buildSystemImage {
     name = "armeabi-v7a-15";
     src = fetchurl {
       url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-15_r02.zip;
@@ -30,7 +29,7 @@ in
     };
   };
     
-  sysimg_16 = buildSystemImage {
+  sysimg_armeabi-v7a_16 = buildSystemImage {
     name = "armeabi-v7a-16";
     src = fetchurl {
       url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-16_r03.zip;
@@ -38,13 +37,75 @@ in
     };
   };
     
-  sysimg_17 = buildSystemImage {
+  sysimg_armeabi-v7a_17 = buildSystemImage {
     name = "armeabi-v7a-17";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-17_r01.zip;
-      sha1 = "45b9344473e0a6d063c2b1fe58d8cd47d307905e";
+      url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-17_r02.zip;
+      sha1 = "1c321cda1af793b84d47d1a8d15f85444d265e3c";
     };
   };
     
-}
-  
\ No newline at end of file
+  sysimg_armeabi-v7a_18 = buildSystemImage {
+    name = "armeabi-v7a-18";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-18_r01.zip;
+      sha1 = "5a9b8ac5b57dd0e3278f47deb5ee58e1db6f1f9e";
+    };
+  };
+    
+  sysimg_x86_10 = buildSystemImage {
+    name = "x86-10";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-10_r02.zip;
+      sha1 = "34e2436f69606cdfe35d3ef9112f0c64e3ff021d";
+    };
+  };
+    
+  sysimg_x86_15 = buildSystemImage {
+    name = "x86-15";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-15_r01.zip;
+      sha1 = "d540325952e0f097509622b9e685737584b83e40";
+    };
+  };
+    
+  sysimg_x86_16 = buildSystemImage {
+    name = "x86-16";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-16_r01.zip;
+      sha1 = "9d35bcaa4f9b40443941f32b8a50337f413c021a";
+    };
+  };
+    
+  sysimg_x86_17 = buildSystemImage {
+    name = "x86-17";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-17_r01.zip;
+      sha1 = "ddb3313e8dcd07926003f7b828eafea1115ea35b";
+    };
+  };
+    
+  sysimg_mips_15 = buildSystemImage {
+    name = "mips-15";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-15_r01.zip;
+      sha1 = "a753bb4a6783124dad726c500ce9aec9d2c1b2d9";
+    };
+  };
+    
+  sysimg_mips_16 = buildSystemImage {
+    name = "mips-16";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-16_r04.zip;
+      sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e";
+    };
+  };
+    
+  sysimg_mips_17 = buildSystemImage {
+    name = "mips-17";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-17_r01.zip;
+      sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d";
+    };
+  };
+    }
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 24bb1d2d93a0..4dbf6c5e82ef 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -1,5 +1,5 @@
 {stdenv, androidsdk, titaniumsdk, xcodewrapper}:
-{ appId, name, appName ? null, src, target, androidPlatformVersions ? [ "8" ]
+{ appId, name, appName ? null, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ]
 , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
 , iosKeyFile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosDistribute ? false
 }:
@@ -10,6 +10,7 @@ assert (release && target == "iphone") -> iosKeyFile != null && iosCertificateNa
 let
   androidsdkComposition = androidsdk {
     platformVersions = androidPlatformVersions;
+    abiVersions = androidAbiVersions;
     useGoogleAPIs = true;
   };
   
diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix
index 96f70ea38325..7c98ce76a1a6 100644
--- a/pkgs/development/mobile/xcodeenv/simulate-app.nix
+++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix
@@ -1,5 +1,8 @@
 {stdenv, xcodewrapper}:
-{name, appName ? null, app, device ? "iPhone", baseDir ? ""}:
+{ name, appName ? null, app
+, device ? "iPhone", baseDir ? ""
+, sdkVersion ? "6.1"
+}:
 
 let
   _appName = if appName == null then name else appName;
@@ -12,7 +15,7 @@ stdenv.mkDerivation {
     #! ${stdenv.shell} -e
 
     cd "${app}/${baseDir}/${_appName}.app"
-    "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${_appName}' -SimulateDevice '${device}'
+    "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${_appName}' -SimulateDevice '${device}' -currentSDKRoot "$(readlink "${xcodewrapper}/SDKs")/iPhoneSimulator${sdkVersion}.sdk"
     EOF
     chmod +x $out/bin/run-test-simulator
   '';
diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
index 77d2c4c867ef..1cbab99e365d 100644
--- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
+++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
@@ -11,6 +11,9 @@ stdenv.mkDerivation {
     ln -s /usr/bin/security
     ln -s "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app/Contents/MacOS/iPhone Simulator"
 
+    cd ..
+    ln -s "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs"
+
     # Check if we have the xcodebuild version that we want
     if [ -z "$($out/bin/xcodebuild -version | grep ${version})" ]
     then
diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index 564b89347b59..403bb264892f 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -18,7 +18,7 @@ in buildPythonPackage rec {
   src = fetchurl {
     url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/"
         + "${name}.tar.bz2";
-    sha256 = "0b28q539657mqif0mn5dfqcpqv7gbyszg83gf2fv6z7q6206rnx5";
+    sha256 = "1k3mws2q0ryb7422mml6idmaasz2i2v6ngyvg6d976dx090qnmci";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
new file mode 100644
index 000000000000..d45d724ae589
--- /dev/null
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "pylint-0.26.0";
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "http://download.logilab.org/pub/pylint/${name}.tar.gz";
+    sha256 = "1mg1ywpj0klklv63s2hwn5xwxi3wfwgnyz9d4pz32hzb53azq835";
+  };
+
+  propagatedBuildInputs = [ pythonPackages.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";
+  };
+}
diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix
new file mode 100644
index 000000000000..7d82ef9adf2e
--- /dev/null
+++ b/pkgs/development/python-modules/rbtools/default.nix
@@ -0,0 +1,13 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "rbtools-0.4.1";
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "http://downloads.reviewboard.org/releases/RBTools/0.4/RBTools-0.4.1.tar.gz";
+    sha256 = "1v0r7rfzrasj56s53mib51wl056g7ykh2y1c6dwv12r6hzqsycgv";
+  };
+
+  propagatedBuildInputs = [ pythonPackages.setuptools ];
+}
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 3dcaaca4c250..d6ad28645c11 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -34,9 +34,10 @@ stdenv.mkDerivation rec {
     ${python}/bin/${python.executable} setup.py test
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Utilities to facilitate the installation of Python packages";
     homepage = http://pypi.python.org/pypi/setuptools;
     licenses = [ "PSF" "ZPL" ];
+    platforms = platforms.all;
   };    
 }
diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix
index cb804b9e6b0d..e8a056bca5a7 100644
--- a/pkgs/development/tools/analysis/splint/default.nix
+++ b/pkgs/development/tools/analysis/splint/default.nix
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://splint.org/;
-    description = "Splint, an annotation-assisted lightweight static analyzer for C";
+    description = "Annotation-assisted lightweight static analyzer for C";
 
     longDescription = ''
       Splint is a tool for statically checking C programs for security
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
       checking than can be done by any standard lint.
     '';
 
-    license = "GPLv2+";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh
index c4b7002a7186..f5489a4a76fc 100644
--- a/pkgs/development/tools/build-managers/leiningen/builder.sh
+++ b/pkgs/development/tools/build-managers/leiningen/builder.sh
@@ -21,7 +21,3 @@ chmod -v 755 $out_bin
 patchShebangs $out
 
 wrapProgram $out_bin --prefix PATH ":" ${rlwrap}/bin
-
-echo "Testing out \"lein version\"..."
-$out_bin version
-echo "Success."
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index bf1a275046ec..4ca362ede0a2 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -1,21 +1,21 @@
-{stdenv, fetchurl, makeWrapper, openjdk, rlwrap, clojure }:
+{ stdenv, fetchurl, makeWrapper, jdk, rlwrap, clojure }:
 
 stdenv.mkDerivation rec {
   pname = "leiningen";
-  version = "2.1.2";
+  version = "2.3.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
-    sha256 = "10s4xpwrhd8wz3h2vj8ay4rf2hw8vzswfkr8ckckk3fhjcn130dy";
+    sha256 = "07z4sr4ssi9lqr1kydxn4gp992n44jsr6llarlvpx0ns8yi4gx0l";
   };
 
   jarsrc = fetchurl {
     url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar";
-    sha256 = "08jq21zpsgwsmsz7lpfxidj2s3mv8i23fjwyl9qc6dngskkx45sa";
+    sha256 = "00hmxyvrzxjwa2qz3flnrvg2k2llzvprk9b5szyrh3rv5z5jd4hw";
   };
 
-  patches = ./lein_2.1.2.patch;
+  patches = ./lein_2.3.0.patch;
 
   inherit rlwrap clojure;
 
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper ];
 
-  propagatedBuildInputs = [ openjdk clojure ];
+  propagatedBuildInputs = [ jdk clojure ];
 
   meta = {
-    homepage = https://github.com/technomancy/leiningen;
+    homepage = http://leiningen.org/;
     description = "Project automation for Clojure";
     license = "EPL";
     platforms = stdenv.lib.platforms.unix;
-    maintainer = with stdenv.lib.maintainers; [the-kenny];
+    maintainer = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }
diff --git a/pkgs/development/tools/build-managers/leiningen/lein_2.1.2.patch b/pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/leiningen/lein_2.1.2.patch
rename to pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch
diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix
new file mode 100644
index 000000000000..68eacf8d2ea4
--- /dev/null
+++ b/pkgs/development/tools/build-managers/rebar/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, erlang }:
+
+stdenv.mkDerivation {
+  name = "rebar-2.1.0-pre";
+
+  src = fetchurl {
+    url = "https://github.com/basho/rebar/archive/2.1.0-pre.tar.gz";
+    sha256 = "0dsbk9ssvk1hx9275900dg4bz79kpwcid4gsz09ziiwzv0jjbrjn";
+  };
+
+  buildInputs = [ erlang ];
+
+  buildPhase = "escript bootstrap";
+  installPhase = ''
+    mkdir -p $out/bin
+    cp rebar $out/bin/rebar
+  '';
+
+  meta = {
+    homepage = "https://github.com/rebar/rebar";
+    description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases.";
+
+    longDescription = ''
+      rebar is a self-contained Erlang script, so it's easy to
+      distribute or even embed directly in a project. Where possible,
+      rebar uses standard Erlang/OTP conventions for project
+      structures, thus minimizing the amount of build configuration
+      work. rebar also provides dependency management, enabling
+      application writers to easily re-use common libraries from a
+      variety of locations (git, hg, etc).
+      '';
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.the-kenny ];
+  };
+}
diff --git a/pkgs/development/tools/haskell/cabal-ghci/default.nix b/pkgs/development/tools/haskell/cabal-ghci/default.nix
index 4676850fd938..dee257273846 100644
--- a/pkgs/development/tools/haskell/cabal-ghci/default.nix
+++ b/pkgs/development/tools/haskell/cabal-ghci/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-ghci";
-  version = "0.2.1";
-  sha256 = "0za0bf59f4a3v5zvyy7h1xvxskrazdga4j1cs6psfv9fv80qig9r";
+  version = "0.3";
+  sha256 = "1x7fpvvmr2mq7l960wgsijhyrdaiq3lnnl3z6drklc5p73pms8w6";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ Cabal filepath ];
   meta = {
-    homepage = "http://code.atnnn.com/projects/cabal-ghci/wiki";
+    homepage = "http://github.com/atnnn/cabal-ghci";
     description = "Set up ghci with options taken from a .cabal file";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 05dcb2aa1196..295852562167 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.52";
-  sha256 = "1w38qxwbwaq37c7vypydwjjhgrn9vbaqnnk7b2y0pm8n2fh78z1s";
+  version = "1.53";
+  sha256 = "1xhvxx5maj03rc6zd8bcqwzyn3b9yqxsbzgdh4d9ss4myn8x2zp3";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix
new file mode 100644
index 000000000000..d19bb24eb370
--- /dev/null
+++ b/pkgs/development/tools/misc/babeltrace/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt }:
+
+stdenv.mkDerivation rec {
+  name = "babeltrace-1.1.1";
+
+  src = fetchurl {
+    url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2";
+    sha256 = "04jc1yd3aaq59fmpzswzc78cywpq7wzjfqdlsg7xc76ivb8cggfz";
+  };
+
+  buildInputs = [ pkgconfig glib libuuid popt ];
+
+  meta = with stdenv.lib; {
+    description = "Command-line tool and library to read and convert LTTng tracefiles";
+    homepage = http://www.efficios.com/babeltrace;
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+
+}
diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix
new file mode 100644
index 000000000000..63c585b00a95
--- /dev/null
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchurl}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="cl-launch";
+    version="3.21.1";
+    name="${baseName}-${version}";
+    hash="1241lyn2a3ry06ii9zlns0cj462bi7rih41vlbbmra1chj4c21ij";
+    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-3.21.1.tar.gz";
+    sha256="1241lyn2a3ry06ii9zlns0cj462bi7rih41vlbbmra1chj4c21ij";
+  };
+  buildInputs = [
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+
+  preConfigure = ''
+    export makeFlags="$makeFlags PREFIX='$out'"
+    mkdir -p "$out/bin"
+  '';
+
+  meta = {
+    inherit (s) version;
+    description = ''Common Lisp launcher script'';
+    license = stdenv.lib.licenses.llgpl21 ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/misc/cl-launch/default.upstream b/pkgs/development/tools/misc/cl-launch/default.upstream
new file mode 100644
index 000000000000..1ff5daca02c5
--- /dev/null
+++ b/pkgs/development/tools/misc/cl-launch/default.upstream
@@ -0,0 +1,2 @@
+url http://common-lisp.net/project/xcvb/cl-launch/
+version_link '.-[0-9].*[0-9][.]tar[.].*'
diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
new file mode 100644
index 000000000000..9bc24b9387bf
--- /dev/null
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, popt, libuuid, liburcu, lttngUst }:
+
+stdenv.mkDerivation rec {
+  name = "lttng-tools-2.2.3";
+
+  src = fetchurl {
+    url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
+    sha256 = "1p16n42j34xkaj17zg2g12rzkfwpdv9ay1h4bkdq6038v320mljv";
+  };
+
+  buildInputs = [ popt libuuid liburcu lttngUst ];
+
+  patches = [ ./lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch ];
+
+  meta = with stdenv.lib; {
+    description = "Tracing tools (kernel + user space) for Linux";
+    homepage = http://lttng.org/;
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+
+}
diff --git a/pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch b/pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch
new file mode 100644
index 000000000000..7d9edbda97ae
--- /dev/null
+++ b/pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch
@@ -0,0 +1,53 @@
+From daba2e936571a236817022b760d91c48b730c30b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
+Date: Tue, 9 Jul 2013 23:47:47 +0200
+Subject: [PATCH] Change modprobe path from "/sbin/modprobe" to "modprobe"
+ (rely on PATH lookup)
+
+---
+ src/bin/lttng-sessiond/modprobe.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c
+index 7e06dad..4075efe 100644
+--- a/src/bin/lttng-sessiond/modprobe.c
++++ b/src/bin/lttng-sessiond/modprobe.c
+@@ -90,7 +90,7 @@ void modprobe_remove_lttng_control(void)
+ 
+ 	for (i = ARRAY_SIZE(kern_modules_control) - 1; i >= 0; i--) {
+ 		ret = snprintf(modprobe, sizeof(modprobe),
+-				"/sbin/modprobe -r -q %s",
++				"modprobe -r -q %s",
+ 				kern_modules_control[i].name);
+ 		if (ret < 0) {
+ 			PERROR("snprintf modprobe -r");
+@@ -125,7 +125,7 @@ void modprobe_remove_lttng_data(void)
+ 
+ 	for (i = ARRAY_SIZE(kern_modules_list) - 1; i >= 0; i--) {
+ 		ret = snprintf(modprobe, sizeof(modprobe),
+-				"/sbin/modprobe -r -q %s",
++				"modprobe -r -q %s",
+ 				kern_modules_list[i].name);
+ 		if (ret < 0) {
+ 			PERROR("snprintf modprobe -r");
+@@ -169,7 +169,7 @@ int modprobe_lttng_control(void)
+ 
+ 	for (i = 0; i < ARRAY_SIZE(kern_modules_control); i++) {
+ 		ret = snprintf(modprobe, sizeof(modprobe),
+-				"/sbin/modprobe %s%s",
++				"modprobe %s%s",
+ 				kern_modules_control[i].required ? "" : "-q ",
+ 				kern_modules_control[i].name);
+ 		if (ret < 0) {
+@@ -205,7 +205,7 @@ int modprobe_lttng_data(void)
+ 
+ 	for (i = 0; i < ARRAY_SIZE(kern_modules_list); i++) {
+ 		ret = snprintf(modprobe, sizeof(modprobe),
+-				"/sbin/modprobe %s%s",
++				"modprobe %s%s",
+ 				kern_modules_list[i].required ? "" : "-q ",
+ 				kern_modules_list[i].name);
+ 		if (ret < 0) {
+-- 
+1.8.2.3
+
diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
new file mode 100644
index 000000000000..d234a7b74f8a
--- /dev/null
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, liburcu }:
+
+# NOTE:
+#   ./configure ...
+#   [...]
+#   LTTng-UST will be built with the following options:
+#   
+#   Java support (JNI): Disabled
+#   sdt.h integration:  Disabled
+#   [...]
+#
+# Debian builds with std.h (systemtap).
+
+stdenv.mkDerivation rec {
+  name = "lttng-ust-2.2.1";
+
+  src = fetchurl {
+    url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
+    sha256 = "0881ri3v96fjii24qnwgsypk4crri4qp6mc4zp7kwghz8gys9rla";
+  };
+
+  buildInputs = [ liburcu ];
+
+  meta = with stdenv.lib; {
+    description = "LTTng Userspace Tracer libraries";
+    homepage = http://lttng.org/;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+
+}
diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix
new file mode 100644
index 000000000000..df9f81d02e63
--- /dev/null
+++ b/pkgs/development/tools/misc/lttv/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, glib, gtk2, popt, babeltrace }:
+
+stdenv.mkDerivation rec {
+  name = "lttv-1.5-beta1";
+
+  src = fetchurl {
+    url = "http://lttng.org/files/packages/${name}.tar.bz2";
+    sha256 = "0cz69q189wndwpvic0l6wvzl1nsfqadbrigaaxgzij72r7n89sfc";
+  };
+
+  buildInputs = [ pkgconfig glib gtk2 popt babeltrace ];
+
+  meta = with stdenv.lib; {
+    description = "Graphical trace viewer for LTTng trace files";
+    homepage = http://lttng.org/;
+    # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1.
+    # The rest of the LTTV package is distributed under the GNU GPL v2.
+    license = with licenses; [ gpl2 lgpl21 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+
+}
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index d5bb2b06e12c..bdf3a7d05616 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "strace-4.7";
+  name = "strace-4.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/strace/${name}.tar.xz";
-    sha256 = "158iwk0pl2mfw93m1843xb7a2zb8p6lh0qim07rca6f1ff4dk764";
+    sha256 = "1y6pw4aj4rw5470lqks1ml0n8jh5xbhwr5c3gb00bj570wgjk4pl";
   };
 
   nativeBuildInputs = [ perl ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://strace.sourceforge.net/;
     description = "A system call tracer for Linux";
-    license = "bsd";
+    license = licenses.bsd3;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix
index ac1bc2f1abc5..36047210a924 100644
--- a/pkgs/development/tools/misc/xxdiff/default.nix
+++ b/pkgs/development/tools/misc/xxdiff/default.nix
@@ -1,13 +1,11 @@
-{ stdenv, fetchhg, qt4, flex, bison, docutils }:
+{ stdenv, fetchurl, qt4, flex, bison, docutils }:
 
-stdenv.mkDerivation {
-  name = "xxdiff-2013.03.08";
+stdenv.mkDerivation rec {
+  name = "xxdiff-4.0";
 
-  src = fetchhg {
-    name = "xxdiff";
-    tag = "6a86d8353eef";
-    url = https://hg.furius.ca/public/xxdiff;
-    sha256 = "1c1krgmf1cfkrmg48w6zw61wgy01xm171ifkkh6givm8v6c8i340";
+  src = fetchurl {
+    url = "mirror://sourceforge/xxdiff/${name}.tar.bz2";
+    sha256 = "0c0k8cwxyv5byw7va1n9iykvypv435j0isvys21rkj1bx121al4i";
   };
 
   nativeBuildInputs = [ flex bison qt4 docutils ];
@@ -16,14 +14,16 @@ stdenv.mkDerivation {
 
   QMAKE = "qmake";
 
-  configurePhase =
-    ''
-      cd src
-      make -f Makefile.bootstrap
-    '';
+  configurePhase = "cd src; make -f Makefile.bootstrap";
 
   installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin";
 
-  meta.platforms = stdenv.lib.platforms.linux;
+  meta = {
+    homepage = "http://furius.ca/xxdiff/";
+    description = "graphical file and directories comparator and merge tool";
+    license = "GPLv2";
 
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [];
+  };
 }
diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/2.x.nix
similarity index 100%
rename from pkgs/development/tools/parsing/bison/default.nix
rename to pkgs/development/tools/parsing/bison/2.x.nix
diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
new file mode 100644
index 000000000000..63ceb7d6b6a0
--- /dev/null
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, m4, perl }:
+
+stdenv.mkDerivation rec {
+  name = "bison-3.0";
+
+  src = fetchurl {
+    url = "mirror://gnu/bison/${name}.tar.xz";
+    sha256 = "1j14fqgi9wzqgsy4fhkcdrv4hv6rrvhvn84axs520w9b022mbb79";
+  };
+
+  nativeBuildInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl;
+  propagatedBuildInputs = [ m4 ];
+
+  doCheck = true;
+
+  meta = {
+    homepage = "http://www.gnu.org/software/bison/";
+    description = "GNU Bison, a Yacc-compatible parser generator";
+    license = "GPLv3+";
+
+    longDescription = ''
+      Bison is a general-purpose parser generator that converts an
+      annotated context-free grammar into an LALR(1) or GLR parser for
+      that grammar.  Once you are proficient with Bison, you can use
+      it to develop a wide range of language parsers, from those used
+      in simple desk calculators to complex programming languages.
+
+      Bison is upward compatible with Yacc: all properly-written Yacc
+      grammars ought to work with Bison with no change.  Anyone
+      familiar with Yacc should be able to use Bison with little
+      trouble.  You need to be fluent in C or C++ programming in order
+      to use Bison.
+    '';
+
+    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+
+  passthru = { glrSupport = true; };
+}
diff --git a/pkgs/development/web/nodejs/setup-hook.sh b/pkgs/development/web/nodejs/setup-hook.sh
index c2888471044d..41a9746ba424 100644
--- a/pkgs/development/web/nodejs/setup-hook.sh
+++ b/pkgs/development/web/nodejs/setup-hook.sh
@@ -1,5 +1,5 @@
 addNodePath () {
-    addToSearchPath NODE_PATH $1/node_modules
+    addToSearchPath NODE_PATH $1/lib/node_modules
 }
 
 envHooks=(${envHooks[@]} addNodePath)
diff --git a/pkgs/development/web/plone/4.1.nix b/pkgs/development/web/plone/4.1.nix
deleted file mode 100644
index 47bd00b80cbf..000000000000
--- a/pkgs/development/web/plone/4.1.nix
+++ /dev/null
@@ -1,5141 +0,0 @@
-# DO NOT EDIT THIS FILE!
-#
-# Nix expressions autogenerated with:
-#   bin/pypi2nix -n plone41Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.1.6.json -p plone/4.1.6.txt -o plone/4.1.6.nix
-
-{ pkgs, pythonPackages }:
-
-let plone41Packages = pythonPackages.python.modules // rec {
-  inherit (pythonPackages) buildPythonPackage setuptools zc_buildout pillow;
-  inherit (pkgs) fetchurl stdenv;
-
-  plone_app_portlets = buildPythonPackage rec {
-    name = "plone.app.portlets-2.1.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.1.8.zip";
-      md5 = "cfdcd1c2261103f8ce823813b2ca54ea";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface zope_traversing plone_app_form datetime zope_container zope_lifecycleevent zope_annotation five_customerize zope_i18nmessageid zope_publisher products_genericsetup plone_i18n feedparser zope_event zope_browser zope_contentprovider plone_memoize zope2 zope_schema acquisition transaction products_pluggableauthservice zope_site zope_component plone_app_vocabularies plone_portlets plone_app_i18n zope_configuration zope_formlib zodb3 five_formlib setuptools products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope2 = buildPythonPackage rec {
-    name = "Zope2-2.13.15";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.15.zip";
-      md5 = "dc43f1fa82a3aa044466143c5524143c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing zope_interface zope_traversing multimapping zope_size zope_contenttype zope_browserpage datetime zope_component zope_sendmail zope_lifecycleevent products_zctextindex products_standardcachemanagers persistence products_mimetools zope_i18nmessageid zope_publisher missing zope_viewlet zope_sequencesort zope_testbrowser docutils zope_event products_pythonscripts zope_browser zope_structuredtext zope_contentprovider zope_browsermenu zope_tal zope_exceptions products_mailhost products_btreefolder2 zopeundo zconfig record accesscontrol pytz products_ofsp zope_schema zexceptions zope_processlifetime acquisition extensionclass zope_proxy zope_site zope_container zope_pagetemplate zdaemon zope_browserresource zope_deferredimport initgroups zope_security zope_configuration zope_i18n products_zcatalog restrictedpython zodb3 documenttemplate setuptools zope_ptresource zlog tempstorage transaction zope_tales zope_location products_externalmethod ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_btreefolder2 = buildPythonPackage rec {
-    name = "Products.BTreeFolder2-2.13.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.BTreeFolder2/Products.BTreeFolder2-2.13.3.tar.gz";
-      md5 = "f57c85673036af7ccd34c3fa251f6bb2";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ accesscontrol zope_container zodb3 zope_event persistence setuptools zope_lifecycleevent acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_pythonscripts = buildPythonPackage rec {
-    name = "Products.PythonScripts-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PythonScripts/Products.PythonScripts-2.13.0.zip";
-      md5 = "db1fad6815cb238a58dbbab8d5e95667";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol datetime restrictedpython documenttemplate setuptools zexceptions acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zopeundo = buildPythonPackage rec {
-    name = "ZopeUndo-2.12.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZopeUndo/ZopeUndo-2.12.0.zip";
-      md5 = "2b8da09d1b98d5558f62e12f6e52c401";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  datetime = buildPythonPackage rec {
-    name = "DateTime-2.12.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/D/DateTime/DateTime-2.12.6.zip";
-      md5 = "b2ade6cd7e85dd0c38c770f015c42500";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface pytz ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_session = buildPythonPackage rec {
-    name = "plone.session-3.5.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.session/plone.session-3.5.3.zip";
-      md5 = "f95872454735abc8f27c3dcbc9434c11";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 products_pluggableauthservice plone_keyring zope_interface setuptools zope_component plone_protect ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_container = buildPythonPackage rec {
-    name = "zope.container-3.11.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.container/zope.container-3.11.2.tar.gz";
-      md5 = "fc66d85a17b8ffb701091c9328983dcc";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_filerepresentation zope_i18nmessageid zope_publisher zope_broken zope_interface zope_size zope_dottedname zope_security zope_location zope_lifecycleevent zope_component zodb3 zope_event setuptools zope_schema zope_traversing ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_folder = buildPythonPackage rec {
-    name = "plone.folder-1.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.folder/plone.folder-1.0.1.zip";
-      md5 = "acb3958b623c0da35fdb259c94120396";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_memoize setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_plonepas = buildPythonPackage rec {
-    name = "Products.PlonePAS-4.0.13";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PlonePAS/Products.PlonePAS-4.0.13.zip";
-      md5 = "93da488c71a2b8a1751f1733cbc235f1";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_genericsetup plone_memoize plone_i18n plone_session zope2 setuptools products_cmfcore products_pluggableauthservice ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_locales = buildPythonPackage rec {
-    name = "plone.app.locales-4.0.13";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.0.13.zip";
-      md5 = "276fcceff2b567a32293de373e182d1f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_sequencesort = buildPythonPackage rec {
-    name = "zope.sequencesort-3.4.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.sequencesort/zope.sequencesort-3.4.0.tar.gz";
-      md5 = "cfc35fc426a47f5c0ee43c416224b864";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_genericsetup = buildPythonPackage rec {
-    name = "Products.GenericSetup-1.6.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.6.6.tar.gz";
-      md5 = "f9ce78d543052179ebc3cedcc3c5852f";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ zope_formlib five_localsitemanager zope2 setuptools eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  kss_core = buildPythonPackage rec {
-    name = "kss.core-1.6.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/k/kss.core/kss.core-1.6.3.zip";
-      md5 = "e9e0974851499556b7d09d79e1e14f11";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing zope_security zope_datetime zope_app_component zope_app_publication zope_pagetemplate zope_interface zope_location zope_app_publisher zope_contenttype zope_configuration zope_publisher zope_component zope_event setuptools zope_app_pagetemplate zope_schema zope_lifecycleevent zope_app_folder zope_traversing ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_tal = buildPythonPackage rec {
-    name = "zope.tal-3.5.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.tal/zope.tal-3.5.2.zip";
-      md5 = "13869f292ba36b294736b7330b1396fd";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_cachepurging = buildPythonPackage rec {
-    name = "plone.cachepurging-1.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.cachepurging/plone.cachepurging-1.0.3.tar.gz";
-      md5 = "26d47c4e2dccfb1992feb259e7e01c11";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 five_globalrequest zope_interface zope_component zope_event setuptools zope_lifecycleevent zope_annotation plone_registry ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_securemailhost = buildPythonPackage rec {
-    name = "Products.SecureMailHost-1.1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.SecureMailHost/Products.SecureMailHost-1.1.2.zip";
-      md5 = "7db0f1fa867bd0df972082f502a7a707";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_portaltransforms = buildPythonPackage rec {
-    name = "Products.PortalTransforms-2.0.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.0.7.zip";
-      md5 = "bd3568fa71e8941d049514ba91b3292e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 zope_interface zope_structuredtext products_mimetypesregistry zodb3 products_cmfdefault plone_intelligenttext setuptools markdown products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_memoize = buildPythonPackage rec {
-    name = "plone.memoize-1.1.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.memoize/plone.memoize-1.1.1.zip";
-      md5 = "d07cd14b976160e1f26a859e3370147e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_component zope_annotation zope_ramcache setuptools zope_interface ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  docutils = buildPythonPackage rec {
-    name = "docutils-0.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/d/docutils/docutils-0.7.tar.gz";
-      md5 = "9aec716baf15d06b5aa57cf8d5591c15";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  five_formlib = buildPythonPackage rec {
-    name = "five.formlib-1.0.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.formlib/five.formlib-1.0.4.zip";
-      md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid transaction zope_app_form zope_formlib zope_interface zope_location zope_publisher zope_component extensionclass zope_event setuptools zope_schema zope_lifecycleevent zope_browser zope2 ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zexceptions = buildPythonPackage rec {
-    name = "zExceptions-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zExceptions/zExceptions-2.13.0.zip";
-      md5 = "4c679696c959040d8e656ef85ae40136";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_publisher zope_security setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfuid = buildPythonPackage rec {
-    name = "Products.CMFUid-2.2.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFUid/Products.CMFUid-2.2.1.tar.gz";
-      md5 = "e20727959351dffbf0bac80613eee110";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  restrictedpython = buildPythonPackage rec {
-    name = "RestrictedPython-3.6.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/R/RestrictedPython/RestrictedPython-3.6.0.zip";
-      md5 = "aa75a7dcc7fbc966357837cc66cacec6";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  feedparser = buildPythonPackage rec {
-    name = "feedparser-5.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/feedparser/feedparser-5.0.1.zip";
-      md5 = "cefffeba66b658d3cc7c1d66b92c6a1a";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_browser = buildPythonPackage rec {
-    name = "zope.browser-1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browser/zope.browser-1.3.zip";
-      md5 = "4ff0ddbf64c45bfcc3189e35f4214ded";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfdefault = buildPythonPackage rec {
-    name = "Products.CMFDefault-2.2.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.2.tar.gz";
-      md5 = "87d0a1637afb1d09731b376f72236e31";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ products_genericsetup products_cmfcore five_formlib setuptools zope2 eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  python_dateutil = buildPythonPackage rec {
-    name = "python-dateutil-1.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz";
-      md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_error = buildPythonPackage rec {
-    name = "zope.error-3.7.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.error/zope.error-3.7.4.tar.gz";
-      md5 = "281445a906458ff5f18f56923699a127";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_location zope_exceptions setuptools zodb3 ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  collective_monkeypatcher = buildPythonPackage rec {
-    name = "collective.monkeypatcher-1.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.monkeypatcher/collective.monkeypatcher-1.0.1.zip";
-      md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_mimetools = buildPythonPackage rec {
-    name = "Products.MIMETools-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip";
-      md5 = "ad5372fc1190599a19493db0864448ec";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ documenttemplate setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_deprecation = buildPythonPackage rec {
-    name = "zope.deprecation-3.4.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-3.4.1.tar.gz";
-      md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  unidecode = buildPythonPackage rec {
-    name = "Unidecode-0.04.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/U/Unidecode/Unidecode-0.04.1.tar.gz";
-      md5 = "c4c9ed8d40cff25c390ff5d5112b9308";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfcore = buildPythonPackage rec {
-    name = "Products.CMFCore-2.2.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.6.tar.gz";
-      md5 = "ae649fd2d54755691148c86d2e02c8ae";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ zope2 products_zsqlmethods five_localsitemanager setuptools products_genericsetup eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  five_localsitemanager = buildPythonPackage rec {
-    name = "five.localsitemanager-2.0.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.localsitemanager/five.localsitemanager-2.0.5.zip";
-      md5 = "5e3a658e6068832bd802018ebc83f2d4";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing zope_site zope_interface zope_location zope_component zodb3 zope_event setuptools zope_lifecycleevent zope2 acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_configuration = buildPythonPackage rec {
-    name = "zope.configuration-3.7.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-3.7.4.zip";
-      md5 = "5b0271908ef26c05059eda76928896ea";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_schema zope_interface zope_i18nmessageid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  z3c_batching = buildPythonPackage rec {
-    name = "z3c.batching-1.1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.batching/z3c.batching-1.1.0.tar.gz";
-      md5 = "d1dc834781d228127ca6d15301757863";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  z3c_form = buildPythonPackage rec {
-    name = "z3c.form-2.5.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.form/z3c.form-2.5.1.tar.gz";
-      md5 = "f029f83dd226f695f55049ed1ecee95e";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_pagetemplate zope_interface zope_location zope_security zope_configuration zope_component zope_event setuptools zope_schema zope_lifecycleevent zope_browser zope_i18n zope_traversing zope_contentprovider ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfcalendar = buildPythonPackage rec {
-    name = "Products.CMFCalendar-2.2.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.2.tar.gz";
-      md5 = "49458e68dc3b6826ea9a3576ac014419";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ products_cmfdefault zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_extendedpathindex = buildPythonPackage rec {
-    name = "Products.ExtendedPathIndex-2.9";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/Products.ExtendedPathIndex-2.9.zip";
-      md5 = "7dfd5a6c3abc87f91cbaab3798038e1f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  archetypes_schemaextender = buildPythonPackage rec {
-    name = "archetypes.schemaextender-2.1.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.schemaextender/archetypes.schemaextender-2.1.1.zip";
-      md5 = "3659dd72db341b629308d90f135031df";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_uuid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zconfig = buildPythonPackage rec {
-    name = "ZConfig-2.9.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-2.9.0.zip";
-      md5 = "5c932690a70c8907efd240cdd76a7bc4";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_copypastemove = buildPythonPackage rec {
-    name = "zope.copypastemove-3.7.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.copypastemove/zope.copypastemove-3.7.0.tar.gz";
-      md5 = "f335940686d15cfc5520c42f2494a924";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_container zope_copy zope_interface zope_location zope_exceptions zope_component zope_event setuptools zope_lifecycleevent zope_annotation ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_contentmenu = buildPythonPackage rec {
-    name = "plone.app.contentmenu-2.0.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.contentmenu/plone.app.contentmenu-2.0.5.tar.gz";
-      md5 = "50de3ddf80d602ab79064d652275c2e7";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_app_publisher zope_publisher products_cmfdynamicviewfti zope_interface plone_memoize plone_app_content zope_component zope2 acquisition setuptools zope_i18n plone_locking products_cmfcore zope_contentprovider ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_pluginregistry = buildPythonPackage rec {
-    name = "Products.PluginRegistry-1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz";
-      md5 = "5b166193ca1eb84dfb402051f779ebab";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope2 products_genericsetup setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfplacefulworkflow = buildPythonPackage rec {
-    name = "Products.CMFPlacefulWorkflow-1.5.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.7.zip";
-      md5 = "7617fcd9d2590c0d2f1b6cff08addc8a";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfplone zope_i18nmessageid products_plonetestcase products_genericsetup zope_interface zope_testing zope_component setuptools products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_outputfilters = buildPythonPackage rec {
-    name = "plone.outputfilters-1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.2.zip";
-      md5 = "052ec24783b6ca7b5e55e50c7b57d3a2";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_portaltransforms products_mimetypesregistry products_cmfcore setuptools products_genericsetup ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_publisher = buildPythonPackage rec {
-    name = "zope.publisher-3.12.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.publisher/zope.publisher-3.12.6.tar.gz";
-      md5 = "495131970cc7cb14de8e517fb3857ade";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_contenttype zope_proxy zope_interface zope_location zope_exceptions zope_security zope_configuration zope_component zope_event setuptools zope_browser zope_i18n ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_security = buildPythonPackage rec {
-    name = "zope.security-3.7.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz";
-      md5 = "072ab8d11adc083eace11262da08630c";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_schema zope_interface zope_location zope_configuration zope_component setuptools zope_proxy ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zdaemon = buildPythonPackage rec {
-    name = "zdaemon-2.0.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zdaemon/zdaemon-2.0.7.tar.gz";
-      md5 = "291a875f82e812110557eb6704af8afe";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zconfig ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_annotation = buildPythonPackage rec {
-    name = "zope.annotation-3.5.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.annotation/zope.annotation-3.5.0.tar.gz";
-      md5 = "4238153279d3f30ab5613438c8e76380";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_proxy zope_interface zope_location zope_component zodb3 setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmftestcase = buildPythonPackage rec {
-    name = "Products.CMFTestCase-0.9.11";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFTestCase/Products.CMFTestCase-0.9.11.zip";
-      md5 = "19ed5008a93eff36b853780dd0bca119";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing zope2 products_genericsetup zope_site zope_interface zope_component zodb3 products_cmfdefault products_cmfcalendar setuptools products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_structuredtext = buildPythonPackage rec {
-    name = "zope.structuredtext-3.5.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.structuredtext/zope.structuredtext-3.5.1.tar.gz";
-      md5 = "eabbfb983485d0879322bc878d2478a0";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zodb3 = buildPythonPackage rec {
-    name = "ZODB3-3.10.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz";
-      md5 = "6f180c6897a1820948fee2a6290503cd";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface transaction zconfig zope_event zdaemon zc_lockfile ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  documenttemplate = buildPythonPackage rec {
-    name = "DocumentTemplate-2.13.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip";
-      md5 = "07bb086c77c1dfe94125ad2efbba94b7";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol extensionclass zope_sequencesort zexceptions restrictedpython zope_structuredtext acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_globalrequest = buildPythonPackage rec {
-    name = "zope.globalrequest-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.globalrequest/zope.globalrequest-1.0.zip";
-      md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_customerize = buildPythonPackage rec {
-    name = "plone.app.customerize-1.2.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.customerize/plone.app.customerize-1.2.2.zip";
-      md5 = "6a3802c4e8fbd955597adc6a8298febf";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_viewlet zope2 zope_publisher zope_interface plone_browserlayer plone_portlets zope_component setuptools five_customerize products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfdifftool = buildPythonPackage rec {
-    name = "Products.CMFDiffTool-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFDiffTool/Products.CMFDiffTool-2.0.2.zip";
-      md5 = "c12ba4fb9912a9a5a046b07b5b1cf69d";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 products_genericsetup zope_interface setuptools products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_testbrowser = buildPythonPackage rec {
-    name = "zope.testbrowser-3.11.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.testbrowser/zope.testbrowser-3.11.1.tar.gz";
-      md5 = "64abbee892121e7f1a91aed12cfc155a";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_interface mechanize pytz setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_contentmigration = buildPythonPackage rec {
-    name = "Products.contentmigration-2.1.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.1.zip";
-      md5 = "3231b92976728ced7b9699472fe0cc43";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_intelligenttext = buildPythonPackage rec {
-    name = "plone.intelligenttext-2.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.intelligenttext/plone.intelligenttext-2.0.1.zip";
-      md5 = "bec8ed2107d3c1b63a60d49a1a88ddeb";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plonetheme_classic = buildPythonPackage rec {
-    name = "plonetheme.classic-1.1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.1.2.tar.gz";
-      md5 = "b1305c82931e9e19ce910318c8e1dc55";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_kupu = buildPythonPackage rec {
-    name = "Products.kupu-1.5.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.kupu/Products.kupu-1.5.0.zip";
-      md5 = "0952b721f77fdb38bd0bbc0a52943cbd";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid products_genericsetup zope_interface products_portaltransforms products_cmfcore products_archetypes products_mimetypesregistry setuptools products_cmfplone zope_schema zope_i18n plone_outputfilters ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_authentication = buildPythonPackage rec {
-    name = "zope.authentication-3.7.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.authentication/zope.authentication-3.7.1.zip";
-      md5 = "7d6bb340610518f2fc71213cfeccda68";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_security zope_component setuptools zope_schema zope_browser ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_i18n = buildPythonPackage rec {
-    name = "zope.i18n-3.7.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.i18n/zope.i18n-3.7.4.tar.gz";
-      md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_component zope_i18nmessageid pytz setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_componentvocabulary = buildPythonPackage rec {
-    name = "zope.componentvocabulary-1.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.componentvocabulary/zope.componentvocabulary-1.0.1.tar.gz";
-      md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_security zope_component setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_ofsp = buildPythonPackage rec {
-    name = "Products.OFSP-2.13.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.OFSP/Products.OFSP-2.13.2.zip";
-      md5 = "c76d40928753c2ee56db873304e65bd5";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol persistence setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_datetime = buildPythonPackage rec {
-    name = "zope.datetime-3.4.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.datetime/zope.datetime-3.4.1.tar.gz";
-      md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_form = buildPythonPackage rec {
-    name = "plone.app.form-2.0.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.0.5.tar.gz";
-      md5 = "ecac76663325511a110837e7ad7c24a6";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_app_form zope_site zope_formlib plone_app_vocabularies zope2 datetime zope_component zope_event five_formlib setuptools zope_interface zope_schema zope_lifecycleevent zope_browser zope_i18n plone_locking products_cmfcore acquisition products_cmfdefault ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_passwordresettool = buildPythonPackage rec {
-    name = "Products.PasswordResetTool-2.0.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.8.zip";
-      md5 = "f6658bec0ba11a34f53e8ef49461ad4a";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface plone_memoize datetime zope_component setuptools zope_i18n products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_jquerytools = buildPythonPackage rec {
-    name = "plone.app.jquerytools-1.3.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.3.2.zip";
-      md5 = "326470a34e07aa98c40d75ec22484572";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_component zope2 products_cmfcore setuptools products_genericsetup ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_validation = buildPythonPackage rec {
-    name = "Products.validation-2.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.validation/Products.validation-2.0.zip";
-      md5 = "afa217e2306637d1dccbebf337caa8bf";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface datetime setuptools zope_i18n acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_registry = buildPythonPackage rec {
-    name = "plone.registry-1.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.registry/plone.registry-1.0.1.zip";
-      md5 = "6be3d2ec7e2d170e29b8c0bc65049aff";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing zope_interface zope_dottedname zope_component zodb3 zope_event setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_pagetemplate = buildPythonPackage rec {
-    name = "zope.app.pagetemplate-3.11.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.pagetemplate/zope.app.pagetemplate-3.11.2.tar.gz";
-      md5 = "2d304729c0d6a9ab67dd5ea852f19476";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_browserpage zope_traversing zope_tales zope_size zope_pagetemplate zope_dublincore zope_security zope_component zope_configuration setuptools zope_interface zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_viewlet = buildPythonPackage rec {
-    name = "zope.viewlet-3.7.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.viewlet/zope.viewlet-3.7.2.tar.gz";
-      md5 = "367e03096df57e2f9b74fff43f7901f9";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_browserpage zope_i18nmessageid zope_publisher zope_interface zope_location zope_security zope_configuration zope_component zope_event setuptools zope_schema zope_traversing zope_contentprovider ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_portlet_static = buildPythonPackage rec {
-    name = "plone.portlet.static-2.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.1.zip";
-      md5 = "63a5f5555cd9d829e995bd7fe23a44b3";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 plone_app_portlets zope_formlib zope_interface setuptools plone_i18n plone_portlets zope_component plone_app_form zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_portlet_collection = buildPythonPackage rec {
-    name = "plone.portlet.collection-2.0.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.0.4.tar.gz";
-      md5 = "39ba9a24e240ffe30c3a0d1984b771f1";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ plone_memoize setuptools plone_app_vocabularies plone_app_form plone_portlets plone_app_portlets ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_users = buildPythonPackage rec {
-    name = "plone.app.users-1.1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.users/plone.app.users-1.1.3.tar.gz";
-      md5 = "21b1ac5c3a8ff554f1cbf593fd1d3600";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_app_form setuptools zope_site zope_formlib zope_interface plone_app_controlpanel plone_app_layout zope2 zope_component products_statusmessages products_cmfdefault five_formlib plone_protect zodb3 zope_schema products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_theme = buildPythonPackage rec {
-    name = "plone.theme-2.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.theme/plone.theme-2.1.zip";
-      md5 = "c592d0d095e9fc76cc81597cdf6d0c37";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 zope_publisher zope_interface zope_traversing zope_component products_cmfdefault setuptools products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_i18nmessageid = buildPythonPackage rec {
-    name = "zope.i18nmessageid-3.5.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-3.5.3.tar.gz";
-      md5 = "cb84bf61c2b7353e3b7578057fbaa264";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_folder = buildPythonPackage rec {
-    name = "plone.app.folder-1.0.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.folder/plone.app.folder-1.0.4.zip";
-      md5 = "90fbe9c841a2f01d06979a1869c12fce";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_folder setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_zcatalog = buildPythonPackage rec {
-    name = "Products.ZCatalog-2.13.23";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZCatalog/Products.ZCatalog-2.13.23.zip";
-      md5 = "d425171516dfc70e543a4e2b852301cb";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol zope_testing extensionclass missing zope_dottedname restrictedpython datetime record persistence zodb3 documenttemplate setuptools zope_interface zope_schema products_zctextindex zexceptions acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  z3c_autoinclude = buildPythonPackage rec {
-    name = "z3c.autoinclude-0.3.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.autoinclude/z3c.autoinclude-0.3.4.zip";
-      md5 = "6a615ae18c12b459bceb3ae28e8e7709";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_dottedname zope_configuration zc_buildout setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_processlifetime = buildPythonPackage rec {
-    name = "zope.processlifetime-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.processlifetime/zope.processlifetime-1.0.tar.gz";
-      md5 = "69604bfd668a01ebebdd616a8f26ccfe";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_uuid = buildPythonPackage rec {
-    name = "plone.uuid-1.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.uuid/plone.uuid-1.0.3.zip";
-      md5 = "183fe2911a7d6c9f6b3103855e98ad8a";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_browserpage zope_publisher setuptools zope_lifecycleevent ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  archetypes_kss = buildPythonPackage rec {
-    name = "archetypes.kss-1.7.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.kss/archetypes.kss-1.7.2.zip";
-      md5 = "a8502140123b74f1b7ed4f36d3e56ff3";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_uuid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_traversing = buildPythonPackage rec {
-    name = "zope.traversing-3.13.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.traversing/zope.traversing-3.13.2.zip";
-      md5 = "eaad8fc7bbef126f9f8616b074ec00aa";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_proxy zope_location zope_interface zope_security zope_component setuptools zope_publisher zope_i18n ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  python_gettext = buildPythonPackage rec {
-    name = "python-gettext-1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-gettext/python-gettext-1.2.zip";
-      md5 = "cd4201d440126d1296d1d2bc2b4795f3";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ unittest2 ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_stringinterp = buildPythonPackage rec {
-    name = "plone.stringinterp-1.0.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.5.tar.gz";
-      md5 = "a60848a07b35c14639ca6aa0d9c4d66b";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18n products_cmfcore setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_container = buildPythonPackage rec {
-    name = "zope.app.container-3.9.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.container/zope.app.container-3.9.2.tar.gz";
-      md5 = "1e286c59f0166e517d67ddd723641c84";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_copypastemove zope_exceptions zope_component zope_dublincore zope_location zope_browsermenu zope_size zope_security zope_publisher zope_container zope_browserpage zope_event setuptools zope_interface zope_lifecycleevent zope_browser zope_i18n zope_traversing ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_plonelanguagetool = buildPythonPackage rec {
-    name = "Products.PloneLanguageTool-3.2.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.4.tar.gz";
-      md5 = "6cdc7d49a0b76051b80ca915289ad72d";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  eggtestinfo = buildPythonPackage rec {
-    name = "eggtestinfo-0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/e/eggtestinfo/eggtestinfo-0.3.tar.gz";
-      md5 = "6f0507aee05f00c640c0d64b5073f840";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  mailinglogger = buildPythonPackage rec {
-    name = "mailinglogger-3.3.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mailinglogger/mailinglogger-3.3.3.tar.gz";
-      md5 = "1e5897227b7990ee0c2d98f1ad33b072";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  missing = buildPythonPackage rec {
-    name = "Missing-2.13.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip";
-      md5 = "9823cff54444cbbcaef8fc45d8e42572";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_deferredimport = buildPythonPackage rec {
-    name = "zope.deferredimport-3.5.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.deferredimport/zope.deferredimport-3.5.3.tar.gz";
-      md5 = "68fce3bf4f011d4a840902fd763884ee";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_proxy setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_tales = buildPythonPackage rec {
-    name = "zope.tales-3.5.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.tales/zope.tales-3.5.2.tar.gz";
-      md5 = "1c5060bd766a0a18632b7879fc9e4e1e";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface setuptools zope_tal ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_zsqlmethods = buildPythonPackage rec {
-    name = "Products.ZSQLMethods-2.13.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZSQLMethods/Products.ZSQLMethods-2.13.4.zip";
-      md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass missing zope_interface datetime zope2 record transaction acquisition setuptools zodb3 persistence ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_statusmessages = buildPythonPackage rec {
-    name = "Products.statusmessages-4.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.statusmessages/Products.statusmessages-4.0.zip";
-      md5 = "265324b0a58a032dd0ed038103ed0473";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_annotation zope_i18n setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_i18n = buildPythonPackage rec {
-    name = "plone.i18n-2.0.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.6.zip";
-      md5 = "651e8cbc2cea201276777ab56337a3ee";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ unidecode zope_publisher zope_interface zope_component setuptools zope_i18n ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_transformchain = buildPythonPackage rec {
-    name = "plone.transformchain-1.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.transformchain/plone.transformchain-1.0.2.tar.gz";
-      md5 = "18f836f28ad78ee69ab5d182a1b7664a";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_interface setuptools zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_pluggableauthservice = buildPythonPackage rec {
-    name = "Products.PluggableAuthService-1.8.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PluggableAuthService/Products.PluggableAuthService-1.8.0.tar.gz";
-      md5 = "76de2b0c95e8159c7edfe94e3fd6eb8a";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ products_pluginregistry zope2 products_genericsetup setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  borg_localrole = buildPythonPackage rec {
-    name = "borg.localrole-3.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/b/borg.localrole/borg.localrole-3.0.2.zip";
-      md5 = "04082694dfda9ae5cda62747b8ac7ccf";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 products_genericsetup zope_deferredimport zope_interface plone_memoize zope_component setuptools products_pluggableauthservice zope_annotation products_cmfcore acquisition products_plonepas ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  elementtree = buildPythonPackage rec {
-    name = "elementtree-1.2.7-20070827-preview";
-    src = fetchurl {
-      url = "http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip";
-      md5 = "30e2fe5edd143f347e03a8baf5d60f8a";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_content = buildPythonPackage rec {
-    name = "zope.app.content-3.5.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.content/zope.app.content-3.5.1.tar.gz";
-      md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_interface zope_componentvocabulary zope_security setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plonetheme_sunburst = buildPythonPackage rec {
-    name = "plonetheme.sunburst-1.1.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.1.6.tar.gz";
-      md5 = "43d3a8c79c4605dd489ed24c93cdd21f";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_portlets = buildPythonPackage rec {
-    name = "plone.portlets-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.portlets/plone.portlets-2.0.2.zip";
-      md5 = "8a719cb0495081415fe03f3c8820d6b0";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_publisher zope_site zope_container zope_interface plone_memoize zope_component zodb3 setuptools zope_schema zope_annotation zope_contentprovider ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_proxy = buildPythonPackage rec {
-    name = "zope.proxy-3.6.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-3.6.1.zip";
-      md5 = "a400b0a26624b17fa889dbcaa989d440";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_archetypes = buildPythonPackage rec {
-    name = "Products.Archetypes-1.7.14";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.7.14.zip";
-      md5 = "275eb51788761fdd3b24ad836deb4311";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfformcontroller products_cmftestcase zope_interface zope_contenttype datetime zope_component products_mimetypesregistry plone_app_folder zope2 zope_lifecycleevent zope_i18nmessageid zope_publisher products_genericsetup products_validation products_portaltransforms products_cmfquickinstallertool products_placelesstranslationservice zope_event acquisition products_dcworkflow products_cmfdefault zope_tal plone_folder products_statusmessages zope_schema zope_viewlet products_cmfcalendar extensionclass zope_datetime products_marshall zope_site zope_deferredimport zodb3 plone_uuid setuptools transaction zope_i18n products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_dublincore = buildPythonPackage rec {
-    name = "zope.dublincore-3.7.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.dublincore/zope.dublincore-3.7.0.tar.gz";
-      md5 = "2e34e42e454d896feb101ac74af62ded";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_datetime zope_interface zope_location zope_security zope_component pytz setuptools zope_schema zope_lifecycleevent ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  initgroups = buildPythonPackage rec {
-    name = "initgroups-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/i/initgroups/initgroups-2.13.0.zip";
-      md5 = "38e842dcab8445f65e701fec75213acd";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_schema = buildPythonPackage rec {
-    name = "zope.schema-4.2.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.0.tar.gz";
-      md5 = "d1ecf5a29e8572eee28450fd9c2150da";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_event setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_publisher = buildPythonPackage rec {
-    name = "zope.app.publisher-3.10.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.publisher/zope.app.publisher-3.10.2.zip";
-      md5 = "66e9110e2967d8d204a65a98e2227404";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_componentvocabulary zope_datetime zope_browsermenu zope_interface zope_browserresource zope_security zope_configuration zope_component zope_browserpage zope_publisher setuptools zope_ptresource zope_schema zope_location ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_scale = buildPythonPackage rec {
-    name = "plone.scale-1.2.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.2.2.zip";
-      md5 = "7c59522b4806ee24f5e0a5fa69c523a5";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_copy = buildPythonPackage rec {
-    name = "zope.copy-3.5.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.copy/zope.copy-3.5.0.tar.gz";
-      md5 = "a9836a5d36cd548be45210eb00407337";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_event = buildPythonPackage rec {
-    name = "zope.event-3.5.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz";
-      md5 = "6e8af2a16157a74885d4f0d88137cefb";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  acquisition = buildPythonPackage rec {
-    name = "Acquisition-2.13.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip";
-      md5 = "8c33160c157b50649e2b2b3224622579";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface extensionclass ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_linkintegrity = buildPythonPackage rec {
-    name = "plone.app.linkintegrity-1.4.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.4.5.zip";
-      md5 = "206edc1a0b8e7755560578bee95043a8";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_resourceregistries = buildPythonPackage rec {
-    name = "Products.ResourceRegistries-2.0.9";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.0.9.zip";
-      md5 = "bd6f31bb793ac5894b89763a2ac45ca0";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 products_genericsetup zope_interface datetime zope_component zodb3 setuptools zope_viewlet products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_browserlayer = buildPythonPackage rec {
-    name = "plone.browserlayer-2.1.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.browserlayer/plone.browserlayer-2.1.1.tar.gz";
-      md5 = "10d5737682c3287241aab286d1477050";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope2 zope_interface zope_traversing zope_component setuptools products_genericsetup products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  markdown = buildPythonPackage rec {
-    name = "Markdown-2.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.3.zip";
-      md5 = "122418893e21e91109edbf6e082f830d";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  z3c_formwidget_query = buildPythonPackage rec {
-    name = "z3c.formwidget.query-0.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.formwidget.query/z3c.formwidget.query-0.5.tar.gz";
-      md5 = "a049d9f3b11bcdc48d37379e8883c5bb";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_app_form z3c_form zope_interface zope_component setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_z3cform = buildPythonPackage rec {
-    name = "plone.app.z3cform-0.5.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.5.8.zip";
-      md5 = "af8f85f81cb127d6531b191f9cef063b";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 plone_z3cform zope_interface z3c_formwidget_query collective_z3cform_datetimewidget kss_core zope_component setuptools plone_app_kss ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_viewletmanager = buildPythonPackage rec {
-    name = "plone.app.viewletmanager-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.2.zip";
-      md5 = "2e60a9239f70ccf40bc57a58c5fc2dd7";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 products_genericsetup zope_site zope_interface zope_component zodb3 acquisition setuptools zope_viewlet zope_contentprovider ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_ramcache = buildPythonPackage rec {
-    name = "zope.ramcache-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.ramcache/zope.ramcache-1.0.zip";
-      md5 = "87289e15f0e51f50704adda1557c02a7";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_location zodb3 zope_testing setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_vocabularies = buildPythonPackage rec {
-    name = "plone.app.vocabularies-2.1.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.6.zip";
-      md5 = "3880f2f3310ce0b59cb6146d563047ea";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_app_form zope_site products_archetypes zope_interface zope_component setuptools zope_schema zope_browser zope_i18n products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_cache = buildPythonPackage rec {
-    name = "zope.app.cache-3.7.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.cache/zope.app.cache-3.7.0.zip";
-      md5 = "8dd74574e869ce236ced0de7e349bb5c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_ramcache zope_app_form zope_interface zope_traversing zope_publisher zope_component zodb3 zope_proxy setuptools zope_schema zope_componentvocabulary zope_app_pagetemplate zope_annotation ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_folder = buildPythonPackage rec {
-    name = "zope.app.folder-3.5.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.folder/zope.app.folder-3.5.2.tar.gz";
-      md5 = "5ba3a2a7ec527a7eb0cc3c2eb7bb75e9";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_container zope_app_content zope_site setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_discussion = buildPythonPackage rec {
-    name = "plone.app.discussion-2.1.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.1.6.zip";
-      md5 = "60fda796ae3bab6c728805050e63a8f5";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_app_uuid zope_site plone_indexer zope_container collective_monkeypatcher zope_interface plone_app_z3cform plone_app_layout plone_z3cform plone_app_registry zope_component zodb3 zope_event setuptools z3c_form zope_lifecycleevent zope_annotation plone_registry ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zlog = buildPythonPackage rec {
-    name = "zLOG-2.11.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zLOG/zLOG-2.11.1.tar.gz";
-      md5 = "68073679aaa79ac5a7b6a5c025467147";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zconfig ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone = buildPythonPackage rec {
-    name = "Plone-4.1.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Plone/Plone-4.1.6.zip";
-      md5 = "a7585cd8f8608ec251829f1e9c03f1ff";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfplone products_kupu plone_app_caching setuptools products_cmfplacefulworkflow plone_app_openid plone_app_iterate wicked ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_standardcachemanagers = buildPythonPackage rec {
-    name = "Products.StandardCacheManagers-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.StandardCacheManagers/Products.StandardCacheManagers-2.13.0.zip";
-      md5 = "c5088b2b62bd26d63d9579a04369cb73";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol zope_component transaction setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_fieldsets = buildPythonPackage rec {
-    name = "plone.fieldsets-2.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.fieldsets/plone.fieldsets-2.0.1.zip";
-      md5 = "ae0cf4288466efb440a205764e2f5280";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_formlib zope_interface zope_component five_formlib setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  archetypes_referencebrowserwidget = buildPythonPackage rec {
-    name = "archetypes.referencebrowserwidget-2.4.11";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.11.zip";
-      md5 = "81029c17d051c0e76c2a3543a90b345c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_app_jquerytools zope_component zope_interface plone_app_form zope_formlib setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  z3c_zcmlhook = buildPythonPackage rec {
-    name = "z3c.zcmlhook-1.0b1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.zcmlhook/z3c.zcmlhook-1.0b1.tar.gz";
-      md5 = "7b6c80146f5930409eb0b355ddf3daeb";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_component zope_configuration setuptools zope_interface ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_recipe_zope2instance = buildPythonPackage rec {
-    name = "plone.recipe.zope2instance-4.1.10";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.1.10.zip";
-      md5 = "787fad7fa44757de74a50a91e9bcfcb5";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zc_buildout zc_recipe_egg mailinglogger setuptools zope2 ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_supermodel = buildPythonPackage rec {
-    name = "plone.supermodel-1.1.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.1.1.zip";
-      md5 = "301bf89f7e75d372d9175c0b76ac752b";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_deferredimport zope_interface zope_dottedname zope_component z3c_zcmlhook setuptools zope_schema elementtree ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_registry = buildPythonPackage rec {
-    name = "plone.app.registry-1.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.0.1.tar.gz";
-      md5 = "e2bef48f39750a4c2b2afcc883b8badf";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 plone_registry products_genericsetup elementtree zope_interface plone_app_z3cform zope_dottedname zope_component products_statusmessages plone_supermodel setuptools plone_autoform products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_pagetemplate = buildPythonPackage rec {
-    name = "zope.pagetemplate-3.5.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.pagetemplate/zope.pagetemplate-3.5.2.tar.gz";
-      md5 = "caa27a15351bc2ae11f5eecb5531e6c5";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_traversing zope_tales zope_security zope_component setuptools zope_tal zope_i18n ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfformcontroller = buildPythonPackage rec {
-    name = "Products.CMFFormController-3.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFFormController/Products.CMFFormController-3.0.2.zip";
-      md5 = "dab913bfda518714046c811e2dfe2c34";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ transaction products_genericsetup zope_interface zope_tales products_cmfcore zope2 setuptools zope_structuredtext acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_openid = buildPythonPackage rec {
-    name = "plone.openid-2.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.openid/plone.openid-2.0.1.zip";
-      md5 = "d4c36926a6dbefed035ed92c29329ce1";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ transaction products_pluggableauthservice python_openid zodb3 setuptools zope2 acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_size = buildPythonPackage rec {
-    name = "zope.size-3.4.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.size/zope.size-3.4.1.tar.gz";
-      md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_mimetypesregistry = buildPythonPackage rec {
-    name = "Products.MimetypesRegistry-2.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.3.zip";
-      md5 = "b04aeeb9d49836272efc9ad0226d6118";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 zope_interface zope_contenttype zodb3 setuptools products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_imaging = buildPythonPackage rec {
-    name = "plone.app.imaging-1.0.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.6.zip";
-      md5 = "8d494cd69b3f6be7fcb9e21c20277765";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_scale setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_marshall = buildPythonPackage rec {
-    name = "Products.Marshall-2.1.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.Marshall/Products.Marshall-2.1.1.zip";
-      md5 = "5de4b78af86ea43dc4c60314ac8f681e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ transaction products_genericsetup zope_interface zope_contenttype datetime extensionclass plone_uuid setuptools zope2 products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_ptresource = buildPythonPackage rec {
-    name = "zope.ptresource-3.9.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.ptresource/zope.ptresource-3.9.0.tar.gz";
-      md5 = "f4645e51c15289d3fdfb4139039e18e9";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_publisher zope_pagetemplate zope_interface zope_browserresource zope_security setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_component = buildPythonPackage rec {
-    name = "zope.app.component-3.9.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.component/zope.app.component-3.9.3.tar.gz";
-      md5 = "bc2dce245d2afe462529c350956711e0";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_component zope_site zope_deprecation zope_interface zope_traversing zope_exceptions zope_security zope_formlib zope_componentvocabulary setuptools zope_schema zope_app_pagetemplate zope_publisher zope_app_container ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  multimapping = buildPythonPackage rec {
-    name = "MultiMapping-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/M/MultiMapping/MultiMapping-2.13.0.zip";
-      md5 = "d69c5904c105b9f2f085d4103e0f0586";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_mailhost = buildPythonPackage rec {
-    name = "Products.MailHost-2.13.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.MailHost/Products.MailHost-2.13.1.zip";
-      md5 = "1102e523435d8bf78a15b9ddb57478e1";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_kss = buildPythonPackage rec {
-    name = "plone.app.kss-1.6.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.kss/plone.app.kss-1.6.2.zip";
-      md5 = "4849de5b67ca1694791f7d916cfc4dc8";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_viewlet zope_i18nmessageid zope2 setuptools products_archetypes zope_deprecation zope_interface kss_core zope_component products_statusmessages acquisition plone_app_portlets products_dcworkflow zope_lifecycleevent zope_i18n plone_locking products_cmfcore zope_contentprovider plone_portlets ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  pytz = buildPythonPackage rec {
-    name = "pytz-2012c";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pytz/pytz-2012c.zip";
-      md5 = "115c950275d185f69f05d5441b1c2151";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_i18n = buildPythonPackage rec {
-    name = "plone.app.i18n-2.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.i18n/plone.app.i18n-2.0.1.zip";
-      md5 = "39f5a8dbfe102c0309abe30a0e77f639";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_indexer = buildPythonPackage rec {
-    name = "plone.indexer-1.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip";
-      md5 = "538aeee1f9db78bc8c85ae1bcb0153ed";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface products_cmfcore setuptools zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_externalmethod = buildPythonPackage rec {
-    name = "Products.ExternalMethod-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip";
-      md5 = "15ba953ef6cb632eb571977651252ea6";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol extensionclass zodb3 persistence setuptools acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_upgrade = buildPythonPackage rec {
-    name = "plone.app.upgrade-1.1.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.1.7.zip";
-      md5 = "c40910e7df831070cdba94039fbdfc11";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfformcontroller zope_interface products_cmfactionicons products_cmfeditions products_archetypes products_mimetypesregistry plone_app_folder products_cmfuid products_securemailhost zope_ramcache products_genericsetup products_cmfdifftool five_localsitemanager products_cmfquickinstallertool products_portaltransforms products_cmfdefault acquisition products_dcworkflow products_zcatalog borg_localrole products_contentmigration products_resourceregistries plone_portlets products_atcontenttypes zope2 plone_app_portlets products_pluggableauthservice products_cmfcalendar products_plonepas transaction zope_app_cache zope_site zope_component zope_location products_plonelanguagetool plone_session setuptools products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_browserpage = buildPythonPackage rec {
-    name = "zope.browserpage-3.12.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz";
-      md5 = "a543ef3cb1b42f7233b3fca23dc9ea60";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_pagetemplate zope_interface zope_traversing zope_component zope_security zope_configuration zope_publisher setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_atcontenttypes = buildPythonPackage rec {
-    name = "Products.ATContentTypes-2.1.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.7.zip";
-      md5 = "2dd578f1f2e23e06aaa20c70ce47b62f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface plone_memoize datetime products_archetypes products_mimetypesregistry plone_app_folder zope2 zope_i18nmessageid zope_publisher products_genericsetup plone_i18n products_portaltransforms products_cmfdefault products_atreferencebrowserwidget zope_tal zconfig archetypes_referencebrowserwidget transaction products_validation acquisition extensionclass zope_component plone_app_layout zodb3 setuptools zope_i18n products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfeditions = buildPythonPackage rec {
-    name = "Products.CMFEditions-2.1.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.1.7.tar.gz";
-      md5 = "a5d248705523b90526dfdfa605276943";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid transaction products_cmfdifftool plone_app_blob zope_interface products_genericsetup zope_dottedname products_zopeversioncontrol datetime products_cmfuid zodb3 products_cmfcore setuptools zope2 acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_interface = buildPythonPackage rec {
-    name = "zope.interface-3.6.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.6.7.zip";
-      md5 = "9df962180fbbb54eb1875cff9fe436e5";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_content = buildPythonPackage rec {
-    name = "plone.app.content-2.0.11";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.0.11.zip";
-      md5 = "a48bc7e7a06ca80e538706ad394125a1";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_publisher zope_container zope_interface plone_memoize plone_i18n products_atcontenttypes zope_component zope_event products_cmfcore setuptools zope_schema zope_lifecycleevent zope_i18n zope_viewlet acquisition products_cmfdefault ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfquickinstallertool = buildPythonPackage rec {
-    name = "Products.CMFQuickInstallerTool-3.0.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/Products.CMFQuickInstallerTool-3.0.6.tar.gz";
-      md5 = "af34adb87ddf2b6da48eff8b70ca2989";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 products_genericsetup zope_interface datetime zope_component setuptools zope_annotation products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_autoform = buildPythonPackage rec {
-    name = "plone.autoform-1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.2.zip";
-      md5 = "f6d73e2d46d3f19601e919ce1f0ef10c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ z3c_form zope_interface zope_dottedname zope_security setuptools plone_supermodel zope_schema plone_z3cform ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_contentrules = buildPythonPackage rec {
-    name = "plone.app.contentrules-2.1.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-2.1.5.zip";
-      md5 = "b43c695ac824140f2cb5a07ec6a38e07";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_traversing plone_app_form zope_component zope_lifecycleevent zope_annotation zope_i18nmessageid products_genericsetup zope_event products_cmfdefault zope_browser plone_app_kss plone_uuid products_archetypes plone_memoize zope2 products_atcontenttypes plone_stringinterp products_statusmessages plone_contentrules zope_schema acquisition transaction zope_site zope_container plone_app_vocabularies zope_publisher kss_core zope_formlib zodb3 five_formlib setuptools products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  record = buildPythonPackage rec {
-    name = "Record-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/R/Record/Record-2.13.0.zip";
-      md5 = "cfed6a89d4fb2c9cb995e9084c3071b7";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_plonetestcase = buildPythonPackage rec {
-    name = "Products.PloneTestCase-0.9.14";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PloneTestCase/Products.PloneTestCase-0.9.14.zip";
-      md5 = "c9539a7901c7d5418e69642ecd1b9d33";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfplone zope_testing zope2 products_genericsetup zope_site zope_interface products_atcontenttypes zope_component zodb3 setuptools products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  wicked = buildPythonPackage rec {
-    name = "wicked-1.1.9";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/w/wicked/wicked-1.1.9.zip";
-      md5 = "78ab0e6dbe28eadaae11c869d6169f69";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_schema zope_container zope_traversing setuptools zope_lifecycleevent ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_blob = buildPythonPackage rec {
-    name = "plone.app.blob-1.5.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.blob/plone.app.blob-1.5.2.zip";
-      md5 = "4ba2e753d3355b929891d2cd0f5fb33d";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_scale plone_app_imaging zodb3 setuptools archetypes_schemaextender zope_proxy ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfdynamicviewfti = buildPythonPackage rec {
-    name = "Products.CMFDynamicViewFTI-4.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.2.zip";
-      md5 = "d29f89c3c83b3694c6f76b8c7d9b3bb2";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass products_genericsetup zope_interface zope_app_publisher zope_component zope2 setuptools products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_keyring = buildPythonPackage rec {
-    name = "plone.keyring-2.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.keyring/plone.keyring-2.0.1.zip";
-      md5 = "f3970e9bddb2cc65e461a2c62879233f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_container zope_location zodb3 setuptools zope_interface ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_contentprovider = buildPythonPackage rec {
-    name = "zope.contentprovider-3.7.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.contentprovider/zope.contentprovider-3.7.2.tar.gz";
-      md5 = "1bb2132551175c0123f17939a793f812";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_publisher zope_interface zope_location zope_tales zope_component zope_event setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_atreferencebrowserwidget = buildPythonPackage rec {
-    name = "Products.ATReferenceBrowserWidget-3.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/Products.ATReferenceBrowserWidget-3.0.zip";
-      md5 = "157bdd32155c8353450c17c649aad042";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_deprecation archetypes_referencebrowserwidget setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_browserresource = buildPythonPackage rec {
-    name = "zope.browserresource-3.10.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-3.10.3.zip";
-      md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_location zope_traversing zope_contenttype zope_configuration zope_publisher setuptools zope_schema zope_i18n zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_caching = buildPythonPackage rec {
-    name = "plone.caching-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.caching/plone.caching-1.0.zip";
-      md5 = "2c2e3b27d13b9101c92dfed222fde36c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid five_globalrequest z3c_caching zope_interface zope2 zope_component setuptools plone_transformchain zope_schema plone_registry ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_locales = buildPythonPackage rec {
-    name = "zope.app.locales-3.6.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.locales/zope.app.locales-3.6.2.tar.gz";
-      md5 = "bd2b4c6040e768f33004b1210d3207fa";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_placelesstranslationservice = buildPythonPackage rec {
-    name = "Products.PlacelessTranslationService-2.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/Products.PlacelessTranslationService-2.0.3.zip";
-      md5 = "a94635eb712563c5a002520713f5d6dc";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass zope_publisher zope_deferredimport zope_deprecation zope_interface python_gettext datetime zope_component zodb3 setuptools zope_annotation zope_i18n zope2 acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_z3cform = buildPythonPackage rec {
-    name = "plone.z3cform-0.7.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.7.8.zip";
-      md5 = "da891365156a5d5824d4e504465886a2";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ z3c_batching z3c_form zope_i18n zope_component collective_monkeypatcher setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_lifecycleevent = buildPythonPackage rec {
-    name = "zope.lifecycleevent-3.6.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/zope.lifecycleevent-3.6.2.tar.gz";
-      md5 = "3ba978f3ba7c0805c81c2c79ea3edb33";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_event setuptools zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_form = buildPythonPackage rec {
-    name = "zope.app.form-4.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.form/zope.app.form-4.0.2.tar.gz";
-      md5 = "3d2b164d9d37a71490a024aaeb412e91";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_browserpage zope_schema transaction zope_datetime zope_browsermenu zope_interface zope_exceptions zope_security zope_configuration zope_publisher zope_component zope_formlib zope_browser setuptools zope_proxy zope_i18n ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_tinymce = buildPythonPackage rec {
-    name = "Products.TinyMCE-1.2.12";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.2.12.zip";
-      md5 = "0a6ae43c75950878691d9136c356df18";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_app_imaging elementtree plone_outputfilters setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  collective_z3cform_datetimewidget = buildPythonPackage rec {
-    name = "collective.z3cform.datetimewidget-1.0.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.0.5.tar.gz";
-      md5 = "3c6703fa6ef43bc749411c90a5e1fc77";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ z3c_form zope_deprecation zope_i18n setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_protect = buildPythonPackage rec {
-    name = "plone.protect-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.protect/plone.protect-2.0.2.zip";
-      md5 = "74925ffb08782e72f9b1e850fa78fffa";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_component plone_keyring zope2 setuptools zope_interface ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_dcworkflow = buildPythonPackage rec {
-    name = "Products.DCWorkflow-2.2.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz";
-      md5 = "c90a16c4f3611015592ba8173a5f1863";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  mechanize = buildPythonPackage rec {
-    name = "mechanize-0.2.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.zip";
-      md5 = "a497ad4e875f7506ffcf8ad3ada4c2fc";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_iterate = buildPythonPackage rec {
-    name = "plone.app.iterate-2.1.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.iterate/plone.app.iterate-2.1.5.zip";
-      md5 = "7b7b9fcac73dfdd0edee042eec8d6489";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_viewlet zope_i18nmessageid zodb3 products_archetypes zope_interface plone_memoize products_cmfeditions datetime zope_component products_statusmessages zope_event setuptools products_dcworkflow zope_schema products_cmfplacefulworkflow zope_annotation zope2 plone_locking products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  accesscontrol = buildPythonPackage rec {
-    name = "AccessControl-2.13.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/A/AccessControl/AccessControl-2.13.7.zip";
-      md5 = "b64088eecdc488e6b2a5b6eced2cfaa6";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_security zope_testing extensionclass zope_publisher restrictedpython zope_interface zope_deferredimport zope_schema zope_configuration datetime record transaction acquisition zodb3 zope_component zexceptions persistence ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_testing = buildPythonPackage rec {
-    name = "zope.testing-3.9.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.testing/zope.testing-3.9.7.tar.gz";
-      md5 = "8999f3d143d416dc3c8b2a5bd6f33e28";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_exceptions setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_externaleditor = buildPythonPackage rec {
-    name = "Products.ExternalEditor-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.0.zip";
-      md5 = "015350455d140233cb3aa4846cae2571";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_publication = buildPythonPackage rec {
-    name = "zope.app.publication-3.12.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.publication/zope.app.publication-3.12.0.zip";
-      md5 = "d8c521287f52fb9f40fa9b8c2acb4675";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_authentication zope_publisher zope_interface zope_location zope_traversing zope_component zope_error zodb3 setuptools zope_browser ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_filerepresentation = buildPythonPackage rec {
-    name = "zope.filerepresentation-3.6.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.filerepresentation/zope.filerepresentation-3.6.1.tar.gz";
-      md5 = "4a7a434094f4bfa99a7f22e75966c359";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  five_globalrequest = buildPythonPackage rec {
-    name = "five.globalrequest-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz";
-      md5 = "87f8996bd21d4aa156aa26e7d21b8744";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_globalrequest zope2 setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_exceptions = buildPythonPackage rec {
-    name = "zope.exceptions-3.6.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-3.6.2.tar.gz";
-      md5 = "d7234d99d728abe3d9275346e8d24fd9";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_layout = buildPythonPackage rec {
-    name = "plone.app.layout-2.1.13";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.1.13.tar.gz";
-      md5 = "b8652d42bb04ee1977ff6bbb15b38857";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_deprecation zope_interface plone_memoize zope_dottedname datetime zope_component zope_annotation zope_publisher plone_i18n products_cmfdefault plone_app_controlpanel plone_app_viewletmanager plone_portlets plone_app_portlets zope_schema zope_viewlet acquisition zope2 setuptools zope_i18n plone_locking products_cmfcore products_cmfeditions ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_contenttype = buildPythonPackage rec {
-    name = "zope.contenttype-3.5.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.contenttype/zope.contenttype-3.5.5.zip";
-      md5 = "c6ac80e6887de4108a383f349fbdf332";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  five_customerize = buildPythonPackage rec {
-    name = "five.customerize-1.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.customerize/five.customerize-1.0.3.zip";
-      md5 = "32f597c2fa961f7dcc84b23e655d928e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing transaction zope_publisher zope_site zope_pagetemplate zope_interface zope_traversing zope_dottedname plone_portlets zope_component zope_componentvocabulary setuptools zope_app_pagetemplate zope_schema zope_lifecycleevent zope2 zope_viewlet acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_site = buildPythonPackage rec {
-    name = "zope.site-3.9.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.site/zope.site-3.9.2.tar.gz";
-      md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_location zope_interface zope_security zope_container zope_event setuptools zope_lifecycleevent zope_annotation zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_uuid = buildPythonPackage rec {
-    name = "plone.app.uuid-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.uuid/plone.app.uuid-1.0.zip";
-      md5 = "9ca8dcfb09a8a0d6bbee0f28073c3d3f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_indexer zope_interface zope_publisher plone_uuid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  unittest2 = buildPythonPackage rec {
-    name = "unittest2-0.5.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/u/unittest2/unittest2-0.5.1.zip";
-      md5 = "1527fb89e38343945af1166342d851ee";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  persistence = buildPythonPackage rec {
-    name = "Persistence-2.13.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip";
-      md5 = "92693648ccdc59c8fc71f7f06b1d228c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass zodb3 ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_zopeversioncontrol = buildPythonPackage rec {
-    name = "Products.ZopeVersionControl-1.1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZopeVersionControl/Products.ZopeVersionControl-1.1.3.zip";
-      md5 = "238239102f3ac798ee4f4c53343a561f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ transaction zope_interface datetime zodb3 setuptools zope2 acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_location = buildPythonPackage rec {
-    name = "zope.location-3.9.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-3.9.1.tar.gz";
-      md5 = "1684a8f986099d15296f670c58e713d8";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_schema zope_component setuptools zope_proxy ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_browsermenu = buildPythonPackage rec {
-    name = "zope.browsermenu-3.9.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browsermenu/zope.browsermenu-3.9.1.zip";
-      md5 = "a47c7b1e786661c912a1150bf8d1f83f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_interface zope_traversing zope_component zope_security zope_configuration zope_pagetemplate setuptools zope_schema zope_browser ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_workflow = buildPythonPackage rec {
-    name = "plone.app.workflow-2.0.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.0.6.zip";
-      md5 = "7e217af9bd7a9e6cd4dbe9791dd844ad";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid transaction products_genericsetup zope_site zope_interface plone_memoize zope_testing datetime kss_core zope_component products_cmfcore products_statusmessages zope2 setuptools products_dcworkflow zope_schema zope_i18n plone_app_kss acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_locking = buildPythonPackage rec {
-    name = "plone.locking-2.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.3.tar.gz";
-      md5 = "73b8a045121ad14e2e0ed3fc2713fa63";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface datetime zope_component zodb3 setuptools zope_schema zope_annotation zope_viewlet products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_dottedname = buildPythonPackage rec {
-    name = "zope.dottedname-3.4.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.dottedname/zope.dottedname-3.4.6.tar.gz";
-      md5 = "62d639f75b31d2d864fe5982cb23959c";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_cachedescriptors = buildPythonPackage rec {
-    name = "zope.cachedescriptors-3.5.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip";
-      md5 = "263459a95238fd61d17e815d97ca49ce";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zc_lockfile = buildPythonPackage rec {
-    name = "zc.lockfile-1.0.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.0.tar.gz";
-      md5 = "6cf83766ef9935c33e240b0904c7a45e";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_contentrules = buildPythonPackage rec {
-    name = "plone.contentrules-2.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.1.zip";
-      md5 = "3ae91cb7a21749e14f4cd7564dcf1619";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_container zope_interface zope_testing zope_configuration zope_component zope_componentvocabulary setuptools zodb3 zope_schema zope_lifecycleevent zope_annotation ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_sendmail = buildPythonPackage rec {
-    name = "zope.sendmail-3.7.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.sendmail/zope.sendmail-3.7.5.tar.gz";
-      md5 = "8a513ecf2b41cad849f6607bf16d6818";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid transaction zope_interface zope_configuration setuptools zope_schema zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_formlib = buildPythonPackage rec {
-    name = "zope.formlib-4.0.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.formlib/zope.formlib-4.0.6.zip";
-      md5 = "eed9c94382d11a4dececd0a48ac1d3f2";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_schema zope_datetime zope_interface zope_traversing zope_security zope_component pytz zope_event zope_browser setuptools zope_lifecycleevent zope_i18n zope_browserpage ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_caching = buildPythonPackage rec {
-    name = "plone.app.caching-1.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.0.3.zip";
-      md5 = "37429bd0fb79814ac1b3383acb215226";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_memoize zope_publisher plone_protect zope_pagetemplate zope_interface plone_app_z3cform plone_app_registry products_cmfcore zope_component z3c_form products_statusmessages plone_caching z3c_zcmlhook setuptools python_dateutil zope2 plone_cachepurging plone_registry products_genericsetup acquisition products_cmfdynamicviewfti ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfplone = buildPythonPackage rec {
-    name = "Products.CMFPlone-4.1.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.1.6.zip";
-      md5 = "ac1e1b42c429b9d1d0b9c8b620d7723d";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfdynamicviewfti plone_app_blob products_dcworkflow products_extendedpathindex zope_dottedname datetime zope_traversing products_tinymce zope_publisher plone_app_contentmenu plonetheme_classic plone_fieldsets products_cmfdefault five_localsitemanager products_externaleditor products_pluginregistry products_cmfeditions products_resourceregistries zope_tal plone_app_jquerytools products_genericsetup acquisition plone_app_vocabularies zope_location products_plonelanguagetool borg_localrole kss_core zope_i18n products_cmfuid plone_theme plone_memoize plone_app_i18n zope_component products_mimetypesregistry plone_app_folder plone_registry zope_i18nmessageid plone_app_upgrade products_cmfdifftool plone_app_layout products_portaltransforms plone_app_controlpanel plone_app_locales plone_app_linkintegrity zope2 plone_contentrules plone_app_portlets products_plonepas zope_pagetemplate zodb3 plone_locking products_cmfformcontroller zope_deprecation plone_app_form products_cmfquickinstallertool five_customerize plone_app_redirector plone_i18n plone_app_registry products_placelesstranslationservice z3c_autoinclude zope_interface zope_event plone_app_viewletmanager zope_structuredtext plone_app_customerize zope_app_locales plone_portlets products_statusmessages products_cmfcalendar extensionclass products_pluggableauthservice plone_indexer zope_deferredimport zope_container plone_app_workflow plone_browserlayer setuptools plone_portlet_collection plone_app_contentrules products_cmfactionicons products_archetypes plone_app_users plone_intelligenttext products_passwordresettool plone_app_content plonetheme_sunburst archetypes_kss plone_app_kss plone_protect zope_tales plone_app_uuid archetypes_referencebrowserwidget products_atcontenttypes transaction zope_site plone_app_discussion plone_portlet_static plone_session products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  transaction = buildPythonPackage rec {
-    name = "transaction-1.1.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/t/transaction/transaction-1.1.1.tar.gz";
-      md5 = "30b062baa34fe1521ad979fb088c8c55";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_controlpanel = buildPythonPackage rec {
-    name = "plone.app.controlpanel-2.1.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.1.4.zip";
-      md5 = "254da507958dcb54b60bcc9e37360c94";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing zope_interface plone_memoize zope_component plone_app_workflow zope_annotation zope_ramcache zope_publisher products_portaltransforms plone_fieldsets zope_event products_cmfdefault zope_cachedescriptors plone_app_form zope_app_form setuptools products_statusmessages zope_schema zope2 acquisition products_plonepas zope_site products_archetypes plone_app_vocabularies zope_formlib zodb3 plone_protect zope_i18n plone_locking products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_redirector = buildPythonPackage rec {
-    name = "plone.app.redirector-1.1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.1.3.zip";
-      md5 = "7d441340a83b8ed72a03bc16148a5f21";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_memoize setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_component = buildPythonPackage rec {
-    name = "zope.component-3.9.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-3.9.5.tar.gz";
-      md5 = "22780b445b1b479701c05978055d1c82";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_event setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_broken = buildPythonPackage rec {
-    name = "zope.broken-3.6.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.broken/zope.broken-3.6.0.zip";
-      md5 = "eff24d7918099a3e899ee63a9c31bee6";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zc_recipe_egg = buildPythonPackage rec {
-    name = "zc.recipe.egg-1.2.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-1.2.2.tar.gz";
-      md5 = "fe5ad0f1c0fc3d4348286534e1b9cec5";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zc_buildout setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_openid = buildPythonPackage rec {
-    name = "plone.app.openid-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.openid/plone.app.openid-2.0.2.tar.gz";
-      md5 = "ae0748f91cab0612a498926d405d8edd";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ products_plonepas zope_i18nmessageid zope2 setuptools plone_openid zope_interface plone_portlets zope_component plone_app_portlets products_cmfcore products_pluggableauthservice ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  z3c_caching = buildPythonPackage rec {
-    name = "z3c.caching-2.0a1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.caching/z3c.caching-2.0a1.tar.gz";
-      md5 = "17f250b5084c2324a7d15c6810ee628e";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_component zope_event setuptools zope_lifecycleevent zope_browser ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  python_openid = buildPythonPackage rec {
-    name = "python-openid-2.2.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.zip";
-      md5 = "f89d9d4f4dccfd33b5ce34eb4725f751";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  tempstorage = buildPythonPackage rec {
-    name = "tempstorage-2.12.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.1.zip";
-      md5 = "8389f6c9a653a0ee2b82138502e28487";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zodb3 ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfactionicons = buildPythonPackage rec {
-    name = "Products.CMFActionIcons-2.1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFActionIcons/Products.CMFActionIcons-2.1.3.tar.gz";
-      md5 = "ab1dc62404ed11aea84dc0d782b2235e";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ products_cmfcore setuptools products_genericsetup eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_zctextindex = buildPythonPackage rec {
-    name = "Products.ZCTextIndex-2.13.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.3.zip";
-      md5 = "bf95ea9fa2831237fa3c3d38fafdec96";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol transaction zope_interface zexceptions zodb3 persistence setuptools acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  extensionclass = buildPythonPackage rec {
-    name = "ExtensionClass-2.13.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip";
-      md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-}; in plone41Packages
diff --git a/pkgs/development/web/plone/4.2.nix b/pkgs/development/web/plone/4.2.nix
deleted file mode 100644
index 6006e5908b22..000000000000
--- a/pkgs/development/web/plone/4.2.nix
+++ /dev/null
@@ -1,5394 +0,0 @@
-# DO NOT EDIT THIS FILE!
-#
-# Nix expressions autogenerated with:
-#   bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.2.5.json -p plone/4.2.5.txt -o plone/4.2.5.nix
-
-{ pkgs, pythonPackages }:
-
-let plone43Packages = pythonPackages.python.modules // rec {
-  inherit (pythonPackages) buildPythonPackage setuptools zc_buildout pillow;
-  inherit (pkgs) fetchurl stdenv;
-
-  plone_app_portlets = buildPythonPackage rec {
-    name = "plone.app.portlets-2.3.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.3.8.zip";
-      md5 = "3d18ff10053f5a04670f22e6359d2804";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface zope_traversing plone_app_form datetime zope_container zope_lifecycleevent zope_annotation five_customerize zope_i18nmessageid zope_publisher products_genericsetup plone_i18n feedparser zope_event zope_browser zope_contentprovider plone_memoize zope2 zope_schema acquisition transaction products_pluggableauthservice zope_site zope_component plone_app_vocabularies plone_portlets plone_app_i18n zope_configuration zope_formlib zodb3 five_formlib setuptools products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope2 = buildPythonPackage rec {
-    name = "Zope2-2.13.19";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.19.zip";
-      md5 = "26fee311aace7c12e406543ea91eb42a";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing zope_interface zope_traversing multimapping zope_size zope_contenttype zope_browserpage datetime zope_component zope_sendmail zope_lifecycleevent products_zctextindex products_standardcachemanagers persistence products_mimetools zope_i18nmessageid zope_publisher missing zope_viewlet zope_sequencesort zope_testbrowser docutils zope_event products_pythonscripts zope_browser zope_structuredtext zope_contentprovider zope_browsermenu zope_tal zope_exceptions products_mailhost products_btreefolder2 zopeundo zconfig record accesscontrol pytz products_ofsp zope_schema zexceptions zope_processlifetime acquisition extensionclass zope_proxy zope_site zope_container zope_pagetemplate zdaemon zope_browserresource zope_deferredimport initgroups zope_security zope_configuration zope_i18n products_zcatalog restrictedpython zodb3 documenttemplate setuptools zope_ptresource zlog tempstorage transaction zope_tales zope_location products_externalmethod ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_btreefolder2 = buildPythonPackage rec {
-    name = "Products.BTreeFolder2-2.13.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.BTreeFolder2/Products.BTreeFolder2-2.13.3.tar.gz";
-      md5 = "f57c85673036af7ccd34c3fa251f6bb2";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ accesscontrol zope_container zodb3 zope_event persistence setuptools zope_lifecycleevent acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_pythonscripts = buildPythonPackage rec {
-    name = "Products.PythonScripts-2.13.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PythonScripts/Products.PythonScripts-2.13.2.zip";
-      md5 = "04c86f2c45a29a162297a80dac61d14f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol datetime restrictedpython documenttemplate setuptools zexceptions acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zopeundo = buildPythonPackage rec {
-    name = "ZopeUndo-2.12.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZopeUndo/ZopeUndo-2.12.0.zip";
-      md5 = "2b8da09d1b98d5558f62e12f6e52c401";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  datetime = buildPythonPackage rec {
-    name = "DateTime-2.12.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/D/DateTime/DateTime-2.12.7.zip";
-      md5 = "72a8bcf80b52211ae7fdfe36c693d70c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface pytz ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_session = buildPythonPackage rec {
-    name = "plone.session-3.5.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.session/plone.session-3.5.3.zip";
-      md5 = "f95872454735abc8f27c3dcbc9434c11";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 products_pluggableauthservice plone_keyring zope_interface setuptools zope_component plone_protect ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_container = buildPythonPackage rec {
-    name = "zope.container-3.11.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.container/zope.container-3.11.2.tar.gz";
-      md5 = "fc66d85a17b8ffb701091c9328983dcc";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_filerepresentation zope_i18nmessageid zope_publisher zope_broken zope_interface zope_size zope_dottedname zope_security zope_location zope_lifecycleevent zope_component zodb3 zope_event setuptools zope_schema zope_traversing ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_folder = buildPythonPackage rec {
-    name = "plone.folder-1.0.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.folder/plone.folder-1.0.4.zip";
-      md5 = "1674ff18b7a9452d0c2063cf11c679b7";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_component zope_interface plone_memoize zope_container setuptools zope_annotation ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_plonepas = buildPythonPackage rec {
-    name = "Products.PlonePAS-4.0.16";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PlonePAS/Products.PlonePAS-4.0.16.zip";
-      md5 = "f504cdfb5d1e9703cf526f6f03c9a1c5";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_genericsetup plone_memoize plone_i18n plone_session zope2 setuptools products_cmfcore products_pluggableauthservice ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_locales = buildPythonPackage rec {
-    name = "plone.app.locales-4.2.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.2.5.zip";
-      md5 = "baf48a0a5278a18fa1c2848d3470464f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_sequencesort = buildPythonPackage rec {
-    name = "zope.sequencesort-3.4.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.sequencesort/zope.sequencesort-3.4.0.tar.gz";
-      md5 = "cfc35fc426a47f5c0ee43c416224b864";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_genericsetup = buildPythonPackage rec {
-    name = "Products.GenericSetup-1.7.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.3.tar.gz";
-      md5 = "c48967c81c880ed33ee16a14caab3b11";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_formlib five_localsitemanager zope2 setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  kss_core = buildPythonPackage rec {
-    name = "kss.core-1.6.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/k/kss.core/kss.core-1.6.5.zip";
-      md5 = "87e66e78c3bbd7af3ecce5b2fef935ae";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing zope_security zope_datetime zope_site zope_pagetemplate zope_interface zope_browserresource zope_contenttype zope_configuration zope_publisher zope_component zope_browserpage zope_event setuptools zope_schema zope_lifecycleevent zope_location zope_traversing ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_tal = buildPythonPackage rec {
-    name = "zope.tal-3.5.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.tal/zope.tal-3.5.2.zip";
-      md5 = "13869f292ba36b294736b7330b1396fd";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_cachepurging = buildPythonPackage rec {
-    name = "plone.cachepurging-1.0.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.cachepurging/plone.cachepurging-1.0.4.zip";
-      md5 = "886814ac4deef0f1ed99a2eb60864264";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 five_globalrequest zope_interface zope_component zope_event setuptools zope_lifecycleevent zope_annotation plone_registry ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_protect = buildPythonPackage rec {
-    name = "plone.protect-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.protect/plone.protect-2.0.2.zip";
-      md5 = "74925ffb08782e72f9b1e850fa78fffa";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_component plone_keyring zope2 setuptools zope_interface ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_portaltransforms = buildPythonPackage rec {
-    name = "Products.PortalTransforms-2.1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.2.zip";
-      md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 zope_interface zope_structuredtext products_mimetypesregistry zodb3 products_cmfdefault plone_intelligenttext setuptools markdown products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_memoize = buildPythonPackage rec {
-    name = "plone.memoize-1.1.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.memoize/plone.memoize-1.1.1.zip";
-      md5 = "d07cd14b976160e1f26a859e3370147e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_component zope_annotation zope_ramcache setuptools zope_interface ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  docutils = buildPythonPackage rec {
-    name = "docutils-0.9.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/d/docutils/docutils-0.9.1.tar.gz";
-      md5 = "b0d5cd5298fedf9c62f5fd364a274d56";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  five_formlib = buildPythonPackage rec {
-    name = "five.formlib-1.0.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.formlib/five.formlib-1.0.4.zip";
-      md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid transaction zope_app_form zope_formlib zope_interface zope_location zope_publisher zope_component extensionclass zope_event setuptools zope_schema zope_lifecycleevent zope_browser zope2 ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zexceptions = buildPythonPackage rec {
-    name = "zExceptions-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zExceptions/zExceptions-2.13.0.zip";
-      md5 = "4c679696c959040d8e656ef85ae40136";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_publisher zope_security setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfuid = buildPythonPackage rec {
-    name = "Products.CMFUid-2.2.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFUid/Products.CMFUid-2.2.1.tar.gz";
-      md5 = "e20727959351dffbf0bac80613eee110";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  restrictedpython = buildPythonPackage rec {
-    name = "RestrictedPython-3.6.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/R/RestrictedPython/RestrictedPython-3.6.0.zip";
-      md5 = "aa75a7dcc7fbc966357837cc66cacec6";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_theming = buildPythonPackage rec {
-    name = "plone.app.theming-1.0.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.0.4.zip";
-      md5 = "2da6d810e0d5f295dd0daa2b60731a1b";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfplone plone_resource repoze_xmliter plone_app_registry plone_transformchain zope_traversing lxml setuptools five_globalrequest diazo plone_subrequest ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  feedparser = buildPythonPackage rec {
-    name = "feedparser-5.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/feedparser/feedparser-5.0.1.zip";
-      md5 = "cefffeba66b658d3cc7c1d66b92c6a1a";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_browser = buildPythonPackage rec {
-    name = "zope.browser-1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browser/zope.browser-1.3.zip";
-      md5 = "4ff0ddbf64c45bfcc3189e35f4214ded";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfdefault = buildPythonPackage rec {
-    name = "Products.CMFDefault-2.2.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.3.tar.gz";
-      md5 = "fe7d2d3906ee0e3b484e4a02401576ab";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ products_genericsetup products_cmfcore five_formlib setuptools zope2 eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  python_dateutil = buildPythonPackage rec {
-    name = "python-dateutil-1.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz";
-      md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_error = buildPythonPackage rec {
-    name = "zope.error-3.7.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.error/zope.error-3.7.4.tar.gz";
-      md5 = "281445a906458ff5f18f56923699a127";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_location zope_exceptions setuptools zodb3 ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_mimetools = buildPythonPackage rec {
-    name = "Products.MIMETools-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip";
-      md5 = "ad5372fc1190599a19493db0864448ec";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ documenttemplate setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_deprecation = buildPythonPackage rec {
-    name = "zope.deprecation-3.4.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-3.4.1.tar.gz";
-      md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  unidecode = buildPythonPackage rec {
-    name = "Unidecode-0.04.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/U/Unidecode/Unidecode-0.04.1.tar.gz";
-      md5 = "c4c9ed8d40cff25c390ff5d5112b9308";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfcore = buildPythonPackage rec {
-    name = "Products.CMFCore-2.2.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.7.tar.gz";
-      md5 = "9320a4023b8575097feacfd4a400e930";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ products_genericsetup zope_app_publication products_zsqlmethods zope2 setuptools five_localsitemanager ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  five_localsitemanager = buildPythonPackage rec {
-    name = "five.localsitemanager-2.0.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.localsitemanager/five.localsitemanager-2.0.5.zip";
-      md5 = "5e3a658e6068832bd802018ebc83f2d4";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing zope_site zope_interface zope_location zope_component zodb3 zope_event setuptools zope_lifecycleevent zope2 acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_configuration = buildPythonPackage rec {
-    name = "zope.configuration-3.7.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-3.7.4.zip";
-      md5 = "5b0271908ef26c05059eda76928896ea";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_schema zope_interface zope_i18nmessageid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  z3c_batching = buildPythonPackage rec {
-    name = "z3c.batching-1.1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.batching/z3c.batching-1.1.0.tar.gz";
-      md5 = "d1dc834781d228127ca6d15301757863";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfcalendar = buildPythonPackage rec {
-    name = "Products.CMFCalendar-2.2.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.2.tar.gz";
-      md5 = "49458e68dc3b6826ea9a3576ac014419";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ products_cmfdefault zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_extendedpathindex = buildPythonPackage rec {
-    name = "Products.ExtendedPathIndex-3.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/Products.ExtendedPathIndex-3.1.zip";
-      md5 = "00c048a4b103200bdcbda61fa22c66df";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol transaction zope2 setuptools zodb3 ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  archetypes_schemaextender = buildPythonPackage rec {
-    name = "archetypes.schemaextender-2.1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.schemaextender/archetypes.schemaextender-2.1.2.zip";
-      md5 = "865aa5b4b6b26e3bb650d89ddfe77c87";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_uuid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zconfig = buildPythonPackage rec {
-    name = "ZConfig-2.9.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-2.9.0.zip";
-      md5 = "5c932690a70c8907efd240cdd76a7bc4";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_copypastemove = buildPythonPackage rec {
-    name = "zope.copypastemove-3.7.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.copypastemove/zope.copypastemove-3.7.0.tar.gz";
-      md5 = "f335940686d15cfc5520c42f2494a924";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_container zope_copy zope_interface zope_location zope_exceptions zope_component zope_event setuptools zope_lifecycleevent zope_annotation ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_contentmenu = buildPythonPackage rec {
-    name = "plone.app.contentmenu-2.0.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.contentmenu/plone.app.contentmenu-2.0.8.zip";
-      md5 = "8ba463f1a164c454c70d26507e5bd22a";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_publisher products_cmfdynamicviewfti zope_browsermenu zope_interface plone_memoize plone_app_content zope_component acquisition setuptools zope_i18n plone_locking products_cmfcore zope_contentprovider ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_pluginregistry = buildPythonPackage rec {
-    name = "Products.PluginRegistry-1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz";
-      md5 = "5b166193ca1eb84dfb402051f779ebab";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope2 products_genericsetup setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfplacefulworkflow = buildPythonPackage rec {
-    name = "Products.CMFPlacefulWorkflow-1.5.9";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.9.zip";
-      md5 = "9041e1f52eab5b348c0dfa85be438722";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfplone zope_i18nmessageid products_plonetestcase products_genericsetup zope_interface zope_testing zope_component setuptools products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_outputfilters = buildPythonPackage rec {
-    name = "plone.outputfilters-1.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.8.zip";
-      md5 = "a5ef28580f7fa7f2dc1768893995b0f7";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_portaltransforms products_mimetypesregistry products_cmfcore setuptools products_genericsetup ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_publisher = buildPythonPackage rec {
-    name = "zope.publisher-3.12.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.publisher/zope.publisher-3.12.6.tar.gz";
-      md5 = "495131970cc7cb14de8e517fb3857ade";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_contenttype zope_proxy zope_interface zope_location zope_exceptions zope_security zope_configuration zope_component zope_event setuptools zope_browser zope_i18n ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_security = buildPythonPackage rec {
-    name = "zope.security-3.7.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz";
-      md5 = "072ab8d11adc083eace11262da08630c";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_schema zope_interface zope_location zope_configuration zope_component setuptools zope_proxy ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zdaemon = buildPythonPackage rec {
-    name = "zdaemon-2.0.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zdaemon/zdaemon-2.0.7.tar.gz";
-      md5 = "291a875f82e812110557eb6704af8afe";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zconfig ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_annotation = buildPythonPackage rec {
-    name = "zope.annotation-3.5.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.annotation/zope.annotation-3.5.0.tar.gz";
-      md5 = "4238153279d3f30ab5613438c8e76380";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_proxy zope_interface zope_location zope_component zodb3 setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  repoze_xmliter = buildPythonPackage rec {
-    name = "repoze.xmliter-0.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/r/repoze.xmliter/repoze.xmliter-0.5.zip";
-      md5 = "99da76bcbad6fbaced4a273bde29b10e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ lxml setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_form = buildPythonPackage rec {
-    name = "plone.app.form-2.1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.1.2.zip";
-      md5 = "8017f8f782d992825ed71d16b126c4e7";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_schema zope_site plone_app_vocabularies zope2 datetime zope_component zope_event five_formlib setuptools zope_interface zope_lifecycleevent zope_formlib zope_browser zope_i18n plone_locking products_cmfcore acquisition products_cmfdefault ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_structuredtext = buildPythonPackage rec {
-    name = "zope.structuredtext-3.5.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.structuredtext/zope.structuredtext-3.5.1.tar.gz";
-      md5 = "eabbfb983485d0879322bc878d2478a0";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_validation = buildPythonPackage rec {
-    name = "Products.validation-2.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.validation/Products.validation-2.0.zip";
-      md5 = "afa217e2306637d1dccbebf337caa8bf";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface datetime setuptools zope_i18n acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zodb3 = buildPythonPackage rec {
-    name = "ZODB3-3.10.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz";
-      md5 = "6f180c6897a1820948fee2a6290503cd";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface transaction zconfig zope_event zdaemon zc_lockfile ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  documenttemplate = buildPythonPackage rec {
-    name = "DocumentTemplate-2.13.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip";
-      md5 = "07bb086c77c1dfe94125ad2efbba94b7";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol extensionclass zope_sequencesort zexceptions restrictedpython zope_structuredtext acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_search = buildPythonPackage rec {
-    name = "plone.app.search-1.0.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.0.8.zip";
-      md5 = "80dffacba718ab809d28147b5b6b0892";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_app_contentlisting setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  diazo = buildPythonPackage rec {
-    name = "diazo-1.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/d/diazo/diazo-1.0.3.zip";
-      md5 = "d3c2b017af521db4c86fb360c86e0bc8";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ lxml experimental_cssselect setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_globalrequest = buildPythonPackage rec {
-    name = "zope.globalrequest-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.globalrequest/zope.globalrequest-1.0.zip";
-      md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_customerize = buildPythonPackage rec {
-    name = "plone.app.customerize-1.2.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.customerize/plone.app.customerize-1.2.2.zip";
-      md5 = "6a3802c4e8fbd955597adc6a8298febf";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_viewlet zope2 zope_publisher zope_interface plone_browserlayer plone_portlets zope_component setuptools five_customerize products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfdifftool = buildPythonPackage rec {
-    name = "Products.CMFDiffTool-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFDiffTool/Products.CMFDiffTool-2.0.2.zip";
-      md5 = "c12ba4fb9912a9a5a046b07b5b1cf69d";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 products_genericsetup zope_interface setuptools products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_testbrowser = buildPythonPackage rec {
-    name = "zope.testbrowser-3.11.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.testbrowser/zope.testbrowser-3.11.1.tar.gz";
-      md5 = "64abbee892121e7f1a91aed12cfc155a";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_interface mechanize pytz setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_contentmigration = buildPythonPackage rec {
-    name = "Products.contentmigration-2.1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.3.zip";
-      md5 = "e15b9777593157f060b50638b0253be1";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_intelligenttext = buildPythonPackage rec {
-    name = "plone.intelligenttext-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.intelligenttext/plone.intelligenttext-2.0.2.zip";
-      md5 = "51688fa0815b49e00334e3ef948328ba";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfquickinstallertool = buildPythonPackage rec {
-    name = "Products.CMFQuickInstallerTool-3.0.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/Products.CMFQuickInstallerTool-3.0.6.tar.gz";
-      md5 = "af34adb87ddf2b6da48eff8b70ca2989";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 products_genericsetup zope_interface datetime zope_component setuptools zope_annotation products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_kupu = buildPythonPackage rec {
-    name = "Products.kupu-1.5.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.kupu/Products.kupu-1.5.1.zip";
-      md5 = "b884fcc7f510426974d8d3c4333da4f4";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid products_genericsetup zope_app_component zope_interface products_portaltransforms products_cmfcore products_archetypes products_mimetypesregistry setuptools products_cmfplone zope_schema zope_i18n plone_outputfilters ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_authentication = buildPythonPackage rec {
-    name = "zope.authentication-3.7.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.authentication/zope.authentication-3.7.1.zip";
-      md5 = "7d6bb340610518f2fc71213cfeccda68";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_security zope_component setuptools zope_schema zope_browser ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_i18n = buildPythonPackage rec {
-    name = "zope.i18n-3.7.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.i18n/zope.i18n-3.7.4.tar.gz";
-      md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_component zope_i18nmessageid pytz setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_componentvocabulary = buildPythonPackage rec {
-    name = "zope.componentvocabulary-1.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.componentvocabulary/zope.componentvocabulary-1.0.1.tar.gz";
-      md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_security zope_component setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_ofsp = buildPythonPackage rec {
-    name = "Products.OFSP-2.13.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.OFSP/Products.OFSP-2.13.2.zip";
-      md5 = "c76d40928753c2ee56db873304e65bd5";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol persistence setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_datetime = buildPythonPackage rec {
-    name = "zope.datetime-3.4.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.datetime/zope.datetime-3.4.1.tar.gz";
-      md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  experimental_cssselect = buildPythonPackage rec {
-    name = "experimental.cssselect-0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/e/experimental.cssselect/experimental.cssselect-0.3.zip";
-      md5 = "3fecdcf1fbc3ea6025e115a56a262957";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ lxml setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_passwordresettool = buildPythonPackage rec {
-    name = "Products.PasswordResetTool-2.0.12";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.12.zip";
-      md5 = "db87c166732a5800f25e33f27a23b7b4";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface plone_memoize datetime zope_component setuptools zope_i18n products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_jquerytools = buildPythonPackage rec {
-    name = "plone.app.jquerytools-1.3.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.3.2.zip";
-      md5 = "326470a34e07aa98c40d75ec22484572";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_component zope2 products_cmfcore setuptools products_genericsetup ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_viewletmanager = buildPythonPackage rec {
-    name = "plone.app.viewletmanager-2.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.3.zip";
-      md5 = "1dbc51c7664ce3e6ca4dcca1b7b86082";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 products_genericsetup zope_site zope_interface zope_component zodb3 acquisition setuptools plone_app_vocabularies zope_viewlet zope_contentprovider ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_registry = buildPythonPackage rec {
-    name = "plone.registry-1.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.registry/plone.registry-1.0.1.zip";
-      md5 = "6be3d2ec7e2d170e29b8c0bc65049aff";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing zope_interface zope_dottedname zope_component zodb3 zope_event setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_pagetemplate = buildPythonPackage rec {
-    name = "zope.app.pagetemplate-3.11.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.pagetemplate/zope.app.pagetemplate-3.11.2.tar.gz";
-      md5 = "2d304729c0d6a9ab67dd5ea852f19476";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_browserpage zope_traversing zope_tales zope_size zope_pagetemplate zope_dublincore zope_security zope_component zope_configuration setuptools zope_interface zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_viewlet = buildPythonPackage rec {
-    name = "zope.viewlet-3.7.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.viewlet/zope.viewlet-3.7.2.tar.gz";
-      md5 = "367e03096df57e2f9b74fff43f7901f9";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_browserpage zope_i18nmessageid zope_publisher zope_interface zope_location zope_security zope_configuration zope_component zope_event setuptools zope_schema zope_traversing zope_contentprovider ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_portlet_static = buildPythonPackage rec {
-    name = "plone.portlet.static-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip";
-      md5 = "ec0dc691b4191a41ff97779b117f9985";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 plone_app_portlets zope_formlib zope_interface setuptools plone_i18n plone_portlets zope_component plone_app_form zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_portlet_collection = buildPythonPackage rec {
-    name = "plone.portlet.collection-2.1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.1.3.zip";
-      md5 = "5f0006dbb3e0b56870383dfdedc49228";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_memoize setuptools plone_app_vocabularies plone_app_form plone_portlets plone_app_portlets ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_users = buildPythonPackage rec {
-    name = "plone.app.users-1.1.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.users/plone.app.users-1.1.5.zip";
-      md5 = "97895d8dbdf885784be1afbf5b8b364c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid setuptools zope_site zope_formlib zope_interface plone_app_controlpanel plone_app_layout zope2 zope_component products_statusmessages products_cmfdefault five_formlib plone_protect zodb3 zope_schema products_cmfcore products_plonepas ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_querystring = buildPythonPackage rec {
-    name = "plone.app.querystring-1.0.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.querystring/plone.app.querystring-1.0.7.zip";
-      md5 = "b501910b23def9b58e8309d1e469eb6f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_i18n zope_publisher setuptools zope_globalrequest plone_app_vocabularies zope_dottedname plone_app_layout datetime plone_registry zope_component plone_app_contentlisting zope_interface zope_schema plone_app_registry products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_theme = buildPythonPackage rec {
-    name = "plone.theme-2.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.theme/plone.theme-2.1.zip";
-      md5 = "c592d0d095e9fc76cc81597cdf6d0c37";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 zope_publisher zope_interface zope_traversing zope_component products_cmfdefault setuptools products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_i18nmessageid = buildPythonPackage rec {
-    name = "zope.i18nmessageid-3.5.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-3.5.3.tar.gz";
-      md5 = "cb84bf61c2b7353e3b7578057fbaa264";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_folder = buildPythonPackage rec {
-    name = "plone.app.folder-1.0.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.folder/plone.app.folder-1.0.5.zip";
-      md5 = "8ea860daddb4c93c0b7f2b5f7106fef0";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_folder setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_zcatalog = buildPythonPackage rec {
-    name = "Products.ZCatalog-2.13.23";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZCatalog/Products.ZCatalog-2.13.23.zip";
-      md5 = "d425171516dfc70e543a4e2b852301cb";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol zope_testing extensionclass missing zope_dottedname restrictedpython datetime record persistence zodb3 documenttemplate setuptools zope_interface zope_schema products_zctextindex zexceptions acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  z3c_autoinclude = buildPythonPackage rec {
-    name = "z3c.autoinclude-0.3.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.autoinclude/z3c.autoinclude-0.3.4.zip";
-      md5 = "6a615ae18c12b459bceb3ae28e8e7709";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_dottedname zope_configuration zc_buildout setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_processlifetime = buildPythonPackage rec {
-    name = "zope.processlifetime-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.processlifetime/zope.processlifetime-1.0.tar.gz";
-      md5 = "69604bfd668a01ebebdd616a8f26ccfe";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_uuid = buildPythonPackage rec {
-    name = "plone.uuid-1.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.uuid/plone.uuid-1.0.3.zip";
-      md5 = "183fe2911a7d6c9f6b3103855e98ad8a";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_browserpage zope_publisher setuptools zope_lifecycleevent ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  archetypes_kss = buildPythonPackage rec {
-    name = "archetypes.kss-1.7.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.kss/archetypes.kss-1.7.2.zip";
-      md5 = "a8502140123b74f1b7ed4f36d3e56ff3";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_uuid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_traversing = buildPythonPackage rec {
-    name = "zope.traversing-3.13.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.traversing/zope.traversing-3.13.2.zip";
-      md5 = "eaad8fc7bbef126f9f8616b074ec00aa";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_proxy zope_location zope_interface zope_security zope_component setuptools zope_publisher zope_i18n ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  python_gettext = buildPythonPackage rec {
-    name = "python-gettext-1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-gettext/python-gettext-1.2.zip";
-      md5 = "cd4201d440126d1296d1d2bc2b4795f3";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ unittest2 ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_securemailhost = buildPythonPackage rec {
-    name = "Products.SecureMailHost-1.1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.SecureMailHost/Products.SecureMailHost-1.1.2.zip";
-      md5 = "7db0f1fa867bd0df972082f502a7a707";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_container = buildPythonPackage rec {
-    name = "zope.app.container-3.9.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.container/zope.app.container-3.9.2.tar.gz";
-      md5 = "1e286c59f0166e517d67ddd723641c84";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_copypastemove zope_exceptions zope_component zope_dublincore zope_location zope_browsermenu zope_size zope_security zope_publisher zope_container zope_browserpage zope_event setuptools zope_interface zope_lifecycleevent zope_browser zope_i18n zope_traversing ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_plonelanguagetool = buildPythonPackage rec {
-    name = "Products.PloneLanguageTool-3.2.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip";
-      md5 = "bd9eb6278bf76e8cbce99437ca362164";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  eggtestinfo = buildPythonPackage rec {
-    name = "eggtestinfo-0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/e/eggtestinfo/eggtestinfo-0.3.tar.gz";
-      md5 = "6f0507aee05f00c640c0d64b5073f840";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  mailinglogger = buildPythonPackage rec {
-    name = "mailinglogger-3.7.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mailinglogger/mailinglogger-3.7.0.tar.gz";
-      md5 = "f865f0df6059ce23062b7457d01dbac5";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  missing = buildPythonPackage rec {
-    name = "Missing-2.13.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip";
-      md5 = "9823cff54444cbbcaef8fc45d8e42572";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_deferredimport = buildPythonPackage rec {
-    name = "zope.deferredimport-3.5.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.deferredimport/zope.deferredimport-3.5.3.tar.gz";
-      md5 = "68fce3bf4f011d4a840902fd763884ee";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_proxy setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_tales = buildPythonPackage rec {
-    name = "zope.tales-3.5.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.tales/zope.tales-3.5.2.tar.gz";
-      md5 = "1c5060bd766a0a18632b7879fc9e4e1e";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface setuptools zope_tal ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_zsqlmethods = buildPythonPackage rec {
-    name = "Products.ZSQLMethods-2.13.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZSQLMethods/Products.ZSQLMethods-2.13.4.zip";
-      md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass missing zope_interface datetime zope2 record transaction acquisition setuptools zodb3 persistence ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_statusmessages = buildPythonPackage rec {
-    name = "Products.statusmessages-4.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.statusmessages/Products.statusmessages-4.0.zip";
-      md5 = "265324b0a58a032dd0ed038103ed0473";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_annotation zope_i18n setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_i18n = buildPythonPackage rec {
-    name = "plone.i18n-2.0.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.5.zip";
-      md5 = "ef36aa9a294d507abb37787f9f7700bd";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ unidecode zope_publisher zope_interface zope_component setuptools zope_i18n ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  archetypes_querywidget = buildPythonPackage rec {
-    name = "archetypes.querywidget-1.0.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.8.zip";
-      md5 = "3416b6b4948c624e1b5b8dd8d7e33f59";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_app_jquerytools plone_app_querystring setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_transformchain = buildPythonPackage rec {
-    name = "plone.transformchain-1.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.transformchain/plone.transformchain-1.0.3.zip";
-      md5 = "f5fb7ca894249e3e666501c4fae52a6c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_schema zope_interface setuptools zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_pluggableauthservice = buildPythonPackage rec {
-    name = "Products.PluggableAuthService-1.10.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PluggableAuthService/Products.PluggableAuthService-1.10.0.tar.gz";
-      md5 = "1a1db6b1d9dd34f8b93a8a3104385a37";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ products_pluginregistry zope2 products_genericsetup setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  borg_localrole = buildPythonPackage rec {
-    name = "borg.localrole-3.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/b/borg.localrole/borg.localrole-3.0.2.zip";
-      md5 = "04082694dfda9ae5cda62747b8ac7ccf";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 products_genericsetup zope_deferredimport zope_interface plone_memoize zope_component setuptools products_pluggableauthservice zope_annotation products_cmfcore acquisition products_plonepas ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  elementtree = buildPythonPackage rec {
-    name = "elementtree-1.2.7-20070827-preview";
-    src = fetchurl {
-      url = "http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip";
-      md5 = "30e2fe5edd143f347e03a8baf5d60f8a";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_content = buildPythonPackage rec {
-    name = "zope.app.content-3.5.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.content/zope.app.content-3.5.1.tar.gz";
-      md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_interface zope_componentvocabulary zope_security setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plonetheme_sunburst = buildPythonPackage rec {
-    name = "plonetheme.sunburst-1.2.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.2.8.zip";
-      md5 = "be02660c869e04ac8cf6ade3559f2516";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_portlets = buildPythonPackage rec {
-    name = "plone.portlets-2.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.portlets/plone.portlets-2.1.zip";
-      md5 = "12b9a33f787756a48617c2d2dd63c538";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_publisher zope_site zope_container zope_interface plone_memoize zope_component zodb3 setuptools zope_schema zope_annotation zope_contentprovider ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_proxy = buildPythonPackage rec {
-    name = "zope.proxy-3.6.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-3.6.1.zip";
-      md5 = "a400b0a26624b17fa889dbcaa989d440";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_archetypes = buildPythonPackage rec {
-    name = "Products.Archetypes-1.8.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.8.6.zip";
-      md5 = "74be68879b27228c084a9be869132a98";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfformcontroller zope_interface zope_contenttype datetime zope_component products_mimetypesregistry plone_app_folder zope2 zope_lifecycleevent zope_i18nmessageid zope_publisher products_genericsetup products_validation products_portaltransforms products_cmfquickinstallertool products_placelesstranslationservice zope_event acquisition products_dcworkflow products_cmfdefault zope_tal plone_folder products_zsqlmethods products_statusmessages zope_schema zope_viewlet products_cmfcalendar extensionclass zope_datetime products_marshall zope_site zope_deferredimport zodb3 plone_uuid setuptools transaction zope_i18n products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_dublincore = buildPythonPackage rec {
-    name = "zope.dublincore-3.7.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.dublincore/zope.dublincore-3.7.0.tar.gz";
-      md5 = "2e34e42e454d896feb101ac74af62ded";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_datetime zope_interface zope_location zope_security zope_component pytz setuptools zope_schema zope_lifecycleevent ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  initgroups = buildPythonPackage rec {
-    name = "initgroups-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/i/initgroups/initgroups-2.13.0.zip";
-      md5 = "38e842dcab8445f65e701fec75213acd";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_schema = buildPythonPackage rec {
-    name = "zope.schema-4.2.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.1.zip";
-      md5 = "bfa0460b68df0dbbf7a5dc793b0eecc6";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_event setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_publisher = buildPythonPackage rec {
-    name = "zope.app.publisher-3.10.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.publisher/zope.app.publisher-3.10.2.zip";
-      md5 = "66e9110e2967d8d204a65a98e2227404";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_componentvocabulary zope_datetime zope_browsermenu zope_interface zope_browserresource zope_security zope_configuration zope_component zope_browserpage zope_publisher setuptools zope_ptresource zope_schema zope_location ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_scale = buildPythonPackage rec {
-    name = "plone.scale-1.2.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.2.2.zip";
-      md5 = "7c59522b4806ee24f5e0a5fa69c523a5";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_copy = buildPythonPackage rec {
-    name = "zope.copy-3.5.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.copy/zope.copy-3.5.0.tar.gz";
-      md5 = "a9836a5d36cd548be45210eb00407337";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_event = buildPythonPackage rec {
-    name = "zope.event-3.5.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz";
-      md5 = "6e8af2a16157a74885d4f0d88137cefb";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  acquisition = buildPythonPackage rec {
-    name = "Acquisition-2.13.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip";
-      md5 = "8c33160c157b50649e2b2b3224622579";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface extensionclass ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  unittest2 = buildPythonPackage rec {
-    name = "unittest2-0.5.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/u/unittest2/unittest2-0.5.1.zip";
-      md5 = "1527fb89e38343945af1166342d851ee";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_resource = buildPythonPackage rec {
-    name = "plone.resource-1.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.resource/plone.resource-1.0.2.zip";
-      md5 = "594d41e3acd913ae92f2e9ef96503b9f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ python_dateutil zope_filerepresentation zope2 zope_publisher z3c_caching zope_interface zope_traversing zope_configuration zope_component plone_caching setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_linkintegrity = buildPythonPackage rec {
-    name = "plone.app.linkintegrity-1.5.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.1.zip";
-      md5 = "89701634d59c3b1a6fc61e5a21c4de52";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_resourceregistries = buildPythonPackage rec {
-    name = "Products.ResourceRegistries-2.2.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.7.zip";
-      md5 = "954e31a168a1eb3153e2fd4e590bb9ba";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 products_genericsetup zope_interface datetime plone_app_registry zope_component zodb3 setuptools zope_viewlet products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_browserlayer = buildPythonPackage rec {
-    name = "plone.browserlayer-2.1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.browserlayer/plone.browserlayer-2.1.2.zip";
-      md5 = "bce02f4907a4f29314090c525e5fc28e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 zope_interface zope_traversing zope_component setuptools products_genericsetup products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  markdown = buildPythonPackage rec {
-    name = "Markdown-2.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.3.zip";
-      md5 = "122418893e21e91109edbf6e082f830d";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  z3c_formwidget_query = buildPythonPackage rec {
-    name = "z3c.formwidget.query-0.9";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.formwidget.query/z3c.formwidget.query-0.9.zip";
-      md5 = "d9f7960b1a5a81d8ba5241530f496522";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid z3c_form zope_interface zope_component setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_z3cform = buildPythonPackage rec {
-    name = "plone.app.z3cform-0.6.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.6.2.zip";
-      md5 = "2e77f5e03d48a6fb2eb9994edb871917";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 plone_z3cform zope_interface z3c_formwidget_query collective_z3cform_datetimewidget kss_core zope_component zope_browserpage setuptools plone_app_kss zope_traversing ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  archetypes_referencebrowserwidget = buildPythonPackage rec {
-    name = "archetypes.referencebrowserwidget-2.4.17";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.17.zip";
-      md5 = "bb7552f5ccfddcd068649d7b8162020c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_app_jquerytools zope_component zope_interface plone_app_form zope_formlib setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_contentlisting = buildPythonPackage rec {
-    name = "plone.app.contentlisting-1.0.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.4.zip";
-      md5 = "fa6eb45c4ffd0eb3817ad4813ca24916";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_uuid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_ramcache = buildPythonPackage rec {
-    name = "zope.ramcache-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.ramcache/zope.ramcache-1.0.zip";
-      md5 = "87289e15f0e51f50704adda1557c02a7";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_location zodb3 zope_testing setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_vocabularies = buildPythonPackage rec {
-    name = "plone.app.vocabularies-2.1.10";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.10.tar.gz";
-      md5 = "166a0d6f9a3e3cd753efa56aaef585be";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_site zope_formlib zope_interface zope_component setuptools zope_schema zope_browser zope_i18n products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_cache = buildPythonPackage rec {
-    name = "zope.app.cache-3.7.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.cache/zope.app.cache-3.7.0.zip";
-      md5 = "8dd74574e869ce236ced0de7e349bb5c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_ramcache zope_app_form zope_interface zope_traversing zope_publisher zope_component zodb3 zope_proxy setuptools zope_schema zope_componentvocabulary zope_app_pagetemplate zope_annotation ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_discussion = buildPythonPackage rec {
-    name = "plone.app.discussion-2.1.9";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.1.9.zip";
-      md5 = "0c87aa53d4288d031cf384838bc03782";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_app_uuid zope_site plone_indexer collective_monkeypatcher zope_interface plone_app_z3cform zope_container plone_app_layout plone_z3cform plone_app_registry zope_component zodb3 zope_event setuptools z3c_form zope_lifecycleevent zope_annotation plone_registry ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zlog = buildPythonPackage rec {
-    name = "zLOG-2.11.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zLOG/zLOG-2.11.1.tar.gz";
-      md5 = "68073679aaa79ac5a7b6a5c025467147";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zconfig ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone = buildPythonPackage rec {
-    name = "Plone-4.2.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Plone/Plone-4.2.5.zip";
-      md5 = "1330b7966ffb86f962f4c0bfe56ba594";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfplone products_kupu plone_app_caching zope_app_publisher zope_app_component zope_copypastemove plone_app_theming setuptools products_cmfplacefulworkflow zope_app_container plone_app_openid plone_app_iterate wicked ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_standardcachemanagers = buildPythonPackage rec {
-    name = "Products.StandardCacheManagers-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.StandardCacheManagers/Products.StandardCacheManagers-2.13.0.zip";
-      md5 = "c5088b2b62bd26d63d9579a04369cb73";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol zope_component transaction setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_fieldsets = buildPythonPackage rec {
-    name = "plone.fieldsets-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.fieldsets/plone.fieldsets-2.0.2.zip";
-      md5 = "4158c8a1f784fcb5cecbd63deda7222f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_formlib zope_interface zope_component five_formlib setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  collective_monkeypatcher = buildPythonPackage rec {
-    name = "collective.monkeypatcher-1.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.monkeypatcher/collective.monkeypatcher-1.0.1.zip";
-      md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  z3c_zcmlhook = buildPythonPackage rec {
-    name = "z3c.zcmlhook-1.0b1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.zcmlhook/z3c.zcmlhook-1.0b1.tar.gz";
-      md5 = "7b6c80146f5930409eb0b355ddf3daeb";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_component zope_configuration setuptools zope_interface ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_recipe_zope2instance = buildPythonPackage rec {
-    name = "plone.recipe.zope2instance-4.2.10";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.10.zip";
-      md5 = "787fad7fa44757de74a50a91e9bcfcb5";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zodb3 mailinglogger zc_buildout setuptools zope2 zc_recipe_egg ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_supermodel = buildPythonPackage rec {
-    name = "plone.supermodel-1.1.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.1.4.zip";
-      md5 = "00b3d723bb1a48116fe3bf8754f17085";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_deferredimport zope_interface zope_dottedname zope_component z3c_zcmlhook setuptools zope_schema elementtree ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_registry = buildPythonPackage rec {
-    name = "plone.app.registry-1.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.1.zip";
-      md5 = "0fdbb01e9ff71108f1be262c39b41b81";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 plone_registry products_genericsetup elementtree plone_supermodel plone_app_z3cform zope_dottedname zope_component products_statusmessages setuptools zope_interface plone_autoform products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_pagetemplate = buildPythonPackage rec {
-    name = "zope.pagetemplate-3.5.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.pagetemplate/zope.pagetemplate-3.5.2.tar.gz";
-      md5 = "caa27a15351bc2ae11f5eecb5531e6c5";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_traversing zope_tales zope_security zope_component setuptools zope_tal zope_i18n ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfformcontroller = buildPythonPackage rec {
-    name = "Products.CMFFormController-3.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFFormController/Products.CMFFormController-3.0.3.zip";
-      md5 = "6573df7dcb39e3b63ba22abe2acd639e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ transaction products_genericsetup zope_interface zope_tales products_cmfcore zope2 setuptools zope_structuredtext acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_openid = buildPythonPackage rec {
-    name = "plone.openid-2.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.openid/plone.openid-2.0.1.zip";
-      md5 = "d4c36926a6dbefed035ed92c29329ce1";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ transaction products_pluggableauthservice python_openid zodb3 setuptools zope2 acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_size = buildPythonPackage rec {
-    name = "zope.size-3.4.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.size/zope.size-3.4.1.tar.gz";
-      md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_mimetypesregistry = buildPythonPackage rec {
-    name = "Products.MimetypesRegistry-2.0.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.4.zip";
-      md5 = "898166bb2aaececc8238ad4ee4826793";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 zope_interface zope_contenttype zodb3 setuptools products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_imaging = buildPythonPackage rec {
-    name = "plone.app.imaging-1.0.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.7.zip";
-      md5 = "27c24477bdcbcebeba6cd83419a57aa6";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_scale setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_marshall = buildPythonPackage rec {
-    name = "Products.Marshall-2.1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.Marshall/Products.Marshall-2.1.2.zip";
-      md5 = "bde4d7f75195c1ded8371554b04d2541";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ transaction products_genericsetup zope_interface zope_contenttype datetime extensionclass plone_uuid setuptools zope2 products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_ptresource = buildPythonPackage rec {
-    name = "zope.ptresource-3.9.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.ptresource/zope.ptresource-3.9.0.tar.gz";
-      md5 = "f4645e51c15289d3fdfb4139039e18e9";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_publisher zope_pagetemplate zope_interface zope_browserresource zope_security setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_component = buildPythonPackage rec {
-    name = "zope.app.component-3.9.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.component/zope.app.component-3.9.3.tar.gz";
-      md5 = "bc2dce245d2afe462529c350956711e0";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_component zope_site zope_deprecation zope_interface zope_traversing zope_exceptions zope_security zope_formlib zope_componentvocabulary setuptools zope_schema zope_app_pagetemplate zope_publisher zope_app_container ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  multimapping = buildPythonPackage rec {
-    name = "MultiMapping-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/M/MultiMapping/MultiMapping-2.13.0.zip";
-      md5 = "d69c5904c105b9f2f085d4103e0f0586";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_mailhost = buildPythonPackage rec {
-    name = "Products.MailHost-2.13.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.MailHost/Products.MailHost-2.13.1.zip";
-      md5 = "1102e523435d8bf78a15b9ddb57478e1";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_kss = buildPythonPackage rec {
-    name = "plone.app.kss-1.7.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.kss/plone.app.kss-1.7.1.zip";
-      md5 = "97a35086fecfe25e55b65042eb35e796";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_viewlet zope_i18nmessageid zope2 setuptools zope_deprecation zope_interface plone_app_layout kss_core zope_component products_statusmessages acquisition plone_app_portlets products_dcworkflow zope_lifecycleevent zope_i18n plone_locking products_cmfcore zope_contentprovider plone_portlets ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  pytz = buildPythonPackage rec {
-    name = "pytz-2012g";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pytz/pytz-2012g.zip";
-      md5 = "1a9b24da1ab6328074b48fc3d4525078";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_i18n = buildPythonPackage rec {
-    name = "plone.app.i18n-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.i18n/plone.app.i18n-2.0.2.zip";
-      md5 = "a10026573463dfc1899bf4062cebdbf2";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_indexer = buildPythonPackage rec {
-    name = "plone.indexer-1.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip";
-      md5 = "538aeee1f9db78bc8c85ae1bcb0153ed";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface products_cmfcore setuptools zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_externalmethod = buildPythonPackage rec {
-    name = "Products.ExternalMethod-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip";
-      md5 = "15ba953ef6cb632eb571977651252ea6";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol extensionclass zodb3 persistence setuptools acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_upgrade = buildPythonPackage rec {
-    name = "plone.app.upgrade-1.2.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.2.5.zip";
-      md5 = "8da18e8173668cad813dd8bb5a35ee9e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfformcontroller zope_interface products_cmfactionicons products_cmfeditions products_archetypes products_mimetypesregistry plone_app_folder products_cmfuid products_securemailhost zope_ramcache products_genericsetup products_cmfdifftool five_localsitemanager products_cmfquickinstallertool products_portaltransforms products_cmfdefault acquisition products_dcworkflow products_zcatalog borg_localrole products_contentmigration products_resourceregistries plone_portlets products_atcontenttypes zope2 plone_app_portlets products_pluggableauthservice products_cmfcalendar products_plonepas transaction zope_app_cache zope_site zope_component zope_location products_plonelanguagetool plone_session setuptools products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_browserpage = buildPythonPackage rec {
-    name = "zope.browserpage-3.12.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz";
-      md5 = "a543ef3cb1b42f7233b3fca23dc9ea60";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_pagetemplate zope_interface zope_traversing zope_component zope_security zope_configuration zope_publisher setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_atcontenttypes = buildPythonPackage rec {
-    name = "Products.ATContentTypes-2.1.12";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.12.zip";
-      md5 = "ef38ce0769a5f44e272623f8f118a669";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface plone_memoize datetime products_archetypes products_mimetypesregistry plone_app_folder zope2 zope_i18nmessageid zope_publisher products_genericsetup plone_i18n products_portaltransforms products_cmfdefault products_atreferencebrowserwidget zope_tal zconfig archetypes_referencebrowserwidget transaction products_validation acquisition extensionclass zope_component plone_app_layout zodb3 setuptools zope_i18n products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfeditions = buildPythonPackage rec {
-    name = "Products.CMFEditions-2.2.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.8.zip";
-      md5 = "1806f2e17e2527fad9364670b343bd11";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid transaction products_cmfdifftool zope_copy zope_interface products_genericsetup zope_dottedname products_zopeversioncontrol datetime products_cmfuid zodb3 products_cmfcore setuptools zope2 acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_interface = buildPythonPackage rec {
-    name = "zope.interface-3.6.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.6.7.zip";
-      md5 = "9df962180fbbb54eb1875cff9fe436e5";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_content = buildPythonPackage rec {
-    name = "plone.app.content-2.0.12";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.0.12.zip";
-      md5 = "2f14a85fb66d73e0b699b839caaaad26";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_publisher zope_container zope_interface plone_memoize plone_i18n zope_component zope_event products_cmfcore setuptools zope_schema zope_lifecycleevent zope_i18n zope_viewlet acquisition products_cmfdefault ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plonetheme_classic = buildPythonPackage rec {
-    name = "plonetheme.classic-1.2.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.2.5.zip";
-      md5 = "9dc15871937f9cdf94cdfdb9be77a221";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_autoform = buildPythonPackage rec {
-    name = "plone.autoform-1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.3.zip";
-      md5 = "4cb2935ba9cda3eb3ee801ad8cda7c60";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ z3c_form zope_interface zope_dottedname zope_security setuptools plone_supermodel zope_schema plone_z3cform ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_contentrules = buildPythonPackage rec {
-    name = "plone.app.contentrules-2.1.9";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-2.1.9.zip";
-      md5 = "74d2fed9095a7c5f890b6f27de78dafc";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_traversing plone_app_form zope_component zope_lifecycleevent zope_annotation zope_i18nmessageid products_genericsetup zope_event products_cmfdefault zope_browser plone_app_kss plone_uuid plone_memoize zope2 plone_stringinterp products_statusmessages plone_contentrules zope_schema acquisition transaction zope_site zope_container plone_app_vocabularies zope_publisher kss_core zope_formlib zodb3 five_formlib setuptools products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  record = buildPythonPackage rec {
-    name = "Record-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/R/Record/Record-2.13.0.zip";
-      md5 = "cfed6a89d4fb2c9cb995e9084c3071b7";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_plonetestcase = buildPythonPackage rec {
-    name = "Products.PloneTestCase-0.9.15";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PloneTestCase/Products.PloneTestCase-0.9.15.zip";
-      md5 = "ddd5810937919ab5233ebd64893c8bae";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfplone zope_testing zope2 products_genericsetup zope_site zope_interface products_atcontenttypes zope_component zodb3 setuptools products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_stringinterp = buildPythonPackage rec {
-    name = "plone.stringinterp-1.0.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.7.zip";
-      md5 = "81909716210c6ac3fd0ee87f45ea523d";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18n products_cmfcore setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  wicked = buildPythonPackage rec {
-    name = "wicked-1.1.10";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip";
-      md5 = "f65611f11d547d7dc8e623bf87d3929d";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_schema zope_container zope_traversing setuptools zope_lifecycleevent ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_blob = buildPythonPackage rec {
-    name = "plone.app.blob-1.5.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.blob/plone.app.blob-1.5.7.zip";
-      md5 = "135bc404212981c445d5bbb6a749b155";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_scale plone_app_imaging zodb3 setuptools archetypes_schemaextender zope_proxy ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfdynamicviewfti = buildPythonPackage rec {
-    name = "Products.CMFDynamicViewFTI-4.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.3.zip";
-      md5 = "7d39d416b41b2d93954bc73d9d0e077f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass products_genericsetup zope_browsermenu zope_interface zope_component zope2 setuptools products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_keyring = buildPythonPackage rec {
-    name = "plone.keyring-2.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.keyring/plone.keyring-2.0.1.zip";
-      md5 = "f3970e9bddb2cc65e461a2c62879233f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_container zope_location zodb3 setuptools zope_interface ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_contentprovider = buildPythonPackage rec {
-    name = "zope.contentprovider-3.7.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.contentprovider/zope.contentprovider-3.7.2.tar.gz";
-      md5 = "1bb2132551175c0123f17939a793f812";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_publisher zope_interface zope_location zope_tales zope_component zope_event setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_jquery = buildPythonPackage rec {
-    name = "plone.app.jquery-1.4.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.jquery/plone.app.jquery-1.4.4.zip";
-      md5 = "a12d56f3dfd2ba6840bf21a6bd860b90";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfcore setuptools products_genericsetup ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_atreferencebrowserwidget = buildPythonPackage rec {
-    name = "Products.ATReferenceBrowserWidget-3.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/Products.ATReferenceBrowserWidget-3.0.zip";
-      md5 = "157bdd32155c8353450c17c649aad042";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_deprecation archetypes_referencebrowserwidget setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_browserresource = buildPythonPackage rec {
-    name = "zope.browserresource-3.10.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-3.10.3.zip";
-      md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_location zope_traversing zope_contenttype zope_configuration zope_publisher setuptools zope_schema zope_i18n zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_caching = buildPythonPackage rec {
-    name = "plone.caching-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.caching/plone.caching-1.0.zip";
-      md5 = "2c2e3b27d13b9101c92dfed222fde36c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid five_globalrequest z3c_caching zope_interface zope2 zope_component setuptools plone_transformchain zope_schema plone_registry ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_locales = buildPythonPackage rec {
-    name = "zope.app.locales-3.6.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.locales/zope.app.locales-3.6.2.tar.gz";
-      md5 = "bd2b4c6040e768f33004b1210d3207fa";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_placelesstranslationservice = buildPythonPackage rec {
-    name = "Products.PlacelessTranslationService-2.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/Products.PlacelessTranslationService-2.0.3.zip";
-      md5 = "a94635eb712563c5a002520713f5d6dc";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass zope_publisher zope_deferredimport zope_deprecation zope_interface python_gettext datetime zope_component zodb3 setuptools zope_annotation zope_i18n zope2 acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_z3cform = buildPythonPackage rec {
-    name = "plone.z3cform-0.7.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.7.8.zip";
-      md5 = "da891365156a5d5824d4e504465886a2";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ z3c_batching z3c_form zope_i18n zope_component collective_monkeypatcher setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_lifecycleevent = buildPythonPackage rec {
-    name = "zope.lifecycleevent-3.6.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/zope.lifecycleevent-3.6.2.tar.gz";
-      md5 = "3ba978f3ba7c0805c81c2c79ea3edb33";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_event setuptools zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_form = buildPythonPackage rec {
-    name = "zope.app.form-4.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.form/zope.app.form-4.0.2.tar.gz";
-      md5 = "3d2b164d9d37a71490a024aaeb412e91";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_browserpage zope_schema transaction zope_datetime zope_browsermenu zope_interface zope_exceptions zope_security zope_configuration zope_publisher zope_component zope_formlib zope_browser setuptools zope_proxy zope_i18n ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_tinymce = buildPythonPackage rec {
-    name = "Products.TinyMCE-1.2.15";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.2.15.zip";
-      md5 = "108b919bfcff711d2116e41eccbede58";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_app_component plone_app_imaging zope_app_content setuptools elementtree plone_outputfilters ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  collective_z3cform_datetimewidget = buildPythonPackage rec {
-    name = "collective.z3cform.datetimewidget-1.2.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.3.zip";
-      md5 = "439117021c93f26c677510504ee245d3";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ z3c_form zope_deprecation zope_i18n setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  z3c_form = buildPythonPackage rec {
-    name = "z3c.form-2.5.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.form/z3c.form-2.5.1.tar.gz";
-      md5 = "f029f83dd226f695f55049ed1ecee95e";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_pagetemplate zope_interface zope_location zope_security zope_configuration zope_component zope_event setuptools zope_schema zope_lifecycleevent zope_browser zope_i18n zope_traversing zope_contentprovider ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_dcworkflow = buildPythonPackage rec {
-    name = "Products.DCWorkflow-2.2.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz";
-      md5 = "c90a16c4f3611015592ba8173a5f1863";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  mechanize = buildPythonPackage rec {
-    name = "mechanize-0.2.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.zip";
-      md5 = "a497ad4e875f7506ffcf8ad3ada4c2fc";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_iterate = buildPythonPackage rec {
-    name = "plone.app.iterate-2.1.9";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.iterate/plone.app.iterate-2.1.9.zip";
-      md5 = "db598cfc0986737145ddc7e6b70a1794";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_viewlet zope_i18nmessageid zodb3 products_archetypes zope_interface plone_memoize products_cmfeditions datetime zope_component products_dcworkflow products_statusmessages zope_event setuptools products_cmfplacefulworkflow zope_schema zope_lifecycleevent zope_annotation zope2 plone_locking products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  accesscontrol = buildPythonPackage rec {
-    name = "AccessControl-2.13.12";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/A/AccessControl/AccessControl-2.13.12.zip";
-      md5 = "b9205bceb8386deceab51f758bc4784a";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_security zope_testing extensionclass zope_publisher restrictedpython zope_interface zope_deferredimport zope_schema zope_configuration datetime record transaction acquisition zodb3 zope_component zexceptions persistence ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_testing = buildPythonPackage rec {
-    name = "zope.testing-3.9.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.testing/zope.testing-3.9.7.tar.gz";
-      md5 = "8999f3d143d416dc3c8b2a5bd6f33e28";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_exceptions setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_externaleditor = buildPythonPackage rec {
-    name = "Products.ExternalEditor-1.1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip";
-      md5 = "475fea6e0b958c0c51cfdbfef2f4e623";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_publication = buildPythonPackage rec {
-    name = "zope.app.publication-3.12.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.publication/zope.app.publication-3.12.0.zip";
-      md5 = "d8c521287f52fb9f40fa9b8c2acb4675";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_authentication zope_publisher zope_interface zope_location zope_traversing zope_component zope_error zodb3 setuptools zope_browser ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_filerepresentation = buildPythonPackage rec {
-    name = "zope.filerepresentation-3.6.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.filerepresentation/zope.filerepresentation-3.6.1.tar.gz";
-      md5 = "4a7a434094f4bfa99a7f22e75966c359";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  five_globalrequest = buildPythonPackage rec {
-    name = "five.globalrequest-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz";
-      md5 = "87f8996bd21d4aa156aa26e7d21b8744";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_globalrequest zope2 setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_exceptions = buildPythonPackage rec {
-    name = "zope.exceptions-3.6.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-3.6.2.tar.gz";
-      md5 = "d7234d99d728abe3d9275346e8d24fd9";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_layout = buildPythonPackage rec {
-    name = "plone.app.layout-2.2.9";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.2.9.zip";
-      md5 = "9ad17aaae1e37de2a427cbebc0565166";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_deprecation zope_interface plone_memoize zope_dottedname datetime zope_component zope_annotation zope_publisher plone_i18n products_cmfdefault plone_app_controlpanel plone_app_viewletmanager plone_portlets plone_app_portlets zope_schema zope_viewlet acquisition zope2 setuptools zope_i18n plone_locking products_cmfcore products_cmfeditions ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_contenttype = buildPythonPackage rec {
-    name = "zope.contenttype-3.5.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.contenttype/zope.contenttype-3.5.5.zip";
-      md5 = "c6ac80e6887de4108a383f349fbdf332";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  five_customerize = buildPythonPackage rec {
-    name = "five.customerize-1.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.customerize/five.customerize-1.0.3.zip";
-      md5 = "32f597c2fa961f7dcc84b23e655d928e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing transaction zope_publisher zope_site zope_pagetemplate zope_interface zope_traversing zope_dottedname plone_portlets zope_component zope_componentvocabulary setuptools zope_app_pagetemplate zope_schema zope_lifecycleevent zope2 zope_viewlet acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_subrequest = buildPythonPackage rec {
-    name = "plone.subrequest-1.6.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.subrequest/plone.subrequest-1.6.7.zip";
-      md5 = "cc12f68a22565415b10dbeef0020baa4";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_globalrequest five_globalrequest setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_site = buildPythonPackage rec {
-    name = "zope.site-3.9.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.site/zope.site-3.9.2.tar.gz";
-      md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_location zope_interface zope_security zope_container zope_event setuptools zope_lifecycleevent zope_annotation zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_uuid = buildPythonPackage rec {
-    name = "plone.app.uuid-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.uuid/plone.app.uuid-1.0.zip";
-      md5 = "9ca8dcfb09a8a0d6bbee0f28073c3d3f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_indexer zope_interface zope_publisher plone_uuid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfactionicons = buildPythonPackage rec {
-    name = "Products.CMFActionIcons-2.1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFActionIcons/Products.CMFActionIcons-2.1.3.tar.gz";
-      md5 = "ab1dc62404ed11aea84dc0d782b2235e";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ products_cmfcore setuptools products_genericsetup eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  persistence = buildPythonPackage rec {
-    name = "Persistence-2.13.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip";
-      md5 = "92693648ccdc59c8fc71f7f06b1d228c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass zodb3 ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_zopeversioncontrol = buildPythonPackage rec {
-    name = "Products.ZopeVersionControl-1.1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZopeVersionControl/Products.ZopeVersionControl-1.1.3.zip";
-      md5 = "238239102f3ac798ee4f4c53343a561f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ transaction zope_interface datetime zodb3 setuptools zope2 acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_location = buildPythonPackage rec {
-    name = "zope.location-3.9.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-3.9.1.tar.gz";
-      md5 = "1684a8f986099d15296f670c58e713d8";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_schema zope_component setuptools zope_proxy ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_browsermenu = buildPythonPackage rec {
-    name = "zope.browsermenu-3.9.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browsermenu/zope.browsermenu-3.9.1.zip";
-      md5 = "a47c7b1e786661c912a1150bf8d1f83f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_interface zope_traversing zope_component zope_security zope_configuration zope_pagetemplate setuptools zope_schema zope_browser ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_workflow = buildPythonPackage rec {
-    name = "plone.app.workflow-2.0.10";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.0.10.zip";
-      md5 = "350ea680ccf7eb9b1598927cafad4f38";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid transaction products_genericsetup zope_site zope_interface plone_memoize zope_testing datetime kss_core zope_component products_cmfcore products_statusmessages zope2 setuptools products_dcworkflow zope_schema zope_i18n acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_locking = buildPythonPackage rec {
-    name = "plone.locking-2.0.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip";
-      md5 = "a7f8b8db78f57272d351d7fe0d067eb2";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface datetime zope_component zodb3 setuptools zope_schema zope_annotation zope_viewlet products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_dottedname = buildPythonPackage rec {
-    name = "zope.dottedname-3.4.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.dottedname/zope.dottedname-3.4.6.tar.gz";
-      md5 = "62d639f75b31d2d864fe5982cb23959c";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_cachedescriptors = buildPythonPackage rec {
-    name = "zope.cachedescriptors-3.5.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip";
-      md5 = "263459a95238fd61d17e815d97ca49ce";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_collection = buildPythonPackage rec {
-    name = "plone.app.collection-1.0.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.8.zip";
-      md5 = "8bbd299daa04b35ecfad3c13afa7aba0";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_portlet_collection zope_i18nmessageid transaction plone_app_contentlisting zope_component plone_app_vocabularies plone_app_form products_validation zope_configuration plone_portlets setuptools products_archetypes zope2 plone_app_portlets zope_interface zope_schema products_cmfquickinstallertool archetypes_querywidget products_cmfcore zope_formlib ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zc_lockfile = buildPythonPackage rec {
-    name = "zc.lockfile-1.0.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.0.tar.gz";
-      md5 = "6cf83766ef9935c33e240b0904c7a45e";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  lxml = buildPythonPackage rec {
-    name = "lxml-2.3.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/l/lxml/lxml-2.3.4.tar.gz";
-      md5 = "61d4ad80726b984b35c9a81aa2510b4d";
-    };
-    buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_contentrules = buildPythonPackage rec {
-    name = "plone.contentrules-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.2.zip";
-      md5 = "a32370656c4fd58652fcd8a234db69c5";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_container zope_interface zope_testing zope_configuration zope_component zope_componentvocabulary setuptools zodb3 zope_schema zope_lifecycleevent zope_annotation ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_sendmail = buildPythonPackage rec {
-    name = "zope.sendmail-3.7.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.sendmail/zope.sendmail-3.7.5.tar.gz";
-      md5 = "8a513ecf2b41cad849f6607bf16d6818";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid transaction zope_interface zope_configuration setuptools zope_schema zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_formlib = buildPythonPackage rec {
-    name = "zope.formlib-4.0.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.formlib/zope.formlib-4.0.6.zip";
-      md5 = "eed9c94382d11a4dececd0a48ac1d3f2";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_schema zope_datetime zope_interface zope_traversing zope_security zope_component pytz zope_event zope_browser setuptools zope_lifecycleevent zope_i18n zope_browserpage ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_caching = buildPythonPackage rec {
-    name = "plone.app.caching-1.1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.3.zip";
-      md5 = "1975506ecf8d42944946dbb2b8f8dc01";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfdynamicviewfti z3c_form zope_interface plone_memoize zope_component plone_caching zope_publisher products_genericsetup plone_app_registry z3c_zcmlhook setuptools plone_app_z3cform products_statusmessages python_dateutil plone_cachepurging acquisition zope2 zope_pagetemplate zope_browserresource plone_protect plone_registry products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfplone = buildPythonPackage rec {
-    name = "Products.CMFPlone-4.2.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.2.5.zip";
-      md5 = "dab2fb239699598e6b48b060b07a8c7e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfdynamicviewfti plone_app_blob products_dcworkflow products_extendedpathindex zope_dottedname datetime zope_traversing zope_app_container products_tinymce zope_publisher plonetheme_classic plone_fieldsets products_cmfdefault five_localsitemanager plone_app_contentlisting products_externaleditor products_pluginregistry products_cmfeditions products_resourceregistries zope_tal plone_app_jquerytools products_genericsetup acquisition plone_app_vocabularies zope_location zope_deferredimport products_plonelanguagetool borg_localrole kss_core zope_i18n plone_browserlayer plone_theme plone_memoize plone_app_contentmenu plone_app_i18n zope_component products_mimetypesregistry plone_app_folder plone_registry zope_i18nmessageid z3c_autoinclude plone_app_upgrade products_cmfdifftool five_customerize plone_app_search products_portaltransforms plone_app_controlpanel plone_app_locales plone_app_linkintegrity zope2 plone_contentrules plone_app_portlets products_plonepas zope_pagetemplate zodb3 plone_locking products_cmfformcontroller zope_deprecation plone_app_form plone_app_layout products_cmfquickinstallertool archetypes_querywidget plone_app_redirector plone_i18n plone_app_registry products_placelesstranslationservice plone_app_users zope_interface zope_event plone_app_viewletmanager zope_structuredtext zope_app_publisher plone_app_customerize zope_app_locales plone_portlets products_statusmessages products_cmfcalendar extensionclass products_pluggableauthservice plone_indexer products_cmfuid zope_container plone_app_workflow setuptools plone_portlet_collection plone_app_contentrules products_cmfactionicons products_archetypes plone_intelligenttext plone_app_collection products_passwordresettool plone_app_content plonetheme_sunburst archetypes_kss plone_app_kss plone_protect zope_app_component zope_tales plone_app_uuid archetypes_referencebrowserwidget products_atcontenttypes plone_app_jquery transaction zope_site plone_app_discussion plone_portlet_static zope_copypastemove plone_session products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  transaction = buildPythonPackage rec {
-    name = "transaction-1.1.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/t/transaction/transaction-1.1.1.tar.gz";
-      md5 = "30b062baa34fe1521ad979fb088c8c55";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_controlpanel = buildPythonPackage rec {
-    name = "plone.app.controlpanel-2.2.11";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.2.11.zip";
-      md5 = "401c8880865f398c281953f5837108b9";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing zope_interface plone_memoize zope_component plone_app_workflow zope_annotation zope_ramcache zope_publisher products_portaltransforms plone_fieldsets zope_event products_cmfdefault zope_cachedescriptors plone_app_form setuptools products_statusmessages zope_schema zope2 acquisition products_plonepas zope_site plone_app_vocabularies zope_formlib zodb3 plone_protect zope_i18n plone_locking products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_redirector = buildPythonPackage rec {
-    name = "plone.app.redirector-1.1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.1.3.zip";
-      md5 = "7d441340a83b8ed72a03bc16148a5f21";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_memoize setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_component = buildPythonPackage rec {
-    name = "zope.component-3.9.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-3.9.5.tar.gz";
-      md5 = "22780b445b1b479701c05978055d1c82";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_event setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_broken = buildPythonPackage rec {
-    name = "zope.broken-3.6.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.broken/zope.broken-3.6.0.zip";
-      md5 = "eff24d7918099a3e899ee63a9c31bee6";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zc_recipe_egg = buildPythonPackage rec {
-    name = "zc.recipe.egg-1.2.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-1.2.2.tar.gz";
-      md5 = "fe5ad0f1c0fc3d4348286534e1b9cec5";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zc_buildout setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_openid = buildPythonPackage rec {
-    name = "plone.app.openid-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.openid/plone.app.openid-2.0.2.tar.gz";
-      md5 = "ae0748f91cab0612a498926d405d8edd";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ products_plonepas zope_i18nmessageid zope2 setuptools plone_openid zope_interface plone_portlets zope_component plone_app_portlets products_cmfcore products_pluggableauthservice ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  z3c_caching = buildPythonPackage rec {
-    name = "z3c.caching-2.0a1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.caching/z3c.caching-2.0a1.tar.gz";
-      md5 = "17f250b5084c2324a7d15c6810ee628e";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_component zope_event setuptools zope_lifecycleevent zope_browser ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  python_openid = buildPythonPackage rec {
-    name = "python-openid-2.2.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.zip";
-      md5 = "f89d9d4f4dccfd33b5ce34eb4725f751";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  tempstorage = buildPythonPackage rec {
-    name = "tempstorage-2.12.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.2.zip";
-      md5 = "7a2b76b39839e229249b1bb175604480";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing zodb3 setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_zctextindex = buildPythonPackage rec {
-    name = "Products.ZCTextIndex-2.13.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.4.zip";
-      md5 = "8bbfa5fcd3609246990a9314d6f826b4";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol transaction zope_interface zexceptions zodb3 persistence setuptools acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  extensionclass = buildPythonPackage rec {
-    name = "ExtensionClass-2.13.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip";
-      md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-}; in plone43Packages
diff --git a/pkgs/development/web/plone/4.3.nix b/pkgs/development/web/plone/4.3.nix
deleted file mode 100644
index 0eac538951d9..000000000000
--- a/pkgs/development/web/plone/4.3.nix
+++ /dev/null
@@ -1,5532 +0,0 @@
-# DO NOT EDIT THIS FILE!
-#
-# Nix expressions autogenerated with:
-#   bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d plone.recipe.zeoserver -d plone.recipe.varnish -d collective.recipe.template -d collective.recipe.filestorage -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.3.1.json -p plone/4.3.1.txt -o plone/4.3.1.nix
-
-{ pkgs, pythonPackages }:
-
-let plone43Packages = pythonPackages.python.modules // rec {
-  inherit (pythonPackages) buildPythonPackage setuptools zc_buildout pillow;
-  inherit (pkgs) fetchurl stdenv;
-
-  plone_app_portlets = buildPythonPackage rec {
-    name = "plone.app.portlets-2.4.4";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.4.zip";
-      md5 = "c1144f7686cacf3d64fcd202ab2e5e2d";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface zope_traversing plone_app_form datetime zope_container zope_lifecycleevent zope_annotation five_customerize zope_i18nmessageid zope_publisher products_genericsetup plone_i18n feedparser zope_event zope_browser zope_contentprovider plone_memoize zope2 zope_schema acquisition transaction products_pluggableauthservice zope_site zope_component plone_app_vocabularies plone_portlets plone_app_i18n zope_configuration zope_formlib zodb3 five_formlib setuptools products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope2 = buildPythonPackage rec {
-    name = "Zope2-2.13.20";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.20.zip";
-      md5 = "557b08fec37620c37e32f2dc01020f29";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing zope_interface zope_traversing multimapping zope_size zope_contenttype zope_browserpage datetime zope_component zope_sendmail zope_lifecycleevent products_zctextindex products_standardcachemanagers persistence products_mimetools zope_i18nmessageid zope_publisher missing zope_viewlet zope_sequencesort zope_testbrowser docutils zope_event products_pythonscripts zope_browser zope_structuredtext zope_contentprovider zope_browsermenu zope_tal zope_exceptions products_mailhost products_btreefolder2 zopeundo zconfig record accesscontrol pytz products_ofsp zope_schema zexceptions zope_processlifetime acquisition extensionclass zope_proxy zope_site zope_container zope_pagetemplate zdaemon zope_browserresource zope_deferredimport initgroups zope_security zope_configuration zope_i18n products_zcatalog restrictedpython zodb3 documenttemplate setuptools zope_ptresource zlog tempstorage transaction zope_tales zope_location products_externalmethod ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_btreefolder2 = buildPythonPackage rec {
-    name = "Products.BTreeFolder2-2.13.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.BTreeFolder2/Products.BTreeFolder2-2.13.3.tar.gz";
-      md5 = "f57c85673036af7ccd34c3fa251f6bb2";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ accesscontrol zope_container zodb3 zope_event persistence setuptools zope_lifecycleevent acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_pythonscripts = buildPythonPackage rec {
-    name = "Products.PythonScripts-2.13.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PythonScripts/Products.PythonScripts-2.13.2.zip";
-      md5 = "04c86f2c45a29a162297a80dac61d14f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol datetime restrictedpython documenttemplate setuptools zexceptions acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zopeundo = buildPythonPackage rec {
-    name = "ZopeUndo-2.12.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZopeUndo/ZopeUndo-2.12.0.zip";
-      md5 = "2b8da09d1b98d5558f62e12f6e52c401";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  datetime = buildPythonPackage rec {
-    name = "DateTime-3.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/D/DateTime/DateTime-3.0.3.zip";
-      md5 = "5ebf0a8e3775b744c5de2e6685b37ae9";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface pytz ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_session = buildPythonPackage rec {
-    name = "plone.session-3.5.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.session/plone.session-3.5.3.zip";
-      md5 = "f95872454735abc8f27c3dcbc9434c11";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 products_pluggableauthservice plone_keyring zope_interface setuptools zope_component plone_protect ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_container = buildPythonPackage rec {
-    name = "zope.container-3.11.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.container/zope.container-3.11.2.tar.gz";
-      md5 = "fc66d85a17b8ffb701091c9328983dcc";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_filerepresentation zope_i18nmessageid zope_publisher zope_broken zope_interface zope_size zope_dottedname zope_security zope_location zope_lifecycleevent zope_component zodb3 zope_event setuptools zope_schema zope_traversing ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_folder = buildPythonPackage rec {
-    name = "plone.folder-1.0.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.folder/plone.folder-1.0.4.zip";
-      md5 = "1674ff18b7a9452d0c2063cf11c679b7";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_component zope_interface plone_memoize zope_container setuptools zope_annotation ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_plonepas = buildPythonPackage rec {
-    name = "Products.PlonePAS-4.1.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PlonePAS/Products.PlonePAS-4.1.1.zip";
-      md5 = "32db1808c3ad42e82542b65eb95c3c71";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_genericsetup plone_memoize plone_i18n plone_session zope2 setuptools products_cmfcore products_pluggableauthservice ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_locales = buildPythonPackage rec {
-    name = "plone.app.locales-4.3.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.1.zip";
-      md5 = "c88b2da05361a24a564bdef30fb371aa";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_sequencesort = buildPythonPackage rec {
-    name = "zope.sequencesort-3.4.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.sequencesort/zope.sequencesort-3.4.0.tar.gz";
-      md5 = "cfc35fc426a47f5c0ee43c416224b864";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_genericsetup = buildPythonPackage rec {
-    name = "Products.GenericSetup-1.7.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.3.tar.gz";
-      md5 = "c48967c81c880ed33ee16a14caab3b11";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ zope_formlib five_localsitemanager zope2 setuptools eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_theme = buildPythonPackage rec {
-    name = "plone.theme-2.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.theme/plone.theme-2.1.zip";
-      md5 = "c592d0d095e9fc76cc81597cdf6d0c37";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 zope_publisher zope_interface zope_traversing zope_component products_cmfdefault setuptools products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_tal = buildPythonPackage rec {
-    name = "zope.tal-3.5.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.tal/zope.tal-3.5.2.zip";
-      md5 = "13869f292ba36b294736b7330b1396fd";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_cachepurging = buildPythonPackage rec {
-    name = "plone.cachepurging-1.0.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.cachepurging/plone.cachepurging-1.0.4.zip";
-      md5 = "886814ac4deef0f1ed99a2eb60864264";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 five_globalrequest zope_interface zope_component zope_event setuptools zope_lifecycleevent zope_annotation plone_registry ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_protect = buildPythonPackage rec {
-    name = "plone.protect-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.protect/plone.protect-2.0.2.zip";
-      md5 = "74925ffb08782e72f9b1e850fa78fffa";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_component plone_keyring zope2 setuptools zope_interface ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_portaltransforms = buildPythonPackage rec {
-    name = "Products.PortalTransforms-2.1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.2.zip";
-      md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 zope_interface zope_structuredtext products_mimetypesregistry zodb3 products_cmfdefault plone_intelligenttext setuptools markdown products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_memoize = buildPythonPackage rec {
-    name = "plone.memoize-1.1.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.memoize/plone.memoize-1.1.1.zip";
-      md5 = "d07cd14b976160e1f26a859e3370147e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_component zope_annotation zope_ramcache setuptools zope_interface ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  docutils = buildPythonPackage rec {
-    name = "docutils-0.9.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/d/docutils/docutils-0.9.1.tar.gz";
-      md5 = "b0d5cd5298fedf9c62f5fd364a274d56";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  five_formlib = buildPythonPackage rec {
-    name = "five.formlib-1.0.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.formlib/five.formlib-1.0.4.zip";
-      md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid transaction zope_app_form zope_formlib zope_interface zope_location zope_publisher zope_component extensionclass zope_event setuptools zope_schema zope_lifecycleevent zope_browser zope2 ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zexceptions = buildPythonPackage rec {
-    name = "zExceptions-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zExceptions/zExceptions-2.13.0.zip";
-      md5 = "4c679696c959040d8e656ef85ae40136";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_publisher zope_security setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfuid = buildPythonPackage rec {
-    name = "Products.CMFUid-2.2.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFUid/Products.CMFUid-2.2.1.tar.gz";
-      md5 = "e20727959351dffbf0bac80613eee110";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  restrictedpython = buildPythonPackage rec {
-    name = "RestrictedPython-3.6.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/R/RestrictedPython/RestrictedPython-3.6.0.zip";
-      md5 = "aa75a7dcc7fbc966357837cc66cacec6";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_theming = buildPythonPackage rec {
-    name = "plone.app.theming-1.1.1";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip";
-      md5 = "a694b7a050b6e7c25d720d1e99bb73fa";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfplone plone_subrequest repoze_xmliter plone_app_registry plone_transformchain zope_traversing lxml docutils roman plone_resource setuptools five_globalrequest diazo plone_resourceeditor ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  feedparser = buildPythonPackage rec {
-    name = "feedparser-5.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/feedparser/feedparser-5.0.1.zip";
-      md5 = "cefffeba66b658d3cc7c1d66b92c6a1a";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_browser = buildPythonPackage rec {
-    name = "zope.browser-1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browser/zope.browser-1.3.zip";
-      md5 = "4ff0ddbf64c45bfcc3189e35f4214ded";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfdefault = buildPythonPackage rec {
-    name = "Products.CMFDefault-2.2.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.3.tar.gz";
-      md5 = "fe7d2d3906ee0e3b484e4a02401576ab";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ products_genericsetup products_cmfcore five_formlib setuptools zope2 eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  python_dateutil = buildPythonPackage rec {
-    name = "python-dateutil-1.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz";
-      md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_error = buildPythonPackage rec {
-    name = "zope.error-3.7.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.error/zope.error-3.7.4.tar.gz";
-      md5 = "281445a906458ff5f18f56923699a127";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_location zope_exceptions setuptools zodb3 ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_mimetools = buildPythonPackage rec {
-    name = "Products.MIMETools-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip";
-      md5 = "ad5372fc1190599a19493db0864448ec";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ documenttemplate setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_deprecation = buildPythonPackage rec {
-    name = "zope.deprecation-3.4.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-3.4.1.tar.gz";
-      md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfplacefulworkflow = buildPythonPackage rec {
-    name = "Products.CMFPlacefulWorkflow-1.5.9";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.9.zip";
-      md5 = "9041e1f52eab5b348c0dfa85be438722";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfplone zope_i18nmessageid products_plonetestcase products_genericsetup zope_interface zope_testing zope_component setuptools products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  unidecode = buildPythonPackage rec {
-    name = "Unidecode-0.04.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/U/Unidecode/Unidecode-0.04.1.tar.gz";
-      md5 = "c4c9ed8d40cff25c390ff5d5112b9308";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfcore = buildPythonPackage rec {
-    name = "Products.CMFCore-2.2.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.7.tar.gz";
-      md5 = "9320a4023b8575097feacfd4a400e930";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ products_genericsetup zope_app_publication products_zsqlmethods zope2 setuptools five_localsitemanager eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  five_localsitemanager = buildPythonPackage rec {
-    name = "five.localsitemanager-2.0.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.localsitemanager/five.localsitemanager-2.0.5.zip";
-      md5 = "5e3a658e6068832bd802018ebc83f2d4";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing zope_site zope_interface zope_location zope_component zodb3 zope_event setuptools zope_lifecycleevent zope2 acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  collective_recipe_template = buildPythonPackage rec {
-    name = "collective.recipe.template-1.9";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.recipe.template/collective.recipe.template-1.9.zip";
-      md5 = "f8b8eab3cf183ea92c2e50a54da228e8";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zc_buildout setuptools pythonPackages.genshi ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_configuration = buildPythonPackage rec {
-    name = "zope.configuration-3.7.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-3.7.4.zip";
-      md5 = "5b0271908ef26c05059eda76928896ea";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_schema zope_interface zope_i18nmessageid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfcalendar = buildPythonPackage rec {
-    name = "Products.CMFCalendar-2.2.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.2.tar.gz";
-      md5 = "49458e68dc3b6826ea9a3576ac014419";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ products_cmfdefault zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_extendedpathindex = buildPythonPackage rec {
-    name = "Products.ExtendedPathIndex-3.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/Products.ExtendedPathIndex-3.1.zip";
-      md5 = "00c048a4b103200bdcbda61fa22c66df";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol transaction zope2 setuptools zodb3 ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  archetypes_schemaextender = buildPythonPackage rec {
-    name = "archetypes.schemaextender-2.1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.schemaextender/archetypes.schemaextender-2.1.2.zip";
-      md5 = "865aa5b4b6b26e3bb650d89ddfe77c87";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_uuid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zconfig = buildPythonPackage rec {
-    name = "ZConfig-2.9.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-2.9.1.tar.gz";
-      md5 = "4738de641d90b992de5b89ff1bc2fe49";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_contentmenu = buildPythonPackage rec {
-    name = "plone.app.contentmenu-2.0.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.contentmenu/plone.app.contentmenu-2.0.8.zip";
-      md5 = "8ba463f1a164c454c70d26507e5bd22a";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_publisher products_cmfdynamicviewfti zope_browsermenu zope_interface plone_memoize plone_app_content zope_component acquisition setuptools zope_i18n plone_locking products_cmfcore zope_contentprovider ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_pluginregistry = buildPythonPackage rec {
-    name = "Products.PluginRegistry-1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz";
-      md5 = "5b166193ca1eb84dfb402051f779ebab";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope2 products_genericsetup setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_alterego = buildPythonPackage rec {
-    name = "plone.alterego-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.alterego/plone.alterego-1.0.zip";
-      md5 = "b7b6dbcbba00505d98d5aba83e016408";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_outputfilters = buildPythonPackage rec {
-    name = "plone.outputfilters-1.10";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.10.zip";
-      md5 = "2c8ba3b7fd2bf18406eb49d01b478139";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_portaltransforms products_mimetypesregistry products_cmfcore setuptools products_genericsetup ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_publisher = buildPythonPackage rec {
-    name = "zope.publisher-3.12.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.publisher/zope.publisher-3.12.6.tar.gz";
-      md5 = "495131970cc7cb14de8e517fb3857ade";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_contenttype zope_proxy zope_interface zope_location zope_exceptions zope_security zope_configuration zope_component zope_event setuptools zope_browser zope_i18n ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_security = buildPythonPackage rec {
-    name = "zope.security-3.7.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz";
-      md5 = "072ab8d11adc083eace11262da08630c";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_schema zope_interface zope_location zope_configuration zope_component setuptools zope_proxy ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zdaemon = buildPythonPackage rec {
-    name = "zdaemon-2.0.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zdaemon/zdaemon-2.0.7.tar.gz";
-      md5 = "291a875f82e812110557eb6704af8afe";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zconfig ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_annotation = buildPythonPackage rec {
-    name = "zope.annotation-3.5.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.annotation/zope.annotation-3.5.0.tar.gz";
-      md5 = "4238153279d3f30ab5613438c8e76380";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_proxy zope_interface zope_location zope_component zodb3 setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_mkzeoinstance = buildPythonPackage rec {
-    name = "zope.mkzeoinstance-3.9.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.mkzeoinstance/zope.mkzeoinstance-3.9.5.tar.gz";
-      md5 = "2c2dcf7cc7de58f7d009ca3294f54377";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zodb3 setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  repoze_xmliter = buildPythonPackage rec {
-    name = "repoze.xmliter-0.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/r/repoze.xmliter/repoze.xmliter-0.5.zip";
-      md5 = "99da76bcbad6fbaced4a273bde29b10e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ lxml setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_form = buildPythonPackage rec {
-    name = "plone.app.form-2.2.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.2.zip";
-      md5 = "6101e6a5bd4de6cc8cdef09ced2743eb";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_schema zope_site plone_app_vocabularies zope2 datetime zope_component zope_event five_formlib setuptools zope_interface zope_lifecycleevent zope_formlib zope_browser zope_i18n plone_locking products_cmfcore acquisition products_cmfdefault ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_structuredtext = buildPythonPackage rec {
-    name = "zope.structuredtext-3.5.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.structuredtext/zope.structuredtext-3.5.1.tar.gz";
-      md5 = "eabbfb983485d0879322bc878d2478a0";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_recipe_varnish = buildPythonPackage rec {
-    name = "plone.recipe.varnish-1.3dev";
-    src = fetchurl {
-      url = "https://github.com/collective/plone.recipe.varnish/archive/38ef4a86ce2e1c407e35ab36487bc1311c4eb1e3.zip";
-      md5 = "9aa448793ca115790d38df6f676bd7d8";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zc_buildout setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zodb3 = buildPythonPackage rec {
-    name = "ZODB3-3.10.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz";
-      md5 = "6f180c6897a1820948fee2a6290503cd";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface transaction zconfig zope_event zdaemon zc_lockfile ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_batching = buildPythonPackage rec {
-    name = "plone.batching-1.0";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0.zip";
-      md5 = "cabd58ccfec67cd384602343ce40dc7b";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  documenttemplate = buildPythonPackage rec {
-    name = "DocumentTemplate-2.13.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip";
-      md5 = "07bb086c77c1dfe94125ad2efbba94b7";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol extensionclass zope_sequencesort zexceptions restrictedpython zope_structuredtext acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_search = buildPythonPackage rec {
-    name = "plone.app.search-1.1.4";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.4.zip";
-      md5 = "fb24320380ed2ba11e6f20cc1fe3b6df";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_app_contentlisting setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  diazo = buildPythonPackage rec {
-    name = "diazo-1.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/d/diazo/diazo-1.0.3.zip";
-      md5 = "d3c2b017af521db4c86fb360c86e0bc8";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ lxml experimental_cssselect setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_globalrequest = buildPythonPackage rec {
-    name = "zope.globalrequest-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.globalrequest/zope.globalrequest-1.0.zip";
-      md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_customerize = buildPythonPackage rec {
-    name = "plone.app.customerize-1.2.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.customerize/plone.app.customerize-1.2.2.zip";
-      md5 = "6a3802c4e8fbd955597adc6a8298febf";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_viewlet zope2 zope_publisher zope_interface plone_browserlayer plone_portlets zope_component setuptools five_customerize products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfdifftool = buildPythonPackage rec {
-    name = "Products.CMFDiffTool-2.1";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/P/Products.CMFDiffTool/Products.CMFDiffTool-2.1.zip";
-      md5 = "7513d954294e9f318182f9d61660abdb";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 products_genericsetup zope_interface setuptools products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_testbrowser = buildPythonPackage rec {
-    name = "zope.testbrowser-3.11.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.testbrowser/zope.testbrowser-3.11.1.tar.gz";
-      md5 = "64abbee892121e7f1a91aed12cfc155a";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_interface mechanize pytz setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_contentmigration = buildPythonPackage rec {
-    name = "Products.contentmigration-2.1.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.4.zip";
-      md5 = "711f9d4ea3cc2130acaa74efb0f9da5e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  collective_recipe_filestorage = buildPythonPackage rec {
-    name = "collective.recipe.filestorage-0.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.recipe.filestorage/collective.recipe.filestorage-0.6.zip";
-      md5 = "c0d85a82a858a860dc665dd38303fedd";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zc_buildout setuptools plone_recipe_zope2instance ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_intelligenttext = buildPythonPackage rec {
-    name = "plone.intelligenttext-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.intelligenttext/plone.intelligenttext-2.0.2.zip";
-      md5 = "51688fa0815b49e00334e3ef948328ba";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plonetheme_classic = buildPythonPackage rec {
-    name = "plonetheme.classic-1.3.2";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.2.zip";
-      md5 = "c77d4c34afaf7c02df44d4df72328155";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_authentication = buildPythonPackage rec {
-    name = "zope.authentication-3.7.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.authentication/zope.authentication-3.7.1.zip";
-      md5 = "7d6bb340610518f2fc71213cfeccda68";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_security zope_component setuptools zope_schema zope_browser ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_i18n = buildPythonPackage rec {
-    name = "zope.i18n-3.7.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.i18n/zope.i18n-3.7.4.tar.gz";
-      md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_component zope_i18nmessageid pytz setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_componentvocabulary = buildPythonPackage rec {
-    name = "zope.componentvocabulary-1.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.componentvocabulary/zope.componentvocabulary-1.0.1.tar.gz";
-      md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_security zope_component setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_ofsp = buildPythonPackage rec {
-    name = "Products.OFSP-2.13.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.OFSP/Products.OFSP-2.13.2.zip";
-      md5 = "c76d40928753c2ee56db873304e65bd5";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol persistence setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_datetime = buildPythonPackage rec {
-    name = "zope.datetime-3.4.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.datetime/zope.datetime-3.4.1.tar.gz";
-      md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  experimental_cssselect = buildPythonPackage rec {
-    name = "experimental.cssselect-0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/e/experimental.cssselect/experimental.cssselect-0.3.zip";
-      md5 = "3fecdcf1fbc3ea6025e115a56a262957";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ lxml setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_passwordresettool = buildPythonPackage rec {
-    name = "Products.PasswordResetTool-2.0.14";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.14.zip";
-      md5 = "4267a5fef471d0ebe5ca848e86630702";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface plone_memoize datetime zope_component setuptools zope_i18n products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_jquerytools = buildPythonPackage rec {
-    name = "plone.app.jquerytools-1.5.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.5.zip";
-      md5 = "7a4957a3a8482e4963e49e2d02772e33";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_component zope2 products_cmfcore setuptools products_genericsetup ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_validation = buildPythonPackage rec {
-    name = "Products.validation-2.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.validation/Products.validation-2.0.zip";
-      md5 = "afa217e2306637d1dccbebf337caa8bf";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface datetime setuptools zope_i18n acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_registry = buildPythonPackage rec {
-    name = "plone.registry-1.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.registry/plone.registry-1.0.1.zip";
-      md5 = "6be3d2ec7e2d170e29b8c0bc65049aff";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing zope_interface zope_dottedname zope_component zodb3 zope_event setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_portlet_static = buildPythonPackage rec {
-    name = "plone.portlet.static-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip";
-      md5 = "ec0dc691b4191a41ff97779b117f9985";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 plone_app_portlets zope_formlib zope_interface setuptools plone_i18n plone_portlets zope_component plone_app_form zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_viewlet = buildPythonPackage rec {
-    name = "zope.viewlet-3.7.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.viewlet/zope.viewlet-3.7.2.tar.gz";
-      md5 = "367e03096df57e2f9b74fff43f7901f9";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_browserpage zope_i18nmessageid zope_publisher zope_interface zope_location zope_security zope_configuration zope_component zope_event setuptools zope_schema zope_traversing zope_contentprovider ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_portlet_collection = buildPythonPackage rec {
-    name = "plone.portlet.collection-2.1.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.1.5.zip";
-      md5 = "065f0d9141860229cf66d0ff2ed6d4ea";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_memoize setuptools plone_app_vocabularies plone_app_form plone_portlets plone_app_portlets ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_users = buildPythonPackage rec {
-    name = "plone.app.users-1.2a2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.users/plone.app.users-1.2a2.zip";
-      md5 = "a96e42e34d97162363cb3bbc8483d2ba";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid setuptools zope_site zope_formlib zope_interface plone_app_controlpanel plone_app_layout zope2 zope_component products_statusmessages products_cmfdefault five_formlib plone_protect zodb3 zope_schema products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_querystring = buildPythonPackage rec {
-    name = "plone.app.querystring-1.0.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.querystring/plone.app.querystring-1.0.8.zip";
-      md5 = "3ad2155da0dd5c6b99643551ad494607";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_i18n zope_publisher setuptools zope_globalrequest plone_app_vocabularies zope_dottedname plone_app_layout datetime plone_registry zope_component plone_app_contentlisting zope_interface zope_schema plone_app_registry products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_i18nmessageid = buildPythonPackage rec {
-    name = "zope.i18nmessageid-3.5.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-3.5.3.tar.gz";
-      md5 = "cb84bf61c2b7353e3b7578057fbaa264";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_folder = buildPythonPackage rec {
-    name = "plone.app.folder-1.0.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.folder/plone.app.folder-1.0.5.zip";
-      md5 = "8ea860daddb4c93c0b7f2b5f7106fef0";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_folder setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_zcatalog = buildPythonPackage rec {
-    name = "Products.ZCatalog-2.13.23";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZCatalog/Products.ZCatalog-2.13.23.zip";
-      md5 = "d425171516dfc70e543a4e2b852301cb";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol zope_testing extensionclass missing zope_dottedname restrictedpython datetime record persistence zodb3 documenttemplate setuptools zope_interface zope_schema products_zctextindex zexceptions acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  python_openid = buildPythonPackage rec {
-    name = "python-openid-2.2.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.zip";
-      md5 = "f89d9d4f4dccfd33b5ce34eb4725f751";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  z3c_autoinclude = buildPythonPackage rec {
-    name = "z3c.autoinclude-0.3.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.autoinclude/z3c.autoinclude-0.3.4.zip";
-      md5 = "6a615ae18c12b459bceb3ae28e8e7709";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_dottedname zope_configuration zc_buildout setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_processlifetime = buildPythonPackage rec {
-    name = "zope.processlifetime-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.processlifetime/zope.processlifetime-1.0.tar.gz";
-      md5 = "69604bfd668a01ebebdd616a8f26ccfe";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_uuid = buildPythonPackage rec {
-    name = "plone.uuid-1.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.uuid/plone.uuid-1.0.3.zip";
-      md5 = "183fe2911a7d6c9f6b3103855e98ad8a";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_browserpage zope_publisher setuptools zope_lifecycleevent ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_dexterity = buildPythonPackage rec {
-    name = "plone.dexterity-2.1.3";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.1.3.zip";
-      md5 = "7f6444a2c26488e4068217266fd243b7";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface plone_memoize zope_dottedname zope_container zope_lifecycleevent plone_synchronize zope_annotation plone_autoform plone_behavior plone_folder zope_publisher products_cmfdefault zope_filerepresentation zope_browser plone_rfc822 zope_size plone_alterego products_statusmessages zope_schema zope2 zope_component zope_location zope_security plone_z3cform zodb3 plone_supermodel plone_uuid setuptools products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_synchronize = buildPythonPackage rec {
-    name = "plone.synchronize-1.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.synchronize/plone.synchronize-1.0.1.zip";
-      md5 = "d25e86ace8daa0816861296c3288c4fb";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_traversing = buildPythonPackage rec {
-    name = "zope.traversing-3.13.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.traversing/zope.traversing-3.13.2.zip";
-      md5 = "eaad8fc7bbef126f9f8616b074ec00aa";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_proxy zope_location zope_interface zope_security zope_component setuptools zope_publisher zope_i18n ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  python_gettext = buildPythonPackage rec {
-    name = "python-gettext-1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-gettext/python-gettext-1.2.zip";
-      md5 = "cd4201d440126d1296d1d2bc2b4795f3";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ unittest2 ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_securemailhost = buildPythonPackage rec {
-    name = "Products.SecureMailHost-1.1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.SecureMailHost/Products.SecureMailHost-1.1.2.zip";
-      md5 = "7db0f1fa867bd0df972082f502a7a707";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_plonelanguagetool = buildPythonPackage rec {
-    name = "Products.PloneLanguageTool-3.2.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip";
-      md5 = "bd9eb6278bf76e8cbce99437ca362164";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  eggtestinfo = buildPythonPackage rec {
-    name = "eggtestinfo-0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/e/eggtestinfo/eggtestinfo-0.3.tar.gz";
-      md5 = "6f0507aee05f00c640c0d64b5073f840";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_recipe_zeoserver = buildPythonPackage rec {
-    name = "plone.recipe.zeoserver-1.2.6";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.recipe.zeoserver/plone.recipe.zeoserver-1.2.6.zip";
-      md5 = "3e2b1634c850b76b0f485675799d0189";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_mkzeoinstance zopeundo zodb3 zc_buildout setuptools zc_recipe_egg ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  mailinglogger = buildPythonPackage rec {
-    name = "mailinglogger-3.7.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mailinglogger/mailinglogger-3.7.0.tar.gz";
-      md5 = "f865f0df6059ce23062b7457d01dbac5";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  missing = buildPythonPackage rec {
-    name = "Missing-2.13.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip";
-      md5 = "9823cff54444cbbcaef8fc45d8e42572";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_deferredimport = buildPythonPackage rec {
-    name = "zope.deferredimport-3.5.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.deferredimport/zope.deferredimport-3.5.3.tar.gz";
-      md5 = "68fce3bf4f011d4a840902fd763884ee";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_proxy setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_tales = buildPythonPackage rec {
-    name = "zope.tales-3.5.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.tales/zope.tales-3.5.3.tar.gz";
-      md5 = "a2dbc6e41140c29de81b66a4d703fc3f";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface setuptools zope_tal ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_zsqlmethods = buildPythonPackage rec {
-    name = "Products.ZSQLMethods-2.13.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZSQLMethods/Products.ZSQLMethods-2.13.4.zip";
-      md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass missing zope_interface datetime zope2 record transaction acquisition setuptools zodb3 persistence ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_statusmessages = buildPythonPackage rec {
-    name = "Products.statusmessages-4.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.statusmessages/Products.statusmessages-4.0.zip";
-      md5 = "265324b0a58a032dd0ed038103ed0473";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_annotation zope_i18n setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_i18n = buildPythonPackage rec {
-    name = "plone.i18n-2.0.8";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.8.zip";
-      md5 = "572c21e86b99316a06dc9998454d7750";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ unidecode zope_publisher zope_interface zope_component setuptools zope_i18n ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  archetypes_querywidget = buildPythonPackage rec {
-    name = "archetypes.querywidget-1.0.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.8.zip";
-      md5 = "3416b6b4948c624e1b5b8dd8d7e33f59";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_app_jquerytools plone_app_querystring setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_transformchain = buildPythonPackage rec {
-    name = "plone.transformchain-1.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.transformchain/plone.transformchain-1.0.3.zip";
-      md5 = "f5fb7ca894249e3e666501c4fae52a6c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_schema zope_interface setuptools zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_pluggableauthservice = buildPythonPackage rec {
-    name = "Products.PluggableAuthService-1.10.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PluggableAuthService/Products.PluggableAuthService-1.10.0.tar.gz";
-      md5 = "1a1db6b1d9dd34f8b93a8a3104385a37";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ products_pluginregistry zope2 products_genericsetup setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  borg_localrole = buildPythonPackage rec {
-    name = "borg.localrole-3.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/b/borg.localrole/borg.localrole-3.0.2.zip";
-      md5 = "04082694dfda9ae5cda62747b8ac7ccf";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 products_genericsetup zope_deferredimport zope_interface plone_memoize zope_component setuptools products_pluggableauthservice zope_annotation products_cmfcore acquisition products_plonepas ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  archetypes_referencebrowserwidget = buildPythonPackage rec {
-    name = "archetypes.referencebrowserwidget-2.4.18";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.18.zip";
-      md5 = "6eff85cbde401ff1566a76323792d514";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_app_jquerytools zope_component zope_interface plone_app_form zope_formlib setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  five_globalrequest = buildPythonPackage rec {
-    name = "five.globalrequest-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz";
-      md5 = "87f8996bd21d4aa156aa26e7d21b8744";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_globalrequest zope2 setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_rfc822 = buildPythonPackage rec {
-    name = "plone.rfc822-1.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.rfc822/plone.rfc822-1.0.1.zip";
-      md5 = "b5b79bb5a9181da624a7e88940a45424";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_schema zope_component python_dateutil setuptools zope_interface ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plonetheme_sunburst = buildPythonPackage rec {
-    name = "plonetheme.sunburst-1.4.4";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.4.zip";
-      md5 = "f2cb3fdd66ecc14d1a542d2ca76252db";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_portlets = buildPythonPackage rec {
-    name = "plone.portlets-2.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.portlets/plone.portlets-2.2.zip";
-      md5 = "5b7e06bee6e40af83694b82e1fee8c2d";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_publisher zope_site zope_container zope_interface plone_memoize zope_component zodb3 setuptools zope_schema zope_annotation zope_contentprovider ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_proxy = buildPythonPackage rec {
-    name = "zope.proxy-3.6.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-3.6.1.zip";
-      md5 = "a400b0a26624b17fa889dbcaa989d440";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_archetypes = buildPythonPackage rec {
-    name = "Products.Archetypes-1.9.1";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.9.1.zip";
-      md5 = "c2343539f9f3e485f0bc98b46c12cd85";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfformcontroller zope_interface zope_contenttype datetime zope_component products_mimetypesregistry plone_app_folder zope2 zope_lifecycleevent zope_i18nmessageid zope_publisher products_genericsetup products_validation products_portaltransforms products_cmfquickinstallertool products_placelesstranslationservice zope_event acquisition products_dcworkflow products_cmfdefault zope_tal plone_folder products_zsqlmethods products_statusmessages zope_schema zope_viewlet products_cmfcalendar extensionclass zope_datetime products_marshall zope_site zope_deferredimport zodb3 plone_uuid setuptools transaction zope_i18n products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  initgroups = buildPythonPackage rec {
-    name = "initgroups-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/i/initgroups/initgroups-2.13.0.zip";
-      md5 = "38e842dcab8445f65e701fec75213acd";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_schema = buildPythonPackage rec {
-    name = "zope.schema-4.2.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz";
-      md5 = "e7e581af8193551831560a736a53cf58";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_event setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_scale = buildPythonPackage rec {
-    name = "plone.scale-1.3.2";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.2.zip";
-      md5 = "584ccbf515aff9fef363c2cc8abac789";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_copy = buildPythonPackage rec {
-    name = "zope.copy-3.5.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.copy/zope.copy-3.5.0.tar.gz";
-      md5 = "a9836a5d36cd548be45210eb00407337";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  roman = buildPythonPackage rec {
-    name = "roman-1.4.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/r/roman/roman-1.4.0.tar.gz";
-      md5 = "4f8832ed4108174b159c2afb4bd1d1dd";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_event = buildPythonPackage rec {
-    name = "zope.event-3.5.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz";
-      md5 = "6e8af2a16157a74885d4f0d88137cefb";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  acquisition = buildPythonPackage rec {
-    name = "Acquisition-2.13.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip";
-      md5 = "8c33160c157b50649e2b2b3224622579";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface extensionclass ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_resource = buildPythonPackage rec {
-    name = "plone.resource-1.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.resource/plone.resource-1.0.2.zip";
-      md5 = "594d41e3acd913ae92f2e9ef96503b9f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ python_dateutil zope_filerepresentation zope2 zope_publisher z3c_caching zope_interface zope_traversing zope_configuration zope_component plone_caching setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_linkintegrity = buildPythonPackage rec {
-    name = "plone.app.linkintegrity-1.5.2";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.2.zip";
-      md5 = "f97c61da9f243391cafdfe3fe1cf6d6c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_resourceregistries = buildPythonPackage rec {
-    name = "Products.ResourceRegistries-2.2.9";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.9.zip";
-      md5 = "8dd4f36eb894d868366b51941f6f0966";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 products_genericsetup zope_interface datetime plone_app_registry zope_component zodb3 setuptools zope_viewlet products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_browserlayer = buildPythonPackage rec {
-    name = "plone.browserlayer-2.1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.browserlayer/plone.browserlayer-2.1.2.zip";
-      md5 = "bce02f4907a4f29314090c525e5fc28e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 zope_interface zope_traversing zope_component setuptools products_genericsetup products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  markdown = buildPythonPackage rec {
-    name = "Markdown-2.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.3.zip";
-      md5 = "122418893e21e91109edbf6e082f830d";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  z3c_formwidget_query = buildPythonPackage rec {
-    name = "z3c.formwidget.query-0.9";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.formwidget.query/z3c.formwidget.query-0.9.zip";
-      md5 = "d9f7960b1a5a81d8ba5241530f496522";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid z3c_form zope_interface zope_component setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_z3cform = buildPythonPackage rec {
-    name = "plone.app.z3cform-0.7.3";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.3.zip";
-      md5 = "deddc1af36efb26a6792c9803531c665";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 setuptools plone_z3cform zope_interface z3c_formwidget_query collective_z3cform_datetimewidget zope_component zope_browserpage plone_protect zope_traversing ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_viewletmanager = buildPythonPackage rec {
-    name = "plone.app.viewletmanager-2.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.3.zip";
-      md5 = "1dbc51c7664ce3e6ca4dcca1b7b86082";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 products_genericsetup zope_site zope_interface zope_component zodb3 acquisition setuptools plone_app_vocabularies zope_viewlet zope_contentprovider ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_contentlisting = buildPythonPackage rec {
-    name = "plone.app.contentlisting-1.0.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.4.zip";
-      md5 = "fa6eb45c4ffd0eb3817ad4813ca24916";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_uuid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_ramcache = buildPythonPackage rec {
-    name = "zope.ramcache-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.ramcache/zope.ramcache-1.0.zip";
-      md5 = "87289e15f0e51f50704adda1557c02a7";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_location zodb3 zope_testing setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_vocabularies = buildPythonPackage rec {
-    name = "plone.app.vocabularies-2.1.10";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.10.tar.gz";
-      md5 = "166a0d6f9a3e3cd753efa56aaef585be";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_site zope_formlib zope_interface zope_component setuptools zope_schema zope_browser zope_i18n products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_discussion = buildPythonPackage rec {
-    name = "plone.app.discussion-2.2.7";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.7.tar.gz";
-      md5 = "47e2713140dbbcd6dd9c3fa6dbd17fd0";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_app_uuid zope_site plone_indexer collective_monkeypatcher zope_interface plone_app_z3cform zope_container plone_app_layout plone_z3cform plone_app_registry zope_component zodb3 zope_event setuptools z3c_form zope_lifecycleevent zope_annotation plone_registry ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zlog = buildPythonPackage rec {
-    name = "zLOG-2.11.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zLOG/zLOG-2.11.1.tar.gz";
-      md5 = "68073679aaa79ac5a7b6a5c025467147";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zconfig ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone = buildPythonPackage rec {
-    name = "Plone-4.3.1";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.1.zip";
-      md5 = "faefd5d2044a9f7660fd18388fd71a4e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfplone plone_app_caching plone_app_dexterity plone_app_theming setuptools products_cmfplacefulworkflow plone_app_openid plone_app_iterate wicked ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_standardcachemanagers = buildPythonPackage rec {
-    name = "Products.StandardCacheManagers-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.StandardCacheManagers/Products.StandardCacheManagers-2.13.0.zip";
-      md5 = "c5088b2b62bd26d63d9579a04369cb73";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol zope_component transaction setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_fieldsets = buildPythonPackage rec {
-    name = "plone.fieldsets-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.fieldsets/plone.fieldsets-2.0.2.zip";
-      md5 = "4158c8a1f784fcb5cecbd63deda7222f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_formlib zope_interface zope_component five_formlib setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  collective_monkeypatcher = buildPythonPackage rec {
-    name = "collective.monkeypatcher-1.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.monkeypatcher/collective.monkeypatcher-1.0.1.zip";
-      md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  z3c_zcmlhook = buildPythonPackage rec {
-    name = "z3c.zcmlhook-1.0b1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.zcmlhook/z3c.zcmlhook-1.0b1.tar.gz";
-      md5 = "7b6c80146f5930409eb0b355ddf3daeb";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_component zope_configuration setuptools zope_interface ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_recipe_zope2instance = buildPythonPackage rec {
-    name = "plone.recipe.zope2instance-4.2.11";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.11.zip";
-      md5 = "ac51fe0566b43866906181134a3c8a9e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zodb3 mailinglogger zc_buildout setuptools zope2 zc_recipe_egg ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_supermodel = buildPythonPackage rec {
-    name = "plone.supermodel-1.2.2";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.2.zip";
-      md5 = "6e829dc362d6ff8e3c7696277e11e322";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ lxml zope_deferredimport zope_interface zope_dottedname zope_component z3c_zcmlhook setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_registry = buildPythonPackage rec {
-    name = "plone.app.registry-1.2.3";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.2.3.zip";
-      md5 = "b2269e10516e8f2faf83545e3d0163d8";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid lxml plone_registry products_genericsetup plone_supermodel plone_app_z3cform zope_dottedname zope_component zope2 setuptools zope_interface products_statusmessages plone_autoform products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_pagetemplate = buildPythonPackage rec {
-    name = "zope.pagetemplate-3.6.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.pagetemplate/zope.pagetemplate-3.6.3.zip";
-      md5 = "834a4bf702c05fba1e669677b4dc871f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_traversing zope_tales zope_security zope_component setuptools zope_tal zope_i18n ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfformcontroller = buildPythonPackage rec {
-    name = "Products.CMFFormController-3.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFFormController/Products.CMFFormController-3.0.3.zip";
-      md5 = "6573df7dcb39e3b63ba22abe2acd639e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ transaction products_genericsetup zope_interface zope_tales products_cmfcore zope2 setuptools zope_structuredtext acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_openid = buildPythonPackage rec {
-    name = "plone.openid-2.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.openid/plone.openid-2.0.1.zip";
-      md5 = "d4c36926a6dbefed035ed92c29329ce1";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ transaction products_pluggableauthservice python_openid zodb3 setuptools zope2 acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_content = buildPythonPackage rec {
-    name = "zope.app.content-3.5.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.content/zope.app.content-3.5.1.tar.gz";
-      md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_interface zope_componentvocabulary zope_security setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_size = buildPythonPackage rec {
-    name = "zope.size-3.4.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.size/zope.size-3.4.1.tar.gz";
-      md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_mimetypesregistry = buildPythonPackage rec {
-    name = "Products.MimetypesRegistry-2.0.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.4.zip";
-      md5 = "898166bb2aaececc8238ad4ee4826793";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 zope_interface zope_contenttype zodb3 setuptools products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_imaging = buildPythonPackage rec {
-    name = "plone.app.imaging-1.0.9";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.9.zip";
-      md5 = "e680c5540021a70266343b935ac732a7";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_marshall = buildPythonPackage rec {
-    name = "Products.Marshall-2.1.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.Marshall/Products.Marshall-2.1.2.zip";
-      md5 = "bde4d7f75195c1ded8371554b04d2541";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ transaction products_genericsetup zope_interface zope_contenttype datetime extensionclass plone_uuid setuptools zope2 products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_ptresource = buildPythonPackage rec {
-    name = "zope.ptresource-3.9.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.ptresource/zope.ptresource-3.9.0.tar.gz";
-      md5 = "f4645e51c15289d3fdfb4139039e18e9";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_publisher zope_pagetemplate zope_interface zope_browserresource zope_security setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfactionicons = buildPythonPackage rec {
-    name = "Products.CMFActionIcons-2.1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFActionIcons/Products.CMFActionIcons-2.1.3.tar.gz";
-      md5 = "ab1dc62404ed11aea84dc0d782b2235e";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ products_cmfcore setuptools products_genericsetup eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  multimapping = buildPythonPackage rec {
-    name = "MultiMapping-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/M/MultiMapping/MultiMapping-2.13.0.zip";
-      md5 = "d69c5904c105b9f2f085d4103e0f0586";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_mailhost = buildPythonPackage rec {
-    name = "Products.MailHost-2.13.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.MailHost/Products.MailHost-2.13.1.zip";
-      md5 = "1102e523435d8bf78a15b9ddb57478e1";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  pytz = buildPythonPackage rec {
-    name = "pytz-2013b";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pytz/pytz-2013b.zip";
-      md5 = "c70dc37ffe435dd77e3f967a0dffe928";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_i18n = buildPythonPackage rec {
-    name = "plone.app.i18n-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.i18n/plone.app.i18n-2.0.2.zip";
-      md5 = "a10026573463dfc1899bf4062cebdbf2";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_indexer = buildPythonPackage rec {
-    name = "plone.indexer-1.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip";
-      md5 = "538aeee1f9db78bc8c85ae1bcb0153ed";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface products_cmfcore setuptools zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_externalmethod = buildPythonPackage rec {
-    name = "Products.ExternalMethod-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip";
-      md5 = "15ba953ef6cb632eb571977651252ea6";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol extensionclass zodb3 persistence setuptools acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_upgrade = buildPythonPackage rec {
-    name = "plone.app.upgrade-1.3.3";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.3.zip";
-      md5 = "1c45e809fba27bec11e8a40f686f0f5b";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfformcontroller zope_interface products_cmfactionicons products_cmfeditions products_archetypes products_mimetypesregistry plone_app_folder products_cmfuid products_securemailhost zope_ramcache products_genericsetup products_cmfdifftool five_localsitemanager products_cmfquickinstallertool products_portaltransforms products_cmfdefault acquisition products_dcworkflow products_zcatalog borg_localrole products_contentmigration products_resourceregistries plone_portlets zope2 plone_app_portlets products_cmfcalendar products_plonepas transaction products_pluggableauthservice zope_site zope_component zope_location products_plonelanguagetool plone_session setuptools products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_browserpage = buildPythonPackage rec {
-    name = "zope.browserpage-3.12.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz";
-      md5 = "a543ef3cb1b42f7233b3fca23dc9ea60";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_pagetemplate zope_interface zope_traversing zope_component zope_security zope_configuration zope_publisher setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_resourceeditor = buildPythonPackage rec {
-    name = "plone.resourceeditor-1.0";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip";
-      md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_resource zope2 zope_publisher zope_interface zope_component setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_atcontenttypes = buildPythonPackage rec {
-    name = "Products.ATContentTypes-2.1.13";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.13.zip";
-      md5 = "093899fc74f5e2a83db464c96d0f5293";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface plone_memoize datetime products_archetypes products_mimetypesregistry plone_app_folder zope2 zope_i18nmessageid zope_publisher products_genericsetup plone_i18n products_portaltransforms products_cmfdefault products_atreferencebrowserwidget zope_tal zconfig archetypes_referencebrowserwidget transaction products_validation acquisition extensionclass zope_component plone_app_layout zodb3 setuptools zope_i18n products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfeditions = buildPythonPackage rec {
-    name = "Products.CMFEditions-2.2.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.8.zip";
-      md5 = "1806f2e17e2527fad9364670b343bd11";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid transaction products_cmfdifftool zope_copy zope_interface products_genericsetup zope_dottedname products_zopeversioncontrol datetime products_cmfuid zodb3 products_cmfcore setuptools zope2 acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_interface = buildPythonPackage rec {
-    name = "zope.interface-3.6.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.6.7.zip";
-      md5 = "9df962180fbbb54eb1875cff9fe436e5";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_content = buildPythonPackage rec {
-    name = "plone.app.content-2.1.2";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.2.zip";
-      md5 = "247eb174269b2ab03c05f318915f087e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_publisher zope_container plone_batching zope_interface plone_memoize plone_i18n zope_component zope_event products_cmfcore setuptools zope_schema zope_lifecycleevent zope_i18n zope_viewlet acquisition products_cmfdefault ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfquickinstallertool = buildPythonPackage rec {
-    name = "Products.CMFQuickInstallerTool-3.0.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/Products.CMFQuickInstallerTool-3.0.6.tar.gz";
-      md5 = "af34adb87ddf2b6da48eff8b70ca2989";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 products_genericsetup zope_interface datetime zope_component setuptools zope_annotation products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_autoform = buildPythonPackage rec {
-    name = "plone.autoform-1.4";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.4.zip";
-      md5 = "01e5ccb59253bfaaa02c1ab4be3f212f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ z3c_form zope_interface zope_dottedname zope_security setuptools plone_supermodel zope_schema plone_z3cform ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_contentrules = buildPythonPackage rec {
-    name = "plone.app.contentrules-3.0.3";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.3.zip";
-      md5 = "518c1e22a9cfe187b6770e62be4f8bd8";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_traversing plone_app_form zope_component zope_lifecycleevent zope_annotation zope_i18nmessageid products_genericsetup zope_event products_cmfdefault zope_browser plone_uuid plone_memoize zope2 plone_stringinterp products_statusmessages plone_contentrules zope_schema acquisition transaction zope_site zope_container plone_app_vocabularies zope_publisher zope_formlib zodb3 five_formlib setuptools products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  record = buildPythonPackage rec {
-    name = "Record-2.13.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/R/Record/Record-2.13.0.zip";
-      md5 = "cfed6a89d4fb2c9cb995e9084c3071b7";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_behavior = buildPythonPackage rec {
-    name = "plone.behavior-1.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.behavior/plone.behavior-1.0.2.zip";
-      md5 = "4459b91287ebc2f2cf4fa38728b2a739";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_configuration zope_component setuptools zope_schema zope_annotation ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_plonetestcase = buildPythonPackage rec {
-    name = "Products.PloneTestCase-0.9.17";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/P/Products.PloneTestCase/Products.PloneTestCase-0.9.17.zip";
-      md5 = "2a5bfb94220a520961d710abc92280f2";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfplone zope_testing zope2 products_genericsetup zope_site zope_interface products_atcontenttypes zope_component zodb3 setuptools products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_stringinterp = buildPythonPackage rec {
-    name = "plone.stringinterp-1.0.10";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.10.zip";
-      md5 = "595074e94944ad6860e2105a020a3b9a";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18n products_cmfcore setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_formwidget_namedfile = buildPythonPackage rec {
-    name = "plone.formwidget.namedfile-1.0.6";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.6.zip";
-      md5 = "afd20f030906a72fca7548876bdcbb48";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ z3c_form plone_z3cform plone_namedfile setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_blob = buildPythonPackage rec {
-    name = "plone.app.blob-1.5.8";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.blob/plone.app.blob-1.5.8.zip";
-      md5 = "7e575d8df137cd19067cc95845aae604";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_scale plone_app_imaging zodb3 setuptools archetypes_schemaextender zope_proxy ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfdynamicviewfti = buildPythonPackage rec {
-    name = "Products.CMFDynamicViewFTI-4.0.5";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.5.zip";
-      md5 = "2d31b1700ed8b1441adc737b454af693";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass products_genericsetup zope_browsermenu zope_interface zope_component zope2 setuptools products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_keyring = buildPythonPackage rec {
-    name = "plone.keyring-2.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.keyring/plone.keyring-2.0.1.zip";
-      md5 = "f3970e9bddb2cc65e461a2c62879233f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_container zope_location zodb3 setuptools zope_interface ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_contentprovider = buildPythonPackage rec {
-    name = "zope.contentprovider-3.7.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.contentprovider/zope.contentprovider-3.7.2.tar.gz";
-      md5 = "1bb2132551175c0123f17939a793f812";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_publisher zope_interface zope_location zope_tales zope_component zope_event setuptools zope_schema ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_jquery = buildPythonPackage rec {
-    name = "plone.app.jquery-1.7.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.jquery/plone.app.jquery-1.7.2.tar.gz";
-      md5 = "e204cf45456d26217263531832b5bdac";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ products_cmfcore setuptools products_genericsetup ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_atreferencebrowserwidget = buildPythonPackage rec {
-    name = "Products.ATReferenceBrowserWidget-3.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/Products.ATReferenceBrowserWidget-3.0.zip";
-      md5 = "157bdd32155c8353450c17c649aad042";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_deprecation archetypes_referencebrowserwidget setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_browserresource = buildPythonPackage rec {
-    name = "zope.browserresource-3.10.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-3.10.3.zip";
-      md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_location zope_traversing zope_contenttype zope_configuration zope_publisher setuptools zope_schema zope_i18n zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_caching = buildPythonPackage rec {
-    name = "plone.caching-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.caching/plone.caching-1.0.zip";
-      md5 = "2c2e3b27d13b9101c92dfed222fde36c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid five_globalrequest z3c_caching zope_interface zope2 zope_component setuptools plone_transformchain zope_schema plone_registry ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_locales = buildPythonPackage rec {
-    name = "zope.app.locales-3.6.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.locales/zope.app.locales-3.6.2.tar.gz";
-      md5 = "bd2b4c6040e768f33004b1210d3207fa";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_placelesstranslationservice = buildPythonPackage rec {
-    name = "Products.PlacelessTranslationService-2.0.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/Products.PlacelessTranslationService-2.0.3.zip";
-      md5 = "a94635eb712563c5a002520713f5d6dc";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass zope_publisher zope_deferredimport zope_deprecation zope_interface python_gettext datetime zope_component zodb3 setuptools zope_annotation zope_i18n zope2 acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_z3cform = buildPythonPackage rec {
-    name = "plone.z3cform-0.8.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.8.0.zip";
-      md5 = "bdb23dd162544964d2f8f8f5f002e874";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 zope_component plone_batching zope_i18n z3c_form zope_browserpage setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_lifecycleevent = buildPythonPackage rec {
-    name = "zope.lifecycleevent-3.6.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/zope.lifecycleevent-3.6.2.tar.gz";
-      md5 = "3ba978f3ba7c0805c81c2c79ea3edb33";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_event setuptools zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_form = buildPythonPackage rec {
-    name = "zope.app.form-4.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.form/zope.app.form-4.0.2.tar.gz";
-      md5 = "3d2b164d9d37a71490a024aaeb412e91";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_browserpage zope_schema transaction zope_datetime zope_browsermenu zope_interface zope_exceptions zope_security zope_configuration zope_publisher zope_component zope_formlib zope_browser setuptools zope_proxy zope_i18n ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_tinymce = buildPythonPackage rec {
-    name = "Products.TinyMCE-1.3.4";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.4.zip";
-      md5 = "e697dfdd72f3b6238e26908bb455d39a";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_archetypes plone_app_imaging plone_namedfile plone_app_layout zope_schema products_resourceregistries zope_app_content plone_caching setuptools plone_outputfilters ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  collective_z3cform_datetimewidget = buildPythonPackage rec {
-    name = "collective.z3cform.datetimewidget-1.2.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.3.zip";
-      md5 = "439117021c93f26c677510504ee245d3";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ z3c_form zope_deprecation zope_i18n setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  z3c_form = buildPythonPackage rec {
-    name = "z3c.form-3.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.zip";
-      md5 = "f9fa3cf56c83722425b3b1be4467ce46";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_site zope_pagetemplate zope_interface zope_browserresource six zope_security zope_configuration zope_component zope_browserpage zope_event zope_traversing setuptools zope_schema zope_lifecycleevent zope_browser zope_i18n zope_location zope_contentprovider ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_dcworkflow = buildPythonPackage rec {
-    name = "Products.DCWorkflow-2.2.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz";
-      md5 = "c90a16c4f3611015592ba8173a5f1863";
-    };
-    buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  mechanize = buildPythonPackage rec {
-    name = "mechanize-0.2.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.zip";
-      md5 = "a497ad4e875f7506ffcf8ad3ada4c2fc";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_iterate = buildPythonPackage rec {
-    name = "plone.app.iterate-2.1.10";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.iterate/plone.app.iterate-2.1.10.zip";
-      md5 = "8bd270d8a3c9509e524a06e092a9b4c4";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_viewlet zope_i18nmessageid zodb3 products_archetypes zope_interface plone_memoize products_cmfeditions datetime zope_component products_dcworkflow products_statusmessages zope_event setuptools products_cmfplacefulworkflow zope_schema zope_lifecycleevent zope_annotation zope2 plone_locking products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  accesscontrol = buildPythonPackage rec {
-    name = "AccessControl-3.0.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/A/AccessControl/AccessControl-3.0.6.zip";
-      md5 = "a8ce472482adabf9ec969f3971a39a19";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_security zope_testing extensionclass zope_publisher restrictedpython zope_interface zope_deferredimport zope_schema zope_configuration datetime record transaction acquisition zodb3 zope_component zexceptions persistence ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_testing = buildPythonPackage rec {
-    name = "zope.testing-3.9.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.testing/zope.testing-3.9.7.tar.gz";
-      md5 = "8999f3d143d416dc3c8b2a5bd6f33e28";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_exceptions setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_externaleditor = buildPythonPackage rec {
-    name = "Products.ExternalEditor-1.1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip";
-      md5 = "475fea6e0b958c0c51cfdbfef2f4e623";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_app_publication = buildPythonPackage rec {
-    name = "zope.app.publication-3.12.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.publication/zope.app.publication-3.12.0.zip";
-      md5 = "d8c521287f52fb9f40fa9b8c2acb4675";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_authentication zope_publisher zope_interface zope_location zope_traversing zope_component zope_error zodb3 setuptools zope_browser ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_filerepresentation = buildPythonPackage rec {
-    name = "zope.filerepresentation-3.6.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.filerepresentation/zope.filerepresentation-3.6.1.tar.gz";
-      md5 = "4a7a434094f4bfa99a7f22e75966c359";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_schema zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  six = buildPythonPackage rec {
-    name = "six-1.2.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/s/six/six-1.2.0.tar.gz";
-      md5 = "2a5d1afc79912832ac78fd38e3d75d7e";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_dexterity = buildPythonPackage rec {
-    name = "plone.app.dexterity-2.0.8";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.8.zip";
-      md5 = "2e0ec48224a3a8afd51656c22d574359";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ collective_z3cform_datetimewidget zope_interface zope_component plone_dexterity plone_autoform plone_app_z3cform plone_behavior lxml zope_publisher products_genericsetup plone_supermodel plone_namedfile plone_app_content z3c_form plone_app_textfield plone_rfc822 plone_formwidget_namedfile plone_portlets plone_app_uuid zope_browserpage plone_contentrules products_cmfplone zope_schema products_atcontenttypes zope2 plone_app_layout plone_schemaeditor plone_z3cform setuptools products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_exceptions = buildPythonPackage rec {
-    name = "zope.exceptions-3.6.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-3.6.2.tar.gz";
-      md5 = "d7234d99d728abe3d9275346e8d24fd9";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_layout = buildPythonPackage rec {
-    name = "plone.app.layout-2.3.5";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.5.zip";
-      md5 = "960665807ad60eb3e12c52a0cf092ceb";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_deprecation zope_interface plone_memoize zope_dottedname datetime zope_component zope_annotation zope_publisher plone_i18n products_cmfdefault plone_app_viewletmanager plone_portlets plone_app_portlets zope_schema zope_viewlet acquisition zope2 setuptools zope_i18n plone_locking products_cmfcore products_cmfeditions ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_contenttype = buildPythonPackage rec {
-    name = "zope.contenttype-3.5.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.contenttype/zope.contenttype-3.5.5.zip";
-      md5 = "c6ac80e6887de4108a383f349fbdf332";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  five_customerize = buildPythonPackage rec {
-    name = "five.customerize-1.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.customerize/five.customerize-1.1.zip";
-      md5 = "80772212a2d55150a6c070fc4638b0c7";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing transaction zope_publisher zope_site zope_pagetemplate zope_interface zope_traversing zope_dottedname plone_portlets zope_component zope_componentvocabulary setuptools zope_schema zope_lifecycleevent zope2 zope_viewlet acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_subrequest = buildPythonPackage rec {
-    name = "plone.subrequest-1.6.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.subrequest/plone.subrequest-1.6.7.zip";
-      md5 = "cc12f68a22565415b10dbeef0020baa4";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_globalrequest five_globalrequest setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_site = buildPythonPackage rec {
-    name = "zope.site-3.9.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.site/zope.site-3.9.2.tar.gz";
-      md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_location zope_interface zope_security zope_container zope_event setuptools zope_lifecycleevent zope_annotation zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  wicked = buildPythonPackage rec {
-    name = "wicked-1.1.10";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip";
-      md5 = "f65611f11d547d7dc8e623bf87d3929d";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_schema zope_container zope_traversing setuptools zope_lifecycleevent ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_schemaeditor = buildPythonPackage rec {
-    name = "plone.schemaeditor-1.3.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.schemaeditor/plone.schemaeditor-1.3.2.zip";
-      md5 = "ab9cb4e929f305063dc8f33e9a33fd21";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope2 zope_publisher zope_container z3c_form zope_interface zope_component setuptools zope_schema zope_lifecycleevent plone_autoform plone_z3cform ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_uuid = buildPythonPackage rec {
-    name = "plone.app.uuid-1.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.uuid/plone.app.uuid-1.0.zip";
-      md5 = "9ca8dcfb09a8a0d6bbee0f28073c3d3f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_indexer zope_interface zope_publisher plone_uuid setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  unittest2 = buildPythonPackage rec {
-    name = "unittest2-0.5.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/u/unittest2/unittest2-0.5.1.zip";
-      md5 = "1527fb89e38343945af1166342d851ee";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  persistence = buildPythonPackage rec {
-    name = "Persistence-2.13.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip";
-      md5 = "92693648ccdc59c8fc71f7f06b1d228c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ extensionclass zodb3 ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_zopeversioncontrol = buildPythonPackage rec {
-    name = "Products.ZopeVersionControl-1.1.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZopeVersionControl/Products.ZopeVersionControl-1.1.3.zip";
-      md5 = "238239102f3ac798ee4f4c53343a561f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ transaction zope_interface datetime zodb3 setuptools zope2 acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_location = buildPythonPackage rec {
-    name = "zope.location-3.9.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-3.9.1.tar.gz";
-      md5 = "1684a8f986099d15296f670c58e713d8";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_schema zope_component setuptools zope_proxy ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_browsermenu = buildPythonPackage rec {
-    name = "zope.browsermenu-3.9.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browsermenu/zope.browsermenu-3.9.1.zip";
-      md5 = "a47c7b1e786661c912a1150bf8d1f83f";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_interface zope_traversing zope_component zope_security zope_configuration zope_pagetemplate setuptools zope_schema zope_browser ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_workflow = buildPythonPackage rec {
-    name = "plone.app.workflow-2.1.5";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.5.zip";
-      md5 = "b3589b4def82201adc196b3075b54213";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid transaction products_genericsetup zope_site zope_interface plone_memoize zope_testing datetime zope_component products_statusmessages zope2 setuptools products_dcworkflow zope_schema zope_i18n products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_locking = buildPythonPackage rec {
-    name = "plone.locking-2.0.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip";
-      md5 = "a7f8b8db78f57272d351d7fe0d067eb2";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface datetime zope_component zodb3 setuptools zope_schema zope_annotation zope_viewlet products_cmfcore acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_dottedname = buildPythonPackage rec {
-    name = "zope.dottedname-3.4.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.dottedname/zope.dottedname-3.4.6.tar.gz";
-      md5 = "62d639f75b31d2d864fe5982cb23959c";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_cachedescriptors = buildPythonPackage rec {
-    name = "zope.cachedescriptors-3.5.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip";
-      md5 = "263459a95238fd61d17e815d97ca49ce";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_collection = buildPythonPackage rec {
-    name = "plone.app.collection-1.0.10";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.10.zip";
-      md5 = "1042ac059be2311d4758452a3fa4f82e";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_portlet_collection zope_i18nmessageid transaction plone_app_contentlisting zope_component plone_app_vocabularies plone_app_form products_validation zope_configuration plone_portlets setuptools products_archetypes zope2 plone_app_portlets zope_interface zope_schema products_cmfquickinstallertool archetypes_querywidget products_cmfcore zope_formlib ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zc_lockfile = buildPythonPackage rec {
-    name = "zc.lockfile-1.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.2.tar.gz";
-      md5 = "f099d4cf2583a0c7bea0146a44dc4d59";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  lxml = buildPythonPackage rec {
-    name = "lxml-2.3.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/l/lxml/lxml-2.3.6.tar.gz";
-      md5 = "d5d886088e78b1bdbfd66d328fc2d0bc";
-    };
-    buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_contentrules = buildPythonPackage rec {
-    name = "plone.contentrules-2.0.3";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.3.zip";
-      md5 = "e743dca41b07b7ac1c2a65b652679201";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_container zope_interface zope_testing zope_configuration zope_component zope_componentvocabulary setuptools zodb3 zope_schema zope_lifecycleevent zope_annotation ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_sendmail = buildPythonPackage rec {
-    name = "zope.sendmail-3.7.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.sendmail/zope.sendmail-3.7.5.tar.gz";
-      md5 = "8a513ecf2b41cad849f6607bf16d6818";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_i18nmessageid transaction zope_interface zope_configuration setuptools zope_schema zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_formlib = buildPythonPackage rec {
-    name = "zope.formlib-4.0.6";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.formlib/zope.formlib-4.0.6.zip";
-      md5 = "eed9c94382d11a4dececd0a48ac1d3f2";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_schema zope_datetime zope_interface zope_traversing zope_security zope_component pytz zope_event zope_browser setuptools zope_lifecycleevent zope_i18n zope_browserpage ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_caching = buildPythonPackage rec {
-    name = "plone.app.caching-1.1.4";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.4.zip";
-      md5 = "bbb46c9dc36f0ac6cc833ee152203a81";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfdynamicviewfti z3c_form zope_interface plone_memoize zope_component plone_caching zope_publisher products_genericsetup plone_app_registry z3c_zcmlhook setuptools plone_app_z3cform products_statusmessages python_dateutil plone_cachepurging acquisition zope2 zope_pagetemplate zope_browserresource plone_protect plone_registry products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_cmfplone = buildPythonPackage rec {
-    name = "Products.CMFPlone-4.3.1";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.1.zip";
-      md5 = "2fee0c66e0d9bdf28b513bcd6d95a602";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ products_cmfdynamicviewfti plone_app_blob products_dcworkflow products_extendedpathindex zope_dottedname datetime zope_traversing products_tinymce zope_publisher plonetheme_classic plone_batching plone_fieldsets products_cmfdefault acquisition plone_app_contentlisting products_externaleditor products_pluginregistry products_cmfeditions products_resourceregistries zope_tal plone_app_jquerytools products_genericsetup pillow five_localsitemanager plone_app_vocabularies zope_location zope_deferredimport products_plonelanguagetool borg_localrole zope_i18n plone_browserlayer plone_theme plone_memoize plone_app_contentmenu plone_app_i18n zope_component products_mimetypesregistry plone_app_customerize plone_app_folder plone_registry zope_i18nmessageid plone_app_upgrade products_cmfdifftool five_customerize plone_app_search products_portaltransforms plone_app_controlpanel plone_app_locales plone_app_linkintegrity zope2 plone_contentrules plone_app_portlets products_plonepas zope_pagetemplate zodb3 plone_locking products_cmfformcontroller zope_deprecation plone_app_form plone_app_layout products_cmfquickinstallertool archetypes_querywidget plone_app_redirector plone_i18n plone_app_registry products_placelesstranslationservice plone_app_users zope_interface zope_event plone_app_viewletmanager zope_structuredtext z3c_autoinclude zope_app_locales plone_portlets products_statusmessages products_cmfcalendar extensionclass products_pluggableauthservice plone_indexer products_cmfuid zope_container plone_app_workflow setuptools plone_portlet_collection plone_app_contentrules products_cmfactionicons products_archetypes plone_intelligenttext plone_app_collection products_passwordresettool plone_app_content plonetheme_sunburst plone_protect zope_tales plone_app_uuid archetypes_referencebrowserwidget products_atcontenttypes plone_app_jquery transaction zope_site plone_app_discussion plone_portlet_static plone_session products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  transaction = buildPythonPackage rec {
-    name = "transaction-1.1.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/t/transaction/transaction-1.1.1.tar.gz";
-      md5 = "30b062baa34fe1521ad979fb088c8c55";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_controlpanel = buildPythonPackage rec {
-    name = "plone.app.controlpanel-2.3.6";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.6.zip";
-      md5 = "ca5e0e0c8497d9860603e39e0eeba9b8";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing zope_interface plone_memoize zope_component plone_app_workflow zope_annotation zope_ramcache zope_publisher products_portaltransforms plone_fieldsets zope_event products_cmfdefault zope_cachedescriptors plone_app_form setuptools products_statusmessages zope_schema zope2 acquisition products_plonepas zope_site plone_app_vocabularies zope_formlib zodb3 plone_protect zope_i18n plone_locking products_cmfcore ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_redirector = buildPythonPackage rec {
-    name = "plone.app.redirector-1.2";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.2.zip";
-      md5 = "bc0508844f276ac7a7b9556d37281cc8";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_memoize setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_component = buildPythonPackage rec {
-    name = "zope.component-3.9.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-3.9.5.tar.gz";
-      md5 = "22780b445b1b479701c05978055d1c82";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_event setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zope_broken = buildPythonPackage rec {
-    name = "zope.broken-3.6.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.broken/zope.broken-3.6.0.zip";
-      md5 = "eff24d7918099a3e899ee63a9c31bee6";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_namedfile = buildPythonPackage rec {
-    name = "plone.namedfile-2.0.2";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.2.zip";
-      md5 = "f6168ab9e38f3a171dc35483527b3e01";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_traversing zope_security zope_component zope_browserpage setuptools plone_rfc822 ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_openid = buildPythonPackage rec {
-    name = "plone.app.openid-2.0.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.openid/plone.app.openid-2.0.2.tar.gz";
-      md5 = "ae0748f91cab0612a498926d405d8edd";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ products_plonepas zope_i18nmessageid zope2 setuptools plone_openid zope_interface plone_portlets zope_component plone_app_portlets products_cmfcore products_pluggableauthservice ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  z3c_caching = buildPythonPackage rec {
-    name = "z3c.caching-2.0a1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.caching/z3c.caching-2.0a1.tar.gz";
-      md5 = "17f250b5084c2324a7d15c6810ee628e";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_interface zope_component zope_event setuptools zope_lifecycleevent zope_browser ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  plone_app_textfield = buildPythonPackage rec {
-    name = "plone.app.textfield-1.2.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.2.zip";
-      md5 = "f832887a40826d6f68c48b48f071fb9c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_schema zope_interface zodb3 setuptools zope_component ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  tempstorage = buildPythonPackage rec {
-    name = "tempstorage-2.12.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.2.zip";
-      md5 = "7a2b76b39839e229249b1bb175604480";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_testing zodb3 setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  zc_recipe_egg = buildPythonPackage rec {
-    name = "zc.recipe.egg-1.3.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-1.3.2.tar.gz";
-      md5 = "1cb6af73f527490dde461d3614a36475";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zc_buildout setuptools ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  products_zctextindex = buildPythonPackage rec {
-    name = "Products.ZCTextIndex-2.13.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.4.zip";
-      md5 = "8bbfa5fcd3609246990a9314d6f826b4";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ accesscontrol transaction zope_interface zexceptions zodb3 persistence setuptools acquisition ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-  extensionclass = buildPythonPackage rec {
-    name = "ExtensionClass-2.13.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip";
-      md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
-}; in plone43Packages
diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
new file mode 100644
index 000000000000..1e8c0db90455
--- /dev/null
+++ b/pkgs/games/steam/default.nix
@@ -0,0 +1,99 @@
+{ stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc, glibc
+, libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk
+, gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib
+, dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio
+, libxcb, libXau, libXdmcp, flashplayer, libSM, libICE, libXext
+, dbus_glib, libusb1, networkmanager
+, SDL # World of Goo
+, libvorbis # Osmos
+, curl, mesa # Superbrothers: S&S EP
+, patchelf }:
+
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+
+let version = "1.0.0.39"; in
+
+stdenv.mkDerivation rec {
+  name = "steam-${version}";
+
+  src = fetchurl {
+    url = "http://repo.steampowered.com/steam/archive/precise/steam-launcher_${version}_all.deb";
+    sha256 = "1z1cnlr2qw2ndnqsfwjck9617m2p0f3p9q9409vczj909h2a9wyk";
+  };
+
+  buildInputs = [ dpkg makeWrapper ];
+
+  phases = "installPhase";
+
+  installPhase = ''
+    mkdir -p $out
+    dpkg-deb -x $src $out
+    cp -r $out/usr/* $out/
+    rm -rf $out/usr
+    substituteInPlace "$out/bin/steam" --replace "/usr/bin/env bash" "/bin/sh"
+    substituteInPlace "$out/bin/steam" --replace "/usr/" "$out/"
+    sed -i 's,STEAMPACKAGE=.*,STEAMPACKAGE=steam,' $out/bin/steam
+    sed -i '/STEAMSCRIPT/d' $out/bin/steam
+
+    mv $out/bin/steam $out/bin/.steam-wrapped
+    cat > $out/bin/steam << EOF
+
+    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib:${libSM}/lib:${libICE}/lib:${dbus_glib}/lib:${networkmanager}/lib:${libXext}/lib:${libusb1}/lib
+    STEAMBOOTSTRAP=~/.steam/steam/steam.sh
+    if [ -f \$STEAMBOOTSTRAP ]; then
+      PLATFORM32=ubuntu12_32
+      STEAMCONFIG=~/.steam
+      STEAMROOT=~/.local/share/Steam
+      STEAMDATA="\$STEAMROOT"
+      PIDFILE="\$STEAMCONFIG/steam.pid"
+      STEAMBIN32LINK="\$STEAMCONFIG/bin32"
+      STEAMBIN64LINK="\$STEAMCONFIG/bin64"
+      STEAMSDK32LINK="\$STEAMCONFIG/sdk32"
+      STEAMSDK64LINK="\$STEAMCONFIG/sdk64"
+      STEAMROOTLINK="\$STEAMCONFIG/root"
+      STEAMDATALINK="\$STEAMCONFIG/steam"
+      STEAMSTARTING="\$STEAMCONFIG/starting"
+      # Create symbolic links for the Steam API
+      if [ ! -e "\$STEAMCONFIG" ]; then
+          mkdir "\$STEAMCONFIG"
+      fi
+      if [ "\$STEAMROOT" != "\$STEAMROOTLINK" -a "\$STEAMROOT" != "\$STEAMDATALINK" ]; then
+          rm -f "\$STEAMBIN32LINK" && ln -s "\$STEAMROOT/\$PLATFORM32" "\$STEAMBIN32LINK"
+          rm -f "\$STEAMBIN64LINK" && ln -s "\$STEAMROOT/\$PLATFORM64" "\$STEAMBIN64LINK"
+          rm -f "\$STEAMSDK32LINK" && ln -s "\$STEAMROOT/linux32" "\$STEAMSDK32LINK"
+          rm -f "\$STEAMSDK64LINK" && ln -s "\$STEAMROOT/linux64" "\$STEAMSDK64LINK"
+          rm -f "\$STEAMROOTLINK" && ln -s "\$STEAMROOT" "\$STEAMROOTLINK"
+          if [ "\$STEAMDATALINK" ]; then
+              rm -f "\$STEAMDATALINK" && ln -s "\$STEAMDATA" "\$STEAMDATALINK"
+          fi
+      fi
+      # Temporary bandaid until everyone has the new libsteam_api.so
+      rm -f ~/.steampath && ln -s "\$STEAMCONFIG/bin32/steam" ~/.steampath
+      rm -f ~/.steampid && ln -s "\$PIDFILE" ~/.steampid
+      rm -f ~/.steam/bin && ln -s "\$STEAMBIN32LINK" ~/.steam/bin
+      export LD_LIBRARY_PATH="\$STEAMBIN32LINK:\$LD_LIBRARY_PATH:${mesa}/lib"
+      export SDL_VIDEO_X11_DGAMOUSE=0
+      cd "\$STEAMROOT"
+      FLASHLINK="\$STEAMCONFIG/bin32/plugins"
+      rm -f "\$FLASHLINK" && ln -s "${flashplayer}/lib/mozilla/plugins" "\$FLASHLINK"
+      LDSO="\$STEAMBIN32LINK/ld.so"
+      cp ${glibc}/lib/ld-linux.so.2 "\$LDSO"
+      chmod u+w "\$LDSO"
+      echo \$\$ > "\$PIDFILE" # pid of the shell will become pid of steam
+      export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${glibc}/lib
+      exec "\$LDSO" "\$STEAMBIN32LINK/steam"
+    else
+      export PATH=${xz}/bin:\$PATH
+      exec $out/bin/.steam-wrapped
+    fi
+    EOF
+
+    chmod +x $out/bin/steam
+  '';
+
+  meta = {
+    description = "A digital distribution platform";
+    homepage = http://store.steampowered.com/;
+    license = "unfree";
+  };
+}
diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/games/uqm/3dovideo.nix
index 4aab9aed42c3..c52cc5ed879c 100644
--- a/pkgs/games/uqm/3dovideo.nix
+++ b/pkgs/games/uqm/3dovideo.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, writeText, fetchgit, haskellPackages }:
+{ stdenv, requireFile, writeText, fetchurl, haskellPackages }:
 
 with stdenv.lib;
 
@@ -19,10 +19,9 @@ let
     pname = "uqm3donix";
     version = "0.1.0.0";
 
-    src = fetchgit {
-      url = "git://github.com/aszlig/uqm3donix.git";
-      rev = "97fc4fd736dcf9fe03e6e5a2c347c5bdc71c8366";
-      sha256 = "09ws6j21mxkcjx444fxkf8a3q17jj6i7h2i9pf5ky52f6xds1h0j";
+    src = fetchurl {
+      url = "https://github.com/aszlig/uqm3donix/archive/v0.1.0.0.tar.gz";
+      sha256 = "0d40gpc3bqkw68varjxwgbdzxw0dvwqksijmvij5ixmlcspbjgvb";
     };
 
     isLibrary = false;
diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix
index 1f82c75f9cf0..07055c415585 100644
--- a/pkgs/games/uqm/default.nix
+++ b/pkgs/games/uqm/default.nix
@@ -1,39 +1,56 @@
 { stdenv, fetchurl
 , pkgconfig, mesa
 , SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod, unzip
+
 , use3DOVideos ? false, requireFile ? null, writeText ? null
-, fetchgit ? null, haskellPackages ? null
+, haskellPackages ? null
+
+, useRemixPacks ? false
 }:
 
 assert use3DOVideos -> requireFile != null && writeText != null
-                    && fetchgit != null && haskellPackages != null;
+                    && haskellPackages != null;
+
+with stdenv.lib;
 
 let
   videos = import ./3dovideo.nix {
-    inherit stdenv requireFile writeText fetchgit haskellPackages;
+    inherit stdenv requireFile writeText fetchurl haskellPackages;
   };
+
+  remixPacks = imap (num: sha256: fetchurl rec {
+    name = "uqm-remix-disc${toString num}.uqm";
+    url = "mirror://sourceforge/sc2/${name}";
+    inherit sha256;
+  }) [
+    "1s470i6hm53l214f2rkrbp111q4jyvnxbzdziqg32ffr8m3nk5xn"
+    "1pmsq65k8gk4jcbyk3qjgi9yqlm0dlaimc2r8hz2fc9f2124gfvz"
+    "07g966ylvw9k5q9jdzqdczp7c5qv4s91xjlg4z5z27fgcs7rzn76"
+    "1l46k9aqlcp7d3fjkjb3n05cjfkxx8rjlypgqy0jmdx529vikj54"
+  ];
+
 in stdenv.mkDerivation rec {
   name = "uqm-${version}";
   version = "0.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/sc2/uqm-${version}-source.tgz";
-    sha256 = "a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221";
+    sha256 = "08dj7fsvflxx69an6vpf3wx050mk0ycmdv401yffrrqbgxgmqsd3";
   };
 
   content = fetchurl {
     url = "mirror://sourceforge/sc2/uqm-${version}-content.uqm";
-    sha256 = "b8f6db8ba29f0628fb1d5c233830896b19f441aee3744bda671ea264b44da3bf";
+    sha256 = "1gx39ns698hyczd4nx73mr0z86bbi4q3h8sw3pxjh1lzla5xpxmq";
   };
 
   voice = fetchurl {
     url = "mirror://sourceforge/sc2/uqm-${version}-voice.uqm";
-    sha256 = "bcccf801b4ba37594ff6217b292744ea586ee2d447e927804842ccae8b73c979";
+    sha256 = "0yf9ff5sxk229202gsa7ski6wn7a8hkjjyr1yr7mjdxsnh0zik5w";
   };
 
   music = fetchurl {
     url = "mirror://sourceforge/sc2/uqm-${version}-3domusic.uqm";
-    sha256 = "c57085e64dad4bddf8a679a9aa2adf63f2156d5f6cbabe63af80519033dbcb82";
+    sha256 = "10nbvcrr0lc0mxivxfkcbxnibwk3vwmamabrlvwdsjxd9pk8aw65";
   };
 
 
@@ -47,10 +64,12 @@ in stdenv.mkDerivation rec {
   postUnpack = ''
     mkdir -p uqm-${version}/content/packages
     mkdir -p uqm-${version}/content/addons
-    cp $content uqm-${version}/content/packages/uqm-0.7.0-content.uqm
-    cp $music uqm-${version}/content/addons/uqm-0.7.0-3domusic.uqm
-    cp $voice uqm-${version}/content/addons/uqm-0.7.0-voice.uqm
-  '' + stdenv.lib.optionalString use3DOVideos ''
+    ln -s "$content" "uqm-${version}/content/packages/uqm-0.7.0-content.uqm"
+    ln -s "$music" "uqm-${version}/content/addons/uqm-0.7.0-3domusic.uqm"
+    ln -s "$voice" "uqm-${version}/content/addons/uqm-0.7.0-voice.uqm"
+  '' + optionalString useRemixPacks (concatMapStrings (disc: ''
+    ln -s "${disc}" "uqm-$version/content/addons/${disc.name}"
+  '') remixPacks) + optionalString use3DOVideos ''
     ln -s "${videos}" "uqm-${version}/content/addons/3dovideo"
   '';
 
@@ -84,6 +103,6 @@ in stdenv.mkDerivation rec {
     '';
     homepage = http://sc2.sourceforge.net/;
     license = "GPLv2";
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+    maintainers = with maintainers; [ jcumming aszlig ];
   };
 }
diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index 0dcdff0bee45..b88945b9eec7 100644
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@@ -4,6 +4,12 @@
    * add it to this list. The URL mentioned above is a good source for inspiration.
    */
 
+  artistic2 = {
+    shortName = "Artistic 2.0";
+    fullName = "Artistic 2.0";
+    url = "http://opensource.org/licenses/artistic-license-2.0.php";
+  };
+
   agpl3 = {
     shortName = "AGPLv3";
     fullName = "GNU Affero General Public License version 3 only";
@@ -148,6 +154,12 @@
     url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html;
   };
 
+  llgpl21 = {
+    shortName = "LLGPLv2.1";
+    fullName = "Lisp LGPL; GNU Lesser General Public License version 2.1 with Franz Inc. preamble for clarification of LGPL terms in context of Lisp";
+    url = http://opensource.franz.com/preamble.html;
+  };
+
   lgpl3 = {
     shortName = "LGPLv3";
     fullName = "GNU Lesser General Public License version 3 only";
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index ab76e2018c0d..354bf39aea53 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -24,9 +24,10 @@
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
   guibert = "David Guibert <david.guibert@gmail.com>";
   iElectric = "Domen Kozar <domen@dev.si>";
-  lovek323 = "Jason O'Conal <jason@oconal.id.au>";
+  iyzsong = "Song Wenwu <iyzsong@gmail.com>";
   jcumming = "Jack Cummings <jack@mudshark.org>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
+  lovek323 = "Jason O'Conal <jason@oconal.id.au>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 69bcea87f6a3..4e6ef5af00db 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -6,18 +6,28 @@
 assert stdenv.isLinux;
 assert stdenv.gcc.gcc != null;
 
-stdenv.mkDerivation rec {
-  version = "1.5.31";
+let gecko = fetchurl {
+      url = "mirror://sourceforge/wine/wine_gecko-2.21-x86.msi";
+      sha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh";
+    };
+
+    gecko64 = fetchurl {
+      url = "mirror://sourceforge/wine/wine_gecko-2.21-x86_64.msi";
+      sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw";
+    };
+
+    mono = fetchurl {
+      url = "mirror://sourceforge/wine/wine-mono-0.0.8.msi";
+      sha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
+    };
+
+in stdenv.mkDerivation rec {
+  version = "1.6";
   name = "wine-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/wine/${name}.tar.bz2";
-    sha256 = "1hlj1r3xi1mbqblkiwrcphvvb8rd50qig25jhyid58qp3r2lf9a6";
-  };
-
-  gecko = fetchurl {
-    url = "mirror://sourceforge/wine/wine_gecko-1.9-x86.msi";
-    sha256 = "10p7djsf85xjk8rzg3hgw5fskrn8402y2aijy701xwm4hy9ga79g";
+    sha256 = "1bj21d94i0mqvkmzxd4971232yniribk7q3fllf23ynbpppk1wg1";
   };
 
   buildInputs = [
@@ -44,6 +54,10 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     install -D ${gecko} $out/share/wine/gecko/${gecko.name}
+  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
+    install -D ${gecko} $out/share/wine/gecko/${gecko64.name}
+  '' + ''
+    install -D ${mono} $out/share/wine/mono/${mono.name}
     wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib
   '';
 
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index 693f00677016..e4b4d1104b0d 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -1,10 +1,12 @@
-{stdenv, fetchurl, kernelDev }:
+{ stdenv, fetchurl, kernelDev }:
+
+let base = "batman-adv-2013.2.0"; in
 
 stdenv.mkDerivation rec {
-  name = "batman-adv-2013.2.0";
+  name = "${base}-${kernelDev.version}";
 
   src = fetchurl {
-    url = "http://downloads.open-mesh.org/batman/releases/${name}/${name}.tar.gz";
+    url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
     sha1 = "7d2aff2ad118cbc5452de43f7e9da8374521ec0e";
   };
 
diff --git a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
deleted file mode 100644
index fb43c7d67e18..000000000000
--- a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
-  src1 = fetchurl {
-    url = "http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=blob_plain;f=brcm/bcm43xx_hdr-0.fw;hb=15888a2eab052ac3d3f49334e4f6f05f347a516e";
-    sha256 = "d02549964d21dd90fc35806483b9fc871d93d7d38ae1a70a9ce006103c2a3de3";
-    name = "bcm43xx_hdr-0.fw";
-  };
-
-  src2 = fetchurl {
-    url = "https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=blob_plain;f=brcm/bcm43xx-0.fw;hb=15888a2eab052ac3d3f49334e4f6f05f347a516e";
-    sha256 = "f90f685903127e4db431fe1efccefebf77272712bd4bfe46d1d1d5825ee52797";
-    name = "bcm43xx-0.fw";
-  };
-in
-stdenv.mkDerivation {
-  name = "bcm43xx-firmware-610.811";
-
-  unpackPhase = "true";
-
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p $out/brcm
-    cp ${src1} $out/brcm/${src1.name}
-    cp ${src2} $out/brcm/${src2.name}
-  '';
-
-  meta = {
-    description = "Firmware for the Broadcom 43xx 802.11 wireless cards";
-    homepage = http://linuxwireless.org/;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 24906f2b0db2..9ddddfde259a 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -3,28 +3,29 @@
 # You can either install the complete bundle, or write a separate package for individual
 # devices that copies the firmware from this package.
 
-{ stdenv, fetchurl, buildEnv, dpkg }:
+{ stdenv, fetchurl, dpkg }:
 
 let
-  version = "0.38";
+  version = "0.40";
 
   packages = [
-    { name = "ipw2x00"; sha256 = "1bdial90l1928sfw3j1fz5cbsav8lz9riv38d02bawq9rzvb5dx0"; }
-    { name = "bnx2x"; sha256 = "1a8jwwa6yldj2pgnsghhdkb8c0s64wzg0vx8y3cj11lhbh2ag2i7"; }
-    { name = "linux-nonfree"; sha256 = "0dr91sswvkh0lk80d6byxjavkqcsickqf8xqhdd82j9mm7bjg7ld"; }
-    { name = "intelwimax"; sha256 = "1156c7a301lk2a4d699dmvwzh4k3rfbxl4fx4raafy8a15lbw8mn"; }
-    { name = "iwlwifi"; sha256 = "1q6gl2x4lj83hn8acamlj7s4j8vjd02798a6i52f4r7x0042f58a"; }
-    { name = "bnx2"; sha256 = "0rpsrmywh97azqmsx4qgxyqcvdn5414m9cg92pd7h9xfmm38nscd"; }
-    { name = "qlogic"; sha256 = "02438jzzybicg0bvl2jc3qnn0r4f1pfpyxbf70cmas9sfxb7s3az"; }
-    { name = "libertas"; sha256 = "0b8n1igx6hpxlav73xs8r6qs2v95r9hx4lqqzy0h5iy7md9xs9y4"; }
-    { name = "ivtv"; sha256 = "1vb1jbxdggy2vj1xlncfzyynpra1y62bb3n30ybafjnx88p6f2hi"; }
-    { name = "linux"; sha256 = "0ijd49rf7cg0lniqm9sqz2g4i9jmc9vyz6wv9jlwrvnbl8hhy5vy"; }
-    { name = "netxen"; sha256 = "19d5d3ibhb22p4mh22lnl441v8xyb1pyfi5h36vsjpccivzkgd2f"; }
-    { name = "myricom"; sha256 = "0vq2rvc71j96q684r1bh0528xnrxa1xzh2sdhqfrgip9ihdsp3ml"; }
-    { name = "atheros"; sha256 = "04zy5j48b83garmnfxiqgmm3yv1pfpbldxp69zm24pfxcwyvx3hm"; }
-    { name = "brcm80211"; sha256 = "0kgw6q18i46npmjxv4ymww8dr7nn140xrrqjrbnfhzgha3y2yylg"; }
-    { name = "ralink"; sha256 = "0kbzbc4vpn6mvvkm4q7mfqg0bsj6akfpypxk98s7kbidmyj577q2"; }
-    { name = "realtek"; sha256 = "1ac9vlrzprp0j2mdmp1zi47wg2i76vmi288sm3vwlvp4s6ymm077"; }
+    { name = "adi"; sha256 = "0wwks9ff4n772435s57z1fjrffi4xl9nxnfn3v7xfcwdjb395d88"; }
+    { name = "atheros"; sha256 = "1gj7hfnyclzgyq06scynaclnfajhs6lw5i51j1w1hikv4yh20djz"; }
+    { name = "bnx2"; sha256 = "15qjj0sfjin5cbkpby29r5czn11xyiyyc4fmhwlqvgfgrnbp0aqk"; }
+    { name = "bnx2x"; sha256 = "08nvbln94ff47b2q0avxj1aa2wx4qih8sq8knbq54lp46kjf3k0h"; }
+    { name = "brcm80211"; sha256 = "1ndsw3s6xkr1n39nf9ig1xhnaglx5qvvvm8rh6ah41v644lzha79"; }
+    { name = "intelwimax"; sha256 = "1qwxmykh90v92asn4ivq0fak761hs7hd2zmz1dpkjidwsycrfyqn"; }
+    { name = "ipw2x00"; sha256 = "0a2nb17b5n3k1b6y4dbi5i8k1fm19ba2abq2jh2hjjmyyl3y388m"; }
+    { name = "ivtv"; sha256 = "1239gsjq16f4kd1yn77iq3ar8ndx3pzd16kpqafr1h2y0zwh452r"; }
+    { name = "iwlwifi"; sha256 = "03kmh5szd02pkbm1nlyz99fr2njhg88wiv73f1fz485m9rvgga43"; }
+    { name = "libertas"; sha256 = "0qjziwmwqbp83hxrjw7x3ralxg4ib9y23bcbn1g8yb5b6m84ca6b"; }
+    { name = "linux"; sha256 = "0ypidsrrfx4kvbfisdpgx2fzbil7g2jixgqhnv960iy5l348amrl"; }
+    { name = "linux-nonfree"; sha256 = "0p9ql3cdxljflh48r6z40kpyisbzp3s3g1qjb9f64n6cppllwjfr"; }
+    { name = "myricom"; sha256 = "12spfaq7z2bb93cy15zldlic1wx2v6h9sn7ny09nkzy4m26zds4q"; }
+    { name = "netxen"; sha256 = "03gmda16bdqw8a4x8x11ph41ksjh48hxydv0f0z3gi3czgbh7sn3"; }
+    { name = "qlogic"; sha256 = "1ah8rrwzi44p1l4q8qkql18djmn5kihsiinpy204xklm1csf3vs1"; }
+    { name = "ralink"; sha256 = "005549jk0wnyfnb247awv2wncsx5is05m1hdwcd33iq0dlbmm39b"; }
+    { name = "realtek"; sha256 = "1ai1klzrql8qxmb7945xiqlkfkyz8admrpb10b3r4ixvclkrvfi2"; }
   ];
 
   fetchPackage =
@@ -40,7 +41,7 @@ in stdenv.mkDerivation {
   inherit srcs;
 
   unpackPhase = ''
-    ensureDir "./firmware"
+    mkdir -p ./firmware
   '';
 
   buildPhase = ''
@@ -53,13 +54,15 @@ in stdenv.mkDerivation {
   buildInputs = [ dpkg ];
 
   installPhase = ''
-    mkdir -p "$out/"
+    mkdir -p $out/share
     cp -r lib/firmware/* "$out/"
+    cp -r usr/share/doc $out/share/
+    find $out/share -name changelog.gz | xargs rm
   '';
 
   meta = {
     description = "Binary firmware collection packaged by Debian";
-    homepage = "http://packages.debian.org/sid/firmware-linux-nonfree";
+    homepage = http://packages.debian.org/sid/firmware-linux-nonfree;
     license = stdenv.lib.licenses.unfreeRedistributableFirmware;
     platforms = stdenv.lib.platforms.linux;
     priority = 10; # low priority so that other packages can override this big package
diff --git a/pkgs/os-specific/linux/firmware/ipw2100/default.nix b/pkgs/os-specific/linux/firmware/ipw2100/default.nix
deleted file mode 100644
index abc6bf08dac9..000000000000
--- a/pkgs/os-specific/linux/firmware/ipw2100/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "ipw2100-fw-1.3";
-  
-  src = fetchurl {
-    url = http://pkgs.fedoraproject.org/repo/pkgs/ipw2100-firmware/ipw2100-fw-1.3.tgz/46aa75bcda1a00efa841f9707bbbd113/ipw2100-fw-1.3.tgz;
-    sha256 = "18m7wgd062qwfdr6y0kjrvf1715wjcjn4yml2sk29ls8br2pq471";
-  };
-
-  unpackPhase = "tar xvzf $src";
-
-  # Installation copies the firmware AND the license.  The license
-  # says: "Your rights to redistribute the Software shall be
-  # contingent upon your installation of this Agreement in its
-  # entirety in the same directory as the Software."
-  installPhase = "mkdir -p $out; cp ipw* LICENSE $out";
-  
-  meta = {
-    # "... you may transfer a copy of the Software ... provided such
-    # recipient agrees to be fully bound by the terms hereof."
-    description = "Firmware for the Intel 2100BG wireless card (requires acceptance of license, see http://ipw2100.sourceforge.net/firmware.php?fid=2)";
-    homepage = http://ipw2100.sourceforge.net/firmware.php;
-    license = http://ipw2100.sourceforge.net/firmware.php?fid=2;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/ipw2200/default.nix b/pkgs/os-specific/linux/firmware/ipw2200/default.nix
deleted file mode 100644
index 5c4989b878a6..000000000000
--- a/pkgs/os-specific/linux/firmware/ipw2200/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "ipw2200-fw-3.1";
-  
-  src = fetchurl {
-    url = http://pkgs.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-3.1.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-3.1.tgz;
-    sha256 = "1gaqc8d827d6ji7zhhkpbr4fzznqpar68gzqbzak1h4cq48qr0f6";
-  };
-  
-  buildPhase = "true";
-
-  # Installation copies the firmware AND the license.  The license
-  # says: "Your rights to redistribute the Software shall be
-  # contingent upon your installation of this Agreement in its
-  # entirety in the same directory as the Software."
-  installPhase = "mkdir -p $out; cp * $out";
-  
-  meta = {
-    # "... you may transfer a copy of the Software ... provided such
-    # recipient agrees to be fully bound by the terms hereof."
-    description = "Firmware for the Intel 2200BG wireless card (requires acceptance of license, see http://ipw2200.sourceforge.net/firmware.php?fid=8";
-    homepage = http://ipw2200.sourceforge.net/firmware.php;
-    license = http://ipw2200.sourceforge.net/firmware.php?fid=8;
-    # See also http://ipw2100.sourceforge.net/firmware_faq.php
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix
deleted file mode 100644
index 8acb75c3ed6f..000000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-1000-ucode-128.50.3.1";
-  
-  src = fetchurl {
-    url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
-    name = "${name}.tgz";
-    sha256 = "7e81ddad18acec19364c9df22496e8afae99a2e1490b2b178e420b52d443728d";
-  };
-  
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-  '';
-  
-  meta = {
-    description = "Firmware for the Intel 1000 wireless card";
-
-    longDescription = ''
-      This package provides version 3 of the Intel wireless card
-      firmware, for Linux up to 2.6.26.  It contains the
-      `iwlwifi-1000-3.ucode' file, which is loaded by the `iwlagn'
-      driver found in recent kernels.
-    '';
-
-    homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix
deleted file mode 100644
index bc9c8efe063a..000000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-2030-ucode-18.168.6.1";
-
-  src = fetchurl {
-    url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
-    name = "${name}.tgz";
-    sha256 = "0b69jpb46fk63ybyyb8lbh99j1d29ayp8fl98l18iqy3q7mx4ry8";
-  };
-
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-  '';
-
-  meta = {
-    description = "Firmware for the Intel 2030 Series wireless card";
-
-    longDescription = ''
-      This package provides the Intel 2030 Series wireless card
-      firmware. It contains the `iwlwifi-2030-6.ucode' file.
-    '';
-
-    homepage = http://intellinuxwireless.org/;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix
deleted file mode 100644
index 77756e771ae9..000000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-3945-ucode-15.32.2.9";
-  
-  src = fetchurl {
-    url = http://pkgs.fedoraproject.org/repo/pkgs/iwl3945-firmware/iwlwifi-3945-ucode-15.32.2.9.tgz/d99a75ab1305d1532a09471b2f9a547a/iwlwifi-3945-ucode-15.32.2.9.tgz;
-    sha256 = "0baf07lblwsq841zdcj9hicf11jiq06sz041qcybc6l8yyhhcqjk";
-  };
-  
-  buildPhase = "true";
-
-  installPhase = "mkdir -p $out; chmod -x *; cp * $out";
-  
-  meta = {
-    description = "Firmware for the Intel 3945ABG wireless card";
-    homepage = http://intellinuxwireless.org/;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix
deleted file mode 100644
index 266c7795d230..000000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-4965-ucode-228.57.1.21";
-  
-  src = fetchurl {
-    url = "wireless.kernel.org/en/users/Drivers/iwlegacy?action=AttachFile&do=get&target=${name}.tgz";
-    name = "${name}.tgz";
-    sha256 = "1rry0kpzszxk60h5gb94advzi009010xb332iyvfpaiwbj6aiyas";
-  };
-  
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-
-    # The driver expects the `-1' in the file name.
-    cd "$out"
-    ln -s iwlwifi-4965.ucode iwlwifi-4965-1.ucode
-  '';
-  
-  meta = {
-    description = "Firmware for the Intel 4965ABG wireless card";
-
-    longDescription = ''
-      This package provides version 2 of the Intel wireless card
-      firmware, for Linux up to 2.6.26.  It contains the
-      `iwlwifi-4965-1.ucode' file, which is loaded by the `iw4965'
-      driver found in recent kernels.
-    '';
-
-    homepage = http://intellinuxwireless.org/;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix
deleted file mode 100644
index 3e15374c65f0..000000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-4965-ucode-228.61.2.24";
-  
-  src = fetchurl {
-    url = "http://wireless.kernel.org/en/users/Drivers/iwlegacy?action=AttachFile&do=get&target=iwlwifi-4965-ucode-228.61.2.24.tgz";
-    name = "iwlwifi-4965-ucode-228.61.2.24.tgz";
-    sha256 = "1n5af3cci0v40w4gr0hplqr1lfvhghlbzdbf60d6185vpcny2l5m";
-  };
-  
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-  '';
-  
-  meta = {
-    description = "Firmware for the Intel 4965ABG wireless card, for Linux 2.6.27+";
-
-    longDescription = ''
-      This package provides version 2 of the Intel wireless card
-      firmware, for Linux 2.6.27 and later.  It contains the
-      `iwlwifi-4965-2.ucode' file, which is loaded by the `iwlagn'
-      driver found in recent kernels.
-    '';
-
-    homepage = http://intellinuxwireless.org/;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix
deleted file mode 100644
index 8805f1393fb0..000000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-5000-ucode-8.83.5.1-1";
-  
-  src = fetchurl {
-    url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-5000-ucode-8.83.5.1-1.tgz";
-    name = "iwlwifi-5000-ucode-8.83.5.1-1.tgz";
-    sha256 = "0pkzr4gflp3j0jm4rw66jypk3xn4bvpgdsnxjqwanyd64aj6naxg";
-  };
-  
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-  '';
-  
-  meta = {
-    description = "Firmware for the Intel 5000 wireless card";
-
-    longDescription = ''
-      This package provides version 5 of the Intel wireless card
-      firmware. It contains the `iwlwifi-5000-5.ucode' file.
-    '';
-
-    homepage = http://intellinuxwireless.org/;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix
deleted file mode 100644
index dca427cbff53..000000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-5150-ucode-8.24.2.2";
-  
-  src = fetchurl {
-    url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
-    name = "${name}.tgz";
-    sha256 = "d253e6ff6624639aded67c82df98b2bc4a66eb66400848d5614921d513540cf9";
-  };
-  
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-  '';
-  
-  meta = {
-    description = "Firmware for the Intel 5150 wireless card";
-
-    longDescription = ''
-      This package provides version 1 of the Intel wireless card
-      firmware.  It contains the `iwlwifi-5150-2.ucode' file.
-    '';
-
-    homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix
deleted file mode 100644
index 2e88f1bba744..000000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-6000-ucode-9.221.4.1";
-
-  src = fetchurl {
-    url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
-    name = "${name}.tgz";
-    sha256 = "7f04623231663dc4ee63df32fd890bfa9514dce1fab9dc7a25fda90350da836b";
-  };
-
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-  '';
-
-  meta = {
-    description = "Firmware for the Intel 6000 Series wireless card";
-
-    longDescription = ''
-      This package provides the Intel 6000 Series wireless card
-      firmware. It contains the `iwlwifi-6000-4.ucode' file.
-    '';
-
-    homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix
deleted file mode 100644
index ef259b709754..000000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-6000g2a-ucode-18.168.6.1";
-
-  src = fetchurl {
-    url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
-    name = "${name}.tgz";
-    sha256 = "a7f2615756addafbf3e6912cb0265f9650b2807d1ccdf54b620735772725bbe9";
-  };
-
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-  '';
-
-  meta = {
-    homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
-    description = "Firmware for the Intel 6000 Series Gen2 wireless card";
-
-    longDescription = ''
-      This package provides the Intel 6000 Series wireless card
-      firmware. It contains the `iwlwifi-6000g2a-5.ucode' file.
-    '';
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix
deleted file mode 100644
index 0fee3acd0a3c..000000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-6000g2b-ucode-17.168.5.2";
-
-  src = fetchurl {
-    url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
-    name = "${name}.tgz";
-    sha256 = "5e4afdf070bfef549e50e62187f22dc2e40f5d9fe8b9a77561f8f3efb0d1d052";
-  };
-
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-  '';
-
-  meta = {
-    description = "Firmware for the Intel 6000 Series Gen2 wireless card";
-
-    longDescription = ''
-      This package provides the Intel 6000 Series wireless card
-      firmware. It contains the `iwlwifi-6000g2b-4.ucode' file.
-    '';
-
-    homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix b/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix
deleted file mode 100644
index 53e0fb235a52..000000000000
--- a/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "radeon-juniper-firmware-2010-04-08";
-
-  srcPfp = fetchurl {
-    url = "http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_pfp.bin";
-    sha256 = "1qm910p7qjs6n528q22gkwpprzdh39vbihdliykbpfs1pphrhkjz";
-  };
-  srcMe = fetchurl {
-    url = "http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_me.bin";
-    sha256 = "1869dhay3f75hhnsvdjhlrjd4fhdi8d6c3lhk45vp7fhjiw4741q";
-  };
-  srcRlc = fetchurl {
-    url = "http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_rlc.bin";
-    sha256 = "0hglq8ab1f3d81mvcb4aikkfdwh6i4a93ps0f9czq1qz5h0q6wlk";
-  };
-
-  unpackPhase = "true";
-  installPhase = ''
-    install -D $srcPfp $out/radeon/JUNIPER_pfp.bin
-    install -D $srcMe $out/radeon/JUNIPER_me.bin
-    install -D $srcRlc $out/radeon/JUNIPER_rlc.bin
-  '';
-
-  meta = {
-    description = "Juniper firmware for the RADEON chipset";
-    homepage = "http://people.freedesktop.org/~agd5f/radeon_ucode";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/radeon-r600/default.nix b/pkgs/os-specific/linux/firmware/radeon-r600/default.nix
deleted file mode 100644
index 9a298ab96d4a..000000000000
--- a/pkgs/os-specific/linux/firmware/radeon-r600/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "radeon-r600-firmware-2009-12-09";
-
-  src = fetchurl {
-    url = "http://people.freedesktop.org/~agd5f/radeon_ucode/R600_rlc.bin";
-    sha256 = "11bxpivxycigv0ffbck33y9czgira3g8py33840zxzwcwbi59yps";
-  };
-
-  unpackPhase = "true";
-  installPhase = "install -D $src $out/radeon/R600_rlc.bin";
-
-  meta = {
-    description = "Firmware for the RADEON r600 chipset";
-    homepage = "http://people.freedesktop.org/~agd5f/radeon_ucode";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/radeon-r700/default.nix b/pkgs/os-specific/linux/firmware/radeon-r700/default.nix
deleted file mode 100644
index 79b16b1dceaa..000000000000
--- a/pkgs/os-specific/linux/firmware/radeon-r700/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "radeon-r700-firmware-2009-12-09";
-
-  src = fetchurl {
-    url = "http://people.freedesktop.org/~agd5f/radeon_ucode/R700_rlc.bin";
-    sha256 = "1sbpq39cvjnpfp1iamhq9k9266jkaaywnm8d2pw95ayw56a77976";
-  };
-
-  unpackPhase = "true";
-  installPhase = "install -D $src $out/radeon/R700_rlc.bin";
-
-  meta = {
-    description = "Firmware for the RADEON r700 chipset";
-    homepage = "http://people.freedesktop.org/~agd5f/radeon_ucode";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/ralink/default.nix b/pkgs/os-specific/linux/firmware/ralink/default.nix
deleted file mode 100644
index abf12fd672b7..000000000000
--- a/pkgs/os-specific/linux/firmware/ralink/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{stdenv, fetchsvn }:
-
-# Upstream is http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-
-stdenv.mkDerivation {
-  name = "ralink-fw-r17279";
-
-  src = fetchsvn {
-    url = svn://svn.debian.org/kernel/dists/trunk/firmware-nonfree/ralink;
-    rev = 17279;
-    sha256 = "06nc6w3xcrxzcai7gaf27k0v8k2xbq3imzpgc02rbxv5q5flxh65";
-  };
-
-  unpackPhase = "true";
-  
-  buildPhase = "true";
-
-  # Installation copies the firmware AND the license.  The license
-  # says: "Your rights to redistribute the Software shall be
-  # contingent upon your installation of this Agreement in its
-  # entirety in the same directory as the Software."
-  installPhase = ''
-    mkdir -p $out
-    cp $src/*.bin $out
-    cp $src/LICENSE $out/ralink.LICENSE
-  '';
-  
-  meta = {
-    description = "Firmware for the Ralink wireless cards";
-    homepage = http://www.ralinktech.com/;
-    license = "non-free";
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/rt2860/default.nix b/pkgs/os-specific/linux/firmware/rt2860/default.nix
deleted file mode 100644
index 0a1cb6555726..000000000000
--- a/pkgs/os-specific/linux/firmware/rt2860/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{stdenv, fetchsvn }:
-
-# Upstream is http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-
-stdenv.mkDerivation {
-  name = "rt2860-fw-26";
-
-  src = fetchsvn {
-    url = svn://svn.debian.org/kernel/dists/trunk/firmware-nonfree/ralink;
-    rev = 17279;
-    sha256 = "06nc6w3xcrxzcai7gaf27k0v8k2xbq3imzpgc02rbxv5q5flxh65";
-  };
-
-  unpackPhase = "true";
-  
-  buildPhase = "true";
-
-  # Installation copies the firmware AND the license.  The license
-  # says: "Your rights to redistribute the Software shall be
-  # contingent upon your installation of this Agreement in its
-  # entirety in the same directory as the Software."
-  installPhase = ''
-    mkdir -p $out
-    cp $src/rt2860.bin $out
-    cp $src/LICENSE $out/rt2860.LICENSE
-  '';
-  
-  meta = {
-    description = "Firmware for the Ralink RT2860 wireless cards";
-    homepage = http://www.ralinktech.com/;
-    license = "non-free";
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/rt2870/default.nix b/pkgs/os-specific/linux/firmware/rt2870/default.nix
deleted file mode 100644
index 15de7c30586b..000000000000
--- a/pkgs/os-specific/linux/firmware/rt2870/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{stdenv, fetchurl, unzip}:
-
-stdenv.mkDerivation rec {
-  name = "rt2870-fw-22";
-  src = fetchurl {
-    url = "http://www.ralinktech.com/download.php?t=U0wyRnpjMlYwY3k4eU1ERXdMekF6THpNeEwyUnZkMjVzYjJGa01UWXpPRGs1T0Rnek5pNTZhWEE5UFQxU1ZESTROekJmUm1seWJYZGhjbVZmVmpJeUM%3D";
-    name = "RT2870_Firmware_V22.zip";
-    sha256 = "d24591a8529b0a609cc3c626ecee96484bb29b2c020260b82f6025459c11f263";
-  };
-
-  buildInputs = [ unzip ];
-  
-  buildPhase = "true";
-
-  # Installation copies the firmware AND the license.  The license
-  # says: "Your rights to redistribute the Software shall be
-  # contingent upon your installation of this Agreement in its
-  # entirety in the same directory as the Software."
-  installPhase = "mkdir -p $out/${name}; cp *.bin $out; cp *.txt $out/${name}";
-  
-  meta = {
-    description = "Firmware for the Ralink RT2870 wireless cards";
-    homepage = http://www.ralinktech.com/;
-    license = "non-free";
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix b/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix
deleted file mode 100644
index dbd2fa45b7b8..000000000000
--- a/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl }:
-
-# http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-let
-  src = fetchurl {
-    url = "http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=blob_plain;f=rtl_nic/rtl8168e-2.fw";
-    sha256 = "11lkwc6r6f5pi8clxajp43j6dzapydgxaxaschribpvhn8lrjj0a";
-    name = "rtl8168e-2.fw";
-  };
-in
-stdenv.mkDerivation {
-  name = "rtl8168e-2-firmware-2012.01.10";
-
-  unpackPhase = "true";
-
-  buildPhase = "true";
-
-  installPhase = "install -v -D ${src} $out/rtl_nic/${src.name}";
-
-  meta = {
-    description = "Firmware for the Realtek Gigabit Ethernet controllers";
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix
deleted file mode 100644
index f06fcb149e86..000000000000
--- a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, firmwareLinuxNonfree}:
-stdenv.mkDerivation {
-  name = "rtl8192c-fw";
-  src = firmwareLinuxNonfree;
-
-  phases = [ "installPhase" ];
-  installPhase = ''
-    mkdir -p $out/rtlwifi
-    cp "$src/rtlwifi/rtl8192cfw.bin" "$out/rtlwifi/rtl8192cfw.bin"
-  '';
-
-  meta = {
-    description = "Firmware for the Realtek RTL8192c wireless cards";
-    homepage = "http://www.realtek.com";
-    license = "non-free";
-  };
-}
diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh
index 47c7a22c177a..8fb5e9f91eb4 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"
+makeFlags="ARCH=$arch SHELL=/bin/sh KBUILD_BUILD_VERSION=1-NixOS $makeFlags"
 if [ -n "$crossConfig" ]; then
   makeFlags="$makeFlags CROSS_COMPILE=$crossConfig-"
 fi
@@ -10,27 +10,25 @@ postPatch() {
     # Makefiles are full of /bin/pwd, /bin/false, /bin/bash, etc.
     # Patch these away, assuming the tools are in $PATH.
     for mf in $(find -name Makefile); do
-	echo "stripping FHS paths in \`$mf'..."
-	sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g'
+        echo "stripping FHS paths in \`$mf'..."
+        sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g'
     done
 }
 
 configurePhase() {
     if test -n "$preConfigure"; then
-        eval "$preConfigure";
+        eval "$preConfigure"
     fi
 
     export INSTALL_PATH=$out
     export INSTALL_MOD_PATH=$out
 
-
     # Set our own localversion, if specified.
     rm -f localversion*
     if test -n "$localVersion"; then
         echo "$localVersion" > localversion-nix
     fi
 
-
     # Patch kconfig to print "###" after every question so that
     # generate-config.pl can answer them.
     sed -e '/fflush(stdout);/i\printf("###");' -i scripts/kconfig/conf.c
@@ -70,14 +68,9 @@ installPhase() {
     cp vmlinux $out
 
     if grep -q "CONFIG_MODULES=y" .config; then
-        # Install the modules in $out/lib/modules with matching paths
-        # in modules.dep (i.e., refererring to $out/lib/modules, not
-        # /lib/modules).  The depmod_opts= is to prevent the kernel
-        # from passing `-b PATH' to depmod.
-        export MODULE_DIR=$out/lib/modules/
-        substituteInPlace Makefile --replace '-b $(INSTALL_MOD_PATH)' ''
+        # Install the modules in $out/lib/modules.
         make modules_install \
-            DEPMOD=$module_init_tools/sbin/depmod depmod_opts= \
+            DEPMOD=$kmod/sbin/depmod \
             $makeFlags "${makeFlagsArray[@]}" \
             $installFlags "${installFlagsArray[@]}"
 
@@ -112,7 +105,7 @@ installPhase() {
 
         if test "$dontStrip" = "1"; then
             # copy any debugging info that can be found
-            cp --parents -rv `find -name \*.debug -o -name debug.a`	\
+            cp --parents -rv `find -name \*.debug -o -name debug.a`     \
                "$out/lib/modules/$version/build"
         fi
 
diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch
deleted file mode 100644
index 8168ffb5a1af..000000000000
--- a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- /tmp/linux-2.6.32.14/fs/cifs/transport.c	2011-03-27 20:37:20.000000000 +0200
-+++ linux-2.6.32.14/fs/cifs/transport.c	2011-04-01 11:07:17.700305670 +0200
-@@ -182,8 +182,8 @@
- 			   after the retries we will kill the socket and
- 			   reconnect which may clear the network problem.
- 			*/
--			if ((i >= 14) || (!server->noblocksnd && (i > 2))) {
--				cERROR(1, "sends on sock %p stuck for 15 seconds",
-+			if ((i >= 119) || (!server->noblocksnd && (i > 2))) {
-+				cERROR(1, "sends on sock %p stuck for 119 seconds",
- 				    ssocket);
- 				rc = -EAGAIN;
- 				break;
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
new file mode 100644
index 000000000000..d4021e735e6d
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -0,0 +1,306 @@
+{ stdenv, version, kernelPlatform, extraConfig }:
+
+with stdenv.lib;
+
+''
+  # Power management and debugging.
+  DEBUG_KERNEL y
+  PM_ADVANCED_DEBUG y
+  PM_RUNTIME y
+  TIMER_STATS y
+  ${optionalString (versionOlder version "3.10") ''
+    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
+  DETECT_HUNG_TASK y
+
+  # 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
+  ${optionalString (versionOlder version "3.2") ''
+    NET_POCKET y # enable pocket and portable adapters
+  ''}
+  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.
+  CFG80211_WEXT y # Without it, ipw2200 drivers don't build
+  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
+  ${optionalString (versionAtLeast version "3.2") ''
+    B43_PHY_HT y
+  ''}
+  BCMA_HOST_PCI y
+
+  # 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
+  ${optionalString (versionOlder version "3.9") ''
+    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_FS_POSIX_ACL y
+  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
+  DEVKMEM n # Disable /dev/kmem
+  CC_STACKPROTECTOR y # Detect buffer overflows on the stack
+
+  # Misc. options.
+  8139TOO_8129 y
+  8139TOO_PIO n # PIO is slower
+  AIC79XX_DEBUG_ENABLE n
+  AIC7XXX_DEBUG_ENABLE n
+  AIC94XX_DEBUG n
+  ${optionalString (versionAtLeast version "3.3") ''
+    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_TTY? y # RFCOMM TTY support
+  CRASH_DUMP? n
+  ${optionalString (versionOlder version "3.1") ''
+    DMAR? n # experimental
+  ''}
+  DVB_DYNAMIC_MINORS? y # we use udev
+  ${optionalString (versionAtLeast version "3.3") ''
+    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
+  ${optionalString (versionAtLeast version "3.6") ''
+    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
+
+  # Linux containers.
+  RT_GROUP_SCHED? y
+  CGROUP_DEVICE? y
+  ${if versionAtLeast version "3.6" then ''
+    MEMCG y
+    MEMCG_SWAP y
+  '' else ''
+    CGROUP_MEM_RES_CTLR y
+    CGROUP_MEM_RES_CTLR_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
+
+  # Easier debugging of NFS issues.
+  ${optionalString (versionAtLeast version "3.4") ''
+    SUNRPC_DEBUG y
+  ''}
+
+  # Virtualisation.
+  PARAVIRT y
+  ${if versionAtLeast version "3.10" then ''
+    HYPERVISOR_GUEST y
+  '' else ''
+    PARAVIRT_GUEST y
+  ''}
+  KVM_GUEST y
+  ${optionalString (versionOlder version "3.7") ''
+    KVM_CLOCK y
+  ''}
+  XEN y
+  XEN_DOM0? y
+  KSM y
+  ${optionalString (!stdenv.is64bit) ''
+    HIGHMEM64G? y # We need 64 GB (PAE) support for Xen guest support.
+  ''}
+
+  # Media support.
+  ${optionalString (versionAtLeast version "3.6") ''
+    MEDIA_DIGITAL_TV_SUPPORT y
+    MEDIA_CAMERA_SUPPORT y
+    MEDIA_RC_SUPPORT y
+  ''}
+  ${optionalString (versionAtLeast version "3.7") ''
+    MEDIA_USB_SUPPORT y
+  ''}
+
+  # Our initrd init uses shebang scripts, so can't be modular.
+  ${optionalString (versionAtLeast version "3.10") ''
+    BINFMT_SCRIPT y
+  ''}
+
+  # Enable the 9P cache to speed up NixOS VM tests.
+  9P_FSCACHE y
+  9P_FS_POSIX_ACL y
+
+  ${kernelPlatform.kernelExtraConfig or ""}
+  ${extraConfig}
+''
diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl
index 05b6867bc553..78663098fb31 100644
--- a/pkgs/os-specific/linux/kernel/generate-config.pl
+++ b/pkgs/os-specific/linux/kernel/generate-config.pl
@@ -54,8 +54,8 @@ sub runConfig {
         if ($s eq "\n") {
             print STDERR "GOT: $line" if $debug;
 
-            # Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR)").
-            if ($line =~ /^\s*>?\s*(\d+)\.\s+.*\(([A-Za-z0-9_]+)\)$/) {
+            # Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR) (NEW)").
+            if ($line =~ /^\s*>?\s*(\d+)\.\s+.*?\(([A-Za-z0-9_]+)\)(?:\s+\(NEW\))?\s*$/) {
                 $choices{$2} = $1;
             }
 
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 50469eb53839..1ade24736279 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, mktemp, module_init_tools
+{ stdenv, fetchurl, perl, mktemp, kmod, bc
 
 , # The kernel source tarball.
   src
@@ -6,15 +6,12 @@
 , # The kernel version.
   version
 
+, # Overrides to the kernel config.
+  extraConfig ? ""
+
 , # The version number used for the module directory
   modDirVersion ? version
 
-, # The kernel configuration.
-  config
-
-, # The kernel configuration when cross building.
-  configCross ? {}
-
 , # An attribute set whose attributes express the availability of
   # certain features in this kernel.  E.g. `{iwlwifi = true;}'
   # indicates a kernel that provides Intel wireless support.  Used in
@@ -40,7 +37,6 @@
   # we force building the target asked: bzImage/zImage/uImage/...
   postBuild ? "make $makeFlags $kernelTarget; make $makeFlags -C scripts unifdef"
 
-, extraNativeBuildInputs ? []
 , ...
 }:
 
@@ -59,6 +55,12 @@ let
         map ({extraConfig ? "", ...}: extraConfig) kernelPatches;
     in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches);
 
+  configWithPlatform = kernelPlatform:
+    import ./common-config.nix { inherit stdenv version kernelPlatform extraConfig; };
+
+  config = configWithPlatform stdenv.platform;
+  configCross = configWithPlatform stdenv.cross.platform;
+
 in
 
 stdenv.mkDerivation {
@@ -69,14 +71,14 @@ stdenv.mkDerivation {
   passthru = {
     inherit version modDirVersion kernelPatches;
     # Combine the `features' attribute sets of all the kernel patches.
-    features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches;
+    features = lib.fold (x: y: (x.features or {}) // y) features kernelPatches;
   };
 
   builder = ./builder.sh;
 
   generateConfig = ./generate-config.pl;
 
-  inherit preConfigure src module_init_tools localVersion postInstall postBuild;
+  inherit preConfigure src kmod localVersion postInstall postBuild;
 
   patches = map (p: p.patch) kernelPatches;
 
@@ -85,7 +87,7 @@ stdenv.mkDerivation {
   # For UML and non-PC, just ignore all options that don't apply (We are lazy).
   ignoreConfigErrors = stdenv.platform.name != "pc";
 
-  nativeBuildInputs = [ perl mktemp ] ++ extraNativeBuildInputs;
+  nativeBuildInputs = [ perl mktemp bc ];
 
   buildInputs = lib.optional (stdenv.platform.uboot != null)
     (ubootChooser stdenv.platform.uboot);
@@ -133,7 +135,6 @@ stdenv.mkDerivation {
         " (with patches: "
         + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))
         + ")");
-    inherit version;
     license = "GPLv2";
     homepage = http://www.kernel.org/;
     maintainers = [
diff --git a/pkgs/os-specific/linux/kernel/guruplug-defconfig.patch b/pkgs/os-specific/linux/kernel/guruplug-defconfig.patch
deleted file mode 100644
index add982951ad5..000000000000
--- a/pkgs/os-specific/linux/kernel/guruplug-defconfig.patch
+++ /dev/null
@@ -1,2714 +0,0 @@
-From 4b82fc0ee759b81c92d33ba4e3dd7bd5f66cc0d6 Mon Sep 17 00:00:00 2001
-From: Siddarth Gore <gores@marvell.com>
-Date: Mon, 29 Mar 2010 11:00:06 +0530
-Subject: [PATCH] Initial defconfig
-
-Signed-off-by: Siddarth Gore <gores@marvell.com>
----
- arch/arm/configs/guruplug_defconfig | 2694 +++++++++++++++++++++++++++++++++++
- 1 files changed, 2694 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/configs/guruplug_defconfig
-
-diff --git a/arch/arm/configs/guruplug_defconfig b/arch/arm/configs/guruplug_defconfig
-new file mode 100644
-index 0000000..5c164ce
---- /dev/null
-+++ b/arch/arm/configs/guruplug_defconfig
-@@ -0,0 +1,2694 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.33.2
-+# Thu Apr 22 14:31:17 2010
-+#
-+CONFIG_ARM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+CONFIG_GENERIC_GPIO=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+CONFIG_CONSTRUCTORS=y
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_HAVE_KERNEL_GZIP=y
-+CONFIG_HAVE_KERNEL_LZO=y
-+CONFIG_KERNEL_GZIP=y
-+# CONFIG_KERNEL_BZIP2 is not set
-+# CONFIG_KERNEL_LZMA is not set
-+# CONFIG_KERNEL_LZO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+
-+#
-+# RCU Subsystem
-+#
-+CONFIG_TREE_RCU=y
-+# CONFIG_TREE_PREEMPT_RCU is not set
-+# CONFIG_TINY_RCU is not set
-+# CONFIG_RCU_TRACE is not set
-+CONFIG_RCU_FANOUT=32
-+# CONFIG_RCU_FANOUT_EXACT is not set
-+# CONFIG_TREE_RCU_TRACE is not set
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=19
-+# CONFIG_GROUP_SCHED is not set
-+# CONFIG_CGROUPS is not set
-+# CONFIG_SYSFS_DEPRECATED_V2 is not set
-+# CONFIG_RELAY is not set
-+CONFIG_NAMESPACES=y
-+# CONFIG_UTS_NS is not set
-+# CONFIG_IPC_NS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_NET_NS is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_RD_GZIP=y
-+CONFIG_RD_BZIP2=y
-+CONFIG_RD_LZMA=y
-+CONFIG_RD_LZO=y
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SYSCTL=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_AIO=y
-+
-+#
-+# Kernel Performance Events And Counters
-+#
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_PCI_QUIRKS=y
-+CONFIG_SLUB_DEBUG=y
-+CONFIG_COMPAT_BRK=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+CONFIG_PROFILING=y
-+CONFIG_OPROFILE=y
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_KPROBES=y
-+CONFIG_KRETPROBES=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+
-+#
-+# GCOV-based kernel profiling
-+#
-+# CONFIG_GCOV_KERNEL is not set
-+CONFIG_SLOW_WORK=y
-+# CONFIG_SLOW_WORK_DEBUG is not set
-+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+# CONFIG_MODULE_FORCE_LOAD is not set
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_BLOCK=y
-+CONFIG_LBDAF=y
-+# CONFIG_BLK_DEV_BSG is not set
-+# CONFIG_BLK_DEV_INTEGRITY is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+CONFIG_DEFAULT_CFQ=y
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="cfq"
-+# CONFIG_INLINE_SPIN_TRYLOCK is not set
-+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-+# CONFIG_INLINE_SPIN_LOCK is not set
-+# CONFIG_INLINE_SPIN_LOCK_BH is not set
-+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-+# CONFIG_INLINE_SPIN_UNLOCK is not set
-+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-+# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
-+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-+# CONFIG_INLINE_READ_TRYLOCK is not set
-+# CONFIG_INLINE_READ_LOCK is not set
-+# CONFIG_INLINE_READ_LOCK_BH is not set
-+# CONFIG_INLINE_READ_LOCK_IRQ is not set
-+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-+# CONFIG_INLINE_READ_UNLOCK is not set
-+# CONFIG_INLINE_READ_UNLOCK_BH is not set
-+# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
-+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-+# CONFIG_INLINE_WRITE_TRYLOCK is not set
-+# CONFIG_INLINE_WRITE_LOCK is not set
-+# CONFIG_INLINE_WRITE_LOCK_BH is not set
-+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-+# CONFIG_INLINE_WRITE_UNLOCK is not set
-+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-+# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
-+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-+CONFIG_FREEZER=y
-+
-+#
-+# System Type
-+#
-+CONFIG_MMU=y
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_GEMINI is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_MXC is not set
-+# CONFIG_ARCH_STMP3XXX is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_NOMADIK is not set
-+# CONFIG_ARCH_IOP13XX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
-+# CONFIG_ARCH_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_DOVE is not set
-+CONFIG_ARCH_KIRKWOOD=y
-+# CONFIG_ARCH_LOKI is not set
-+# CONFIG_ARCH_MV78XX0 is not set
-+# CONFIG_ARCH_ORION5X is not set
-+# CONFIG_ARCH_MMP is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_W90X900 is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_MSM is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+# CONFIG_ARCH_S3C2410 is not set
-+# CONFIG_ARCH_S3C64XX is not set
-+# CONFIG_ARCH_S5PC1XX is not set
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_U300 is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+# CONFIG_ARCH_BCMRING is not set
-+# CONFIG_ARCH_U8500 is not set
-+
-+#
-+# Marvell Kirkwood Implementations
-+#
-+CONFIG_MACH_DB88F6281_BP=y
-+CONFIG_MACH_RD88F6192_NAS=y
-+CONFIG_MACH_RD88F6281=y
-+# CONFIG_MACH_MV88F6281GTW_GE is not set
-+CONFIG_MACH_SHEEVAPLUG=y
-+CONFIG_MACH_GURUPLUG=y
-+CONFIG_MACH_TS219=y
-+CONFIG_MACH_TS41X=y
-+CONFIG_MACH_OPENRD_BASE=y
-+# CONFIG_MACH_NETSPACE_V2 is not set
-+CONFIG_PLAT_ORION=y
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_FEROCEON=y
-+# CONFIG_CPU_FEROCEON_OLD_ID is not set
-+CONFIG_CPU_32v5=y
-+CONFIG_CPU_ABRT_EV5T=y
-+CONFIG_CPU_PABRT_LEGACY=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_FEROCEON=y
-+CONFIG_CPU_TLB_FEROCEON=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+CONFIG_OUTER_CACHE=y
-+CONFIG_CACHE_FEROCEON_L2=y
-+# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
-+CONFIG_ARM_L1_CACHE_SHIFT=5
-+
-+#
-+# Bus support
-+#
-+CONFIG_PCI=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCI_STUB is not set
-+# CONFIG_PCI_IOV is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+CONFIG_VMSPLIT_3G=y
-+# CONFIG_VMSPLIT_2G is not set
-+# CONFIG_VMSPLIT_1G is not set
-+CONFIG_PAGE_OFFSET=0xC0000000
-+# CONFIG_PREEMPT_NONE is not set
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+CONFIG_PREEMPT=y
-+CONFIG_HZ=100
-+CONFIG_AEABI=y
-+# CONFIG_OABI_COMPAT is not set
-+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-+# CONFIG_HIGHMEM is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+CONFIG_PAGEFLAGS_EXTENDED=y
-+CONFIG_SPLIT_PTLOCK_CPUS=999999
-+# CONFIG_PHYS_ADDR_T_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=0
-+CONFIG_VIRT_TO_BUS=y
-+# CONFIG_KSM is not set
-+CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
-+CONFIG_ALIGNMENT_TRAP=y
-+CONFIG_UACCESS_WITH_MEMCPY=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE=""
-+# CONFIG_XIP_KERNEL is not set
-+# CONFIG_KEXEC is not set
-+
-+#
-+# CPU Power Management
-+#
-+CONFIG_CPU_IDLE=y
-+CONFIG_CPU_IDLE_GOV_LADDER=y
-+CONFIG_CPU_IDLE_GOV_MENU=y
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+# CONFIG_VFP is not set
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-+CONFIG_HAVE_AOUT=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+# CONFIG_PM_DEBUG is not set
-+CONFIG_PM_SLEEP=y
-+CONFIG_SUSPEND=y
-+CONFIG_SUSPEND_FREEZER=y
-+# CONFIG_APM_EMULATION is not set
-+# CONFIG_PM_RUNTIME is not set
-+CONFIG_ARCH_SUSPEND_POSSIBLE=y
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=m
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+CONFIG_XFRM_IPCOMP=m
-+CONFIG_NET_KEY=m
-+# CONFIG_NET_KEY_MIGRATE is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+# CONFIG_IP_MULTIPLE_TABLES is not set
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE is not set
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+CONFIG_NET_IPIP=m
-+CONFIG_NET_IPGRE=m
-+# CONFIG_NET_IPGRE_BROADCAST is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
-+CONFIG_INET_LRO=y
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+# CONFIG_IPV6_SIT_6RD is not set
-+CONFIG_IPV6_NDISC_NODETYPE=y
-+# CONFIG_IPV6_TUNNEL is not set
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_IPV6_MROUTE is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+CONFIG_NETFILTER_ADVANCED=y
-+CONFIG_BRIDGE_NETFILTER=y
-+
-+#
-+# Core Netfilter Configuration
-+#
-+CONFIG_NETFILTER_NETLINK=m
-+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-+CONFIG_NETFILTER_NETLINK_LOG=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CT_ACCT=y
-+CONFIG_NF_CONNTRACK_MARK=y
-+# CONFIG_NF_CONNTRACK_EVENTS is not set
-+CONFIG_NF_CT_PROTO_DCCP=m
-+CONFIG_NF_CT_PROTO_GRE=m
-+CONFIG_NF_CT_PROTO_SCTP=m
-+CONFIG_NF_CT_PROTO_UDPLITE=m
-+CONFIG_NF_CONNTRACK_AMANDA=m
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+# CONFIG_NF_CT_NETLINK is not set
-+CONFIG_NETFILTER_TPROXY=m
-+CONFIG_NETFILTER_XTABLES=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_HL=m
-+CONFIG_NETFILTER_XT_TARGET_LED=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-+CONFIG_NETFILTER_XT_TARGET_TRACE=m
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_HL=m
-+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_OWNER=m
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_RECENT=m
-+CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y
-+CONFIG_NETFILTER_XT_MATCH_SCTP=m
-+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+CONFIG_NETFILTER_XT_MATCH_TIME=m
-+CONFIG_NETFILTER_XT_MATCH_U32=m
-+CONFIG_NETFILTER_XT_MATCH_OSF=m
-+# CONFIG_IP_VS is not set
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+CONFIG_NF_DEFRAG_IPV4=m
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_NF_NAT=m
-+CONFIG_NF_NAT_NEEDED=y
-+CONFIG_IP_NF_TARGET_MASQUERADE=m
-+CONFIG_IP_NF_TARGET_NETMAP=m
-+CONFIG_IP_NF_TARGET_REDIRECT=m
-+CONFIG_NF_NAT_SNMP_BASIC=m
-+CONFIG_NF_NAT_PROTO_DCCP=m
-+CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_PROTO_UDPLITE=m
-+CONFIG_NF_NAT_PROTO_SCTP=m
-+CONFIG_NF_NAT_FTP=m
-+CONFIG_NF_NAT_IRC=m
-+CONFIG_NF_NAT_TFTP=m
-+CONFIG_NF_NAT_AMANDA=m
-+CONFIG_NF_NAT_PPTP=m
-+CONFIG_NF_NAT_H323=m
-+CONFIG_NF_NAT_SIP=m
-+CONFIG_IP_NF_MANGLE=m
-+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_RAW=m
-+CONFIG_IP_NF_ARPTABLES=m
-+CONFIG_IP_NF_ARPFILTER=m
-+CONFIG_IP_NF_ARP_MANGLE=m
-+
-+#
-+# IPv6: Netfilter Configuration
-+#
-+CONFIG_NF_CONNTRACK_IPV6=m
-+# CONFIG_IP6_NF_QUEUE is not set
-+CONFIG_IP6_NF_IPTABLES=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_MATCH_FRAG=m
-+CONFIG_IP6_NF_MATCH_OPTS=m
-+CONFIG_IP6_NF_MATCH_HL=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_RT=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_RAW=m
-+CONFIG_BRIDGE_NF_EBTABLES=m
-+CONFIG_BRIDGE_EBT_BROUTE=m
-+CONFIG_BRIDGE_EBT_T_FILTER=m
-+CONFIG_BRIDGE_EBT_T_NAT=m
-+CONFIG_BRIDGE_EBT_802_3=m
-+CONFIG_BRIDGE_EBT_AMONG=m
-+CONFIG_BRIDGE_EBT_ARP=m
-+CONFIG_BRIDGE_EBT_IP=m
-+CONFIG_BRIDGE_EBT_IP6=m
-+CONFIG_BRIDGE_EBT_LIMIT=m
-+CONFIG_BRIDGE_EBT_MARK=m
-+CONFIG_BRIDGE_EBT_PKTTYPE=m
-+CONFIG_BRIDGE_EBT_STP=m
-+CONFIG_BRIDGE_EBT_VLAN=m
-+CONFIG_BRIDGE_EBT_ARPREPLY=m
-+CONFIG_BRIDGE_EBT_DNAT=m
-+CONFIG_BRIDGE_EBT_MARK_T=m
-+CONFIG_BRIDGE_EBT_REDIRECT=m
-+CONFIG_BRIDGE_EBT_SNAT=m
-+CONFIG_BRIDGE_EBT_LOG=m
-+CONFIG_BRIDGE_EBT_ULOG=m
-+CONFIG_BRIDGE_EBT_NFLOG=m
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_RDS is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+CONFIG_STP=m
-+CONFIG_BRIDGE=m
-+CONFIG_NET_DSA=y
-+# CONFIG_NET_DSA_TAG_DSA is not set
-+CONFIG_NET_DSA_TAG_EDSA=y
-+# CONFIG_NET_DSA_TAG_TRAILER is not set
-+CONFIG_NET_DSA_MV88E6XXX=y
-+# CONFIG_NET_DSA_MV88E6060 is not set
-+# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
-+# CONFIG_NET_DSA_MV88E6131 is not set
-+CONFIG_NET_DSA_MV88E6123_61_65=y
-+CONFIG_VLAN_8021Q=m
-+# CONFIG_VLAN_8021Q_GVRP is not set
-+# CONFIG_DECNET is not set
-+CONFIG_LLC=m
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+CONFIG_ATALK=m
-+CONFIG_DEV_APPLETALK=m
-+# CONFIG_IPDDP is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_PHONET is not set
-+# CONFIG_IEEE802154 is not set
-+CONFIG_NET_SCHED=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_PRIO=m
-+CONFIG_NET_SCH_MULTIQ=m
-+CONFIG_NET_SCH_RED=m
-+CONFIG_NET_SCH_SFQ=m
-+CONFIG_NET_SCH_TEQL=m
-+CONFIG_NET_SCH_TBF=m
-+CONFIG_NET_SCH_GRED=m
-+CONFIG_NET_SCH_DSMARK=m
-+CONFIG_NET_SCH_NETEM=m
-+CONFIG_NET_SCH_DRR=m
-+# CONFIG_NET_SCH_INGRESS is not set
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+CONFIG_NET_CLS_BASIC=m
-+CONFIG_NET_CLS_TCINDEX=m
-+CONFIG_NET_CLS_ROUTE4=m
-+CONFIG_NET_CLS_ROUTE=y
-+CONFIG_NET_CLS_FW=m
-+CONFIG_NET_CLS_U32=m
-+CONFIG_CLS_U32_PERF=y
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+CONFIG_NET_CLS_FLOW=m
-+CONFIG_NET_EMATCH=y
-+CONFIG_NET_EMATCH_STACK=32
-+CONFIG_NET_EMATCH_CMP=m
-+CONFIG_NET_EMATCH_NBYTE=m
-+CONFIG_NET_EMATCH_U32=m
-+CONFIG_NET_EMATCH_META=m
-+CONFIG_NET_EMATCH_TEXT=m
-+CONFIG_NET_CLS_ACT=y
-+# CONFIG_NET_ACT_POLICE is not set
-+# CONFIG_NET_ACT_GACT is not set
-+# CONFIG_NET_ACT_MIRRED is not set
-+# CONFIG_NET_ACT_IPT is not set
-+# CONFIG_NET_ACT_NAT is not set
-+# CONFIG_NET_ACT_PEDIT is not set
-+# CONFIG_NET_ACT_SIMP is not set
-+# CONFIG_NET_ACT_SKBEDIT is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_SCH_FIFO=y
-+# CONFIG_DCB is not set
-+
-+#
-+# Network testing
-+#
-+CONFIG_NET_PKTGEN=m
-+# CONFIG_NET_TCPPROBE is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+CONFIG_BT=m
-+CONFIG_BT_L2CAP=m
-+CONFIG_BT_SCO=m
-+CONFIG_BT_RFCOMM=m
-+CONFIG_BT_RFCOMM_TTY=y
-+CONFIG_BT_BNEP=m
-+# CONFIG_BT_BNEP_MC_FILTER is not set
-+# CONFIG_BT_BNEP_PROTO_FILTER is not set
-+CONFIG_BT_HIDP=m
-+
-+#
-+# Bluetooth device drivers
-+#
-+CONFIG_BT_HCIBTUSB=m
-+CONFIG_BT_HCIBTSDIO=m
-+# CONFIG_BT_HCIUART is not set
-+CONFIG_BT_HCIBCM203X=m
-+CONFIG_BT_HCIBPA10X=m
-+CONFIG_BT_HCIBFUSB=m
-+CONFIG_BT_HCIVHCI=m
-+CONFIG_BT_MRVL=m
-+CONFIG_BT_MRVL_SDIO=m
-+# CONFIG_BT_ATH3K is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_WIRELESS=y
-+CONFIG_WIRELESS_EXT=y
-+CONFIG_WEXT_CORE=y
-+CONFIG_WEXT_PROC=y
-+CONFIG_WEXT_SPY=y
-+CONFIG_CFG80211=y
-+# CONFIG_NL80211_TESTMODE is not set
-+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-+# CONFIG_CFG80211_REG_DEBUG is not set
-+CONFIG_CFG80211_DEFAULT_PS=y
-+# CONFIG_CFG80211_DEBUGFS is not set
-+CONFIG_WIRELESS_OLD_REGULATORY=y
-+CONFIG_CFG80211_WEXT=y
-+CONFIG_WIRELESS_EXT_SYSFS=y
-+CONFIG_LIB80211=y
-+# CONFIG_LIB80211_DEBUG is not set
-+CONFIG_MAC80211=y
-+CONFIG_MAC80211_RC_MINSTREL=y
-+# CONFIG_MAC80211_RC_DEFAULT_PID is not set
-+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-+CONFIG_MAC80211_RC_DEFAULT="minstrel"
-+# CONFIG_MAC80211_MESH is not set
-+# CONFIG_MAC80211_LEDS is not set
-+# CONFIG_MAC80211_DEBUGFS is not set
-+# CONFIG_MAC80211_DEBUG_MENU is not set
-+# CONFIG_WIMAX is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+# CONFIG_DEVTMPFS is not set
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+CONFIG_FIRMWARE_IN_KERNEL=y
-+CONFIG_EXTRA_FIRMWARE=""
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_TESTS is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+# CONFIG_MTD_AR7_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+CONFIG_MTD_CFI_ADV_OPTIONS=y
-+CONFIG_MTD_CFI_NOSWAP=y
-+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-+CONFIG_MTD_CFI_GEOMETRY=y
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_OTP is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+# CONFIG_MTD_CFI_AMDSTD is not set
-+CONFIG_MTD_CFI_STAA=y
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+# CONFIG_MTD_PHYSMAP_COMPAT is not set
-+# CONFIG_MTD_ARM_INTEGRATOR is not set
-+# CONFIG_MTD_IMPA7 is not set
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_DATAFLASH is not set
-+CONFIG_MTD_M25P80=y
-+CONFIG_M25PXX_USE_FAST_READ=y
-+# CONFIG_MTD_SST25L is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+# CONFIG_MTD_NAND_GPIO is not set
-+CONFIG_MTD_NAND_IDS=y
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_CAFE is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+CONFIG_MTD_NAND_ORION=y
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# LPDDR flash memory drivers
-+#
-+# CONFIG_MTD_LPDDR is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+CONFIG_MTD_UBI=y
-+CONFIG_MTD_UBI_WL_THRESHOLD=4096
-+CONFIG_MTD_UBI_BEB_RESERVE=1
-+# CONFIG_MTD_UBI_GLUEBI is not set
-+
-+#
-+# UBI debugging options
-+#
-+# CONFIG_MTD_UBI_DEBUG is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+
-+#
-+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
-+#
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=8192
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+CONFIG_ATA_OVER_ETH=m
-+# CONFIG_MG_DISK is not set
-+# CONFIG_MISC_DEVICES is not set
-+CONFIG_EEPROM_93CX6=m
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_SCSI_PROC_FS is not set
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+CONFIG_SCSI_MULTI_LUN=y
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_BNX2_ISCSI is not set
-+# CONFIG_BE2ISCSI is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_HPSA is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_3W_SAS is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_MPT2SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_LIBFC is not set
-+# CONFIG_LIBFCOE is not set
-+# CONFIG_FCOE is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_IPR is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_PMCRAID is not set
-+# CONFIG_SCSI_PM8001 is not set
-+# CONFIG_SCSI_SRP is not set
-+# CONFIG_SCSI_BFA_FC is not set
-+# CONFIG_SCSI_DH is not set
-+# CONFIG_SCSI_OSD_INITIATOR is not set
-+CONFIG_ATA=y
-+# CONFIG_ATA_NONSTANDARD is not set
-+CONFIG_ATA_VERBOSE_ERROR=y
-+CONFIG_SATA_PMP=y
-+# CONFIG_SATA_AHCI is not set
-+# CONFIG_SATA_SIL24 is not set
-+CONFIG_ATA_SFF=y
-+# CONFIG_SATA_SVW is not set
-+# CONFIG_ATA_PIIX is not set
-+CONFIG_SATA_MV=m
-+# CONFIG_SATA_NV is not set
-+# CONFIG_PDC_ADMA is not set
-+# CONFIG_SATA_QSTOR is not set
-+# CONFIG_SATA_PROMISE is not set
-+# CONFIG_SATA_SX4 is not set
-+# CONFIG_SATA_SIL is not set
-+# CONFIG_SATA_SIS is not set
-+# CONFIG_SATA_ULI is not set
-+# CONFIG_SATA_VIA is not set
-+# CONFIG_SATA_VITESSE is not set
-+# CONFIG_SATA_INIC162X is not set
-+# CONFIG_PATA_ALI is not set
-+# CONFIG_PATA_AMD is not set
-+# CONFIG_PATA_ARTOP is not set
-+# CONFIG_PATA_ATP867X is not set
-+# CONFIG_PATA_ATIIXP is not set
-+# CONFIG_PATA_CMD640_PCI is not set
-+# CONFIG_PATA_CMD64X is not set
-+# CONFIG_PATA_CS5520 is not set
-+# CONFIG_PATA_CS5530 is not set
-+# CONFIG_PATA_CYPRESS is not set
-+# CONFIG_PATA_EFAR is not set
-+# CONFIG_ATA_GENERIC is not set
-+# CONFIG_PATA_HPT366 is not set
-+# CONFIG_PATA_HPT37X is not set
-+# CONFIG_PATA_HPT3X2N is not set
-+# CONFIG_PATA_HPT3X3 is not set
-+# CONFIG_PATA_IT821X is not set
-+# CONFIG_PATA_IT8213 is not set
-+# CONFIG_PATA_JMICRON is not set
-+# CONFIG_PATA_TRIFLEX is not set
-+# CONFIG_PATA_MARVELL is not set
-+# CONFIG_PATA_MPIIX is not set
-+# CONFIG_PATA_OLDPIIX is not set
-+# CONFIG_PATA_NETCELL is not set
-+# CONFIG_PATA_NINJA32 is not set
-+# CONFIG_PATA_NS87410 is not set
-+# CONFIG_PATA_NS87415 is not set
-+# CONFIG_PATA_OPTI is not set
-+# CONFIG_PATA_OPTIDMA is not set
-+# CONFIG_PATA_PDC2027X is not set
-+# CONFIG_PATA_PDC_OLD is not set
-+# CONFIG_PATA_RADISYS is not set
-+# CONFIG_PATA_RDC is not set
-+# CONFIG_PATA_RZ1000 is not set
-+# CONFIG_PATA_SC1200 is not set
-+# CONFIG_PATA_SERVERWORKS is not set
-+# CONFIG_PATA_SIL680 is not set
-+# CONFIG_PATA_SIS is not set
-+# CONFIG_PATA_TOSHIBA is not set
-+# CONFIG_PATA_VIA is not set
-+# CONFIG_PATA_WINBOND is not set
-+# CONFIG_PATA_SCH is not set
-+CONFIG_MD=y
-+CONFIG_BLK_DEV_MD=m
-+CONFIG_MD_LINEAR=m
-+CONFIG_MD_RAID0=m
-+CONFIG_MD_RAID1=m
-+CONFIG_MD_RAID10=m
-+CONFIG_MD_RAID456=m
-+CONFIG_MD_RAID6_PQ=m
-+# CONFIG_ASYNC_RAID6_TEST is not set
-+# CONFIG_MD_MULTIPATH is not set
-+# CONFIG_MD_FAULTY is not set
-+CONFIG_BLK_DEV_DM=m
-+# CONFIG_DM_DEBUG is not set
-+CONFIG_DM_CRYPT=m
-+CONFIG_DM_SNAPSHOT=m
-+CONFIG_DM_MIRROR=m
-+# CONFIG_DM_LOG_USERSPACE is not set
-+CONFIG_DM_ZERO=m
-+CONFIG_DM_MULTIPATH=m
-+# CONFIG_DM_MULTIPATH_QL is not set
-+# CONFIG_DM_MULTIPATH_ST is not set
-+# CONFIG_DM_DELAY is not set
-+# CONFIG_DM_UEVENT is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+
-+#
-+# You can enable one or both FireWire driver stacks.
-+#
-+
-+#
-+# The newer stack is recommended.
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_IFB is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+CONFIG_MARVELL_PHY=y
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_NATIONAL_PHY is not set
-+# CONFIG_STE10XP is not set
-+# CONFIG_LSI_ET1011C_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_AX88796 is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_SMC91X is not set
-+# CONFIG_DM9000 is not set
-+# CONFIG_ENC28J60 is not set
-+# CONFIG_ETHOC is not set
-+# CONFIG_SMC911X is not set
-+# CONFIG_SMSC911X is not set
-+# CONFIG_DNET is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_PCNET32 is not set
-+# CONFIG_AMD8111_ETH is not set
-+# CONFIG_ADAPTEC_STARFIRE is not set
-+# CONFIG_B44 is not set
-+# CONFIG_FORCEDETH is not set
-+# CONFIG_E100 is not set
-+# CONFIG_FEALNX is not set
-+# CONFIG_NATSEMI is not set
-+# CONFIG_NE2K_PCI is not set
-+# CONFIG_8139CP is not set
-+# CONFIG_8139TOO is not set
-+# CONFIG_R6040 is not set
-+# CONFIG_SIS900 is not set
-+# CONFIG_EPIC100 is not set
-+# CONFIG_SMSC9420 is not set
-+# CONFIG_SUNDANCE is not set
-+# CONFIG_TLAN is not set
-+# CONFIG_KS8842 is not set
-+# CONFIG_KS8851 is not set
-+# CONFIG_KS8851_MLL is not set
-+# CONFIG_VIA_RHINE is not set
-+# CONFIG_SC92031 is not set
-+# CONFIG_ATL2 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_IGBVF is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_CNIC is not set
-+CONFIG_MV643XX_ETH=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+# CONFIG_ATL1E is not set
-+# CONFIG_ATL1C is not set
-+# CONFIG_JME is not set
-+# CONFIG_NETDEV_10000 is not set
-+# CONFIG_TR is not set
-+CONFIG_WLAN=y
-+# CONFIG_LIBERTAS_THINFIRM is not set
-+CONFIG_LIBERTAS_UAP=m
-+# CONFIG_ATMEL is not set
-+# CONFIG_AT76C50X_USB is not set
-+# CONFIG_PRISM54 is not set
-+# CONFIG_USB_ZD1201 is not set
-+CONFIG_USB_NET_RNDIS_WLAN=m
-+# CONFIG_RTL8180 is not set
-+CONFIG_RTL8187=m
-+# CONFIG_ADM8211 is not set
-+# CONFIG_MAC80211_HWSIM is not set
-+# CONFIG_MWL8K is not set
-+# CONFIG_ATH_COMMON is not set
-+# CONFIG_B43 is not set
-+# CONFIG_B43LEGACY is not set
-+# CONFIG_HOSTAP is not set
-+# CONFIG_IPW2100 is not set
-+# CONFIG_IPW2200 is not set
-+# CONFIG_IWLWIFI is not set
-+# CONFIG_IWM is not set
-+CONFIG_LIBERTAS=m
-+# CONFIG_LIBERTAS_USB is not set
-+CONFIG_LIBERTAS_SDIO=m
-+# CONFIG_LIBERTAS_SPI is not set
-+# CONFIG_LIBERTAS_DEBUG is not set
-+# CONFIG_HERMES is not set
-+# CONFIG_P54_COMMON is not set
-+# CONFIG_RT2X00 is not set
-+# CONFIG_WL12XX is not set
-+# CONFIG_ZD1211RW is not set
-+
-+#
-+# Enable WiMAX (Networking options) to see the WiMAX drivers
-+#
-+
-+#
-+# USB Network Adapters
-+#
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET=m
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_CDCETHER=m
-+# CONFIG_USB_NET_CDC_EEM is not set
-+CONFIG_USB_NET_DM9601=m
-+# CONFIG_USB_NET_SMSC95XX is not set
-+# CONFIG_USB_NET_GL620A is not set
-+CONFIG_USB_NET_NET1080=m
-+# CONFIG_USB_NET_PLUSB is not set
-+# CONFIG_USB_NET_MCS7830 is not set
-+CONFIG_USB_NET_RNDIS_HOST=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+# CONFIG_USB_ALI_M5632 is not set
-+# CONFIG_USB_AN2720 is not set
-+CONFIG_USB_BELKIN=y
-+CONFIG_USB_ARMLINUX=y
-+# CONFIG_USB_EPSON2888 is not set
-+# CONFIG_USB_KC2190 is not set
-+CONFIG_USB_NET_ZAURUS=m
-+# CONFIG_USB_NET_INT51X1 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+CONFIG_PPP=m
-+CONFIG_PPP_MULTILINK=y
-+CONFIG_PPP_FILTER=y
-+CONFIG_PPP_ASYNC=m
-+CONFIG_PPP_SYNC_TTY=m
-+CONFIG_PPP_DEFLATE=m
-+CONFIG_PPP_BSDCOMP=m
-+CONFIG_PPP_MPPE=m
-+CONFIG_PPPOE=m
-+CONFIG_PPPOL2TP=m
-+# CONFIG_SLIP is not set
-+CONFIG_SLHC=m
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_VMXNET3 is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+# CONFIG_INPUT_SPARSEKMAP is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+CONFIG_INPUT_MOUSEDEV_PSAUX=y
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ADP5588 is not set
-+CONFIG_KEYBOARD_ATKBD=y
-+# CONFIG_QT2160 is not set
-+# CONFIG_KEYBOARD_LKKBD is not set
-+CONFIG_KEYBOARD_GPIO=y
-+# CONFIG_KEYBOARD_MATRIX is not set
-+# CONFIG_KEYBOARD_LM8323 is not set
-+# CONFIG_KEYBOARD_MAX7359 is not set
-+# CONFIG_KEYBOARD_NEWTON is not set
-+# CONFIG_KEYBOARD_OPENCORES is not set
-+# CONFIG_KEYBOARD_STOWAWAY is not set
-+# CONFIG_KEYBOARD_SUNKBD is not set
-+# CONFIG_KEYBOARD_XTKBD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+CONFIG_SERIO_SERPORT=y
-+# CONFIG_SERIO_PCIPS2 is not set
-+CONFIG_SERIO_LIBPS2=y
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_SERIO_ALTERA_PS2 is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_CONSOLE_TRANSLATIONS=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_HW_CONSOLE=y
-+# CONFIG_VT_HW_CONSOLE_BINDING is not set
-+# CONFIG_DEVKMEM is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_MAX3100 is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=16
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_COMPAT=y
-+CONFIG_I2C_CHARDEV=y
-+CONFIG_I2C_HELPER_AUTO=y
-+CONFIG_I2C_ALGOBIT=m
-+
-+#
-+# I2C Hardware Bus support
-+#
-+
-+#
-+# PC SMBus host controller drivers
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_ISCH is not set
-+# CONFIG_I2C_PIIX4 is not set
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+
-+#
-+# I2C system bus drivers (mostly embedded / system-on-chip)
-+#
-+# CONFIG_I2C_GPIO is not set
-+CONFIG_I2C_MV64XXX=y
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_SIMTEC is not set
-+
-+#
-+# External I2C/SMBus adapter drivers
-+#
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_TINY_USB is not set
-+
-+#
-+# Other I2C/SMBus bus drivers
-+#
-+# CONFIG_I2C_PCA_PLATFORM is not set
-+# CONFIG_I2C_STUB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_I2C_DEBUG_CORE is not set
-+# CONFIG_I2C_DEBUG_ALGO is not set
-+# CONFIG_I2C_DEBUG_BUS is not set
-+# CONFIG_I2C_DEBUG_CHIP is not set
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+# CONFIG_SPI_BITBANG is not set
-+# CONFIG_SPI_GPIO is not set
-+CONFIG_SPI_ORION=y
-+# CONFIG_SPI_XILINX is not set
-+# CONFIG_SPI_DESIGNWARE is not set
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+
-+#
-+# PPS support
-+#
-+# CONFIG_PPS is not set
-+CONFIG_ARCH_REQUIRE_GPIOLIB=y
-+CONFIG_GPIOLIB=y
-+# CONFIG_DEBUG_GPIO is not set
-+# CONFIG_GPIO_SYSFS is not set
-+
-+#
-+# Memory mapped GPIO expanders:
-+#
-+
-+#
-+# I2C GPIO expanders:
-+#
-+# CONFIG_GPIO_MAX732X is not set
-+# CONFIG_GPIO_PCA953X is not set
-+# CONFIG_GPIO_PCF857X is not set
-+# CONFIG_GPIO_ADP5588 is not set
-+
-+#
-+# PCI GPIO expanders:
-+#
-+# CONFIG_GPIO_CS5535 is not set
-+# CONFIG_GPIO_BT8XX is not set
-+# CONFIG_GPIO_LANGWELL is not set
-+
-+#
-+# SPI GPIO expanders:
-+#
-+# CONFIG_GPIO_MAX7301 is not set
-+# CONFIG_GPIO_MCP23S08 is not set
-+# CONFIG_GPIO_MC33880 is not set
-+
-+#
-+# AC97 GPIO expanders:
-+#
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+CONFIG_SOFT_WATCHDOG=m
-+CONFIG_ORION_WATCHDOG=m
-+# CONFIG_ALIM7101_WDT is not set
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+CONFIG_SSB_POSSIBLE=y
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_CORE is not set
-+# CONFIG_MFD_SM501 is not set
-+# CONFIG_MFD_ASIC3 is not set
-+# CONFIG_HTC_EGPIO is not set
-+# CONFIG_HTC_PASIC3 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_TWL4030_CORE is not set
-+# CONFIG_MFD_TMIO is not set
-+# CONFIG_MFD_TC6393XB is not set
-+# CONFIG_PMIC_DA903X is not set
-+# CONFIG_PMIC_ADP5520 is not set
-+# CONFIG_MFD_WM8400 is not set
-+# CONFIG_MFD_WM831X is not set
-+# CONFIG_MFD_WM8350_I2C is not set
-+# CONFIG_MFD_PCF50633 is not set
-+# CONFIG_MFD_MC13783 is not set
-+# CONFIG_AB3100_CORE is not set
-+# CONFIG_EZX_PCAP is not set
-+# CONFIG_MFD_88PM8607 is not set
-+# CONFIG_AB4500_CORE is not set
-+# CONFIG_REGULATOR is not set
-+CONFIG_MEDIA_SUPPORT=m
-+
-+#
-+# Multimedia core support
-+#
-+CONFIG_VIDEO_DEV=m
-+CONFIG_VIDEO_V4L2_COMMON=m
-+CONFIG_VIDEO_ALLOW_V4L1=y
-+CONFIG_VIDEO_V4L1_COMPAT=y
-+CONFIG_DVB_CORE=m
-+CONFIG_VIDEO_MEDIA=m
-+
-+#
-+# Multimedia drivers
-+#
-+CONFIG_IR_CORE=m
-+CONFIG_VIDEO_IR=m
-+CONFIG_MEDIA_ATTACH=y
-+CONFIG_MEDIA_TUNER=m
-+CONFIG_MEDIA_TUNER_CUSTOMISE=y
-+CONFIG_MEDIA_TUNER_SIMPLE=m
-+CONFIG_MEDIA_TUNER_TDA8290=m
-+CONFIG_MEDIA_TUNER_TDA827X=m
-+CONFIG_MEDIA_TUNER_TDA18271=m
-+CONFIG_MEDIA_TUNER_TDA9887=m
-+CONFIG_MEDIA_TUNER_TEA5761=m
-+CONFIG_MEDIA_TUNER_TEA5767=m
-+CONFIG_MEDIA_TUNER_MT20XX=m
-+CONFIG_MEDIA_TUNER_MT2060=m
-+CONFIG_MEDIA_TUNER_MT2266=m
-+CONFIG_MEDIA_TUNER_MT2131=m
-+CONFIG_MEDIA_TUNER_QT1010=m
-+CONFIG_MEDIA_TUNER_XC2028=m
-+CONFIG_MEDIA_TUNER_XC5000=m
-+CONFIG_MEDIA_TUNER_MXL5005S=m
-+CONFIG_MEDIA_TUNER_MXL5007T=m
-+CONFIG_MEDIA_TUNER_MC44S803=m
-+CONFIG_MEDIA_TUNER_MAX2165=m
-+CONFIG_VIDEO_V4L2=m
-+CONFIG_VIDEO_V4L1=m
-+CONFIG_VIDEOBUF_GEN=m
-+CONFIG_VIDEOBUF_VMALLOC=m
-+CONFIG_VIDEOBUF_DVB=m
-+CONFIG_VIDEO_TVEEPROM=m
-+CONFIG_VIDEO_TUNER=m
-+CONFIG_VIDEO_CAPTURE_DRIVERS=y
-+# CONFIG_VIDEO_ADV_DEBUG is not set
-+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-+CONFIG_VIDEO_IR_I2C=m
-+CONFIG_VIDEO_MSP3400=m
-+CONFIG_VIDEO_CS53L32A=m
-+CONFIG_VIDEO_M52790=m
-+CONFIG_VIDEO_WM8775=m
-+CONFIG_VIDEO_WM8739=m
-+CONFIG_VIDEO_VP27SMPX=m
-+CONFIG_VIDEO_MT9V011=m
-+CONFIG_VIDEO_SAA711X=m
-+CONFIG_VIDEO_SAA717X=m
-+CONFIG_VIDEO_TVP5150=m
-+CONFIG_VIDEO_CX25840=m
-+CONFIG_VIDEO_CX2341X=m
-+CONFIG_VIDEO_SAA7127=m
-+CONFIG_VIDEO_UPD64031A=m
-+CONFIG_VIDEO_UPD64083=m
-+# CONFIG_VIDEO_VIVI is not set
-+# CONFIG_VIDEO_BT848 is not set
-+# CONFIG_VIDEO_CPIA is not set
-+# CONFIG_VIDEO_CPIA2 is not set
-+# CONFIG_VIDEO_SAA5246A is not set
-+# CONFIG_VIDEO_SAA5249 is not set
-+# CONFIG_VIDEO_STRADIS is not set
-+# CONFIG_VIDEO_ZORAN is not set
-+# CONFIG_VIDEO_SAA7134 is not set
-+# CONFIG_VIDEO_MXB is not set
-+# CONFIG_VIDEO_HEXIUM_ORION is not set
-+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-+# CONFIG_VIDEO_CX88 is not set
-+# CONFIG_VIDEO_CX23885 is not set
-+# CONFIG_VIDEO_AU0828 is not set
-+CONFIG_VIDEO_IVTV=m
-+# CONFIG_VIDEO_FB_IVTV is not set
-+# CONFIG_VIDEO_CX18 is not set
-+# CONFIG_VIDEO_SAA7164 is not set
-+# CONFIG_VIDEO_CAFE_CCIC is not set
-+# CONFIG_SOC_CAMERA is not set
-+CONFIG_V4L_USB_DRIVERS=y
-+CONFIG_USB_VIDEO_CLASS=m
-+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-+CONFIG_USB_GSPCA=m
-+CONFIG_USB_M5602=m
-+CONFIG_USB_STV06XX=m
-+CONFIG_USB_GL860=m
-+CONFIG_USB_GSPCA_CONEX=m
-+CONFIG_USB_GSPCA_ETOMS=m
-+CONFIG_USB_GSPCA_FINEPIX=m
-+CONFIG_USB_GSPCA_JEILINJ=m
-+CONFIG_USB_GSPCA_MARS=m
-+CONFIG_USB_GSPCA_MR97310A=m
-+CONFIG_USB_GSPCA_OV519=m
-+CONFIG_USB_GSPCA_OV534=m
-+CONFIG_USB_GSPCA_PAC207=m
-+CONFIG_USB_GSPCA_PAC7302=m
-+CONFIG_USB_GSPCA_PAC7311=m
-+CONFIG_USB_GSPCA_SN9C20X=m
-+# CONFIG_USB_GSPCA_SN9C20X_EVDEV is not set
-+CONFIG_USB_GSPCA_SONIXB=m
-+CONFIG_USB_GSPCA_SONIXJ=m
-+CONFIG_USB_GSPCA_SPCA500=m
-+CONFIG_USB_GSPCA_SPCA501=m
-+CONFIG_USB_GSPCA_SPCA505=m
-+CONFIG_USB_GSPCA_SPCA506=m
-+CONFIG_USB_GSPCA_SPCA508=m
-+CONFIG_USB_GSPCA_SPCA561=m
-+CONFIG_USB_GSPCA_SQ905=m
-+CONFIG_USB_GSPCA_SQ905C=m
-+CONFIG_USB_GSPCA_STK014=m
-+CONFIG_USB_GSPCA_STV0680=m
-+CONFIG_USB_GSPCA_SUNPLUS=m
-+CONFIG_USB_GSPCA_T613=m
-+CONFIG_USB_GSPCA_TV8532=m
-+CONFIG_USB_GSPCA_VC032X=m
-+CONFIG_USB_GSPCA_ZC3XX=m
-+CONFIG_VIDEO_PVRUSB2=m
-+CONFIG_VIDEO_PVRUSB2_SYSFS=y
-+CONFIG_VIDEO_PVRUSB2_DVB=y
-+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-+# CONFIG_VIDEO_HDPVR is not set
-+CONFIG_VIDEO_EM28XX=m
-+CONFIG_VIDEO_EM28XX_ALSA=m
-+CONFIG_VIDEO_EM28XX_DVB=m
-+# CONFIG_VIDEO_CX231XX is not set
-+# CONFIG_VIDEO_USBVISION is not set
-+CONFIG_VIDEO_USBVIDEO=m
-+# CONFIG_USB_VICAM is not set
-+CONFIG_USB_IBMCAM=m
-+# CONFIG_USB_KONICAWC is not set
-+# CONFIG_USB_QUICKCAM_MESSENGER is not set
-+# CONFIG_USB_ET61X251 is not set
-+# CONFIG_VIDEO_OVCAMCHIP is not set
-+# CONFIG_USB_OV511 is not set
-+# CONFIG_USB_SE401 is not set
-+# CONFIG_USB_SN9C102 is not set
-+# CONFIG_USB_STV680 is not set
-+# CONFIG_USB_ZC0301 is not set
-+# CONFIG_USB_PWC is not set
-+CONFIG_USB_PWC_INPUT_EVDEV=y
-+# CONFIG_USB_ZR364XX is not set
-+# CONFIG_USB_STKWEBCAM is not set
-+# CONFIG_USB_S2255 is not set
-+# CONFIG_RADIO_ADAPTERS is not set
-+CONFIG_DVB_MAX_ADAPTERS=8
-+# CONFIG_DVB_DYNAMIC_MINORS is not set
-+CONFIG_DVB_CAPTURE_DRIVERS=y
-+
-+#
-+# Supported SAA7146 based PCI Adapters
-+#
-+# CONFIG_TTPCI_EEPROM is not set
-+# CONFIG_DVB_AV7110 is not set
-+# CONFIG_DVB_BUDGET_CORE is not set
-+
-+#
-+# Supported USB Adapters
-+#
-+# CONFIG_DVB_USB is not set
-+# CONFIG_DVB_TTUSB_BUDGET is not set
-+# CONFIG_DVB_TTUSB_DEC is not set
-+# CONFIG_SMS_SIANO_MDTV is not set
-+
-+#
-+# Supported FlexCopII (B2C2) Adapters
-+#
-+# CONFIG_DVB_B2C2_FLEXCOP is not set
-+
-+#
-+# Supported BT878 Adapters
-+#
-+
-+#
-+# Supported Pluto2 Adapters
-+#
-+# CONFIG_DVB_PLUTO2 is not set
-+
-+#
-+# Supported SDMC DM1105 Adapters
-+#
-+# CONFIG_DVB_DM1105 is not set
-+
-+#
-+# Supported Earthsoft PT1 Adapters
-+#
-+# CONFIG_DVB_PT1 is not set
-+
-+#
-+# Supported Mantis Adapters
-+#
-+# CONFIG_MANTIS_CORE is not set
-+
-+#
-+# Supported DVB Frontends
-+#
-+# CONFIG_DVB_FE_CUSTOMISE is not set
-+CONFIG_DVB_ZL10353=m
-+CONFIG_DVB_TDA10048=m
-+CONFIG_DVB_TDA10023=m
-+CONFIG_DVB_LGDT330X=m
-+CONFIG_DVB_S5H1409=m
-+CONFIG_DVB_S5H1411=m
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+CONFIG_VGA_ARB=y
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+CONFIG_FB=m
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-+# CONFIG_FB_CFB_FILLRECT is not set
-+# CONFIG_FB_CFB_COPYAREA is not set
-+# CONFIG_FB_CFB_IMAGEBLIT is not set
-+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_FOREIGN_ENDIAN is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+# CONFIG_FB_MODE_HELPERS is not set
-+# CONFIG_FB_TILEBLITTING is not set
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+# CONFIG_FB_CIRRUS is not set
-+# CONFIG_FB_PM2 is not set
-+# CONFIG_FB_CYBER2000 is not set
-+# CONFIG_FB_S1D13XXX is not set
-+# CONFIG_FB_NVIDIA is not set
-+# CONFIG_FB_RIVA is not set
-+# CONFIG_FB_MATROX is not set
-+# CONFIG_FB_RADEON is not set
-+# CONFIG_FB_ATY128 is not set
-+# CONFIG_FB_ATY is not set
-+# CONFIG_FB_S3 is not set
-+# CONFIG_FB_SAVAGE is not set
-+# CONFIG_FB_SIS is not set
-+# CONFIG_FB_VIA is not set
-+# CONFIG_FB_NEOMAGIC is not set
-+# CONFIG_FB_KYRO is not set
-+# CONFIG_FB_3DFX is not set
-+# CONFIG_FB_VOODOO1 is not set
-+# CONFIG_FB_VT8623 is not set
-+# CONFIG_FB_TRIDENT is not set
-+# CONFIG_FB_ARK is not set
-+# CONFIG_FB_PM3 is not set
-+# CONFIG_FB_CARMINE is not set
-+# CONFIG_FB_VIRTUAL is not set
-+# CONFIG_FB_METRONOME is not set
-+# CONFIG_FB_MB862XX is not set
-+# CONFIG_FB_BROADSHEET is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Console display driver support
-+#
-+# CONFIG_VGA_CONSOLE is not set
-+CONFIG_DUMMY_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE=m
-+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-+# CONFIG_FONTS is not set
-+CONFIG_FONT_8x8=y
-+CONFIG_FONT_8x16=y
-+# CONFIG_LOGO is not set
-+CONFIG_SOUND=m
-+# CONFIG_SOUND_OSS_CORE is not set
-+CONFIG_SND=m
-+CONFIG_SND_TIMER=m
-+CONFIG_SND_PCM=m
-+CONFIG_SND_HWDEP=m
-+CONFIG_SND_RAWMIDI=m
-+CONFIG_SND_SEQUENCER=m
-+# CONFIG_SND_SEQ_DUMMY is not set
-+# CONFIG_SND_MIXER_OSS is not set
-+# CONFIG_SND_PCM_OSS is not set
-+# CONFIG_SND_SEQUENCER_OSS is not set
-+CONFIG_SND_HRTIMER=m
-+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# CONFIG_SND_VERBOSE_PRINTK is not set
-+# CONFIG_SND_DEBUG is not set
-+CONFIG_SND_RAWMIDI_SEQ=m
-+# CONFIG_SND_OPL3_LIB_SEQ is not set
-+# CONFIG_SND_OPL4_LIB_SEQ is not set
-+# CONFIG_SND_SBAWE_SEQ is not set
-+# CONFIG_SND_EMU10K1_SEQ is not set
-+CONFIG_SND_DRIVERS=y
-+# CONFIG_SND_DUMMY is not set
-+# CONFIG_SND_VIRMIDI is not set
-+# CONFIG_SND_MTPAV is not set
-+# CONFIG_SND_SERIAL_U16550 is not set
-+# CONFIG_SND_MPU401 is not set
-+# CONFIG_SND_PCI is not set
-+CONFIG_SND_ARM=y
-+CONFIG_SND_SPI=y
-+CONFIG_SND_USB=y
-+CONFIG_SND_USB_AUDIO=m
-+CONFIG_SND_USB_CAIAQ=m
-+# CONFIG_SND_USB_CAIAQ_INPUT is not set
-+# CONFIG_SND_SOC is not set
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=y
-+# CONFIG_HID_PID is not set
-+CONFIG_USB_HIDDEV=y
-+
-+#
-+# Special HID drivers
-+#
-+CONFIG_HID_A4TECH=y
-+CONFIG_HID_APPLE=y
-+CONFIG_HID_BELKIN=y
-+CONFIG_HID_CHERRY=y
-+CONFIG_HID_CHICONY=y
-+CONFIG_HID_CYPRESS=y
-+CONFIG_HID_DRAGONRISE=y
-+# CONFIG_DRAGONRISE_FF is not set
-+CONFIG_HID_EZKEY=y
-+CONFIG_HID_KYE=y
-+CONFIG_HID_GYRATION=y
-+CONFIG_HID_TWINHAN=y
-+CONFIG_HID_KENSINGTON=y
-+CONFIG_HID_LOGITECH=y
-+# CONFIG_LOGITECH_FF is not set
-+# CONFIG_LOGIRUMBLEPAD2_FF is not set
-+CONFIG_HID_MICROSOFT=y
-+CONFIG_HID_MONTEREY=y
-+CONFIG_HID_NTRIG=y
-+CONFIG_HID_PANTHERLORD=y
-+# CONFIG_PANTHERLORD_FF is not set
-+CONFIG_HID_PETALYNX=y
-+CONFIG_HID_SAMSUNG=y
-+CONFIG_HID_SONY=y
-+CONFIG_HID_SUNPLUS=y
-+CONFIG_HID_GREENASIA=y
-+# CONFIG_GREENASIA_FF is not set
-+CONFIG_HID_SMARTJOYPLUS=y
-+# CONFIG_SMARTJOYPLUS_FF is not set
-+CONFIG_HID_TOPSEED=y
-+CONFIG_HID_THRUSTMASTER=y
-+# CONFIG_THRUSTMASTER_FF is not set
-+CONFIG_HID_WACOM=m
-+CONFIG_HID_ZEROPLUS=y
-+# CONFIG_ZEROPLUS_FF is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+CONFIG_USB_SUSPEND=y
-+# CONFIG_USB_OTG is not set
-+# CONFIG_USB_MON is not set
-+# CONFIG_USB_WUSB is not set
-+# CONFIG_USB_WUSB_CBAF is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_C67X00_HCD is not set
-+# CONFIG_USB_XHCI_HCD is not set
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_EHCI_ROOT_HUB_TT=y
-+CONFIG_USB_EHCI_TT_NEWSCHED=y
-+# CONFIG_USB_OXU210HP_HCD is not set
-+# CONFIG_USB_ISP116X_HCD is not set
-+# CONFIG_USB_ISP1760_HCD is not set
-+# CONFIG_USB_ISP1362_HCD is not set
-+# CONFIG_USB_OHCI_HCD is not set
-+# CONFIG_USB_UHCI_HCD is not set
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+# CONFIG_USB_WHCI_HCD is not set
-+# CONFIG_USB_HWA_HCD is not set
-+# CONFIG_USB_MUSB_HDRC is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+CONFIG_USB_ACM=m
-+CONFIG_USB_PRINTER=m
-+CONFIG_USB_WDM=m
-+# CONFIG_USB_TMC is not set
-+
-+#
-+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-+#
-+
-+#
-+# also be needed; see USB_STORAGE Help for more info
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+CONFIG_USB_STORAGE_DATAFAB=y
-+CONFIG_USB_STORAGE_FREECOM=y
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+CONFIG_USB_STORAGE_SDDR09=y
-+CONFIG_USB_STORAGE_SDDR55=y
-+CONFIG_USB_STORAGE_JUMPSHOT=y
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_ONETOUCH is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+
-+#
-+# USB port drivers
-+#
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_EZUSB=y
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+CONFIG_USB_SERIAL_CH341=m
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP210X=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=m
-+CONFIG_USB_SERIAL_VISOR=m
-+CONFIG_USB_SERIAL_IPAQ=m
-+CONFIG_USB_SERIAL_IR=m
-+CONFIG_USB_SERIAL_EDGEPORT=m
-+CONFIG_USB_SERIAL_EDGEPORT_TI=m
-+CONFIG_USB_SERIAL_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=m
-+CONFIG_USB_SERIAL_IUU=m
-+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-+CONFIG_USB_SERIAL_KEYSPAN=m
-+# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
-+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
-+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
-+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
-+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
-+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
-+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
-+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
-+# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
-+# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
-+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
-+# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
-+CONFIG_USB_SERIAL_KLSI=m
-+CONFIG_USB_SERIAL_KOBIL_SCT=m
-+CONFIG_USB_SERIAL_MCT_U232=m
-+CONFIG_USB_SERIAL_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_MOTOROLA=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+CONFIG_USB_SERIAL_OTI6858=m
-+CONFIG_USB_SERIAL_QUALCOMM=m
-+CONFIG_USB_SERIAL_SPCP8X5=m
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-+CONFIG_USB_SERIAL_SIEMENS_MPI=m
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_SYMBOL=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+CONFIG_USB_SERIAL_OPTICON=m
-+CONFIG_USB_SERIAL_DEBUG=m
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+CONFIG_USB_EMI62=m
-+CONFIG_USB_EMI26=m
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_SEVSEG is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+CONFIG_USB_SISUSBVGA=m
-+CONFIG_USB_SISUSBVGA_CON=y
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+# CONFIG_USB_ISIGHTFW is not set
-+# CONFIG_USB_VST is not set
-+# CONFIG_USB_GADGET is not set
-+
-+#
-+# OTG and related infrastructure
-+#
-+# CONFIG_USB_GPIO_VBUS is not set
-+# CONFIG_USB_ULPI is not set
-+# CONFIG_NOP_USB_XCEIV is not set
-+# CONFIG_UWB is not set
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+# CONFIG_MMC_UNSAFE_RESUME is not set
-+
-+#
-+# MMC/SD/SDIO Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+CONFIG_MMC_BLOCK_BOUNCE=y
-+CONFIG_SDIO_UART=y
-+# CONFIG_MMC_TEST is not set
-+
-+#
-+# MMC/SD/SDIO Host Controller Drivers
-+#
-+CONFIG_MMC_SDHCI=y
-+# CONFIG_MMC_SDHCI_PCI is not set
-+CONFIG_MMC_SDHCI_PLTFM=y
-+# CONFIG_MMC_AT91 is not set
-+# CONFIG_MMC_ATMELMCI is not set
-+# CONFIG_MMC_TIFM_SD is not set
-+CONFIG_MMC_MVSDIO=y
-+# CONFIG_MMC_SPI is not set
-+# CONFIG_MMC_CB710 is not set
-+# CONFIG_MMC_VIA_SDMMC is not set
-+# CONFIG_MEMSTICK is not set
-+CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=y
-+
-+#
-+# LED drivers
-+#
-+# CONFIG_LEDS_PCA9532 is not set
-+CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_GPIO_PLATFORM=y
-+# CONFIG_LEDS_LP3944 is not set
-+# CONFIG_LEDS_PCA955X is not set
-+# CONFIG_LEDS_DAC124S085 is not set
-+# CONFIG_LEDS_BD2802 is not set
-+# CONFIG_LEDS_LT3593 is not set
-+
-+#
-+# LED Triggers
-+#
-+CONFIG_LEDS_TRIGGERS=y
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-+CONFIG_LEDS_TRIGGER_GPIO=m
-+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-+
-+#
-+# iptables trigger is under Netfilter config (LED target)
-+#
-+# CONFIG_ACCESSIBILITY is not set
-+# CONFIG_INFINIBAND is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_BQ32K is not set
-+CONFIG_RTC_DRV_S35390A=y
-+# CONFIG_RTC_DRV_FM3130 is not set
-+# CONFIG_RTC_DRV_RX8581 is not set
-+# CONFIG_RTC_DRV_RX8025 is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_M41T94 is not set
-+# CONFIG_RTC_DRV_DS1305 is not set
-+# CONFIG_RTC_DRV_DS1390 is not set
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+# CONFIG_RTC_DRV_R9701 is not set
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+# CONFIG_RTC_DRV_DS3234 is not set
-+# CONFIG_RTC_DRV_PCF2123 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1286 is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T35 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_MSM6242 is not set
-+# CONFIG_RTC_DRV_BQ4802 is not set
-+# CONFIG_RTC_DRV_RP5C01 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_MV=y
-+CONFIG_DMADEVICES=y
-+
-+#
-+# DMA Devices
-+#
-+CONFIG_MV_XOR=y
-+CONFIG_DMA_ENGINE=y
-+
-+#
-+# DMA Clients
-+#
-+# CONFIG_NET_DMA is not set
-+# CONFIG_ASYNC_TX_DMA is not set
-+# CONFIG_DMATEST is not set
-+# CONFIG_AUXDISPLAY is not set
-+# CONFIG_UIO is not set
-+
-+#
-+# TI VLYNQ
-+#
-+# CONFIG_STAGING is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-+CONFIG_EXT3_FS_XATTR=y
-+CONFIG_EXT3_FS_POSIX_ACL=y
-+# CONFIG_EXT3_FS_SECURITY is not set
-+CONFIG_EXT4_FS=y
-+CONFIG_EXT4_FS_XATTR=y
-+CONFIG_EXT4_FS_POSIX_ACL=y
-+# CONFIG_EXT4_FS_SECURITY is not set
-+# CONFIG_EXT4_DEBUG is not set
-+CONFIG_JBD=y
-+# CONFIG_JBD_DEBUG is not set
-+CONFIG_JBD2=y
-+# CONFIG_JBD2_DEBUG is not set
-+CONFIG_FS_MBCACHE=y
-+CONFIG_REISERFS_FS=m
-+# CONFIG_REISERFS_CHECK is not set
-+# CONFIG_REISERFS_PROC_INFO is not set
-+# CONFIG_REISERFS_FS_XATTR is not set
-+CONFIG_JFS_FS=y
-+CONFIG_JFS_POSIX_ACL=y
-+# CONFIG_JFS_SECURITY is not set
-+# CONFIG_JFS_DEBUG is not set
-+# CONFIG_JFS_STATISTICS is not set
-+CONFIG_FS_POSIX_ACL=y
-+CONFIG_XFS_FS=m
-+# CONFIG_XFS_QUOTA is not set
-+CONFIG_XFS_POSIX_ACL=y
-+# CONFIG_XFS_RT is not set
-+# CONFIG_XFS_DEBUG is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_BTRFS_FS=m
-+# CONFIG_BTRFS_FS_POSIX_ACL is not set
-+# CONFIG_NILFS2_FS is not set
-+CONFIG_FILE_LOCKING=y
-+CONFIG_FSNOTIFY=y
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_AUTOFS_FS=m
-+CONFIG_AUTOFS4_FS=m
-+CONFIG_FUSE_FS=m
-+# CONFIG_CUSE is not set
-+
-+#
-+# Caches
-+#
-+# CONFIG_FSCACHE is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS is not set
-+CONFIG_UDF_FS=m
-+CONFIG_UDF_NLS=y
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+CONFIG_NTFS_FS=m
-+# CONFIG_NTFS_DEBUG is not set
-+# CONFIG_NTFS_RW is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+CONFIG_MISC_FILESYSTEMS=y
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+CONFIG_HFS_FS=m
-+CONFIG_HFSPLUS_FS=m
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_UBIFS_FS=y
-+# CONFIG_UBIFS_FS_XATTR is not set
-+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-+CONFIG_UBIFS_FS_LZO=y
-+CONFIG_UBIFS_FS_ZLIB=y
-+# CONFIG_UBIFS_FS_DEBUG is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_SQUASHFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_OMFS_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_V4_1 is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V3=y
-+# CONFIG_NFSD_V3_ACL is not set
-+CONFIG_NFSD_V4=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_EXPORTFS=m
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+CONFIG_CIFS=m
-+# CONFIG_CIFS_STATS is not set
-+# CONFIG_CIFS_WEAK_PW_HASH is not set
-+CONFIG_CIFS_XATTR=y
-+CONFIG_CIFS_POSIX=y
-+# CONFIG_CIFS_DEBUG2 is not set
-+# CONFIG_CIFS_EXPERIMENTAL is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+CONFIG_MAC_PARTITION=y
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+CONFIG_EFI_PARTITION=y
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+CONFIG_NLS_CODEPAGE_850=y
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+# CONFIG_NLS_CODEPAGE_866 is not set
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+# CONFIG_NLS_CODEPAGE_936 is not set
-+# CONFIG_NLS_CODEPAGE_950 is not set
-+# CONFIG_NLS_CODEPAGE_932 is not set
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+# CONFIG_NLS_ISO8859_8 is not set
-+# CONFIG_NLS_CODEPAGE_1250 is not set
-+# CONFIG_NLS_CODEPAGE_1251 is not set
-+# CONFIG_NLS_ASCII is not set
-+CONFIG_NLS_ISO8859_1=y
-+CONFIG_NLS_ISO8859_2=y
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+# CONFIG_NLS_ISO8859_15 is not set
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+CONFIG_NLS_UTF8=y
-+# CONFIG_DLM is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_FRAME_WARN=1024
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_STRIP_ASM_SYMS is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-+CONFIG_DETECT_HUNG_TASK=y
-+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+CONFIG_TIMER_STATS=y
-+# CONFIG_DEBUG_OBJECTS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_KMEMLEAK is not set
-+CONFIG_DEBUG_PREEMPT=y
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_LOCK_ALLOC is not set
-+# CONFIG_PROVE_LOCKING is not set
-+# CONFIG_LOCK_STAT is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_WRITECOUNT is not set
-+CONFIG_DEBUG_MEMORY_INIT=y
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_DEBUG_NOTIFIERS is not set
-+# CONFIG_DEBUG_CREDENTIALS is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-+# CONFIG_KPROBES_SANITY_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-+# CONFIG_LKDTM is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_LATENCYTOP is not set
-+CONFIG_SYSCTL_SYSCALL_CHECK=y
-+# CONFIG_PAGE_POISONING is not set
-+CONFIG_HAVE_FUNCTION_TRACER=y
-+CONFIG_RING_BUFFER=y
-+CONFIG_RING_BUFFER_ALLOW_SWAP=y
-+CONFIG_TRACING_SUPPORT=y
-+CONFIG_FTRACE=y
-+# CONFIG_FUNCTION_TRACER is not set
-+# CONFIG_IRQSOFF_TRACER is not set
-+# CONFIG_PREEMPT_TRACER is not set
-+# CONFIG_SCHED_TRACER is not set
-+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
-+# CONFIG_BOOT_TRACER is not set
-+CONFIG_BRANCH_PROFILE_NONE=y
-+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-+# CONFIG_PROFILE_ALL_BRANCHES is not set
-+# CONFIG_STACK_TRACER is not set
-+# CONFIG_KMEMTRACE is not set
-+# CONFIG_WORKQUEUE_TRACER is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_RING_BUFFER_BENCHMARK is not set
-+# CONFIG_DYNAMIC_DEBUG is not set
-+# CONFIG_SAMPLES is not set
-+CONFIG_HAVE_ARCH_KGDB=y
-+# CONFIG_KGDB is not set
-+CONFIG_ARM_UNWIND=y
-+CONFIG_DEBUG_USER=y
-+# CONFIG_DEBUG_ERRORS is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_LL is not set
-+# CONFIG_OC_ETM is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITYFS is not set
-+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-+# CONFIG_DEFAULT_SECURITY_SMACK is not set
-+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-+CONFIG_DEFAULT_SECURITY_DAC=y
-+CONFIG_DEFAULT_SECURITY=""
-+CONFIG_XOR_BLOCKS=m
-+CONFIG_ASYNC_CORE=m
-+CONFIG_ASYNC_MEMCPY=m
-+CONFIG_ASYNC_XOR=m
-+CONFIG_ASYNC_PQ=m
-+CONFIG_ASYNC_RAID6_RECOV=m
-+CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
-+CONFIG_CRYPTO_FIPS=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_ALGAPI2=y
-+CONFIG_CRYPTO_AEAD=m
-+CONFIG_CRYPTO_AEAD2=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_BLKCIPHER2=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_HASH2=y
-+CONFIG_CRYPTO_RNG=m
-+CONFIG_CRYPTO_RNG2=y
-+CONFIG_CRYPTO_PCOMP=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_MANAGER2=y
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_NULL=m
-+CONFIG_CRYPTO_WORKQUEUE=y
-+CONFIG_CRYPTO_CRYPTD=m
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+CONFIG_CRYPTO_CCM=m
-+CONFIG_CRYPTO_GCM=m
-+CONFIG_CRYPTO_SEQIV=m
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_CTR=m
-+CONFIG_CRYPTO_CTS=m
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_LRW=m
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_XTS=m
-+
-+#
-+# Hash modes
-+#
-+CONFIG_CRYPTO_HMAC=m
-+CONFIG_CRYPTO_XCBC=m
-+CONFIG_CRYPTO_VMAC=m
-+
-+#
-+# Digest
-+#
-+CONFIG_CRYPTO_CRC32C=y
-+CONFIG_CRYPTO_GHASH=m
-+CONFIG_CRYPTO_MD4=m
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_RMD128=m
-+CONFIG_CRYPTO_RMD160=m
-+CONFIG_CRYPTO_RMD256=m
-+CONFIG_CRYPTO_RMD320=m
-+CONFIG_CRYPTO_SHA1=m
-+CONFIG_CRYPTO_SHA256=m
-+CONFIG_CRYPTO_SHA512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_WP512=m
-+
-+#
-+# Ciphers
-+#
-+CONFIG_CRYPTO_AES=y
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_ARC4=y
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAMELLIA=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
-+CONFIG_CRYPTO_KHAZAD=m
-+CONFIG_CRYPTO_SALSA20=m
-+CONFIG_CRYPTO_SEED=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+
-+#
-+# Compression
-+#
-+CONFIG_CRYPTO_DEFLATE=y
-+CONFIG_CRYPTO_ZLIB=m
-+CONFIG_CRYPTO_LZO=y
-+
-+#
-+# Random Number Generation
-+#
-+CONFIG_CRYPTO_ANSI_CPRNG=m
-+CONFIG_CRYPTO_HW=y
-+CONFIG_CRYPTO_DEV_MV_CESA=m
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_BINARY_PRINTF is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_GENERIC_FIND_LAST_BIT=y
-+CONFIG_CRC_CCITT=y
-+CONFIG_CRC16=y
-+# CONFIG_CRC_T10DIF is not set
-+CONFIG_CRC_ITU_T=m
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=y
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_LZO_COMPRESS=y
-+CONFIG_LZO_DECOMPRESS=y
-+CONFIG_DECOMPRESS_GZIP=y
-+CONFIG_DECOMPRESS_BZIP2=y
-+CONFIG_DECOMPRESS_LZMA=y
-+CONFIG_DECOMPRESS_LZO=y
-+CONFIG_TEXTSEARCH=y
-+CONFIG_TEXTSEARCH_KMP=m
-+CONFIG_TEXTSEARCH_BM=m
-+CONFIG_TEXTSEARCH_FSM=m
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+CONFIG_NLATTR=y
--- 
-1.6.0.3
-
diff --git a/pkgs/os-specific/linux/kernel/guruplug-mach-type.patch b/pkgs/os-specific/linux/kernel/guruplug-mach-type.patch
deleted file mode 100644
index bfcbcf44aa49..000000000000
--- a/pkgs/os-specific/linux/kernel/guruplug-mach-type.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-The GuruPlug's u-boot is configured with the wrong `arch_number', so
-change Linux so that it matches u-boot's expectations.  See
-<http://www.plugcomputer.org/plugwiki/index.php/Compiling_Linux_Kernel_for_the_Plug_Computer>.
-
---- linux-2.6.35.3/arch/arm/tools/mach-types	2010-08-20 20:55:55.000000000 +0200
-+++ linux-2.6.35.3/arch/arm/tools/mach-types	2010-09-13 22:49:41.000000000 +0200
-@@ -2643,7 +2643,7 @@ rfp43			MACH_RFP43		RFP43			2655
- sk86r0301		MACH_SK86R0301		SK86R0301		2656
- ctpxa			MACH_CTPXA		CTPXA			2657
- epb_arm9_a		MACH_EPB_ARM9_A		EPB_ARM9_A		2658
--guruplug		MACH_GURUPLUG		GURUPLUG		2659
-+guruplug		MACH_GURUPLUG		GURUPLUG		2601
- spear310		MACH_SPEAR310		SPEAR310		2660
- spear320		MACH_SPEAR320		SPEAR320		2661
- robotx			MACH_ROBOTX		ROBOTX			2662
diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
index 9f1a36db7dd7..48197ae14ca5 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -1,252 +1,12 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools
-, ... }:
+{ stdenv, fetchurl, ... } @ args:
 
-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
+import ./generic.nix (args // rec {
+  version = "3.0.88";
 
-      # Support drivers that need external firmware.
-      STANDALONE n
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "1icfkbn9a5cpwiax1xklvpqyjcvqij3dwib009fipp53z4pn5bz4";
+  };
 
-      # 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
-
-      # Disable some expensive (?) features.
-      FTRACE n
-      KPROBES n
-      NUMA? 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
-      NET_POCKET y # enable pocket and portable adapters
-      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
-
-      # 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
-      CIFS_XATTR y
-      CIFS_POSIX 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
-      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_L2CAP y
-      BT_SCO y # audio support
-      BT_RFCOMM m
-      BT_RFCOMM_TTY y # RFCOMM TTY support
-      CRASH_DUMP n
-      DMAR? n # experimental
-      DVB_DYNAMIC_MINORS y # we use udev
-      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
-      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
-      X86_CHECK_BIOS_CORRUPTION y
-      X86_MCE y
-
-      # Linux Containers
-      RT_GROUP_SCHED? y
-      CGROUP_DEVICE? y
-      CGROUP_MEM_RES_CTLR? y
-      CGROUP_MEM_RES_CTLR_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
-
-      # Devtmpfs support.
-      DEVTMPFS y
-
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
-in
-
-import ./generic.nix (
-
-  rec {
-    version = "3.0.80";
-
-    preConfigure = ''
-      substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
-    '';
-
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-      sha256 = "0f3md117bh8n5izkhjd2jp096jqmwz6wpxn7rf8x2x9cz4jz0cqx";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-  }
-
-  // removeAttrs args ["extraConfig"]
-)
+  features.iwlwifi = true;
+})
diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 7de8aa85392b..be77c02d0a06 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,287 +1,16 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools, bc
-, ... }:
+{ stdenv, fetchurl, ... } @ args:
 
-let
-  configWithPlatform = kernelPlatform :
-    ''
-      # Power management and debugging for powertop.
-      DEBUG_KERNEL y
-      PM_ADVANCED_DEBUG y
-      PM_RUNTIME y
-      TIMER_STATS 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
+import ./generic.nix (args // rec {
+  version = "3.10.7";
 
-      # Support drivers that need external firmware.
-      STANDALONE n
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "15f7f7hgiryxvqnmyan1r6j4klfgm2r3jfqb4a00j14jiqyn7ni1";
+  };
 
-      # 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
-
-      # 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
-
-      # Our initrd init uses shebang scripts, so can't be modular
-      BINFMT_SCRIPT y
-
-      # Enable the 9P cache to speed up NixOS VM tests.
-      9P_FSCACHE y
-      9P_FS_POSIX_ACL y
-
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
-in
-
-import ./generic.nix (
-
-  rec {
-    version = "3.10.4";
-    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 = "1f0ynk37bhkllx2ahzp587yr8cvn809v2ad0sn7z92yv48vl4nly";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-    features.efiBootStub = true;
-    features.needsCifsUtils = true;
-    features.canDisableNetfilterConntrackHelpers = true;
-    features.netfilterRPFilter = true;
-
-    extraNativeBuildInputs = [bc];
-  }
-
-  // removeAttrs args ["extraConfig"]
-)
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+})
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index 36e97f15c2be..7597a9c695ec 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -1,263 +1,12 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools
-, ... }:
+{ stdenv, fetchurl, ... } @ args:
 
-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
+import ./generic.nix (args // rec {
+  version = "3.2.50";
 
-      # Support drivers that need external firmware.
-      STANDALONE n
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "0yg936syhay9x0qxqxdqrgi6ijdqklhqdrd8zk7l4zvgxaayaj68";
+  };
 
-      # 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
-
-      # 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
-      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_L2CAP y
-      BT_SCO y # audio support
-      BT_RFCOMM m
-      BT_RFCOMM_TTY y # RFCOMM TTY support
-      CRASH_DUMP n
-      DMAR? n # experimental
-      DVB_DYNAMIC_MINORS y # we use udev
-      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
-      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
-      X86_CHECK_BIOS_CORRUPTION y
-      X86_MCE y
-
-      # Linux Containers
-      RT_GROUP_SCHED? y
-      CGROUP_DEVICE? y
-      CGROUP_MEM_RES_CTLR? y
-      CGROUP_MEM_RES_CTLR_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
-
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
-in
-
-import ./generic.nix (
-
-  rec {
-    version = "3.2.48";
-
-    modDirVersion = version;
-
-    preConfigure = ''
-      substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
-    '';
-
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-      sha256 = "1i24vpv2q8va4ywac970hjisi4jyra7ik99g9zv3bmxmm86k7nqk";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-  }
-
-  // removeAttrs args ["extraConfig"]
-)
+  features.iwlwifi = true;
+})
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 6dcd88a1f913..74304f5239c4 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,271 +1,15 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools
-, ... }:
+{ stdenv, fetchurl, ... } @ args:
 
-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
+import ./generic.nix (args // rec {
+  version = "3.4.58";
 
-      # Support drivers that need external firmware.
-      STANDALONE n
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "11kcxlchiz7ks61yqj29dy2mnncfxcc7qr563wby1k58rvwf8g74";
+  };
 
-      # 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
-
-      # 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
-      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
-
-      # Linux Containers
-      RT_GROUP_SCHED? y
-      CGROUP_DEVICE? y
-      CGROUP_MEM_RES_CTLR? y
-      CGROUP_MEM_RES_CTLR_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
-
-      # Easier debug of NFS issues
-      SUNRPC_DEBUG y
-
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
-in
-
-import ./generic.nix (
-
-  rec {
-    version = "3.4.54";
-    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 = "06gz0svm4ngn9iaq9hw5c63mi0613nlzh78dny2m6z00ivpbnk6i";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-    features.efiBootStub = true;
-    features.needsCifsUtils = true;
-    features.netfilterRPFilter = true;
-  }
-
-  // removeAttrs args ["extraConfig"]
-)
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.netfilterRPFilter = true;
+})
diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix
deleted file mode 100644
index 1516f97521de..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.8.nix
+++ /dev/null
@@ -1,283 +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_SUPPORT y
-      MEDIA_DIGITAL_TV_SUPPORT y
-
-      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.8.13";
-    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 = "0pznsj89020fjl8dhcyf7r5bh95b27727gs0ri9has4i2z63blbw";
-    };
-
-    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/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix
index b3909900c66a..51bcf35b3fe8 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix
@@ -1,286 +1,16 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools, bc
-, ... }:
+{ stdenv, fetchurl, ... } @ args:
 
-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
+import ./generic.nix (args // rec {
+  version = "3.9.11";
 
-      # Support drivers that need external firmware.
-      STANDALONE n
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "0d5j7kg1ifzwipicbi4g26plzbzn1rlvgj1hs4zip6sxj8ifbffl";
+  };
 
-      # 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
-
-      # Enable the 9P cache to speed up NixOS VM tests.
-      9P_FSCACHE y
-      9P_FS_POSIX_ACL y
-
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
-in
-
-import ./generic.nix (
-
-  rec {
-    version = "3.9.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 = "1c187jmdkz6nqfgf4sz9f4da6wzbn2mf99qcjr56nz8sr2zmk2wv";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-    features.efiBootStub = true;
-    features.needsCifsUtils = true;
-    features.canDisableNetfilterConntrackHelpers = true;
-    features.netfilterRPFilter = true;
-
-    extraNativeBuildInputs = [bc];
-  }
-
-  // removeAttrs args ["extraConfig"]
-)
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+})
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix
index cf88544abd5a..319c2ba42b49 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix
@@ -1,44 +1,17 @@
-args @ {
-  stdenv, fetchurl, extraConfig ? "" , perl, mktemp, module_init_tools, ...
-}:
+{ stdenv, fetchurl, ... } @ args:
 
-let
-  configWithPlatform = kernelPlatform :
-    ''
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
+let rev = "91a3be5b2b"; in
 
-  rev = "91a3be5b2b";
-in
+import ./generic.nix (args // rec {
+  version = "3.6.y-${rev}";
 
-import ./generic.nix (
+  src = fetchurl {
+    url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}";
+    name = "linux-raspberrypi-${version}.tar.gz";
+    sha256 = "04370b1da7610622372940decdc13ddbba2a58c9da3c3bd3e7df930a399f140d";
+  };
 
-  rec {
-    version = "3.6.y-${rev}";
-    testing = false;
+  features.iwlwifi = true;
 
-    preConfigure = ''
-      substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
-    '';
-
-    src = fetchurl {
-      url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}";
-      name = "linux-raspberrypi-${version}.tar.gz";
-      sha256 = "04370b1da7610622372940decdc13ddbba2a58c9da3c3bd3e7df930a399f140d";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-    #features.efiBootStub = true;
-    #features.needsCifsUtils = true;
-    #features.canDisableNetfilterConntrackHelpers = true;
-    #features.netfilterRPFilter = true;
-
-    extraMeta.platforms = [];
-  }
-
-  // removeAttrs args ["extraConfig"]
-)
+  extraMeta.platforms = [];
+})
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 37c5f926e87a..62315c4f0e20 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -110,29 +110,6 @@ rec {
     features.aufs3 = true;
   };
 
-  # not officially released yet, but 3.x seems to work fine
-  aufs3_7 = rec {
-    name = "aufs3.7";
-    version = "3.x.20121210";
-    utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
-    utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
-    patch = makeAufs3StandalonePatch {
-      inherit version;
-      rev = "8d24d728c7eb54dd624bccd8e87afa826670142c";
-      sha256 = "02dcb46e02b2a6b90c1601b5747614276074488c9308625c3a52ab74cad997a5";
-    };
-    features.aufsBase = true;
-    features.aufs3 = true;
-  };
-
-  # Increase the timeout on CIFS requests from 15 to 120 seconds to
-  # make CIFS more resilient to high load on the CIFS server.
-  cifs_timeout_2_6_38 =
-    { name = "cifs-timeout";
-      patch = ./cifs-timeout-2.6.38.patch;
-      features.cifsTimeout = true;
-    };
-
   no_xsave =
     { name = "no-xsave";
       patch = ./no-xsave.patch;
@@ -154,28 +131,23 @@ 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";
-         });
+  grsecurity_2_9_1_3_2_50 =
+    { name = "grsecurity-2.9.1-3.2.50";
+      patch = fetchurl {
+        url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.50-201308052151.patch;
+        sha256 = "178y68bx4h4r9gq1p4izbjah8vhjmb3yvr3sfjglz8blxxahgd6n";
+      };
     };
 
-  guruplug_defconfig =
-    { # Default configuration for the GuruPlug.  From
-      # <http://www.openplug.org/plugwiki/images/c/c6/Guruplug-patchset-2.6.33.2.tar.bz2>.
-      name = "guruplug-defconfig";
-      patch = ./guruplug-defconfig.patch;
+  # this patch will probably make it into 3.11 or 3.12
+  # it only touches 1 file (fs/btrfs/send.c) so it only affects people that use
+  # the btrfs send feature.
+  btrfs_send_backport =
+    { name = "btrfs-send-check-parent-dir-when-doing-a-compare-send";
+      patch = fetchurl {
+        url = https://patchwork.kernel.org/patch/2839612/mbox;
+        sha256 = "0qv5mxpfrzj2dibac64n4b3d6pg7gzsafd11548bihwmsa3dlbhg";
+      };
     };
 
-  guruplug_arch_number =
-    { # Hack to match the `arch_number' of the U-Boot that ships with the
-      # GuruPlug.  This is only needed when using this specific U-Boot
-      # binary.  See
-      # <http://www.plugcomputer.org/plugwiki/index.php/Compiling_Linux_Kernel_for_the_Plug_Computer>.
-      name = "guruplug-arch-number";
-      patch = ./guruplug-mach-type.patch;
-    };
 }
diff --git a/pkgs/os-specific/linux/module-init-tools/aggregator.nix b/pkgs/os-specific/linux/kmod/aggregator.nix
similarity index 80%
rename from pkgs/os-specific/linux/module-init-tools/aggregator.nix
rename to pkgs/os-specific/linux/kmod/aggregator.nix
index cc4e6ab35521..161af38ff608 100644
--- a/pkgs/os-specific/linux/module-init-tools/aggregator.nix
+++ b/pkgs/os-specific/linux/kmod/aggregator.nix
@@ -1,4 +1,4 @@
-{stdenv, module_init_tools, modules, buildEnv}:
+{ stdenv, kmod, modules, buildEnv }:
 
 buildEnv {
   name = "kernel-modules";
@@ -8,20 +8,20 @@ buildEnv {
   postBuild =
     ''
       source ${stdenv}/setup
-    
+
       kernelVersion=$(cd $out/lib/modules && ls -d *)
       if test "$(echo $kernelVersion | wc -w)" != 1; then
          echo "inconsistent kernel versions: $kernelVersion"
          exit 1
       fi
-    
+
       echo "kernel version is $kernelVersion"
 
       # Regenerate the depmod map files.  Be sure to pass an explicit
       # kernel version number, otherwise depmod will use `uname -r'.
       if test -w $out/lib/modules/$kernelVersion; then
           rm -f $out/lib/modules/$kernelVersion/modules.*
-          MODULE_DIR=$out/lib/modules/ ${module_init_tools}/sbin/depmod -a $kernelVersion
+          ${kmod}/sbin/depmod -b $out -a $kernelVersion
       fi
     '';
 }
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
new file mode 100644
index 000000000000..7495deb231d2
--- /dev/null
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, kernelDev }:
+
+stdenv.mkDerivation rec {
+  pname = "lttng-modules-2.2.1";
+  name = "${pname}-${kernelDev.version}";
+
+  src = fetchurl {
+    url = "https://lttng.org/files/lttng-modules/${pname}.tar.bz2";
+    sha256 = "00ww1443ssv614s1ix6zby8llaf6zzlxcf5k4w7jsyji47ng33m2";
+  };
+
+  patches = [ ./lttng-fix-build-error-on-linux-3.2.patch ];
+
+  preConfigure = ''
+    export KERNELDIR="${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build"
+    export INSTALL_MOD_PATH="$out"
+  '';
+
+  installPhase = ''
+    make modules_install
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Linux kernel modules for LTTng tracing";
+    homepage = http://lttng.org/;
+    # TODO: Add "mit" to the license list once the license attr set vs string
+    # decision has been made. (Having "mit" there breaks hydra evaluation.)
+    license = with licenses; [ lgpl21 gpl2 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+
+}
diff --git a/pkgs/os-specific/linux/lttng-modules/lttng-fix-build-error-on-linux-3.2.patch b/pkgs/os-specific/linux/lttng-modules/lttng-fix-build-error-on-linux-3.2.patch
new file mode 100644
index 000000000000..dfe6d21be841
--- /dev/null
+++ b/pkgs/os-specific/linux/lttng-modules/lttng-fix-build-error-on-linux-3.2.patch
@@ -0,0 +1,33 @@
+When building against linux 3.2, we get this build error:
+
+  building /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.o
+    CC [M]  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.o
+  In file included from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/lttng-events.h:759:0,
+                   from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/define_trace.h:148,
+                   from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/ext3.h:868,
+                   from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.c:48:
+  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h: In function '__event_probe__ext3__page_op':
+  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type
+  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type
+  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type
+  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h: In function '__event_probe__ext3_invalidatepage':
+  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type
+  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type
+  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type
+
+because a check for existing ext3/*h files in the kernel build tree is skipped
+for linux < 3.4. Fix it by extending the ext3_dep_check thing to also be run
+when building against linux >= 3.2 (not only linux >= 3.4).
+
+diff -uNr lttng-modules-2.2.0.orig/probes/Makefile lttng-modules-2.2.0/probes/Makefile
+--- lttng-modules-2.2.0.orig/probes/Makefile	2013-06-19 03:22:44.000000000 +0200
++++ lttng-modules-2.2.0/probes/Makefile	2013-07-06 13:22:15.902957717 +0200
+@@ -59,7 +59,7 @@
+ ext3_dep_check = $(wildcard $(ext3_dep))
+ ext3 = $(shell \
+ 	if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 1 ] ; then \
+-		if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 4 -a \
++		if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 2 -a \
+ 			-z "$(ext3_dep_check)" ] ; then \
+ 			echo "warn" ; \
+ 			exit ; \
diff --git a/pkgs/os-specific/linux/firmware/amd-ucode/default.nix b/pkgs/os-specific/linux/microcode/amd.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/amd-ucode/default.nix
rename to pkgs/os-specific/linux/microcode/amd.nix
diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix
index 4ca8235f3aea..9a34c503f6d3 100644
--- a/pkgs/os-specific/linux/netatop/default.nix
+++ b/pkgs/os-specific/linux/netatop/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, kernelDev, zlib }:
 
 stdenv.mkDerivation {
-  name = "netatop-${kernelDev.version}-0.2";
+  name = "netatop-${kernelDev.version}-0.3";
 
   src = fetchurl {
-    url = http://www.atoptool.nl/download/netatop-0.2.tar.gz;
-    sha256 = "0ya4qys2qpw080sbgixyx1kawdx1c3smnxwmqcchn0hg9hhndvc0";
+    url = http://www.atoptool.nl/download/netatop-0.3.tar.gz;
+    sha256 = "0rk873nb1hgfnz040plmv6rm9mcm813n0clfjs53fsqbn8y1lhvv";
   };
 
   buildInputs = [ zlib ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   '';
 
   preInstall = ''
-    ensureDir $out/bin $out/share/man/man{4,8}
+    ensureDir $out/bin $out/sbin $out/share/man/man{4,8}
     ensureDir $out/lib/modules/${kernelDev.modDirVersion}/extra
   '';
       
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 9e750629b829..268cdac85050 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -12,7 +12,8 @@ let
 
   versionNumber = "319.32";
   kernel310patch = fetchurl {
-    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia";
+    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia&id=415c1daa9ccb1ec46c172b304f40929239d87af8";
+    name = "nvidia-linux-3.10.patch";
     sha256 = "0nhzg6jdk9sf1vzj519gqi8a2n9xydhz2bcz472pss2cfgbc1ahb";
   };
 
diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix
deleted file mode 100644
index 2f93769d2801..000000000000
--- a/pkgs/os-specific/linux/qemu-kvm/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2
-, libjpeg, libpng, ncurses, python, glib, libaio, mesa, perl, texinfo
-, spice, spice_protocol, spiceSupport ? false }:
-
-assert stdenv.isLinux;
-
-let version = "1.2.0"; in
-
-stdenv.mkDerivation rec {
-  name = "qemu-kvm-${version}";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz";
-    sha256 = "018vb5nmk2fsm143bs2bl2wirhasd4b10d7jchl32zik4inbk2p9";
-  };
-
-  buildInputs =
-    [ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
-      ncurses python glib libaio mesa texinfo perl
-    ] ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ];
-
-  patches = [ ./fix-librt-check.patch ./fix-usb-passthrough.patch ];
-
-  postPatch = ''
-      patchShebangs .
-      sed '/qtest_add_func.*check_time/d' -i tests/rtc-test.c
-    '' # disable tests that meddle with system time, they seem to work bad, maybe due to newer glib
-    + stdenv.lib.optionalString spiceSupport ''
-       for i in configure spice-qemu-char.c ui/spice-input.c ui/spice-core.c ui/qemu-spice.h; do
-         substituteInPlace $i --replace '#include <spice.h>' '#include <spice/spice.h>'
-       done
-    '';
-
-  configureFlags =
-    [ "--audio-drv-list=alsa"
-      "--smbd=smbd"                               # use `smbd' from $PATH
-      "--enable-docs"
-      "--python=${python}/bin/python"
-    ] ++ stdenv.lib.optional spiceSupport "--enable-spice";
-
-  postInstall =
-    ''
-      # Libvirt expects us to be called `qemu-kvm'.  Otherwise it will
-      # set the domain type to "qemu" rather than "kvm", which can
-      # cause architecture selection to misbehave.
-      ln -sv $(cd $out/bin && echo qemu-system-*) $out/bin/qemu-kvm
-    '';
-
-  doCheck = true;
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = http://www.linux-kvm.org/;
-    description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions";
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/os-specific/linux/qemu-kvm/fix-librt-check.patch b/pkgs/os-specific/linux/qemu-kvm/fix-librt-check.patch
deleted file mode 100644
index 57de288723e8..000000000000
--- a/pkgs/os-specific/linux/qemu-kvm/fix-librt-check.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-commit 8bacde8d86a09699207d85d4bab06162aed18dc4
-Author: Natanael Copa <natanael.copa@gmail.com>
-Date:   Wed Sep 12 09:06:51 2012 +0000
-
-    configure: properly check if -lrt and -lm is needed
-    
-    Fixes build against uClibc.
-    
-    uClibc provides 2 versions of clock_gettime(), one with realtime
-    support and one without (this is so you can avoid linking in -lrt
-    unless actually needed). This means that the clock_gettime() don't
-    need -lrt. We still need it for timer_create() so we check for this
-    function in addition.
-    
-    We also need check if -lm is needed for isnan().
-    
-    Both -lm and -lrt are needed for libs_qga.
-    
-    Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
-    Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-
-diff --git a/configure b/configure
-index 7656c32..9ab13db 100755
---- a/configure
-+++ b/configure
-@@ -2671,17 +2671,44 @@ fi
- 
- 
- ##########################################
-+# Do we need libm
-+cat > $TMPC << EOF
-+#include <math.h>
-+int main(void) { return isnan(sin(0.0)); }
-+EOF
-+if compile_prog "" "" ; then
-+  :
-+elif compile_prog "" "-lm" ; then
-+  LIBS="-lm $LIBS"
-+  libs_qga="-lm $libs_qga"
-+else
-+  echo
-+  echo "Error: libm check failed"
-+  echo
-+  exit 1
-+fi
-+
-+##########################################
- # Do we need librt
-+# uClibc provides 2 versions of clock_gettime(), one with realtime
-+# support and one without. This means that the clock_gettime() don't
-+# need -lrt. We still need it for timer_create() so we check for this
-+# function in addition.
- cat > $TMPC <<EOF
- #include <signal.h>
- #include <time.h>
--int main(void) { return clock_gettime(CLOCK_REALTIME, NULL); }
-+int main(void) {
-+  timer_create(CLOCK_REALTIME, NULL, NULL);
-+  return clock_gettime(CLOCK_REALTIME, NULL);
-+}
- EOF
- 
- if compile_prog "" "" ; then
-   :
--elif compile_prog "" "-lrt" ; then
-+# we need pthread for static linking. use previous pthread test result
-+elif compile_prog "" "-lrt $pthread_lib" ; then
-   LIBS="-lrt $LIBS"
-+  libs_qga="-lrt $libs_qga"
- fi
- 
- if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \
diff --git a/pkgs/os-specific/linux/qemu-kvm/fix-usb-passthrough.patch b/pkgs/os-specific/linux/qemu-kvm/fix-usb-passthrough.patch
deleted file mode 100644
index a73df310629d..000000000000
--- a/pkgs/os-specific/linux/qemu-kvm/fix-usb-passthrough.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bugs.launchpad.net/qemu/+bug/1033727
-
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 12 Sep 2012 13:08:40 +0000 (+0200)
-Subject: uhci: Don't queue up packets after one with the SPD flag set
-X-Git-Tag: v1.3.0-rc0~483^2
-X-Git-Url: http://git.qemu.org/?p=qemu.git;a=commitdiff_plain;h=72a04d0c178f01908d74539230d9de64ffc6da19
-Bug-Debian: http://bugs.debian.org/683983
-
-uhci: Don't queue up packets after one with the SPD flag set
-
-Don't queue up packets after a packet with the SPD (short packet detect)
-flag set. Since we won't know if the packet will actually be short until it
-has completed, and if it is short we should stop the queue.
-
-This fixes a miniature photoframe emulating a USB cdrom with the windows
-software for it not working.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
----
-
-diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
-index c7c8786..cdc8bc3 100644
---- a/hw/usb/hcd-uhci.c
-+++ b/hw/usb/hcd-uhci.c
-@@ -1000,6 +1000,9 @@ static void uhci_fill_queue(UHCIState *s, UHCI_TD *td)
-         }
-         assert(ret == TD_RESULT_ASYNC_START);
-         assert(int_mask == 0);
-+        if (ptd.ctrl & TD_CTRL_SPD) {
-+            break;
-+        }
-         plink = ptd.link;
-     }
- }
-@@ -1097,7 +1100,7 @@ static void uhci_process_frame(UHCIState *s)
- 
-         case TD_RESULT_ASYNC_START:
-             trace_usb_uhci_td_async(curr_qh & ~0xf, link & ~0xf);
--            if (is_valid(td.link)) {
-+            if (is_valid(td.link) && !(td.ctrl & TD_CTRL_SPD)) {
-                 uhci_fill_queue(s, &td);
-             }
-             link = curr_qh ? qh.link : td.link;
diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix
index 0189f3dd8fdd..6ee4712ae657 100644
--- a/pkgs/servers/monitoring/zabbix/default.nix
+++ b/pkgs/servers/monitoring/zabbix/default.nix
@@ -2,11 +2,11 @@
 
 let
 
-  version = "1.8.15";
+  version = "1.8.17";
 
   src = fetchurl {
     url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
-    sha256 = "0358syx6vck6l8j9wwlsb78faivh4qxrgy3jlkmjqr99xi6h3r3f";
+    sha256 = "0c2dpx7ncahp161p6zymrrxwyn3algkfzh6dz7x2j0wsnvb6lrp2";
   };
 
   preConfigure =
diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix
index f8fda4f051b0..79c61b8ed233 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.2";
+  name = "ipython-1.0.0";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
-    sha256 = "1sh0n47i1zxqmbzjv6iqc66c8pdk9spzgzchgmhqscgjvyhyxyqp";
+    sha256 = "074i08a1zr7wjpqc7rm0k3rnq0laf0gjrcxlfvvb3qc48wdm41qd";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix
new file mode 100644
index 000000000000..96241bd02cdf
--- /dev/null
+++ b/pkgs/tools/X11/hsetroot/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, imlib2, libX11, libXext }:
+
+stdenv.mkDerivation {
+  name = "hsetroot-1.0.2";
+
+  # The primary download site seems to no longer exist; use Gentoo's mirror for now.
+  src = fetchurl {
+    url = "http://mirror.datapipe.net/gentoo/distfiles/hsetroot-1.0.2.tar.gz";
+    sha256 = "d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7";
+  };
+
+  buildInputs = [ imlib2 libX11 libXext ];
+
+  meta = {
+    description = "hsetroot allows you to compose wallpapers ('root pixmaps') for X";
+    homepage = http://thegraveyard.org/hsetroot.html;
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix
new file mode 100644
index 000000000000..272f1ca0907c
--- /dev/null
+++ b/pkgs/tools/X11/xcape/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, fetchgit, libX11, xproto, libXtst, xextproto, pkgconfig
+, inputproto, libXi}:
+let
+  s = rec {
+    baseName = "xcape";
+    version = "git-2013-05-30";
+    name = "${baseName}-${version}";
+  };
+  buildInputs = [
+    libX11 libXtst xproto xextproto pkgconfig inputproto libXi
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchgit {
+    url = https://github.com/alols/xcape;
+    rev = "39aa08c5da354a8fe495eba8787a01957cfa5fcb";
+    sha256 = "1yh0vbaj4c5lflxm3d4xrfaric1lp0gfcyzq33bqphpsba439bmg";
+  };
+  preConfigure = ''
+    makeFlags="$makeFlags PREFIX=$out"
+  '';
+  meta = {
+    inherit (s) version;
+    description = ''A tool to have Escape and Control on a single key'';
+    license = stdenv.lib.licenses.gpl3 ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix
new file mode 100644
index 000000000000..5158963258c2
--- /dev/null
+++ b/pkgs/tools/X11/xrestop/default.nix
@@ -0,0 +1,13 @@
+{ stdenv, fetchurl, xlibs, pkgconfig, ncurses }:
+stdenv.mkDerivation rec {
+
+  name = "xrestop-${version}";
+  version = "0.4";
+
+  src = fetchurl {
+    url = mirror://gentoo/distfiles/xrestop-0.4.tar.gz;
+    sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7";
+  };
+
+  buildInputs = [ pkgconfig xlibs.libX11 xlibs.libXres xlibs.libXext ncurses ];
+}
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
new file mode 100644
index 000000000000..aa8361c737f1
--- /dev/null
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "awscli-${version}";
+  version = "0.8.3";
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "https://github.com/aws/aws-cli/archive/${version}.tar.gz";
+    sha256 = "0v7igh00zja560v8qz315g3m7x9six1hprrrb10cpp9sy8n58xnn";
+  };
+
+  propagatedBuildInputs = [ 
+    pythonPackages.argparse
+    pythonPackages.botocore
+    pythonPackages.colorama
+  ];
+}
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index 767e85d67733..ff51b28f34bb 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -8,11 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "10j7rc1nzdp7vvcpc3340yi3qw7abby4szv8zkwh10d0zizpwma9";
   };
 
-  preConfigure =
-    ''
-      makeFlagsArray=(DEST_HOME=$out)
-      buildFlags=all3
-    '';
+  preConfigure = ''
+    makeFlagsArray=(DEST_HOME=$out)
+    buildFlags=all3
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    cp makefile.macosx_64bits makefile.machine
+  '';
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
new file mode 100644
index 000000000000..f5d4322ec932
--- /dev/null
+++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, cmake, pkgconfig, qt4, taglib, chromaprint, ffmpeg }:
+
+stdenv.mkDerivation rec {
+  name = "acoustid-fingerprinter-${version}";
+  version = "0.6";
+
+  src = fetchurl {
+    url = "http://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/"
+        + "${name}.tar.gz";
+    sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0";
+  };
+
+  buildInputs = [ cmake pkgconfig qt4 taglib chromaprint ffmpeg ];
+
+  meta = {
+    homepage = "http://acoustid.org/fingerprinter";
+    description = "Audio fingerprinting tool using chromaprint";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index a091142db249..9c8d18231f0f 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs, lzo }:
 
-let version = "0.20pre20130509"; in
+let version = "0.20pre20130705"; in
 
 stdenv.mkDerivation {
   name = "btrfs-progs-${version}";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git";
-    rev = "650e656a8b9c1fbe4ec5cd8c48ae285b8abd3b69";
-    sha256 = "e50e8ce9d24505711ed855f69a73d639dc5e401692a7d1c300753de3472abb21";
+    rev = "194aa4a1bd6447bb545286d0bcb0b0be8204d79f";
+    sha256 = "07c6762c9873cdcc1b9b3be0b412ba14b83457d8f5608d3dd945953b5e06f0f2";
   };
 
   buildInputs = [ zlib libuuid acl attr e2fsprogs lzo ];
diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix
index 36972573b358..2cd40bb08675 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.4.0";
+  version = "0.4.1";
 
   src = fetchurl {
     url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz";
-    sha256 = "1kgiyqh7gndr0zs3qgi6r0dpy5p71d32c2k9kbd8pjf2xyyb6fk6";
+    sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp";
   };
 
   propagatedBuildInputs = [ (blivet.override blivetOverrides) ];
diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
new file mode 100644
index 000000000000..ea54ab4a543d
--- /dev/null
+++ b/pkgs/tools/misc/grc/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, python }:
+
+stdenv.mkDerivation rec {
+  version = "1.4";
+  name    = "grc_${version}";
+
+  src = fetchurl {
+    url    = "http://korpus.juls.savba.sk/~garabik/software/grc/${name}.tar.gz";
+    sha256 = "1l7lskxfjk32kkv4aaqw5qcxvh972nab3x2jzy67m1aa0zpcbzdv";
+  };
+
+  installPhase = ''
+    sed -i s%/usr%% install.sh
+    sed -i "s% /usr/bin/python%${python}/bin/python%" grc
+    sed -i "s% /usr/bin/python%${python}/bin/python%" grc
+    ./install.sh "$out"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Yet another colouriser for beautifying your logfiles or output of commands.";
+    homepage    = http://korpus.juls.savba.sk/~garabik/software/grc.html;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
+
+    longDescription = ''
+      Generic Colouriser is yet another colouriser (written in Python) for
+      beautifying your logfiles or output of commands.
+    '';
+  };
+}
+
diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix
new file mode 100644
index 000000000000..1f281a713011
--- /dev/null
+++ b/pkgs/tools/misc/ponysay/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, python3, texinfo, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "ponysay-3.0.1";
+
+  src = fetchurl {
+    url = "https://github.com/erkin/ponysay/archive/3.0.1.tar.gz";
+    sha256 = "ab281f43510263b2f42a1b0a9097ee7831b3e33a9034778ecb12ccb51f6915ee";
+  };
+
+  buildInputs = [ python3 texinfo makeWrapper ];
+
+  phases = "unpackPhase patchPhase installPhase";
+
+  patches = [ ./pathfix.patch ];
+
+  installPhase = ''
+    python3 setup.py --prefix=$out --freedom=partial install --with-shared-cache=$out/share/ponysay
+    for i in $(cd $out/bin && ls); do
+        wrapProgram $out/bin/$i \
+            --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
+    done
+  '';
+
+  meta = {
+    description = "cowsay reimplemention for ponies.";
+    homepage = http://terse.tk/ponysay/;
+    license = "GPLv3";
+  };
+}
diff --git a/pkgs/tools/misc/ponysay/pathfix.patch b/pkgs/tools/misc/ponysay/pathfix.patch
new file mode 100644
index 000000000000..ad50f6530247
--- /dev/null
+++ b/pkgs/tools/misc/ponysay/pathfix.patch
@@ -0,0 +1,24 @@
+diff -urN ponysay-3.0.1/setup.py ponysay.p/setup.py
+--- ponysay-3.0.1/setup.py	2013-04-05 14:28:18.000000000 +0200
++++ ponysay.p/setup.py	2013-08-10 01:09:30.181043877 +0200
+@@ -514,7 +514,7 @@
+                 for command in commands:
+                     sourceed = 'completion/ponysay.%s' % (command)
+                     generated = 'completion/%s-completion.%s' % (shell, command)
+-                    generatorcmd = './completion/auto-auto-complete.py %s --output %s --source %s' % (shell, generated, sourceed)
++                    generatorcmd = 'python3 completion/auto-auto-complete.py %s --output %s --source %s' % (shell, generated, sourceed)
+                     Popen(generatorcmd.split(' ')).communicate()
+                     if conf[command] is not None:
+                         dest = generated + '.install'
+@@ -559,9 +559,9 @@
+                 for toolcommand in ('--dimensions', '--metadata'):
+                     if not self.free:
+                         print('%s, %s, %s' % ('./src/ponysaytool.py', toolcommand, sharedir))
+-                        Popen(['./src/ponysaytool.py', toolcommand, sharedir], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate()
++                        Popen(['python3', './src/ponysaytool.py', toolcommand, sharedir], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate()
+                     else:
+-                        params = ['./src/ponysaytool.py', toolcommand, sharedir, '--']
++                        params = ['python3', './src/ponysaytool.py', toolcommand, sharedir, '--']
+                         for sharefile in os.listdir(sharedir):
+                             if sharefile.endswith('.pony') and (sharefile != '.pony'):
+                                 if not Setup.validateFreedom(sharedir + '/' + sharefile):
diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix
index 8cf31ff72085..b267074e77fa 100644
--- a/pkgs/tools/misc/unclutter/default.nix
+++ b/pkgs/tools/misc/unclutter/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     make DESTDIR="$out" MANPATH="$out/share/man" PREFIX="" install.man
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Hides mouse pointer while not in use.";
     longDescription = ''
       Unclutter hides your X mouse cursor when you do not need it, to prevent
@@ -28,5 +28,7 @@ stdenv.mkDerivation {
 
           unclutter -idle 1 &
     '';
+    maintainers = with maintainers; [ iElectric ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix
new file mode 100644
index 000000000000..88460d86730c
--- /dev/null
+++ b/pkgs/tools/networking/bwm-ng/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "bwm-ng-0.6";
+  
+  src = fetchurl {
+    url = "http://www.gropp.org/bwm-ng/${name}.tar.gz";
+    sha256 = "1pgzc8y2y73n72qvbd2g0dkbkw5h0f83k5h9id1rsck8w9c464y1";
+  };
+  
+  buildInputs = [ ncurses ];
+
+  meta = with stdenv.lib; {
+    description = "Bandwidth Monitor NG is a small and simple console-based live network and disk io bandwidth monitor.";
+    homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng";
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+
+    longDescription = ''
+        Features
+
+            supports /proc/net/dev, netstat, getifaddr, sysctl, kstat, /proc/diskstats /proc/partitions, IOKit, devstat and libstatgrab
+            unlimited number of interfaces/devices supported
+            interfaces/devices are added or removed dynamically from list
+            white-/blacklist of interfaces/devices
+            output of KB/s, Kb/s, packets, errors, average, max and total sum
+            output in curses, plain console, CSV or HTML
+            configfile
+
+        Short list of changes since 0.5 (for full list read changelog):
+
+            curses2 output, a nice bar chart
+            disk input for bsd/macosx/linux/solaris
+            win32 network bandwidth support
+            moved to autotools
+            alot fixes
+
+        Info
+        This was influenced by the old bwm util written by Barney (barney@freewill.tzo.com) which had some issues with faster interfaces and was very simple. Since i had almost all code done anyway for other projects, i decided to create my own version.
+
+        I actually dont know if netstat input is usefull at all. I saw this elsewhere, so i added it. Its target is "netstat 1.42 (2001-04-15)" linux or Free/Open/netBSD. If there are other formats i would be happy to add them.
+        
+        (from homepage)
+    '';
+  };
+}
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 54cae1b31d97..74b0d0261618 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -3,12 +3,14 @@
 , sslSupport ? false, openssl ? null
 , scpSupport ? false, libssh2 ? null
 , gssSupport ? false, gss ? null
+, c-aresSupport ? false, c-ares ? null
 , linkStatic ? false
 }:
 
 assert zlibSupport -> zlib != null;
 assert sslSupport -> openssl != null;
 assert scpSupport -> libssh2 != null;
+assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
   name = "curl-7.31.0";
@@ -24,6 +26,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = with stdenv.lib;
     optional zlibSupport zlib ++
     optional gssSupport gss ++
+    optional c-aresSupport c-ares ++
     optional sslSupport openssl;
 
   preConfigure = ''
@@ -33,6 +36,7 @@ stdenv.mkDerivation rec {
       ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
       ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )
     ]
+    ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
     ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}"
     ++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]
   ;
diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix
index 33cc53d55110..f6be163bb839 100644
--- a/pkgs/tools/networking/iodine/default.nix
+++ b/pkgs/tools/networking/iodine/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib ];
 
-  patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/sbin/ifconfig,; s,/sbin/route,${nettools}/sbin/route," src/tun.c'';
+  patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/bin/ifconfig,; s,/sbin/route,${nettools}/bin/route," src/tun.c'';
 
   installFlags = "prefix=\${out}";
 
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 387ccfcaed43..69c7b77e3f90 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf
 , 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 }:
+, makeWrapper, networkmanager_openvpn, networkmanager_vpnc
+, networkmanager_openconnect, udev, hicolor_icon_theme }:
 
 let
   pn = "network-manager-applet";
@@ -31,8 +32,18 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-    ln -s ${networkmanager_openvpn}/etc/NetworkManager $out/etc/NetworkManager
-    ln -s ${networkmanager_openvpn}/lib/* $out/lib
+    mkdir -p $out/etc/NetworkManager/VPN
+    ln -s ${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name $out/etc/NetworkManager/VPN/nm-openvpn-service.name
+    ln -s ${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name $out/etc/NetworkManager/VPN/nm-vpnc-service.name
+    ln -s ${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name $out/etc/NetworkManager/VPN/nm-openconnect-service.name
+    mkdir -p $out/lib/NetworkManager
+    ln -s ${networkmanager_openvpn}/lib/NetworkManager/* $out/lib/NetworkManager/
+    ln -s ${networkmanager_vpnc}/lib/NetworkManager/* $out/lib/NetworkManager/
+    ln -s ${networkmanager_openconnect}/lib/NetworkManager/* $out/lib/NetworkManager/
+    mkdir -p $out/libexec
+    ln -s ${networkmanager_openvpn}/libexec/* $out/libexec/
+    ln -s ${networkmanager_vpnc}/libexec/* $out/libexec/
+    ln -s ${networkmanager_openconnect}/libexec/* $out/libexec/
     wrapProgram "$out/bin/nm-applet" \
       --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" \
diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix
new file mode 100644
index 000000000000..ccb5badd9031
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/openconnect.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager
+, withGnome ? true, gtk2, gconf, libgnome_keyring, procps, module_init_tools }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+  pname = "NetworkManager-openconnect";
+  version = networkmanager.version;
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
+    sha256 = "16sdgrabbh2y7j6g9ic9lm5z6sxn7iz3j0xininkiwnjgbsqf961";
+  };
+
+  buildInputs = [ openconnect networkmanager ]
+    ++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring gconf ];
+
+  nativeBuildInputs = [ intltool pkgconfig ];
+
+  configureFlags = [
+    "${if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"}"
+    "--disable-static"
+  ];
+
+  preConfigure = ''
+     substituteInPlace "configure" \
+       --replace "/sbin/sysctl" "${procps}/sbin/sysctl"
+     substituteInPlace "src/nm-openconnect-service.c" \
+       --replace "/sbin/openconnect" "${openconnect}/sbin/openconnect" \
+       --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe"
+  '';
+
+  postConfigure = ''
+     substituteInPlace "./auth-dialog/Makefile" \
+       --replace "-Wstrict-prototypes" "" \
+       --replace "-Werror" ""
+     substituteInPlace "properties/Makefile" \
+       --replace "-Wstrict-prototypes" "" \
+       --replace "-Werror" ""
+  '';
+
+  meta = {
+    description = "NetworkManager's OpenConnect plugin";
+    inherit (networkmanager.meta) maintainers platforms;
+  };
+}
+
diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix
index 9817a8cddd12..c51bf09f99c0 100644
--- a/pkgs/tools/networking/network-manager/openvpn.nix
+++ b/pkgs/tools/networking/network-manager/openvpn.nix
@@ -4,7 +4,7 @@
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname = "NetworkManager-openvpn";
-  version = "0.9.8.0";
+  version = networkmanager.version;
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "TODO";
+    description = "NetworkManager's OpenVPN plugin";
     inherit (networkmanager.meta) maintainers platforms;
   };
 }
diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix
index a60199aab2d0..41dda0086e4b 100644
--- a/pkgs/tools/networking/network-manager/pptp.nix
+++ b/pkgs/tools/networking/network-manager/pptp.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname = "NetworkManager-pptp";
-  version = "0.9.8.0";
+  version = networkmanager.version;
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
-    sha256 = "1j4wczf0lv2c58pgdfxg2qsva5v0r1w99x6l1p78m56qc8a9il1l";
+    sha256 = "7f46ea61376d13d03685eca3f26a26e0022f6e92e6f1fc356034ca9717eb6dac";
   };
 
   buildInputs = [ networkmanager pptp ppp ]
diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix
new file mode 100644
index 000000000000..683a7e76948d
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/vpnc.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager
+, withGnome ? true, gtk2, libgnome_keyring, procps, module_init_tools }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+  pname = "NetworkManager-vpnc";
+  version = networkmanager.version;
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
+    sha256 = "1hdigqfvsjlr1zr23lwmcsvcv1x74cqhfpwrd0j0zhhmjdb4ql74";
+  };
+
+  buildInputs = [ vpnc networkmanager ]
+    ++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring ];
+
+  nativeBuildInputs = [ intltool pkgconfig ];
+
+  configureFlags = [
+    "${if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"}"
+    "--disable-static"
+  ];
+
+  preConfigure = ''
+     substituteInPlace "configure" \
+       --replace "/sbin/sysctl" "${procps}/sbin/sysctl"
+     substituteInPlace "src/nm-vpnc-service.c" \
+       --replace "/sbin/vpnc" "${vpnc}/sbin/vpnc" \
+       --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe"
+  '';
+
+  postConfigure = ''
+     substituteInPlace "./auth-dialog/Makefile" \
+       --replace "-Wstrict-prototypes" "" \
+       --replace "-Werror" ""
+     substituteInPlace "properties/Makefile" \
+       --replace "-Wstrict-prototypes" "" \
+       --replace "-Werror" ""
+  '';
+
+  meta = {
+    description = "NetworkManager's VPNC plugin";
+    inherit (networkmanager.meta) maintainers platforms;
+  };
+}
+
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 1b1aa768a25f..a5b46ebbc3c6 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -3,6 +3,7 @@
 buildPythonPackage rec {
   version = "6.5.5-rc2";
   name = "offlineimap-${version}";
+  namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/OfflineIMAP/offlineimap/tarball/v${version}";
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 8542580e431b..4296ba57f881 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -13,11 +13,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "openssh-6.2p1";
+  name = "openssh-6.2p2";
 
   src = fetchurl {
     url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz";
-    sha1 = "8824708c617cc781b2bb29fa20bd905fd3d2a43d";
+    sha1 = "c2b4909eba6f5ec6f9f75866c202db47f3b501ba";
   };
 
   prePatch = stdenv.lib.optionalString hpnSupport
@@ -26,11 +26,7 @@ stdenv.mkDerivation rec {
       export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
     '';
 
-  patches =
-    [ ./locale_archive.patch
-      # Upstream fix for gratuitous "no such identity" warnings.
-      ./fix-identity-warnings.patch
-    ];
+  patches = [ ./locale_archive.patch ];
 
   buildInputs = [ zlib openssl libedit pkgconfig pam ];
 
diff --git a/pkgs/tools/networking/openssh/fix-identity-warnings.patch b/pkgs/tools/networking/openssh/fix-identity-warnings.patch
deleted file mode 100644
index c341889b3a47..000000000000
--- a/pkgs/tools/networking/openssh/fix-identity-warnings.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-https://bugzilla.mindrot.org/show_bug.cgi?id=2084
-
-@@ -, +, @@ 
-   - dtucker@cvs.openbsd.org 2013/02/17 23:16:57
-     [readconf.c ssh.c readconf.h sshconnect2.c]
-     Keep track of which IndentityFile options were manually supplied and which
-     were default options, and don't warn if the latter are missing.
-     ok markus@
-   - dtucker@cvs.openbsd.org 2013/02/22 04:45:09
-     [ssh.c readconf.c readconf.h]
-     Don't complain if IdentityFiles specified in system-wide configs are
-     missing.  ok djm, deraadt.
-Index: readconf.c
-===================================================================
-RCS file: /home/dtucker/openssh/cvs/openssh/readconf.c,v
---- a/readconf.c	2 Oct 2011 07:59:03 -0000	1.174
-+++ b/readconf.c	5 Apr 2013 02:36:11 -0000
-@@ -1,4 +1,4 @@ 
--/* $OpenBSD: readconf.c,v 1.194 2011/09/23 07:45:05 markus Exp $ */
-+/* $OpenBSD: readconf.c,v 1.196 2013/02/22 04:45:08 dtucker Exp $ */
- /*
-  * Author: Tatu Ylonen <ylo@cs.hut.fi>
-  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-@@ -326,6 +326,26 @@ clear_forwardings(Options *options)
- 	options->tun_open = SSH_TUNMODE_NO;
- }
- 
-+void
-+add_identity_file(Options *options, const char *dir, const char *filename,
-+    int userprovided)
-+{
-+	char *path;
-+
-+	if (options->num_identity_files >= SSH_MAX_IDENTITY_FILES)
-+		fatal("Too many identity files specified (max %d)",
-+		    SSH_MAX_IDENTITY_FILES);
-+
-+	if (dir == NULL) /* no dir, filename is absolute */
-+		path = xstrdup(filename);
-+	else
-+		(void)xasprintf(&path, "%.100s%.100s", dir, filename);
-+
-+	options->identity_file_userprovided[options->num_identity_files] =
-+	    userprovided;
-+	options->identity_files[options->num_identity_files++] = path;
-+}
-+
- /*
-  * Returns the number of the token pointed to by cp or oBadOption.
-  */
-@@ -353,7 +373,7 @@ parse_token(const char *cp, const char *
- int
- process_config_line(Options *options, const char *host,
- 		    char *line, const char *filename, int linenum,
--		    int *activep)
-+		    int *activep, int userconfig)
- {
- 	char *s, **charptr, *endofnumber, *keyword, *arg, *arg2;
- 	char **cpptr, fwdarg[256];
-@@ -586,9 +606,7 @@ parse_yesnoask:
- 			if (*intptr >= SSH_MAX_IDENTITY_FILES)
- 				fatal("%.200s line %d: Too many identity files specified (max %d).",
- 				    filename, linenum, SSH_MAX_IDENTITY_FILES);
--			charptr = &options->identity_files[*intptr];
--			*charptr = xstrdup(arg);
--			*intptr = *intptr + 1;
-+			add_identity_file(options, NULL, arg, userconfig);
- 		}
- 		break;
- 
-@@ -1075,7 +1093,7 @@ parse_int:
- 
- int
- read_config_file(const char *filename, const char *host, Options *options,
--    int checkperm)
-+    int flags)
- {
- 	FILE *f;
- 	char line[1024];
-@@ -1085,7 +1103,7 @@ read_config_file(const char *filename, c
- 	if ((f = fopen(filename, "r")) == NULL)
- 		return 0;
- 
--	if (checkperm) {
-+	if (flags & SSHCONF_CHECKPERM) {
- 		struct stat sb;
- 
- 		if (fstat(fileno(f), &sb) == -1)
-@@ -1106,7 +1124,8 @@ read_config_file(const char *filename, c
- 	while (fgets(line, sizeof(line), f)) {
- 		/* Update line number counter. */
- 		linenum++;
--		if (process_config_line(options, host, line, filename, linenum, &active) != 0)
-+		if (process_config_line(options, host, line, filename, linenum,
-+		    &active, flags & SSHCONF_USERCONF) != 0)
- 			bad_options++;
- 	}
- 	fclose(f);
-@@ -1280,30 +1299,17 @@ fill_default_options(Options * options)
- 		options->protocol = SSH_PROTO_2;
- 	if (options->num_identity_files == 0) {
- 		if (options->protocol & SSH_PROTO_1) {
--			len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1;
--			options->identity_files[options->num_identity_files] =
--			    xmalloc(len);
--			snprintf(options->identity_files[options->num_identity_files++],
--			    len, "~/%.100s", _PATH_SSH_CLIENT_IDENTITY);
-+			add_identity_file(options, "~/",
-+			    _PATH_SSH_CLIENT_IDENTITY, 0);
- 		}
- 		if (options->protocol & SSH_PROTO_2) {
--			len = 2 + strlen(_PATH_SSH_CLIENT_ID_RSA) + 1;
--			options->identity_files[options->num_identity_files] =
--			    xmalloc(len);
--			snprintf(options->identity_files[options->num_identity_files++],
--			    len, "~/%.100s", _PATH_SSH_CLIENT_ID_RSA);
--
--			len = 2 + strlen(_PATH_SSH_CLIENT_ID_DSA) + 1;
--			options->identity_files[options->num_identity_files] =
--			    xmalloc(len);
--			snprintf(options->identity_files[options->num_identity_files++],
--			    len, "~/%.100s", _PATH_SSH_CLIENT_ID_DSA);
-+			add_identity_file(options, "~/",
-+			    _PATH_SSH_CLIENT_ID_RSA, 0);
-+			add_identity_file(options, "~/",
-+			    _PATH_SSH_CLIENT_ID_DSA, 0);
- #ifdef OPENSSL_HAS_ECC
--			len = 2 + strlen(_PATH_SSH_CLIENT_ID_ECDSA) + 1;
--			options->identity_files[options->num_identity_files] =
--			    xmalloc(len);
--			snprintf(options->identity_files[options->num_identity_files++],
--			    len, "~/%.100s", _PATH_SSH_CLIENT_ID_ECDSA);
-+			add_identity_file(options, "~/",
-+			    _PATH_SSH_CLIENT_ID_ECDSA, 0);
- #endif
- 		}
- 	}
-Index: readconf.h
-===================================================================
-RCS file: /home/dtucker/openssh/cvs/openssh/readconf.h,v
---- a/readconf.h	2 Oct 2011 07:59:03 -0000	1.83
-+++ b/readconf.h	5 Apr 2013 02:36:11 -0000
-@@ -1,4 +1,4 @@ 
--/* $OpenBSD: readconf.h,v 1.91 2011/09/23 07:45:05 markus Exp $ */
-+/* $OpenBSD: readconf.h,v 1.93 2013/02/22 04:45:09 dtucker Exp $ */
- 
- /*
-  * Author: Tatu Ylonen <ylo@cs.hut.fi>
-@@ -96,6 +96,7 @@ typedef struct {
- 
- 	int     num_identity_files;	/* Number of files for RSA/DSA identities. */
- 	char   *identity_files[SSH_MAX_IDENTITY_FILES];
-+	int    identity_file_userprovided[SSH_MAX_IDENTITY_FILES];
- 	Key    *identity_keys[SSH_MAX_IDENTITY_FILES];
- 
- 	/* Local TCP/IP forward requests. */
-@@ -148,15 +149,20 @@ typedef struct {
- #define REQUEST_TTY_YES		2
- #define REQUEST_TTY_FORCE	3
- 
-+#define SSHCONF_CHECKPERM	1  /* check permissions on config file */
-+#define SSHCONF_USERCONF	2  /* user provided config file not system */
-+
- void     initialize_options(Options *);
- void     fill_default_options(Options *);
- int	 read_config_file(const char *, const char *, Options *, int);
- int	 parse_forward(Forward *, const char *, int, int);
- 
- int
--process_config_line(Options *, const char *, char *, const char *, int, int *);
-+process_config_line(Options *, const char *, char *, const char *, int, int *,
-+    int);
- 
- void	 add_local_forward(Options *, const Forward *);
- void	 add_remote_forward(Options *, const Forward *);
-+void	 add_identity_file(Options *, const char *, const char *, int);
- 
- #endif				/* READCONF_H */
-Index: ssh.c
-===================================================================
-RCS file: /home/dtucker/openssh/cvs/openssh/ssh.c,v
---- a/ssh.c	6 Jul 2012 03:45:01 -0000	1.366
-+++ b/ssh.c	5 Apr 2013 02:36:11 -0000
-@@ -1,4 +1,4 @@ 
--/* $OpenBSD: ssh.c,v 1.370 2012/07/06 01:47:38 djm Exp $ */
-+/* $OpenBSD: ssh.c,v 1.372 2013/02/22 04:45:09 dtucker Exp $ */
- /*
-  * Author: Tatu Ylonen <ylo@cs.hut.fi>
-  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-@@ -405,12 +405,7 @@ main(int ac, char **av)
- 				    strerror(errno));
- 				break;
- 			}
--			if (options.num_identity_files >=
--			    SSH_MAX_IDENTITY_FILES)
--				fatal("Too many identity files specified "
--				    "(max %d)", SSH_MAX_IDENTITY_FILES);
--			options.identity_files[options.num_identity_files++] =
--			    xstrdup(optarg);
-+			add_identity_file(&options, NULL, optarg, 1);
- 			break;
- 		case 'I':
- #ifdef ENABLE_PKCS11
-@@ -584,7 +579,8 @@ main(int ac, char **av)
- 			dummy = 1;
- 			line = xstrdup(optarg);
- 			if (process_config_line(&options, host ? host : "",
--			    line, "command-line", 0, &dummy) != 0)
-+			    line, "command-line", 0, &dummy, SSHCONF_USERCONF)
-+			    != 0)
- 				exit(255);
- 			xfree(line);
- 			break;
-@@ -678,14 +674,15 @@ main(int ac, char **av)
- 	 * file if the user specifies a config file on the command line.
- 	 */
- 	if (config != NULL) {
--		if (!read_config_file(config, host, &options, 0))
-+		if (!read_config_file(config, host, &options, SSHCONF_USERCONF))
- 			fatal("Can't open user config file %.100s: "
- 			    "%.100s", config, strerror(errno));
- 	} else {
- 		r = snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir,
- 		    _PATH_SSH_USER_CONFFILE);
- 		if (r > 0 && (size_t)r < sizeof(buf))
--			(void)read_config_file(buf, host, &options, 1);
-+			(void)read_config_file(buf, host, &options,
-+			     SSHCONF_CHECKPERM|SSHCONF_USERCONF);
- 
- 		/* Read systemwide configuration file after user config. */
- 		(void)read_config_file(_PATH_HOST_CONFIG_FILE, host,
-Index: sshconnect2.c
-===================================================================
-RCS file: /home/dtucker/openssh/cvs/openssh/sshconnect2.c,v
---- a/sshconnect2.c	20 Mar 2013 01:55:15 -0000	1.184
-+++ b/sshconnect2.c	5 Apr 2013 02:36:07 -0000
-@@ -1,4 +1,4 @@ 
--/* $OpenBSD: sshconnect2.c,v 1.191 2013/02/15 00:21:01 dtucker Exp $ */
-+/* $OpenBSD: sshconnect2.c,v 1.192 2013/02/17 23:16:57 dtucker Exp $ */
- /*
-  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
-  * Copyright (c) 2008 Damien Miller.  All rights reserved.
-@@ -1384,7 +1384,7 @@ pubkey_prepare(Authctxt *authctxt)
- 		id = xcalloc(1, sizeof(*id));
- 		id->key = key;
- 		id->filename = xstrdup(options.identity_files[i]);
--		id->userprovided = 1;
-+		id->userprovided = options.identity_file_userprovided[i];
- 		TAILQ_INSERT_TAIL(&files, id, next);
- 	}
- 	/* Prefer PKCS11 keys that are explicitly listed */
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 47e417ffd8a2..524c93d218a1 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -33,14 +33,14 @@ stdenv.mkDerivation rec {
     
     substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
 
-    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in
-    sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})" in/scripts=wicd.in
-    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in
-    sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in
-    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in
-    sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in
-    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in
-    sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in
+    sed -i "2iexport PATH=${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin\$\{PATH:+:\}\$PATH" in/scripts=wicd.in
+    sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in
+    sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in
+    sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in
+    sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in
+    sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in
+    sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in
+    sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in
     rm po/ast.po
   '';
 
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index e63de65410c1..62a644e195aa 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, libintlOrEmpty, libiconvOrEmpty }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.3pre106668a42f982af4180d7657b47d8316862d4d1d";
+  name = "disnix-0.3pre57b56b6b9d43b48ce72e4e47f6acfdb3b1cbe3ef";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/5430218/download/4/disnix-0.3pre106668a42f982af4180d7657b47d8316862d4d1d.tar.gz;
-    sha256 = "1cnrbw70gpkm9rg5a3j0kkbq0q0wrkc5hwqb614fvja20y52hld6";
+    url = http://hydra.nixos.org/build/5576475/download/4/disnix-0.3pre57b56b6b9d43b48ce72e4e47f6acfdb3b1cbe3ef.tar.gz;
+    sha256 = "18sxs4c3a1sr2sldd6p7rmxg6541v1hsl987vzc7ij8mwkcnm1r0";
   };
   
   buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty ];
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 46422d010faa..80ac91b54899 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, disnix, socat, pkgconfig }:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.2pre827a5b52b8a68b7c16a2d92898e6281c54e7b1ff";
+  name = "disnixos-0.2pre77208b9bf296b2376bd95154b333db304b50bec0.tar.gz";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/5430738/download/3/disnixos-0.2pre827a5b52b8a68b7c16a2d92898e6281c54e7b1ff.tar.gz;
-    sha256 = "1alyzypli32whd371w9wfxcnq6by9zng88nysd3gy8nrvns8di7x";
+    url = http://hydra.nixos.org/build/5578534/download/3/disnixos-0.2pre77208b9bf296b2376bd95154b333db304b50bec0.tar.gz;
+    sha256 = "0a9ah16rhq6kgknylq9dsv6mk8pp4vbahqls9hcg99ys9bn18d8z";
   };
   
   buildInputs = [ socat pkgconfig disnix ];
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index d932d0fa8b21..de3690e3e203 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -16,10 +16,10 @@ assert enableSubversionRepository -> subversion != null;
 assert enableEjabberdDump -> ejabberd != null;
 
 stdenv.mkDerivation {
-  name = "dysnomia-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03";
+  name = "dysnomia-0.3pre7c81cc254a0f6966dd9ac55f945c458b45b3d428.tar.gz";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/5430159/download/1/dysnomia-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03.tar.gz;
-    sha256 = "1y9qf14ygdgq2hjh1p6rf7hcgij02wv091s8wpsn36mrmc9zk6rf";
+    url = http://hydra.nixos.org/build/5613342/download/1/dysnomia-0.3pre7c81cc254a0f6966dd9ac55f945c458b45b3d428.tar.gz;
+    sha256 = "0ll09vh94ygqkncq4ddb62s4c84n3pr5qy0gi1ywy0j30qk6zvsq";
   };
   
   preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index bab89a1145eb..4d5eeca12c1f 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.6pre3166_15e5ac8";
+  name = "nix-1.6pre3187_3fb7ae0";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/5566779/download/5/${name}.tar.xz";
-    sha256 = "c25209bb93ca6859df84f74bd16cb0daee9e6c9820139e9dab1d2848129a2558";
+    url = "http://hydra.nixos.org/build/5663853/download/5/${name}.tar.xz";
+    sha256 = "3cd695b3bb23ea7f9e4779f5b79180319444204b30120ed2cc0f0bf1e070403f";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
new file mode 100644
index 000000000000..ba86b0b1d9ce
--- /dev/null
+++ b/pkgs/tools/security/pass/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, getopt }:
+
+stdenv.mkDerivation rec {
+  version = "1.4.2";
+  name    = "password-store-${version}";
+
+  src = fetchurl {
+    url    = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
+    sha256 = "00m3q6dihrhw8cxsrham3bdqg5841an8ch4s3a4k5fynlcb802m1";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Stores, retrieves, generates, and synchronizes passwords securely.";
+    homepage    = http://zx2c4.com/projects/password-store/;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
+
+    longDescription = ''
+      pass is a very simple password store that keeps passwords inside gpg2
+      encrypted files inside a simple directory tree residing at
+      ~/.password-store. The pass utility provides a series of commands for
+      manipulating the password store, allowing the user to add, remove, edit,
+      synchronize, generate, and manipulate passwords.
+    '';
+  };
+
+  propagatedBuildInputs = [ getopt ];
+
+  installPhase = ''
+    # link zsh and fish completions
+    sed -ie '22s/^#//' Makefile
+    sed -ie '25s/^#//' Makefile
+    sed -i 's/find /find -L /' contrib/pass.zsh-completion
+    mkdir -p "$out/share/zsh/site-functions"
+    mkdir -p "$out/share/fish/completions"
+
+    # use gnused
+    sed -i 's/sed -i ""/sed -i /' Makefile
+
+    SYSCONFDIR="$out/etc" PREFIX="$out" make install
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    # use nix-supplied getopt
+    sed -ie '34c GETOPT="${getopt}/bin/getopt"' \
+      "$out/lib/password-store.platform.sh"
+  '';
+}
+
diff --git a/pkgs/tools/security/torbutton/default.nix b/pkgs/tools/security/torbutton/default.nix
new file mode 100644
index 000000000000..348d96b00247
--- /dev/null
+++ b/pkgs/tools/security/torbutton/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, zip }:
+stdenv.mkDerivation rec {
+
+  name = "torbutton-${version}.xpi";
+  version = "1.6.1";
+
+  src = fetchgit {
+    url = https://git.torproject.org/torbutton.git;
+    rev = "refs/tags/${version}";
+    sha256 = "0ypzrl8nhckrgh45rcwsjds1jnzz3w5nr09b926a4h3a5njammlv";
+  };
+
+  buildInputs = [ zip ];
+
+  buildPhase = ''
+    mkdir pkg
+    ./makexpi.sh
+  '';
+
+  installPhase = "cat pkg/*.xpi > $out";
+
+  meta = with stdenv.lib; {
+    homepage = https://www.torproject.org/torbutton/;
+    description = "the component in Tor Browser Bundle that takes care of application-level security and privacy concerns in Firefox. To keep you safe, Torbutton disables many types of active content.";
+    license = licenses.mit;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix
new file mode 100644
index 000000000000..f2f77bd84cd4
--- /dev/null
+++ b/pkgs/tools/video/vnc2flv/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "vnc2flv-20100207";
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "http://pypi.python.org/packages/source/v/vnc2flv/${name}.tar.gz";
+    md5 = "8492e46496e187b49fe5569b5639804e";
+  };
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  meta = {
+    description = "Tool to record VNC sessions to Flash Video";
+    homepage = http://www.unixuser.org/~euske/python/vnc2flv/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12b8fa43ded6..6ee8ee73c9e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -348,10 +348,9 @@ let
 
   makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
 
-  makeModulesClosure = {kernel, rootModules, allowMissing ? false}:
+  makeModulesClosure = { kernel, rootModules, allowMissing ? false }:
     import ../build-support/kernel/modules-closure.nix {
-      inherit stdenv module_init_tools kernel nukeReferences
-        rootModules allowMissing;
+      inherit stdenv kmod kernel nukeReferences rootModules allowMissing;
     };
 
   pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;
@@ -387,6 +386,9 @@ let
 
   acct = callPackage ../tools/system/acct { };
 
+  acoustidFingerprinter = callPackage
+    ../tools/audio/acoustid-fingerprinter { };
+
   aefs = callPackage ../tools/filesystems/aefs { };
 
   aespipe = callPackage ../tools/security/aespipe { };
@@ -421,6 +423,8 @@ let
     };
   };
 
+  awscli = callPackage ../tools/admin/awscli { };
+
   ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
 
   ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };
@@ -446,8 +450,12 @@ let
 
   apg = callPackage ../tools/security/apg { };
 
+  grc = callPackage ../tools/misc/grc { };
+
   otool = callPackage ../os-specific/darwin/otool { };
 
+  pass = callPackage ../tools/security/pass { };
+
   setfile = callPackage ../os-specific/darwin/setfile { };
 
   install_name_tool = callPackage ../os-specific/darwin/install_name_tool { };
@@ -517,6 +525,8 @@ let
 
   btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { };
 
+  bwm_ng = callPackage ../tools/networking/bwm-ng { };
+
   byobu = callPackage ../tools/misc/byobu { };
 
   catdoc = callPackage ../tools/text/catdoc { };
@@ -823,6 +833,8 @@ let
   finger_bsd = callPackage ../tools/networking/bsd-finger { };
 
   fio = callPackage ../tools/system/fio { };
+  
+  flpsed = callPackage ../applications/editors/flpsed { };
 
   flvstreamer = callPackage ../tools/networking/flvstreamer { };
 
@@ -1329,6 +1341,10 @@ let
 
   networkmanager_pptp_gnome = networkmanager_pptp.override { withGnome = true; };
 
+  networkmanager_vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { };
+
+  networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { gconf = gnome.GConf; };
+
   networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { };
 
   newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { };
@@ -1517,6 +1533,8 @@ let
 
   polkit_gnome = callPackage ../tools/security/polkit-gnome { };
 
+  ponysay = callPackage ../tools/misc/ponysay { };
+
   povray = callPackage ../tools/graphics/povray { };
 
   ppl = callPackage ../development/libraries/ppl { };
@@ -1771,12 +1789,16 @@ let
     guile = guile_1_8;
   };
 
+  tiled-qt = callPackage ../applications/editors/tiled-qt { qt = qt4; };
+
   tinc = callPackage ../tools/networking/tinc { };
 
   tmux = callPackage ../tools/misc/tmux { };
 
   tor = callPackage ../tools/security/tor { };
 
+  torbutton = callPackage ../tools/security/torbutton { };
+
   torsocks = callPackage ../tools/security/tor/torsocks.nix { };
 
   trickle = callPackage ../tools/networking/trickle {};
@@ -1819,12 +1841,14 @@ let
 
   vfdecrypt = callPackage ../tools/misc/vfdecrypt { };
 
-  vifm = callPackage ../applications/misc/vifm {};
+  vifm = callPackage ../applications/misc/vifm { };
 
   viking = callPackage ../applications/misc/viking {
     inherit (gnome) scrollkeeper;
   };
 
+  vnc2flv = callPackage ../tools/video/vnc2flv {};
+
   vncrec = builderDefsPackage ../tools/video/vncrec {
     inherit (xlibs) imake libX11 xproto gccmakedep libXt
       libXmu libXaw libXext xextproto libSM libICE libXpm
@@ -2088,6 +2112,8 @@ let
 
   aspectj = callPackage ../development/compilers/aspectj { };
 
+  avra = callPackage ../development/compilers/avra { };
+
   bigloo = callPackage ../development/compilers/bigloo { };
 
   chicken = callPackage ../development/compilers/chicken { };
@@ -2795,6 +2821,8 @@ let
 
   ocaml_4_00_1 = callPackage ../development/compilers/ocaml/4.00.1.nix { };
 
+  orc = callPackage ../development/compilers/orc { };
+
   metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { };
 
   ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { };
@@ -3068,7 +3096,12 @@ let
 
   erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { };
   erlangR15B03 = callPackage ../development/interpreters/erlang/R15B03.nix { };
-  erlang = erlangR15B03;
+  erlangR16B01 = callPackage ../development/interpreters/erlang/R16B01.nix { };
+  erlang = erlangR16B01;
+
+  rebar = callPackage ../development/tools/build-managers/rebar { };
+
+  elixir = callPackage ../development/interpreters/elixir { };
 
   groovy = callPackage ../development/interpreters/groovy { };
 
@@ -3099,6 +3132,8 @@ let
      lua = lua5;
   };
 
+  lush2 = callPackage ../development/interpreters/lush {};
+
   maude = callPackage ../development/interpreters/maude { };
 
   octave = callPackage ../development/interpreters/octave {
@@ -3132,10 +3167,12 @@ let
 
   php_xcache = callPackage ../development/libraries/php-xcache { };
 
-  phpXdebug_5_3 = callPackage ../development/interpreters/php-xdebug {
+  phpXdebug_5_3 = lowPrio (callPackage ../development/interpreters/php-xdebug {
     php = php53;
-  };
+  });
+
   phpXdebug_5_4 = callPackage ../development/interpreters/php-xdebug { };
+
   phpXdebug = phpXdebug_5_4;
 
   picolisp = callPackage ../development/interpreters/picolisp {};
@@ -3184,9 +3221,7 @@ let
 
   qi = callPackage ../development/compilers/qi { };
 
-  racket = callPackage ../development/interpreters/racket {
-    libpng = libpng15;
-  };
+  racket = callPackage ../development/interpreters/racket { };
 
   regina = callPackage ../development/interpreters/regina {};
 
@@ -3332,6 +3367,8 @@ let
 
   avarice = callPackage ../development/tools/misc/avarice { };
 
+  babeltrace = callPackage ../development/tools/misc/babeltrace { };
+
   bam = callPackage ../development/tools/build-managers/bam {};
 
   binutils = callPackage ../development/tools/misc/binutils {
@@ -3354,7 +3391,9 @@ let
     cross = assert crossSystem != null; crossSystem;
   }));
 
-  bison = callPackage ../development/tools/parsing/bison { };
+  bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { };
+  bison3 = lowPrio (callPackage ../development/tools/parsing/bison/3.x.nix { });
+  bison = bison2;
 
   buildbot = callPackage ../development/tools/build-managers/buildbot {
     inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate;
@@ -3395,6 +3434,8 @@ let
 
   chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; };
 
+  "cl-launch" = callPackage ../development/tools/misc/cl-launch {};
+
   complexity = callPackage ../development/tools/misc/complexity { };
 
   ctags = callPackage ../development/tools/misc/ctags { };
@@ -3568,6 +3609,12 @@ let
 
   ltrace = callPackage ../development/tools/misc/ltrace { };
 
+  lttngTools = callPackage ../development/tools/misc/lttng-tools { };
+
+  lttngUst = callPackage ../development/tools/misc/lttng-ust { };
+
+  lttv = callPackage ../development/tools/misc/lttv { };
+
   mk = callPackage ../development/tools/build-managers/mk { };
 
   neoload = callPackage ../development/tools/neoload {
@@ -3794,7 +3841,9 @@ let
 
   bwidget = callPackage ../development/libraries/bwidget { };
 
-  c-ares = callPackage ../development/libraries/c-ares { };
+  c-ares = callPackage ../development/libraries/c-ares {
+    fetchurl = fetchurlBoot;
+  };
 
   caelum = callPackage ../development/libraries/caelum { };
 
@@ -3820,6 +3869,8 @@ let
 
   chmlib = callPackage ../development/libraries/chmlib { };
 
+  chromaprint = callPackage ../development/libraries/chromaprint { };
+
   cil = callPackage ../development/libraries/cil { };
 
   cilaterm = callPackage ../development/libraries/cil-aterm {
@@ -3900,6 +3951,8 @@ let
   dbus_libs = dbus.libs;
   dbus_daemon = dbus.daemon;
 
+  dhex = callPackage ../applications/editors/dhex { };
+
   dclib = callPackage ../development/libraries/dclib { };
 
   directfb = callPackage ../development/libraries/directfb { };
@@ -4061,8 +4114,6 @@ let
 
   glfw = callPackage ../development/libraries/glfw { };
 
-  glibc = glibc217;
-
   glibcCross = glibc217Cross;
 
   glibc213 = (callPackage ../development/libraries/glibc/2.13 {
@@ -4086,7 +4137,7 @@ let
         inherit fetchgit;
       }));
 
-  glibc217 = callPackage ../development/libraries/glibc/2.17 {
+  glibc = callPackage ../development/libraries/glibc/2.17 {
     kernelHeaders = linuxHeaders;
     installLocales = config.glibc.locales or false;
     machHeaders = null;
@@ -4233,8 +4284,8 @@ let
     guileBindings = config.gnutls.guile or true;
   };
 
-  gnutls_without_guile = gnutls.override { guileBindings = false; };
-  gnutls2_without_guile = gnutls2.override { guileBindings = false; };
+  gnutls_without_guile = lowPrio (gnutls.override { guileBindings = false; });
+  gnutls2_without_guile = lowPrio (gnutls2.override { guileBindings = false; });
 
   gpac = callPackage ../applications/video/gpac { };
 
@@ -4285,7 +4336,9 @@ let
   cairomm = callPackage ../development/libraries/cairomm { };
 
   pango = callPackage ../development/libraries/pango { };
-  pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { };
+  pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix {
+    cairo = cairo_1_12_2;
+  };
 
   pangox_compat = callPackage ../development/libraries/pangox-compat { };
 
@@ -4869,6 +4922,8 @@ let
 
   libtunepimp = callPackage ../development/libraries/libtunepimp { };
 
+  libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { };
+
   libgeotiff = callPackage ../development/libraries/libgeotiff { };
 
   libunistring = callPackage ../development/libraries/libunistring { };
@@ -4881,6 +4936,8 @@ let
 
   libunique = callPackage ../development/libraries/libunique/default.nix { };
 
+  liburcu = callPackage ../development/libraries/liburcu { };
+
   libusb = callPackage ../development/libraries/libusb {
     stdenv = if stdenv.isDarwin
       then overrideGCC stdenv gccApple
@@ -4907,6 +4964,8 @@ let
 
   libvisio = callPackage ../development/libraries/libvisio { };
 
+  libvisual = callPackage ../development/libraries/libvisual { };
+
   libvncserver = builderDefsPackage (import ../development/libraries/libvncserver) {
     inherit libtool libjpeg openssl zlib;
     inherit (xlibs) xproto libX11 damageproto libXdamage
@@ -5289,13 +5348,13 @@ let
       else stdenv;
   };
 
-  qt48Full = callPackage ../development/libraries/qt-4.x/4.8 {
+  qt48Full = lowPrio (callPackage ../development/libraries/qt-4.x/4.8 {
     # GNOME dependencies are not used unless gtkStyle == true
     inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
     docs = true;
     demos = true;
     examples = true;
-  };
+  });
 
   qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { };
 
@@ -5577,21 +5636,6 @@ let
       inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good;
     };
 
-  webkitSVN =
-    builderDefsPackage ../development/libraries/webkit/svn.nix {
-      inherit (gnome) gtkdoc libsoup;
-      inherit gtk atk pango glib;
-      inherit freetype fontconfig gettext gperf curl
-        libjpeg libtiff libxml2 libxslt sqlite
-        icu cairo perl intltool automake libtool
-        pkgconfig autoconf bison libproxy enchant
-        python ruby which flex geoclue;
-      inherit gstreamer gst_plugins_base gst_ffmpeg
-        gst_plugins_good;
-      inherit (xlibs) libXt renderproto libXrender;
-      inherit libpng;
-    };
-
   wildmidi = callPackage ../development/libraries/wildmidi { };
 
   wvstreams = callPackage ../development/libraries/wvstreams { };
@@ -5823,21 +5867,6 @@ let
     python = pypy;
   });
 
-  plone41Packages = recurseIntoAttrs (import ../development/web/plone/4.1.nix {
-    inherit pkgs;
-    pythonPackages = python26Packages;
-  });
-
-  plone42Packages = recurseIntoAttrs (import ../development/web/plone/4.2.nix {
-    inherit pkgs;
-    pythonPackages = python26Packages;
-  });
-
-  plone43Packages = recurseIntoAttrs (import ../development/web/plone/4.3.nix {
-    inherit pkgs;
-    pythonPackages = python27Packages;
-  });
-
   foursuite = callPackage ../development/python-modules/4suite { };
 
   bsddb3 = callPackage ../development/python-modules/bsddb3 { };
@@ -5866,6 +5895,8 @@ let
 
   pyGtkGlade = pythonPackages.pyGtkGlade;
 
+  pylint = callPackage ../development/python-modules/pylint { };
+
   pyopenssl = builderDefsPackage (import ../development/python-modules/pyopenssl) {
     inherit python openssl;
   };
@@ -5890,6 +5921,8 @@ let
 
   pyxml = callPackage ../development/python-modules/pyxml { };
 
+  rbtools = callPackage ../development/python-modules/rbtools { };
+
   setuptools = pythonPackages.setuptools;
 
   wxPython = pythonPackages.wxPython;
@@ -6191,7 +6224,7 @@ let
 
   afuse = callPackage ../os-specific/linux/afuse { };
 
-  amdUcode = callPackage ../os-specific/linux/firmware/amd-ucode { };
+  amdUcode = callPackage ../os-specific/linux/microcode/amd.nix { };
 
   autofs5 = callPackage ../os-specific/linux/autofs/autofs-v5.nix { };
 
@@ -6232,8 +6265,6 @@ let
 
   batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { };
 
-  bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { };
-
   bluez4 = callPackage ../os-specific/linux/bluez {
     pygobject = pygobject3;
   };
@@ -6346,32 +6377,8 @@ let
 
   iptables = callPackage ../os-specific/linux/iptables { };
 
-  ipw2100fw = callPackage ../os-specific/linux/firmware/ipw2100 { };
-
-  ipw2200fw = callPackage ../os-specific/linux/firmware/ipw2200 { };
-
   iw = callPackage ../os-specific/linux/iw { };
 
-  iwlwifi1000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-1000-ucode { };
-
-  iwlwifi2030ucode = callPackage ../os-specific/linux/firmware/iwlwifi-2030-ucode { };
-
-  iwlwifi3945ucode = callPackage ../os-specific/linux/firmware/iwlwifi-3945-ucode { };
-
-  iwlwifi4965ucodeV1 = callPackage ../os-specific/linux/firmware/iwlwifi-4965-ucode { };
-
-  iwlwifi4965ucodeV2 = callPackage ../os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix { };
-
-  iwlwifi5000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-5000-ucode { };
-
-  iwlwifi5150ucode = callPackage ../os-specific/linux/firmware/iwlwifi-5150-ucode { };
-
-  iwlwifi6000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000-ucode { };
-
-  iwlwifi6000g2aucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000g2a-ucode { };
-
-  iwlwifi6000g2bucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000g2b-ucode { };
-
   jujuutils = callPackage ../os-specific/linux/jujuutils { };
 
   kbd = callPackage ../os-specific/linux/kbd { };
@@ -6415,7 +6422,7 @@ let
   kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
 
   linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+    inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
     kernelPatches =
       [ kernelPatches.sec_perm_2_6_24
         # kernelPatches.aufs3_0
@@ -6423,34 +6430,33 @@ let
   };
 
   linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+    inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
     kernelPatches =
       [ kernelPatches.sec_perm_2_6_24
         # kernelPatches.aufs3_2
-        kernelPatches.cifs_timeout_2_6_38
       ];
   };
 
-  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_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: {
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_50 ];
+  })) (args: { makeFlags = "DISABLE_PAX_PLUGINS=y";}));
 
-  linux_3_2_apparmor = linux_3_2.override {
+  linux_3_2_apparmor = lowPrio (linux_3_2.override {
     kernelPatches = [ kernelPatches.apparmor_3_2 ];
     extraConfig = ''
       SECURITY_APPARMOR y
       DEFAULT_SECURITY_APPARMOR y
     '';
-  };
+  });
 
-  linux_3_2_xen = linux_3_2.override {
+  linux_3_2_xen = lowPrio (linux_3_2.override {
     extraConfig = ''
       XEN_DOM0 y
     '';
-  };
+  });
 
   linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+    inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
     kernelPatches =
       [ kernelPatches.sec_perm_2_6_24
         # kernelPatches.aufs3_4
@@ -6460,32 +6466,20 @@ let
       ];
   };
 
-  linux_3_4_apparmor = linux_3_4.override {
+  linux_3_4_apparmor = lowPrio (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;
-  };
-
-  linux_3_8 = makeOverridable (import ../os-specific/linux/kernel/linux-3.8.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
-    kernelPatches =
-      [
-        kernelPatches.sec_perm_2_6_24
-      ] ++ lib.optionals (platform.kernelArch == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
+    inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
   };
 
   linux_3_9 = makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) {
-    inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
+    inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
     kernelPatches =
       [
         kernelPatches.sec_perm_2_6_24
@@ -6497,10 +6491,11 @@ let
   };
 
   linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) {
-    inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
+    inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
     kernelPatches =
       [
         kernelPatches.sec_perm_2_6_24
+        kernelPatches.btrfs_send_backport
       ] ++ lib.optionals (platform.kernelArch == "mips")
       [ kernelPatches.mips_fpureg_emu
         kernelPatches.mips_fpu_sigill
@@ -6555,11 +6550,7 @@ let
 
     iwlwifi = callPackage ../os-specific/linux/iwlwifi { };
 
-    iwlwifi4965ucode =
-      if builtins.compareVersions self.kernel.version "2.6.27" == 0
-         || builtins.compareVersions self.kernel.version "2.6.27" == 1
-      then iwlwifi4965ucodeV2
-      else iwlwifi4965ucodeV1;
+    lttngModules = callPackage ../os-specific/linux/lttng-modules { };
 
     atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { };
 
@@ -6626,12 +6617,11 @@ let
   # Build the kernel modules for the some of the kernels.
   linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 linuxPackages_3_0);
   linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
-  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_2_apparmor = linuxPackagesFor pkgs.linux_3_2_apparmor linuxPackages_3_2_apparmor;
+  linuxPackages_3_2_xen = 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_4_apparmor = 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);
   linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
   # Update this when adding a new version!
@@ -6668,7 +6658,7 @@ let
     linuxHeaders = glibc.kernelHeaders;
   };
 
-  klibcShrunk = callPackage ../os-specific/linux/klibc/shrunk.nix { };
+  klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { });
 
   kmod = callPackage ../os-specific/linux/kmod { };
 
@@ -6703,8 +6693,8 @@ let
   mountall = callPackage ../os-specific/linux/mountall { };
 
   aggregateModules = modules:
-    import ../os-specific/linux/module-init-tools/aggregator.nix {
-      inherit stdenv module_init_tools modules buildEnv;
+    callPackage ../os-specific/linux/kmod/aggregator.nix {
+      inherit modules;
     };
 
   multipath_tools = callPackage ../os-specific/linux/multipath-tools { };
@@ -6768,16 +6758,12 @@ let
 
   "procps-ng" = callPackage ../os-specific/linux/procps-ng { };
 
-  qemu_kvm = callPackage ../os-specific/linux/qemu-kvm { };
+  qemu_kvm = lowPrio (qemu.override { x86Only = true; });
 
   firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { };
 
   radeontools = callPackage ../os-specific/linux/radeontools { };
 
-  radeonR700 = callPackage ../os-specific/linux/firmware/radeon-r700 { };
-  radeonR600 = callPackage ../os-specific/linux/firmware/radeon-r600 { };
-  radeonJuniper = callPackage ../os-specific/linux/firmware/radeon-juniper { };
-
   raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {};
 
   regionset = callPackage ../os-specific/linux/regionset { };
@@ -6786,18 +6772,8 @@ let
 
   rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { };
 
-  ralink_fw = callPackage ../os-specific/linux/firmware/ralink { };
-
-  rt2860fw = callPackage ../os-specific/linux/firmware/rt2860 { };
-
-  rt2870fw = callPackage ../os-specific/linux/firmware/rt2870 { };
-
   rtkit = callPackage ../os-specific/linux/rtkit { };
 
-  rtl8192cfw = callPackage ../os-specific/linux/firmware/rtl8192c { };
-
-  rtl8168e2fw = callPackage ../os-specific/linux/firmware/rtl8168e-2 { };
-
   sdparm = callPackage ../os-specific/linux/sdparm { };
 
   sepolgen = callPackage ../os-specific/linux/sepolgen { };
@@ -7045,7 +7021,7 @@ let
 
   inherit (gnome3) gsettings_desktop_schemas;
 
-  hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { };
+  hicolor_icon_theme = callPackage ../data/icons/hicolor-icon-theme { };
 
   inconsolata = callPackage ../data/fonts/inconsolata {};
 
@@ -7091,6 +7067,8 @@ let
 
   r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { };
 
+  tango-icon-theme = callPackage ../data/icons/tango-icon-theme { };
+
   themes = name: import (../data/misc/themes + ("/" + name + ".nix")) {
     inherit fetchurl;
   };
@@ -7491,7 +7469,7 @@ let
 
     maudeMode = callPackage ../applications/editors/emacs-modes/maude { };
 
-    notmuch = callPackage ../applications/networking/mailreaders/notmuch { };
+    notmuch = lowPrio (callPackage ../applications/networking/mailreaders/notmuch { });
 
     # This is usually a newer version of Org-Mode than that found in GNU Emacs, so
     # we want it to have higher precedence.
@@ -8054,7 +8032,7 @@ let
   midori = builderDefsPackage (import ../applications/networking/browsers/midori) {
     inherit imagemagick intltool python pkgconfig webkit libxml2
       which gettext makeWrapper file libidn sqlite docutils libnotify
-      vala dbus_glib;
+      vala dbus_glib glib_networking;
     inherit gtk3 glib;
     inherit (gnome) gtksourceview;
     inherit (webkit.passthru.args) libsoup;
@@ -8447,12 +8425,12 @@ let
     libpng = libpng12;
   };
 
-  sndBase = builderDefsPackage (import ../applications/audio/snd) {
+  sndBase = lowPrio (builderDefsPackage (import ../applications/audio/snd) {
     inherit fetchurl stdenv stringsWithDeps lib fftw;
     inherit pkgconfig gmp gettext;
     inherit (xlibs) libXpm libX11;
     inherit gtk glib;
-  };
+  });
 
   snd = sndBase.passthru.function {
     inherit mesa libtool jackaudio alsaLib;
@@ -8665,8 +8643,8 @@ let
     # so that we can use gccApple if we're building on darwin
     inherit stdenvAdapters gccApple;
   };
-  vimLatest = vim_configurable.override { source = "latest"; };
-  vimNox = vim_configurable.override { source = "vim-nox"; };
+
+  vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; });
 
   virtviewer = callPackage ../applications/virtualization/virt-viewer {};
   virtmanager = callPackage ../applications/virtualization/virt-manager {
@@ -8707,6 +8685,8 @@ let
     };
   };
 
+  windowmaker = callPackage ../applications/window-managers/windowmaker { };
+
   winswitch = callPackage ../tools/X11/winswitch { };
 
   wings = callPackage ../applications/graphics/wings {
@@ -8789,6 +8769,8 @@ let
 
   xcalib = callPackage ../tools/X11/xcalib { };
 
+  xcape = callPackage ../tools/X11/xcape { };
+
   xchainkeys = callPackage ../tools/X11/xchainkeys { };
 
   xchat = callPackage ../applications/networking/irc/xchat { };
@@ -8840,6 +8822,8 @@ let
 
   xpra = callPackage ../tools/X11/xpra { };
 
+  xrestop = callPackage ../tools/X11/xrestop { };
+
   xscreensaver = callPackage ../misc/screensavers/xscreensaver {
     inherit (gnome) libglade;
   };
@@ -9082,6 +9066,8 @@ let
 
   stardust = callPackage ../games/stardust {};
 
+  steam = callPackage_i686 ../games/steam {};
+
   stuntrally = callPackage ../games/stuntrally { };
 
   superTux = callPackage ../games/super-tux { };
@@ -9203,6 +9189,8 @@ let
 
   gnome = recurseIntoAttrs gnome2;
 
+  hsetroot = callPackage ../tools/X11/hsetroot { };
+
   kde4 = recurseIntoAttrs pkgs.kde410;
 
   kde48 = kdePackagesFor (pkgs.kde48 // {
@@ -9365,7 +9353,8 @@ let
 
   spyder = callPackage ../applications/science/spyder {
     inherit (pythonPackages) pyflakes rope sphinx numpy scipy matplotlib; # recommended
-    inherit (pythonPackages) ipython pylint pep8; # optional
+    inherit (pythonPackages) ipython pep8; # optional
+    inherit pylint;
   };
 
   stellarium = callPackage ../applications/science/astronomy/stellarium { };
@@ -9948,4 +9937,6 @@ let
 
   httrack = callPackage ../tools/backup/httrack { };
 
+  mg = callPackage ../applications/editors/mg { };
+
 }; in pkgs
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1d3caeadf36e..18e32770c0a4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -637,9 +637,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   bytestringProgress = callPackage ../development/libraries/haskell/bytestring-progress {};
 
-  c2hs = callPackage ../development/libraries/haskell/c2hs {
-    languageC = self.languageC_0_3_2_1;
-  };
+  c2hs = callPackage ../development/libraries/haskell/c2hs {};
 
   Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; };
   Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; };
@@ -746,6 +744,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {};
 
+  cryptoCipherTests = callPackage ../development/libraries/haskell/crypto-cipher-tests {};
+
+  cryptoCipherTypes = callPackage ../development/libraries/haskell/crypto-cipher-types {};
+
   cryptoConduit = callPackage ../development/libraries/haskell/crypto-conduit {};
 
   cryptohash = callPackage ../development/libraries/haskell/cryptohash {};
@@ -1263,6 +1265,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   instantGenerics = callPackage ../development/libraries/haskell/instant-generics {};
 
+  intervals = callPackage ../development/libraries/haskell/intervals {};
+
   ioChoice = callPackage ../development/libraries/haskell/io-choice {};
 
   IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {};
@@ -1298,9 +1302,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   knob = callPackage ../development/libraries/haskell/knob {};
 
-  languageC_0_4_2   = callPackage ../development/libraries/haskell/language-c/0.4.2.nix {};
-  languageC_0_3_2_1 = callPackage ../development/libraries/haskell/language-c/0.3.2.1.nix {};
-  languageC = self.languageC_0_4_2;
+  languageC = callPackage ../development/libraries/haskell/language-c {};
 
   languageCQuote = callPackage ../development/libraries/haskell/language-c-quote {};
 
@@ -1380,7 +1382,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   misfortune = callPackage ../development/libraries/haskell/misfortune {};
 
-  MissingH = callPackage ../development/libraries/haskell/MissingH {};
+  MissingH = callPackage ../development/libraries/haskell/MissingH {
+    testpack = null;
+  };
 
   mmap = callPackage ../development/libraries/haskell/mmap {};
 
@@ -1397,8 +1401,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_3 = callPackage ../development/libraries/haskell/monad-par/0.3.4.3.nix {};
-  monadPar = self.monadPar_0_3_4_3;
+  monadPar_0_3_4_4 = callPackage ../development/libraries/haskell/monad-par/0.3.4.4.nix {};
+  monadPar = self.monadPar_0_3_4_4;
 
   monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {};
 
@@ -1491,6 +1495,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   nonNegative = callPackage ../development/libraries/haskell/non-negative {};
 
+  numericExtras = callPackage ../development/libraries/haskell/numeric-extras {};
+
   numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {};
 
   NumInstances = callPackage ../development/libraries/haskell/NumInstances {};
@@ -1739,6 +1745,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   scotty = callPackage ../development/libraries/haskell/scotty {};
 
+  securemem = callPackage ../development/libraries/haskell/securemem {};
+
   sendfile = callPackage ../development/libraries/haskell/sendfile {};
 
   semigroups = callPackage ../development/libraries/haskell/semigroups {};
@@ -1972,10 +1980,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   unboundedDelays = callPackage ../development/libraries/haskell/unbounded-delays {};
 
+  unionFind = callPackage ../development/libraries/haskell/union-find {};
+
   uniplate = callPackage ../development/libraries/haskell/uniplate {};
 
   uniqueid = callPackage ../development/libraries/haskell/uniqueid {};
 
+  unixBytestring = callPackage ../development/libraries/haskell/unix-bytestring {};
+
   unixCompat = callPackage ../development/libraries/haskell/unix-compat {};
 
   unixProcessConduit = callPackage ../development/libraries/haskell/unix-process-conduit {};
diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index f8238b52a659..8b2ff2295e01 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -47,24 +47,24 @@
   {
     name = "amdefine";
     spec = "*";
-    version = "0.0.5";
+    version = "0.0.8";
     topLevel = true;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "86b6e9470f8cde955ef7daa3cf5d544ba81aa3db";
-    tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.5.tgz";
+    sha1 = "34dc8c981e6acb3be1853bef8f0ec94a39d55ba0";
+    tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.8.tgz";
   }
   {
     name = "amdefine";
     spec = ">=0.0.4";
-    version = "0.0.5";
+    version = "0.0.8";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "86b6e9470f8cde955ef7daa3cf5d544ba81aa3db";
-    tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.5.tgz";
+    sha1 = "34dc8c981e6acb3be1853bef8f0ec94a39d55ba0";
+    tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.8.tgz";
   }
   {
     name = "ansi";
@@ -447,7 +447,7 @@
   {
     name = "browserchannel";
     spec = "*";
-    version = "1.0.4";
+    version = "1.0.5";
     topLevel = true;
     dependencies = [
       { name = "hat"; spec = "*"; }
@@ -455,8 +455,8 @@
       { name = "request"; spec = "~2"; }
     ];
     patchLatest = false;
-    sha1 = "077c1d59d7872d84932172d373c5f8f45698e975";
-    tarball = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.4.tgz";
+    sha1 = "e36bc8536cf5a16873087867622cb5028ba33957";
+    tarball = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.5.tgz";
   }
   {
     name = "bson";
@@ -471,14 +471,14 @@
   }
   {
     name = "bson";
-    spec = "0.1.9";
-    version = "0.1.9";
+    spec = "0.2.2";
+    version = "0.2.2";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "7528f81ed770e6d630ca8c2ccdf5394a4096db14";
-    tarball = "http://registry.npmjs.org/bson/-/bson-0.1.9.tgz";
+    sha1 = "3dbf984acb9d33a6878b46e6fb7afbd611856a60";
+    tarball = "http://registry.npmjs.org/bson/-/bson-0.2.2.tgz";
   }
   {
     name = "buffer-crc32";
@@ -653,14 +653,14 @@
   {
     name = "cli";
     spec = "0.4.x";
-    version = "0.4.4";
+    version = "0.4.5";
     topLevel = false;
     dependencies = [
       { name = "glob"; spec = ">= 3.1.4"; }
     ];
     patchLatest = false;
-    sha1 = "13ceb30872e7c9addc383e5519fb2949ab61ba43";
-    tarball = "http://registry.npmjs.org/cli/-/cli-0.4.4.tgz";
+    sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61";
+    tarball = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz";
   }
   {
     name = "cliff";
@@ -758,24 +758,24 @@
   {
     name = "colors";
     spec = "0.6.x";
-    version = "0.6.0";
+    version = "0.6.1";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "07ec10d8ac4f5a2e78f8d820e3e7832b3b463cad";
-    tarball = "http://registry.npmjs.org/colors/-/colors-0.6.0.tgz";
+    sha1 = "59c7799f6c91e0e15802980a98ed138b3c78f4e9";
+    tarball = "http://registry.npmjs.org/colors/-/colors-0.6.1.tgz";
   }
   {
     name = "colors";
     spec = "0.x.x";
-    version = "0.6.0";
+    version = "0.6.1";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "07ec10d8ac4f5a2e78f8d820e3e7832b3b463cad";
-    tarball = "http://registry.npmjs.org/colors/-/colors-0.6.0.tgz";
+    sha1 = "59c7799f6c91e0e15802980a98ed138b3c78f4e9";
+    tarball = "http://registry.npmjs.org/colors/-/colors-0.6.1.tgz";
   }
   {
     name = "combined-stream";
@@ -823,6 +823,18 @@
     sha1 = "fd5713bfa153c7d6cc599378a5ab4c45c535029e";
     tarball = "http://registry.npmjs.org/commander/-/commander-1.2.0.tgz";
   }
+  {
+    name = "commander";
+    spec = "1.3.2";
+    version = "1.3.2";
+    topLevel = false;
+    dependencies = [
+      { name = "keypress"; spec = "0.1.x"; }
+    ];
+    patchLatest = false;
+    sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5";
+    tarball = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz";
+  }
   {
     name = "commander";
     spec = "~0.6.1";
@@ -905,8 +917,8 @@
   }
   {
     name = "connect";
-    spec = "2.8.4";
-    version = "2.8.4";
+    spec = "2.8.5";
+    version = "2.8.5";
     topLevel = false;
     dependencies = [
       { name = "qs"; spec = "0.6.5"; }
@@ -914,22 +926,22 @@
       { 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 = "send"; spec = "0.1.4"; }
       { name = "bytes"; spec = "0.2.0"; }
-      { name = "fresh"; spec = "0.1.0"; }
+      { name = "fresh"; spec = "0.2.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";
+    sha1 = "20572077ba1f626fdb740b0ad7068f9130d701b8";
+    tarball = "http://registry.npmjs.org/connect/-/connect-2.8.5.tgz";
   }
   {
     name = "connect";
     spec = "~2";
-    version = "2.8.4";
+    version = "2.8.5";
     topLevel = false;
     dependencies = [
       { name = "qs"; spec = "0.6.5"; }
@@ -937,17 +949,17 @@
       { 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 = "send"; spec = "0.1.4"; }
       { name = "bytes"; spec = "0.2.0"; }
-      { name = "fresh"; spec = "0.1.0"; }
+      { name = "fresh"; spec = "0.2.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";
+    sha1 = "20572077ba1f626fdb740b0ad7068f9130d701b8";
+    tarball = "http://registry.npmjs.org/connect/-/connect-2.8.5.tgz";
   }
   {
     name = "connect-flash";
@@ -1097,14 +1109,26 @@
   {
     name = "couch-login";
     spec = "~0.1.15";
-    version = "0.1.17";
+    version = "0.1.18";
     topLevel = false;
     dependencies = [
-      { name = "request"; spec = "2 >=2.14"; }
+      { name = "request"; spec = "2 >=2.25.0"; }
     ];
     patchLatest = false;
-    sha1 = "ab3ac31dd56e1061ea5f7faa838c7bda32a2b2ed";
-    tarball = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.17.tgz";
+    sha1 = "a69fa40dd43d1f98d97e560f18187a578a116056";
+    tarball = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.18.tgz";
+  }
+  {
+    name = "couch-login";
+    spec = "~0.1.18";
+    version = "0.1.18";
+    topLevel = false;
+    dependencies = [
+      { name = "request"; spec = "2 >=2.25.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "a69fa40dd43d1f98d97e560f18187a578a116056";
+    tarball = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.18.tgz";
   }
   {
     name = "cryptiles";
@@ -1220,6 +1244,17 @@
     sha1 = "056692c86670977f115de82917918b8e8b9a10f0";
     tarball = "http://registry.npmjs.org/debug/-/debug-0.7.2.tgz";
   }
+  {
+    name = "debug";
+    spec = "0.7.0";
+    version = "0.7.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "f5be05ec0434c992d79940e50b2695cfb2e01b08";
+    tarball = "http://registry.npmjs.org/debug/-/debug-0.7.0.tgz";
+  }
   {
     name = "debug";
     spec = "~0.7.0";
@@ -1470,24 +1505,24 @@
   {
     name = "express";
     spec = "*";
-    version = "3.3.4";
+    version = "3.3.5";
     topLevel = true;
     dependencies = [
-      { name = "connect"; spec = "2.8.4"; }
+      { name = "connect"; spec = "2.8.5"; }
       { 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 = "fresh"; spec = "0.2.0"; }
       { name = "methods"; spec = "0.0.1"; }
-      { name = "send"; spec = "0.1.3"; }
+      { name = "send"; spec = "0.1.4"; }
       { 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";
+    sha1 = "3fd077660c9ccae4710fcfb326290a01d1e72566";
+    tarball = "http://registry.npmjs.org/express/-/express-3.3.5.tgz";
   }
   {
     name = "express";
@@ -1533,6 +1568,20 @@
     sha1 = "52a02c8db8f22bbfa0d7478d847cd45161f985f7";
     tarball = "http://registry.npmjs.org/express/-/express-3.1.2.tgz";
   }
+  {
+    name = "express-form";
+    spec = "*";
+    version = "0.8.1";
+    topLevel = true;
+    dependencies = [
+      { name = "validator"; spec = "0.4.x"; }
+      { name = "object-additions"; spec = ">= 0.5.0"; }
+      { name = "express"; spec = "*"; }
+    ];
+    patchLatest = false;
+    sha1 = "14299158646a796fac584cb5980d63e587c02019";
+    tarball = "http://registry.npmjs.org/express-form/-/express-form-0.8.1.tgz";
+  }
   {
     name = "express-partials";
     spec = "0.0.6";
@@ -1711,6 +1760,23 @@
     sha1 = "0c1647a74f3af12d76a07a99490ade7c7249c8f0";
     tarball = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.0.tgz";
   }
+  {
+    name = "forever-monitor";
+    spec = "*";
+    version = "1.2.2";
+    topLevel = true;
+    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 = "forever-monitor";
     spec = "1.2.2";
@@ -1728,20 +1794,6 @@
     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";
@@ -1825,6 +1877,29 @@
     sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850";
     tarball = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
   }
+  {
+    name = "fresh";
+    spec = "0.2.0";
+    version = "0.2.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "bfd9402cf3df12c4a4c310c79f99a3dde13d34a7";
+    tarball = "http://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz";
+  }
+  {
+    name = "fs-walk";
+    spec = "*";
+    version = "0.0.1";
+    topLevel = true;
+    dependencies = [
+      { name = "async"; spec = "*"; }
+    ];
+    patchLatest = false;
+    sha1 = "f7fc91c3ae1eead07c998bc5d0dd41f2dbebd335";
+    tarball = "http://registry.npmjs.org/fs-walk/-/fs-walk-0.0.1.tgz";
+  }
   {
     name = "fstream";
     spec = "0";
@@ -1978,7 +2053,7 @@
   }
   {
     name = "glob";
-    spec = "~3.2.3";
+    spec = "~3.2.6";
     version = "3.2.6";
     topLevel = false;
     dependencies = [
@@ -2120,21 +2195,6 @@
     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 = "hawk";
     spec = "~1.0.0";
@@ -2173,17 +2233,6 @@
     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";
@@ -2272,20 +2321,6 @@
     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";
@@ -2421,8 +2456,8 @@
   }
   {
     name = "init-package-json";
-    spec = "0.0.10";
-    version = "0.0.10";
+    spec = "0.0.11";
+    version = "0.0.11";
     topLevel = false;
     dependencies = [
       { name = "promzard"; spec = "~0.2.0"; }
@@ -2431,20 +2466,34 @@
       { name = "semver"; spec = "2.x"; }
     ];
     patchLatest = false;
-    sha1 = "7baf10535227e0878105a04e44b78f132475da6a";
-    tarball = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.10.tgz";
+    sha1 = "71914631d091bb1f73a4bddbe6d7985e929859ce";
+    tarball = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.11.tgz";
   }
   {
     name = "ironhorse";
     spec = "*";
-    version = "0.0.2";
+    version = "0.0.6";
     topLevel = true;
     dependencies = [
       { name = "winston"; spec = "*"; }
+      { name = "nconf"; spec = "*"; }
+      { name = "fs-walk"; spec = "*"; }
+      { name = "async"; spec = "*"; }
+      { name = "express"; spec = "*"; }
+      { name = "jade"; spec = "*"; }
+      { name = "passport"; spec = "*"; }
+      { name = "passport-http"; spec = "*"; }
+      { name = "libyaml"; spec = "*"; }
+      { name = "mongoose"; spec = "*"; }
+      { name = "gridfs-stream"; spec = "*"; }
+      { name = "temp"; spec = "*"; }
+      { name = "kue"; spec = "*"; }
+      { name = "redis"; spec = "*"; }
+      { name = "hiredis"; spec = "*"; }
     ];
     patchLatest = false;
-    sha1 = "9a8e27407ecfba7cd4d1d5886c7d97e65d44da9c";
-    tarball = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.2.tgz";
+    sha1 = "de774f72022630a258158acdcb590e1542a09b58";
+    tarball = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.6.tgz";
   }
   {
     name = "is-promise";
@@ -2460,20 +2509,20 @@
   {
     name = "jade";
     spec = "*";
-    version = "0.33.0";
+    version = "0.34.1";
     topLevel = true;
     dependencies = [
-      { name = "commander"; spec = "1.2.0"; }
+      { name = "commander"; spec = "1.3.2"; }
       { name = "mkdirp"; spec = "0.3.x"; }
-      { name = "transformers"; spec = "2.0.1"; }
+      { name = "transformers"; spec = "2.1.0"; }
       { name = "character-parser"; spec = "1.0.2"; }
-      { name = "monocle"; spec = "0.1.48"; }
+      { name = "monocle"; spec = "0.1.50"; }
       { 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";
+    sha1 = "6cb1f0928adfe9be7323d0b57e507e5c3c70f650";
+    tarball = "http://registry.npmjs.org/jade/-/jade-0.34.1.tgz";
   }
   {
     name = "jade";
@@ -2491,20 +2540,20 @@
   {
     name = "jade";
     spec = ">= 0.0.1";
-    version = "0.33.0";
+    version = "0.34.1";
     topLevel = false;
     dependencies = [
-      { name = "commander"; spec = "1.2.0"; }
+      { name = "commander"; spec = "1.3.2"; }
       { name = "mkdirp"; spec = "0.3.x"; }
-      { name = "transformers"; spec = "2.0.1"; }
+      { name = "transformers"; spec = "2.1.0"; }
       { name = "character-parser"; spec = "1.0.2"; }
-      { name = "monocle"; spec = "0.1.48"; }
+      { name = "monocle"; spec = "0.1.50"; }
       { 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";
+    sha1 = "6cb1f0928adfe9be7323d0b57e507e5c3c70f650";
+    tarball = "http://registry.npmjs.org/jade/-/jade-0.34.1.tgz";
   }
   {
     name = "jayschema";
@@ -2545,7 +2594,7 @@
   {
     name = "jshint";
     spec = "*";
-    version = "2.1.4";
+    version = "2.1.9";
     topLevel = true;
     dependencies = [
       { name = "shelljs"; spec = "0.1.x"; }
@@ -2555,8 +2604,8 @@
       { name = "console-browserify"; spec = "0.1.x"; }
     ];
     patchLatest = false;
-    sha1 = "8d5be86628eea91c073c8700dd6e4c90afd9ab38";
-    tarball = "http://registry.npmjs.org/jshint/-/jshint-2.1.4.tgz";
+    sha1 = "65cdbb2302cbf27e45db0066669b5d5e74f66465";
+    tarball = "http://registry.npmjs.org/jshint/-/jshint-2.1.9.tgz";
   }
   {
     name = "json-schema";
@@ -2580,17 +2629,6 @@
     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 = "json-stringify-safe";
     spec = "~5.0.0";
@@ -2599,7 +2637,7 @@
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "156515f55e62ed4cd912ec13bfc79d5013dfd1e7";
+    sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e";
     tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
   }
   {
@@ -2663,7 +2701,7 @@
   {
     name = "knox";
     spec = "*";
-    version = "0.8.4";
+    version = "0.8.6";
     topLevel = true;
     dependencies = [
       { name = "mime"; spec = "*"; }
@@ -2672,8 +2710,8 @@
       { name = "stream-counter"; spec = "~0.1.0"; }
     ];
     patchLatest = false;
-    sha1 = "4e1e98e9942120c3e7fd36286ee4a249b00ac370";
-    tarball = "http://registry.npmjs.org/knox/-/knox-0.8.4.tgz";
+    sha1 = "244e7c643c4c9ea2eb37e215dd02b07c8e138e3a";
+    tarball = "http://registry.npmjs.org/knox/-/knox-0.8.6.tgz";
   }
   {
     name = "kue";
@@ -2807,13 +2845,13 @@
   {
     name = "mime";
     spec = "*";
-    version = "1.2.9";
+    version = "1.2.10";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09";
-    tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz";
+    sha1 = "066380acbc3d78d4f4a51004d8988425dc68b9b1";
+    tarball = "http://registry.npmjs.org/mime/-/mime-1.2.10.tgz";
   }
   {
     name = "mime";
@@ -2851,35 +2889,35 @@
   {
     name = "mime";
     spec = "~1.2.2";
-    version = "1.2.9";
+    version = "1.2.10";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09";
-    tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz";
+    sha1 = "066380acbc3d78d4f4a51004d8988425dc68b9b1";
+    tarball = "http://registry.npmjs.org/mime/-/mime-1.2.10.tgz";
   }
   {
     name = "mime";
     spec = "~1.2.7";
-    version = "1.2.9";
+    version = "1.2.10";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09";
-    tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz";
+    sha1 = "066380acbc3d78d4f4a51004d8988425dc68b9b1";
+    tarball = "http://registry.npmjs.org/mime/-/mime-1.2.10.tgz";
   }
   {
     name = "mime";
     spec = "~1.2.9";
-    version = "1.2.9";
+    version = "1.2.10";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09";
-    tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz";
+    sha1 = "066380acbc3d78d4f4a51004d8988425dc68b9b1";
+    tarball = "http://registry.npmjs.org/mime/-/mime-1.2.10.tgz";
   }
   {
     name = "mimelib";
@@ -3161,35 +3199,36 @@
   }
   {
     name = "mongodb";
-    spec = "1.3.11";
-    version = "1.3.11";
+    spec = "1.3.15";
+    version = "1.3.15";
     topLevel = false;
     dependencies = [
-      { name = "bson"; spec = "0.1.9"; }
+      { name = "bson"; spec = "0.2.2"; }
       { name = "kerberos"; spec = "0.0.3"; }
     ];
     patchLatest = false;
-    sha1 = "dba6f669dd30612b3d07fc13e2181b9d2b105da2";
-    tarball = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.11.tgz";
+    sha1 = "d612597344b6a1b6d07375698fd7ee06cbaea009";
+    tarball = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.15.tgz";
   }
   {
     name = "mongoose";
     spec = "*";
-    version = "3.6.15";
+    version = "3.7.0";
     topLevel = true;
     dependencies = [
       { name = "hooks"; spec = "0.2.1"; }
-      { name = "mongodb"; spec = "1.3.11"; }
+      { name = "mongodb"; spec = "1.3.15"; }
       { name = "ms"; spec = "0.1.0"; }
-      { name = "sliced"; spec = "0.0.3"; }
+      { name = "sliced"; spec = "0.0.5"; }
       { name = "muri"; spec = "0.3.1"; }
-      { name = "mpromise"; spec = "0.2.1"; }
+      { name = "mpromise"; spec = "0.3.0"; }
       { name = "mpath"; spec = "0.1.1"; }
       { name = "regexp-clone"; spec = "0.0.1"; }
+      { name = "mquery"; spec = "0.2.4"; }
     ];
     patchLatest = false;
-    sha1 = "272f1575da3b48ec31467abdf15baa61854ba5f1";
-    tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.15.tgz";
+    sha1 = "ffad3ac81293bffe5b02f886592685675c7a0d99";
+    tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.7.0.tgz";
   }
   {
     name = "mongoose";
@@ -3234,15 +3273,15 @@
   }
   {
     name = "monocle";
-    spec = "0.1.48";
-    version = "0.1.48";
+    spec = "0.1.50";
+    version = "0.1.50";
     topLevel = false;
     dependencies = [
       { name = "readdirp"; spec = "~0.2.3"; }
     ];
     patchLatest = false;
-    sha1 = "b96730f5ca900fa75a56041eb6db10aad980a383";
-    tarball = "http://registry.npmjs.org/monocle/-/monocle-0.1.48.tgz";
+    sha1 = "9a7cbd0ccc10de95fd78a04b9beb2482ae4940b7";
+    tarball = "http://registry.npmjs.org/monocle/-/monocle-0.1.50.tgz";
   }
   {
     name = "mpath";
@@ -3267,6 +3306,32 @@
     sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8";
     tarball = "http://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz";
   }
+  {
+    name = "mpromise";
+    spec = "0.3.0";
+    version = "0.3.0";
+    topLevel = false;
+    dependencies = [
+      { name = "sliced"; spec = "0.0.5"; }
+    ];
+    patchLatest = false;
+    sha1 = "cb864c2f642eb2192765087e3692e1dc152afe4b";
+    tarball = "http://registry.npmjs.org/mpromise/-/mpromise-0.3.0.tgz";
+  }
+  {
+    name = "mquery";
+    spec = "0.2.4";
+    version = "0.2.4";
+    topLevel = false;
+    dependencies = [
+      { name = "sliced"; spec = "0.0.5"; }
+      { name = "debug"; spec = "0.7.0"; }
+      { name = "regexp-clone"; spec = "0.0.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "5d6e7f7f5129aa334e7e754d3f6a93cf304b7778";
+    tarball = "http://registry.npmjs.org/mquery/-/mquery-0.2.4.tgz";
+  }
   {
     name = "ms";
     spec = "0.1.0";
@@ -3292,14 +3357,14 @@
   {
     name = "msgpack";
     spec = ">= 0.0.1";
-    version = "0.1.10";
+    version = "0.1.11";
     topLevel = false;
     dependencies = [
       { name = "nodeunit"; spec = "https://github.com/godsflaw/nodeunit/tarball/master"; }
     ];
     patchLatest = false;
-    sha1 = "ebb2edea5ebc3616a2ce003d8d8ef73b52bf7318";
-    tarball = "http://registry.npmjs.org/msgpack/-/msgpack-0.1.10.tgz";
+    sha1 = "203f7cfd1d1917fae196bbe01a701599f338cf0b";
+    tarball = "http://registry.npmjs.org/msgpack/-/msgpack-0.1.11.tgz";
   }
   {
     name = "muri";
@@ -3449,7 +3514,7 @@
   {
     name = "node-gyp";
     spec = "*";
-    version = "0.10.6";
+    version = "0.10.9";
     topLevel = true;
     dependencies = [
       { name = "glob"; spec = "3"; }
@@ -3462,18 +3527,18 @@
       { name = "osenv"; spec = "0"; }
       { name = "request"; spec = "2"; }
       { name = "rimraf"; spec = "2"; }
-      { name = "semver"; spec = "~2.0.7"; }
+      { name = "semver"; spec = "~2.1"; }
       { 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";
+    sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f";
+    tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz";
   }
   {
     name = "node-gyp";
-    spec = "~0.10.6";
-    version = "0.10.6";
+    spec = "~0.10.9";
+    version = "0.10.9";
     topLevel = false;
     dependencies = [
       { name = "glob"; spec = "3"; }
@@ -3486,13 +3551,13 @@
       { name = "osenv"; spec = "0"; }
       { name = "request"; spec = "2"; }
       { name = "rimraf"; spec = "2"; }
-      { name = "semver"; spec = "~2.0.7"; }
+      { name = "semver"; spec = "~2.1"; }
       { 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";
+    sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f";
+    tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz";
   }
   {
     name = "node-uptime";
@@ -3591,13 +3656,13 @@
   {
     name = "nodemon";
     spec = "*";
-    version = "0.7.8";
+    version = "0.7.10";
     topLevel = true;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "c0667a000f208dbf6a4dad08a5186595a9889590";
-    tarball = "http://registry.npmjs.org/nodemon/-/nodemon-0.7.8.tgz";
+    sha1 = "695a01b9458b115b03bbe01696d361bd50b4fb9b";
+    tarball = "http://registry.npmjs.org/nodemon/-/nodemon-0.7.10.tgz";
   }
   {
     name = "nodeunit";
@@ -3675,10 +3740,10 @@
   {
     name = "npm";
     spec = "*";
-    version = "1.3.5";
+    version = "1.3.7";
     topLevel = true;
     dependencies = [
-      { name = "semver"; spec = "~2.0.8"; }
+      { name = "semver"; spec = "~2.1.0"; }
       { name = "ini"; spec = "~1.1.0"; }
       { name = "slide"; spec = "~1.1.4"; }
       { name = "abbrev"; spec = "~1.0.4"; }
@@ -3686,7 +3751,7 @@
       { name = "minimatch"; spec = "~0.2.12"; }
       { name = "nopt"; spec = "~2.1.2"; }
       { name = "rimraf"; spec = "~2.2.0"; }
-      { name = "request"; spec = "~2.21.0"; }
+      { name = "request"; spec = "~2.25.0"; }
       { name = "which"; spec = "1"; }
       { name = "tar"; spec = "~0.1.18"; }
       { name = "fstream"; spec = "~0.1.23"; }
@@ -3694,18 +3759,18 @@
       { 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 = "node-gyp"; spec = "~0.10.9"; }
       { 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 = "npm-registry-client"; spec = "~0.2.28"; }
       { 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 = "glob"; spec = "~3.2.6"; }
+      { name = "init-package-json"; spec = "0.0.11"; }
       { name = "osenv"; spec = "0"; }
       { name = "lockfile"; spec = "~0.4.0"; }
       { name = "retry"; spec = "~0.6.0"; }
@@ -3720,8 +3785,8 @@
       { name = "npm-user-validate"; spec = "0.0.3"; }
     ];
     patchLatest = false;
-    sha1 = "05d6c4d01d2bc3f1adf15948adf2f7110553f471";
-    tarball = "http://registry.npmjs.org/npm/-/npm-1.3.5.tgz";
+    sha1 = "689bb2093521369ce80ec229fcbbefc32c4bc668";
+    tarball = "http://registry.npmjs.org/npm/-/npm-1.3.7.tgz";
   }
   {
     name = "npm-registry-client";
@@ -3746,24 +3811,24 @@
   }
   {
     name = "npm-registry-client";
-    spec = "~0.2.27";
-    version = "0.2.27";
+    spec = "~0.2.28";
+    version = "0.2.28";
     topLevel = false;
     dependencies = [
-      { name = "request"; spec = "2 >=2.20.0"; }
+      { name = "request"; spec = "2 >=2.25.0"; }
       { name = "graceful-fs"; spec = "~2.0.0"; }
-      { name = "semver"; spec = "~2.0.5"; }
+      { name = "semver"; spec = "~2.1.0"; }
       { 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 = "couch-login"; spec = "~0.1.18"; }
       { name = "npmlog"; spec = ""; }
     ];
     patchLatest = false;
-    sha1 = "8f338189d32769267886a07ad7b7fd2267446adf";
-    tarball = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz";
+    sha1 = "959141fc0180d7b1ad089e87015a8a2142a8bffc";
+    tarball = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.28.tgz";
   }
   {
     name = "npm-user-validate";
@@ -3901,6 +3966,17 @@
     sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
     tarball = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
   }
+  {
+    name = "object-additions";
+    spec = ">= 0.5.0";
+    version = "0.5.1";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "ac624e0995e696c94cc69b41f316462b16a3bda4";
+    tarball = "http://registry.npmjs.org/object-additions/-/object-additions-0.5.1.tgz";
+  }
   {
     name = "once";
     spec = "1.1.1";
@@ -4500,24 +4576,24 @@
   {
     name = "readable-stream";
     spec = "1.0";
-    version = "1.0.2";
+    version = "1.0.15";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "213ce36864fc1f0d4e98e03b9eb92c64042299d4";
-    tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.2.tgz";
+    sha1 = "a2c160237235951da985a1572d0a3af585e4be95";
+    tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.15.tgz";
   }
   {
     name = "readable-stream";
     spec = "~1.0.2";
-    version = "1.0.2";
+    version = "1.0.15";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "213ce36864fc1f0d4e98e03b9eb92c64042299d4";
-    tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.2.tgz";
+    sha1 = "a2c160237235951da985a1572d0a3af585e4be95";
+    tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.15.tgz";
   }
   {
     name = "readdirp";
@@ -4603,7 +4679,7 @@
   {
     name = "request";
     spec = "2";
-    version = "2.25.0";
+    version = "2.26.0";
     topLevel = false;
     dependencies = [
       { name = "qs"; spec = "~0.6.0"; }
@@ -4620,36 +4696,13 @@
       { name = "form-data"; spec = "~0.1.0"; }
     ];
     patchLatest = false;
-    sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
-    tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
-  }
-  {
-    name = "request";
-    spec = "2 >=2.14";
-    version = "2.25.0";
-    topLevel = false;
-    dependencies = [
-      { name = "qs"; spec = "~0.6.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 = "~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.1.0"; }
-    ];
-    patchLatest = false;
-    sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
-    tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
+    sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212";
+    tarball = "http://registry.npmjs.org/request/-/request-2.26.0.tgz";
   }
   {
     name = "request";
     spec = "2 >=2.20.0";
-    version = "2.25.0";
+    version = "2.26.0";
     topLevel = false;
     dependencies = [
       { name = "qs"; spec = "~0.6.0"; }
@@ -4666,8 +4719,31 @@
       { name = "form-data"; spec = "~0.1.0"; }
     ];
     patchLatest = false;
-    sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
-    tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
+    sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212";
+    tarball = "http://registry.npmjs.org/request/-/request-2.26.0.tgz";
+  }
+  {
+    name = "request";
+    spec = "2 >=2.25.0";
+    version = "2.26.0";
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; spec = "~0.6.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 = "~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.1.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212";
+    tarball = "http://registry.npmjs.org/request/-/request-2.26.0.tgz";
   }
   {
     name = "request";
@@ -4705,6 +4781,29 @@
   {
     name = "request";
     spec = "~2";
+    version = "2.26.0";
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; spec = "~0.6.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 = "~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.1.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212";
+    tarball = "http://registry.npmjs.org/request/-/request-2.26.0.tgz";
+  }
+  {
+    name = "request";
+    spec = "~2.25.0";
     version = "2.25.0";
     topLevel = false;
     dependencies = [
@@ -4725,29 +4824,6 @@
     sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
     tarball = "http://registry.npmjs.org/request/-/request-2.25.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";
@@ -4931,13 +5007,13 @@
   {
     name = "semver";
     spec = "*";
-    version = "2.0.11";
+    version = "2.1.0";
     topLevel = true;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
-    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
+    sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
   }
   {
     name = "semver";
@@ -4964,35 +5040,35 @@
   {
     name = "semver";
     spec = "2";
-    version = "2.0.11";
+    version = "2.1.0";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
-    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
+    sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
   }
   {
     name = "semver";
     spec = "2.x";
-    version = "2.0.11";
+    version = "2.1.0";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
-    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
+    sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
   }
   {
     name = "semver";
     spec = ">=2.0.10 <3.0.0";
-    version = "2.0.11";
+    version = "2.1.0";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
-    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
+    sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
   }
   {
     name = "semver";
@@ -5007,40 +5083,40 @@
   }
   {
     name = "semver";
-    spec = "~2.0.7";
-    version = "2.0.11";
+    spec = "~2.1";
+    version = "2.1.0";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
-    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
+    sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
   }
   {
     name = "semver";
-    spec = "~2.0.8";
-    version = "2.0.11";
+    spec = "~2.1.0";
+    version = "2.1.0";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
-    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
+    sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
   }
   {
     name = "send";
     spec = "*";
-    version = "0.1.3";
+    version = "0.1.4";
     topLevel = false;
     dependencies = [
       { name = "debug"; spec = "*"; }
       { name = "mime"; spec = "~1.2.9"; }
-      { name = "fresh"; spec = "0.1.0"; }
+      { name = "fresh"; spec = "0.2.0"; }
       { name = "range-parser"; spec = "0.0.4"; }
     ];
     patchLatest = false;
-    sha1 = "a7875daa6802d31e2ce32fdad98d3664c51ecea3";
-    tarball = "http://registry.npmjs.org/send/-/send-0.1.3.tgz";
+    sha1 = "be70d8d1be01de61821af13780b50345a4f71abd";
+    tarball = "http://registry.npmjs.org/send/-/send-0.1.4.tgz";
   }
   {
     name = "send";
@@ -5059,18 +5135,18 @@
   }
   {
     name = "send";
-    spec = "0.1.3";
-    version = "0.1.3";
+    spec = "0.1.4";
+    version = "0.1.4";
     topLevel = false;
     dependencies = [
       { name = "debug"; spec = "*"; }
       { name = "mime"; spec = "~1.2.9"; }
-      { name = "fresh"; spec = "0.1.0"; }
+      { name = "fresh"; spec = "0.2.0"; }
       { name = "range-parser"; spec = "0.0.4"; }
     ];
     patchLatest = false;
-    sha1 = "a7875daa6802d31e2ce32fdad98d3664c51ecea3";
-    tarball = "http://registry.npmjs.org/send/-/send-0.1.3.tgz";
+    sha1 = "be70d8d1be01de61821af13780b50345a4f71abd";
+    tarball = "http://registry.npmjs.org/send/-/send-0.1.4.tgz";
   }
   {
     name = "sequence";
@@ -5132,15 +5208,15 @@
   {
     name = "simplesmtp";
     spec = ">= 0.1.22";
-    version = "0.3.4";
+    version = "0.3.6";
     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";
+    sha1 = "a6921eb3d38f31f2abd442d0d612ec2d8a1ed08d";
+    tarball = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.6.tgz";
   }
   {
     name = "sliced";
@@ -5164,6 +5240,17 @@
     sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee";
     tarball = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz";
   }
+  {
+    name = "sliced";
+    spec = "0.0.5";
+    version = "0.0.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "5edc044ca4eb6f7816d50ba2fc63e25d8fe4707f";
+    tarball = "http://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz";
+  }
   {
     name = "slide";
     spec = "*";
@@ -5384,16 +5471,17 @@
   {
     name = "stylus";
     spec = "*";
-    version = "0.34.1";
+    version = "0.36.1";
     topLevel = true;
     dependencies = [
       { name = "cssom"; spec = "0.2.x"; }
       { name = "mkdirp"; spec = "0.3.x"; }
       { name = "debug"; spec = "*"; }
+      { name = "sax"; spec = "0.5.x"; }
     ];
     patchLatest = false;
-    sha1 = "937d8502a3be4e617d5ad493f204c70a93d95b14";
-    tarball = "http://registry.npmjs.org/stylus/-/stylus-0.34.1.tgz";
+    sha1 = "64e493933eb5f7347e941b37046f5ba533d3d262";
+    tarball = "http://registry.npmjs.org/stylus/-/stylus-0.36.1.tgz";
   }
   {
     name = "stylus";
@@ -5577,13 +5665,13 @@
   {
     name = "timezone";
     spec = "*";
-    version = "0.0.22";
+    version = "0.0.23";
     topLevel = true;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "933c3d1950224957a349183e124147dd99e182f5";
-    tarball = "http://registry.npmjs.org/timezone/-/timezone-0.0.22.tgz";
+    sha1 = "5e89359e0c01c92b495c725e81ecce6ddbdb9bac";
+    tarball = "http://registry.npmjs.org/timezone/-/timezone-0.0.23.tgz";
   }
   {
     name = "tinycolor";
@@ -5598,8 +5686,8 @@
   }
   {
     name = "transformers";
-    spec = "2.0.1";
-    version = "2.0.1";
+    spec = "2.1.0";
+    version = "2.1.0";
     topLevel = false;
     dependencies = [
       { name = "promise"; spec = "~2.0"; }
@@ -5607,8 +5695,8 @@
       { name = "uglify-js"; spec = "~2.2.5"; }
     ];
     patchLatest = false;
-    sha1 = "352131dfceb93a7532dc7535a4f142510435a394";
-    tarball = "http://registry.npmjs.org/transformers/-/transformers-2.0.1.tgz";
+    sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
+    tarball = "http://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz";
   }
   {
     name = "traverse";
@@ -5868,6 +5956,17 @@
     sha1 = "91a2423ca2eb3322390e211ee3d71cf4fa193aea";
     tarball = "http://registry.npmjs.org/utile/-/utile-0.2.0.tgz";
   }
+  {
+    name = "validator";
+    spec = "0.4.x";
+    version = "0.4.28";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "311d439ae6cf3fbe6f85da6ebaccd0c7007986f4";
+    tarball = "http://registry.npmjs.org/validator/-/validator-0.4.28.tgz";
+  }
   {
     name = "vasync";
     spec = "1.3.3";
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 3379321bb5f4..2d85d28706b8 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -6,6 +6,7 @@
 , "underscore"
 , "extend"
 , "express"
+, "express-form"
 , "s3http"
 , "aws-sdk"
 , "nijs"
@@ -52,6 +53,7 @@
 , "gzippo"
 , "walk"
 , "forever"
+, "forever-monitor"
 , "kue"
 , "supertest"
 , "should"
@@ -65,6 +67,7 @@
 , "tar"
 , "flatiron"
 , "ironhorse"
+, "fs-walk"
 , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
 , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
 ]
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c20f4efd9fc9..162a7b6eb379 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2947,6 +2947,7 @@ rec {
       url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.67.tar.gz;
       sha256 = "8831cd70e1eb3d4ab7d9a8c3692caa7b7220dc888cd1a8dc5640fb2a08379141";
     };
+    doCheck = false;
     meta = {
       description = "Extensions and convenience methods to manage background processes";
       license = "perl";
@@ -6040,11 +6041,16 @@ rec {
     };
   };
 
-  StatisticsDescriptive = buildPerlPackage rec {
-    name = "Statistics-Descriptive-3.0202";
+  StatisticsDescriptive = buildPerlPackage {
+    name = "Statistics-Descriptive-3.0605";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Statistics/${name}.tar.gz";
-      sha256 = "0y8l3dkhfc2gqwfigrg363ac7pxcyshdna66afpdvs8r1gd53a1i";
+      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0605.tar.gz;
+      sha256 = "8e7dae184444e27ee959e33b3ae161cc83115d11da189ed5003b004450e04b48";
+    };
+    meta = {
+      homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/;
+      description = "Module of basic descriptive statistical functions";
+      license = "perl";
     };
   };
 
@@ -7395,6 +7401,14 @@ rec {
     buildInputs = [ pkgs.icu ];
   };
 
+  UnixGetrusage = buildPerlPackage {
+    name = "Unix-Getrusage-0.03";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TA/TAFFY/Unix-Getrusage-0.03.tar.gz;
+      sha256 = "76cde1cee2453260b85abbddc27cdc9875f01d2457e176e03dcabf05fb444d12";
+    };
+  };
+
   URI = buildPerlPackage {
     name = "URI-1.60";
     src = fetchurl {
diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index ec047efecb02..d6408286581d 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -10,19 +10,6 @@ rec {
     # Currently ignored - it should be set according to 'system' once it is
     # not ignored. This is for stdenv-updates.
     kernelArch = "i386";
-    kernelExtraConfig =
-      ''
-        # Virtualisation (KVM, Xen...).
-        HYPERVISOR_GUEST? y #3.10 version of the paravirt options
-        PARAVIRT_GUEST? y #Doesn't exist in 3.10
-        KVM_CLOCK? y #Part of KVM_GUEST since linux 3.7
-        KVM_GUEST? y #Doesn't exist in 3.10
-        XEN? y #Doesn't exist in 3.10
-        KSM y
-
-        # We need 64 GB (PAE) support for Xen guest support.
-        HIGHMEM64G? y
-      '';
   };
 
   pc_simplekernel = pc // {
diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
new file mode 100644
index 000000000000..6a8f080ccac2
--- /dev/null
+++ b/pkgs/top-level/python-packages-generated.nix
@@ -0,0 +1,5516 @@
+{ pkgs, stdenv, fetchurl, python, self }:
+
+let
+in
+{
+
+} // pkgs.lib.optionalAttrs (python.majorVersion == "2.7") {
+
+
+  "plone.uuid-1.0.3" = self.buildPythonPackage {
+    name = "plone.uuid-1.0.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.uuid/plone.uuid-1.0.3.zip";
+        md5 = "183fe2911a7d6c9f6b3103855e98ad8a";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.browserpage-3.12.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        UUIDs for content items
+        '';
+      homepage = "http://plone.org";
+      license = "BSD";
+    };
+  };
+
+
+  "six-1.2.0" = self.buildPythonPackage {
+    name = "six-1.2.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/s/six/six-1.2.0.tar.gz";
+        md5 = "2a5d1afc79912832ac78fd38e3d75d7e";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Python 2 and 3 compatibility utilities
+        '';
+      homepage = "http://pypi.python.org/pypi/six/";
+      license = "UNKNOWN";
+    };
+  };
+
+
+  "Products.ZopeVersionControl-1.1.3" = self.buildPythonPackage {
+    name = "Products.ZopeVersionControl-1.1.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.ZopeVersionControl/Products.ZopeVersionControl-1.1.3.zip";
+        md5 = "238239102f3ac798ee4f4c53343a561f";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Version Control
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.ZopeVersionControl";
+      license = "ZPL";
+    };
+  };
+
+
+  "Products.Archetypes-1.9.1" = self.buildPythonPackage {
+    name = "Products.Archetypes-1.9.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.9.1.zip";
+        md5 = "c2343539f9f3e485f0bc98b46c12cd85";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.5" self."plone.folder-1.0.4" self."plone.uuid-1.0.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.Marshall-2.1.2" self."Products.MimetypesRegistry-2.0.4" self."Products.PlacelessTranslationService-2.0.3" self."Products.PortalTransforms-2.1.2" self."Products.statusmessages-4.0" self."Products.validation-2.0" self."Products.ZSQLMethods-2.13.4" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contenttype-3.5.5" self."zope.datetime-3.4.1" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.tal-3.5.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Archetypes is a developers framework for rapidly developing and deploying rich, full featured content types within the context of Zope/CMF and Plone.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.Archetypes";
+      license = "GPL";
+    };
+  };
+
+
+  "Products.Marshall-2.1.2" = self.buildPythonPackage {
+    name = "Products.Marshall-2.1.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.Marshall/Products.Marshall-2.1.2.zip";
+        md5 = "bde4d7f75195c1ded8371554b04d2541";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."transaction-1.1.1" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Configurable Marshallers for Archetypes
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.Marshall";
+      license = "GPL";
+    };
+  };
+
+
+  "plone.folder-1.0.4" = self.buildPythonPackage {
+    name = "plone.folder-1.0.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.folder/plone.folder-1.0.4.zip";
+        md5 = "1674ff18b7a9452d0c2063cf11c679b7";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        BTree-based folder implementation with order support
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.folder";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Products.CMFPlone-4.3.1" = self.buildPythonPackage {
+    name = "Products.CMFPlone-4.3.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.1.zip";
+        md5 = "2fee0c66e0d9bdf28b513bcd6d95a602";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.querywidget-1.0.8" self."archetypes.referencebrowserwidget-2.4.18" self."borg.localrole-3.0.2" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."five.customerize-1.1" self."five.localsitemanager-2.0.5" self."Pillow-1.7.8" self."plone.app.blob-1.5.8" self."plone.app.collection-1.0.10" self."plone.app.content-2.1.2" self."plone.app.contentlisting-1.0.4" self."plone.app.contentmenu-2.0.8" self."plone.app.contentrules-3.0.3" self."plone.app.controlpanel-2.3.6" self."plone.app.customerize-1.2.2" self."plone.app.discussion-2.2.6" self."plone.app.folder-1.0.5" self."plone.app.form-2.2.2" self."plone.app.i18n-2.0.2" self."plone.app.jquery-1.7.2" self."plone.app.jquerytools-1.5.5" self."plone.app.layout-2.3.5" self."plone.app.linkintegrity-1.5.2" self."plone.app.locales-4.3.1" self."plone.app.portlets-2.4.4" self."plone.app.redirector-1.2" self."plone.app.search-1.1.4" self."plone.app.upgrade-1.3.3" self."plone.app.users-1.2a2" self."plone.app.uuid-1.0" self."plone.app.viewletmanager-2.0.3" self."plone.app.vocabularies-2.1.10" self."plone.app.workflow-2.1.5" self."plone.batching-1.0" self."plone.browserlayer-2.1.2" self."plone.contentrules-2.0.3" self."plone.fieldsets-2.0.2" self."plone.i18n-2.0.8" self."plone.indexer-1.0.2" self."plone.intelligenttext-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlet.collection-2.1.5" self."plone.portlet.static-2.0.2" self."plone.portlets-2.2" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."plone.session-3.5.3" self."plone.theme-2.1" self."plonetheme.classic-1.3.2" self."plonetheme.sunburst-1.4.4" self."Products.Archetypes-1.9.1" self."Products.ATContentTypes-2.1.13" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.DCWorkflow-2.2.4" self."Products.ExtendedPathIndex-3.1" self."Products.ExternalEditor-1.1.0" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PasswordResetTool-2.0.14" self."Products.PlacelessTranslationService-2.0.3" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PluginRegistry-1.3" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.statusmessages-4.0" self."Products.TinyMCE-1.3.4" self.setuptools self."transaction-1.1.1" self."z3c.autoinclude-0.3.4" self."ZODB3-3.10.5" self."zope.app.locales-3.6.2" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.site-3.9.2" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        The Plone Content Management System (core)
+        '';
+      homepage = "http://plone.org/";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "zope.deferredimport-3.5.3" = self.buildPythonPackage {
+    name = "zope.deferredimport-3.5.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.deferredimport/zope.deferredimport-3.5.3.tar.gz";
+        md5 = "68fce3bf4f011d4a840902fd763884ee";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.proxy-3.6.1" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        zope.deferredimport allows you to perform imports names that will only be resolved when used in the code.
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.deferredimport";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "waitress-0.8.6" = self.buildPythonPackage {
+    name = "waitress-0.8.6";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/w/waitress/waitress-0.8.6.tar.gz";
+        md5 = "eb5a8968780cfbc6b75364683b09f5fe";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Waitress WSGI server
+        '';
+      homepage = "https://github.com/Pylons/waitress";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "coverage-3.6" = self.buildPythonPackage {
+    name = "coverage-3.6";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/c/coverage/coverage-3.6.tar.gz";
+        md5 = "67d4e393f4c6a5ffc18605409d2aa1ac";
+    };
+    doCheck = true;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Code coverage measurement for Python
+        '';
+      homepage = "http://nedbatchelder.com/code/coverage";
+      license = "BSD";
+    };
+  };
+
+
+  "plone.app.workflow-2.1.5" = self.buildPythonPackage {
+    name = "plone.app.workflow-2.1.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.5.zip";
+        md5 = "b3589b4def82201adc196b3075b54213";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        workflow and security settings for Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.workflow";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Products.CMFUid-2.2.1" = self.buildPythonPackage {
+    name = "Products.CMFUid-2.2.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.CMFUid/Products.CMFUid-2.2.1.tar.gz";
+        md5 = "e20727959351dffbf0bac80613eee110";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Uid product for the Zope Content Management Framework
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.CMFUid";
+      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
+    };
+  };
+
+
+  "roman-1.4.0" = self.buildPythonPackage {
+    name = "roman-1.4.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/r/roman/roman-1.4.0.tar.gz";
+        md5 = "4f8832ed4108174b159c2afb4bd1d1dd";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Integer to Roman numerals converter
+        '';
+      homepage = "http://pypi.python.org/pypi/roman";
+      license = "Python 2.1.1";
+    };
+  };
+
+
+  "plone.autoform-1.4" = self.buildPythonPackage {
+    name = "plone.autoform-1.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.4.zip";
+        md5 = "01e5ccb59253bfaaa02c1ab4be3f212f";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.supermodel-1.2.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Tools to construct z3c.form forms
+        '';
+      homepage = "http://code.google.com/p/dexterity";
+      license = "LGPL";
+    };
+  };
+
+
+  "Unidecode-0.04.1" = self.buildPythonPackage {
+    name = "Unidecode-0.04.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/U/Unidecode/Unidecode-0.04.1.tar.gz";
+        md5 = "c4c9ed8d40cff25c390ff5d5112b9308";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        US-ASCII transliterations of Unicode text
+        '';
+      homepage = "http://code.zemanta.com/tsolc/unidecode/";
+      license = "UNKNOWN";
+    };
+  };
+
+
+  "plone.fieldsets-2.0.2" = self.buildPythonPackage {
+    name = "plone.fieldsets-2.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.fieldsets/plone.fieldsets-2.0.2.zip";
+        md5 = "4158c8a1f784fcb5cecbd63deda7222f";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."five.formlib-1.0.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        An extension to zope.formlib, which allows to group fields into different fieldsets.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.fieldsets";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "plone.app.redirector-1.2" = self.buildPythonPackage {
+    name = "plone.app.redirector-1.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.2.zip";
+        md5 = "bc0508844f276ac7a7b9556d37281cc8";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        redirection tool
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.redirector";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "plone.app.blob-1.5.8" = self.buildPythonPackage {
+    name = "plone.app.blob-1.5.8";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.blob/plone.app.blob-1.5.8.zip";
+        md5 = "7e575d8df137cd19067cc95845aae604";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."archetypes.schemaextender-2.1.2" self."plone.app.imaging-1.0.9" self."plone.scale__storage-1.3.2" self.setuptools self."ZODB3-3.10.5" self."zope.proxy-3.6.1" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        ZODB blob support for Plone
+        '';
+      homepage = "http://plone.org/products/plone.app.blob";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "WebOb-1.2.3" = self.buildPythonPackage {
+    name = "WebOb-1.2.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/W/WebOb/WebOb-1.2.3.tar.gz";
+        md5 = "11825b7074ba7043e157805e4e6e0f55";
+    };
+    doCheck = true;
+    buildInputs = [ self."nose-1.3.0" ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        WSGI request and response object
+        '';
+      homepage = "http://webob.org/";
+      license = "MIT";
+    };
+  };
+
+
+  "zope.testbrowser-3.11.1" = self.buildPythonPackage {
+    name = "zope.testbrowser-3.11.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.testbrowser/zope.testbrowser-3.11.1.tar.gz";
+        md5 = "64abbee892121e7f1a91aed12cfc155a";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."mechanize-0.2.5" self."pytz-2013b" self.setuptools self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Programmable browser for functional black-box tests
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.testbrowser";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.theme-2.1" = self.buildPythonPackage {
+    name = "plone.theme-2.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.theme/plone.theme-2.1.zip";
+        md5 = "c592d0d095e9fc76cc81597cdf6d0c37";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Tools for managing themes in CMF and Plone sites
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.theme";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "plone.outputfilters-1.10" = self.buildPythonPackage {
+    name = "plone.outputfilters-1.10";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.10.zip";
+        md5 = "2c8ba3b7fd2bf18406eb49d01b478139";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PortalTransforms-2.1.2" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Transformations applied to HTML in Plone text fields as they are rendered
+        '';
+      homepage = "http://github.com/plone/plone.outputfilters";
+      license = "GPL";
+    };
+  };
+
+
+  "zope.site-3.9.2" = self.buildPythonPackage {
+    name = "zope.site-3.9.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.site/zope.site-3.9.2.tar.gz";
+        md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.security__untrustedpython-3.7.4" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Local registries for zope component architecture
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.site";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.batching-1.0" = self.buildPythonPackage {
+    name = "plone.batching-1.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0.zip";
+        md5 = "cabd58ccfec67cd384602343ce40dc7b";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Batching facilities used in Plone.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.batching";
+      license = "GPL";
+    };
+  };
+
+
+  "six-1.3.0" = self.buildPythonPackage {
+    name = "six-1.3.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/s/six/six-1.3.0.tar.gz";
+        md5 = "ec47fe6070a8a64c802363d2c2b1e2ee";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Python 2 and 3 compatibility utilities
+        '';
+      homepage = "http://pypi.python.org/pypi/six/";
+      license = "UNKNOWN";
+    };
+  };
+
+
+  "Products.CMFEditions-2.2.8" = self.buildPythonPackage {
+    name = "Products.CMFEditions-2.2.8";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.8.zip";
+        md5 = "1806f2e17e2527fad9364670b343bd11";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDiffTool-2.1" self."Products.CMFUid-2.2.1" self."Products.GenericSetup-1.7.3" self."Products.ZopeVersionControl-1.1.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.copy-3.5.0" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Versioning for Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.CMFEditions";
+      license = "GPL";
+    };
+  };
+
+
+  "Pillow-1.7.8" = self.buildPythonPackage {
+    name = "Pillow-1.7.8";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Pillow/Pillow-1.7.8.zip";
+        md5 = "41d8688d4db72673069a6dc63b5289d6";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Python Imaging Library (fork)
+        '';
+      homepage = "http://github.com/python-imaging/Pillow";
+      license = "UNKNOWN";
+    };
+  };
+
+
+  "ZConfig-2.9.1" = self.buildPythonPackage {
+    name = "ZConfig-2.9.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/Z/ZConfig/ZConfig-2.9.1.tar.gz";
+        md5 = "4738de641d90b992de5b89ff1bc2fe49";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Structured Configuration Library
+        '';
+      homepage = "http://www.zope.org/Members/fdrake/zconfig/";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.PlacelessTranslationService-2.0.3" = self.buildPythonPackage {
+    name = "Products.PlacelessTranslationService-2.0.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/Products.PlacelessTranslationService-2.0.3.zip";
+        md5 = "a94635eb712563c5a002520713f5d6dc";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."python-gettext-1.2" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        PTS provides a way of internationalizing (i18n'ing) and localizing (l10n'ing) software for Zope 2.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.PlacelessTranslationService";
+      license = "GPL";
+    };
+  };
+
+
+  "zope.deprecation-3.4.1" = self.buildPythonPackage {
+    name = "zope.deprecation-3.4.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-3.4.1.tar.gz";
+        md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Deprecation Infrastructure
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.deprecation";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.CMFFormController-3.0.3" = self.buildPythonPackage {
+    name = "Products.CMFFormController-3.0.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.CMFFormController/Products.CMFFormController-3.0.3.zip";
+        md5 = "6573df7dcb39e3b63ba22abe2acd639e";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."transaction-1.1.1" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."zope.tales-3.5.3" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        CMFFormController provides a form validation mechanism for CMF.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.CMFFormController";
+      license = "BSD";
+    };
+  };
+
+
+  "Products.validation-2.0" = self.buildPythonPackage {
+    name = "Products.validation-2.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.validation/Products.validation-2.0.zip";
+        md5 = "afa217e2306637d1dccbebf337caa8bf";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Data validation package for Archetypes
+        '';
+      homepage = "UNKNOWN";
+      license = "UNKNOWN";
+    };
+  };
+
+
+  "zope.event-4.0.2" = self.buildPythonPackage {
+    name = "zope.event-4.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-4.0.2.tar.gz";
+        md5 = "e08dd299d428d77a1cfcbfe841b81872";
+    };
+    doCheck = true;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Very basic event publishing system
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.event";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.caching-1.0" = self.buildPythonPackage {
+    name = "plone.caching-1.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.caching/plone.caching-1.0.zip";
+        md5 = "2c2e3b27d13b9101c92dfed222fde36c";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self."plone.transformchain-1.0.3" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope 2 integration for z3c.caching
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.caching";
+      license = "GPL";
+    };
+  };
+
+
+  "zope.proxy-3.6.1" = self.buildPythonPackage {
+    name = "zope.proxy-3.6.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-3.6.1.zip";
+        md5 = "a400b0a26624b17fa889dbcaa989d440";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Generic Transparent Proxies
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.proxy";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.componentvocabulary-1.0.1" = self.buildPythonPackage {
+    name = "zope.componentvocabulary-1.0.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.componentvocabulary/zope.componentvocabulary-1.0.1.tar.gz";
+        md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Component vocabularies
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.componentvocabulary";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.component-4.1.0" = self.buildPythonPackage {
+    name = "zope.component-4.1.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-4.1.0.zip";
+        md5 = "8e185893699f9fa577bd9ada0a5302fa";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Component Architecture
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.component";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.PlonePAS-4.1.1" = self.buildPythonPackage {
+    name = "Products.PlonePAS-4.1.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.PlonePAS/Products.PlonePAS-4.1.1.zip";
+        md5 = "32db1808c3ad42e82542b65eb95c3c71";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."plone.session-3.5.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        PlonePAS adapts the PluggableAuthService for use by Plone.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.PlonePAS";
+      license = "ZPL";
+    };
+  };
+
+
+  "mock-1.0.1" = self.buildPythonPackage {
+    name = "mock-1.0.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/m/mock/mock-1.0.1.tar.gz";
+        md5 = "c3971991738caa55ec7c356bbc154ee2";
+    };
+    doCheck = true;
+    buildInputs = [ self."unittest2-0.5.1" ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A Python Mocking and Patching Library for Testing
+        '';
+      homepage = "http://www.voidspace.org.uk/python/mock/";
+      license = "UNKNOWN";
+    };
+  };
+
+
+  "Products.ATReferenceBrowserWidget-3.0" = self.buildPythonPackage {
+    name = "Products.ATReferenceBrowserWidget-3.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/Products.ATReferenceBrowserWidget-3.0.zip";
+        md5 = "157bdd32155c8353450c17c649aad042";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."archetypes.referencebrowserwidget-2.4.18" self.setuptools self."zope.deprecation-3.4.1" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        ATReferenceBrowserWidget is reference widget for Archetypes.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.ATReferenceBrowserWidget";
+      license = "GPL";
+    };
+  };
+
+
+  "MultiMapping-2.13.0" = self.buildPythonPackage {
+    name = "MultiMapping-2.13.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/M/MultiMapping/MultiMapping-2.13.0.zip";
+        md5 = "d69c5904c105b9f2f085d4103e0f0586";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Special MultiMapping objects used in Zope2.
+        '';
+      homepage = "http://pypi.python.org/pypi/MultiMapping";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.ZSQLMethods-2.13.4" = self.buildPythonPackage {
+    name = "Products.ZSQLMethods-2.13.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.ZSQLMethods/Products.ZSQLMethods-2.13.4.zip";
+        md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Record-2.13.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        SQL method support for Zope 2.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.ZSQLMethods";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Mako-0.8.1" = self.buildPythonPackage {
+    name = "Mako-0.8.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/M/Mako/Mako-0.8.1.tar.gz";
+        md5 = "96d962464ce6316004af0cc48495d73e";
+    };
+    doCheck = true;
+    buildInputs = [ self."nose-1.3.0" ];
+    propagatedBuildInputs = [ self."MarkupSafe-0.18" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A super-fast templating language that borrows the  best ideas from the existing templating languages.
+        '';
+      homepage = "http://www.makotemplates.org/";
+      license = "MIT";
+    };
+  };
+
+
+  "plone.transformchain-1.0.3" = self.buildPythonPackage {
+    name = "plone.transformchain-1.0.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.transformchain/plone.transformchain-1.0.3.zip";
+        md5 = "f5fb7ca894249e3e666501c4fae52a6c";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Hook into repoze.zope2 that allows third party packages to register a sequence of hooks that will be allowed to modify the response before it is returned to the browser
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.transformchain";
+      license = "BSD";
+    };
+  };
+
+
+  "zope.schema-4.3.2" = self.buildPythonPackage {
+    name = "zope.schema-4.3.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.3.2.zip";
+        md5 = "b63df4a3035f29113f8130c8ae28bb13";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        zope.interface extension for defining data schemas
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.schema";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.CMFQuickInstallerTool-3.0.6" = self.buildPythonPackage {
+    name = "Products.CMFQuickInstallerTool-3.0.6";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/Products.CMFQuickInstallerTool-3.0.6.tar.gz";
+        md5 = "af34adb87ddf2b6da48eff8b70ca2989";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" self."eggtestinfo-0.3" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        CMFQuickInstallerTool is a facility for comfortable activation/deactivation of CMF compliant products.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.CMFQuickInstallerTool";
+      license = "GPL";
+    };
+  };
+
+
+  "zope.deprecation-4.0.2" = self.buildPythonPackage {
+    name = "zope.deprecation-4.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-4.0.2.tar.gz";
+        md5 = "5f8cecce85f2783f9e020f1288e908fd";
+    };
+    doCheck = true;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Deprecation Infrastructure
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.deprecation";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.app.form-2.2.2" = self.buildPythonPackage {
+    name = "plone.app.form-2.2.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.2.zip";
+        md5 = "6101e6a5bd4de6cc8cdef09ced2743eb";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."five.formlib-1.0.4" self."plone.app.vocabularies-2.1.10" self."plone.locking-2.0.4" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        zope.formlib integration for Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.form";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Products.CMFDefault-2.2.3" = self.buildPythonPackage {
+    name = "Products.CMFDefault-2.2.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.3.tar.gz";
+        md5 = "fe7d2d3906ee0e3b484e4a02401576ab";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."five.formlib-1.0.4" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Default product for the Zope Content Management Framework
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.CMFDefault";
+      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
+    };
+  };
+
+
+  "zope.processlifetime-1.0" = self.buildPythonPackage {
+    name = "zope.processlifetime-1.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.processlifetime/zope.processlifetime-1.0.tar.gz";
+        md5 = "69604bfd668a01ebebdd616a8f26ccfe";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope process lifetime events
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.processlifetime";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.PasswordResetTool-2.0.14" = self.buildPythonPackage {
+    name = "Products.PasswordResetTool-2.0.14";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.14.zip";
+        md5 = "4267a5fef471d0ebe5ca848e86630702";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Password reset tool for Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.PasswordResetTool";
+      license = "GPL";
+    };
+  };
+
+
+  "WSGIProxy2-0.2" = self.buildPythonPackage {
+    name = "WSGIProxy2-0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/W/WSGIProxy2/WSGIProxy2-0.2.tar.gz";
+        md5 = "d8c764aa68173e0d4851874ed6021211";
+    };
+    doCheck = true;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."six-1.3.0" self."WebOb-1.2.3" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        UNKNOWN
+        '';
+      homepage = "https://github.com/gawel/WSGIProxy2/";
+      license = "MIT";
+    };
+  };
+
+
+  "plone.synchronize-1.0.1" = self.buildPythonPackage {
+    name = "plone.synchronize-1.0.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.synchronize/plone.synchronize-1.0.1.zip";
+        md5 = "d25e86ace8daa0816861296c3288c4fb";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Simple decorators to support synchronized methods
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.synchronize";
+      license = "BSD";
+    };
+  };
+
+
+  "collective.monkeypatcher-1.0.1" = self.buildPythonPackage {
+    name = "collective.monkeypatcher-1.0.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/c/collective.monkeypatcher/collective.monkeypatcher-1.0.1.zip";
+        md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Support for applying monkey patches late in the startup cycle by using ZCML configuration actions
+        '';
+      homepage = "http://pypi.python.org/pypi/collective.monkeypatcher";
+      license = "BSD";
+    };
+  };
+
+
+  "plone.stringinterp-1.0.10" = self.buildPythonPackage {
+    name = "plone.stringinterp-1.0.10";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.10.zip";
+        md5 = "595074e94944ad6860e2105a020a3b9a";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.i18n__zcml-3.7.4" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Adaptable string interpolation
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.stringinterp";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "plonetheme.sunburst-1.4.4" = self.buildPythonPackage {
+    name = "plonetheme.sunburst-1.4.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.4.zip";
+        md5 = "f2cb3fdd66ecc14d1a542d2ca76252db";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        The default theme for Plone 4.
+        '';
+      homepage = "http://pypi.python.org/pypi/plonetheme.sunburst";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "PasteDeploy-1.5.0" = self.buildPythonPackage {
+    name = "PasteDeploy-1.5.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-1.5.0.tar.gz";
+        md5 = "f1a068a0b680493b6eaff3dd7690690f";
+    };
+    doCheck = true;
+    buildInputs = [ self."nose-1.3.0" ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Load, configure, and compose WSGI applications and servers
+        '';
+      homepage = "http://pythonpaste.org/deploy/";
+      license = "MIT";
+    };
+  };
+
+
+  "zope.sequencesort-3.4.0" = self.buildPythonPackage {
+    name = "zope.sequencesort-3.4.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.sequencesort/zope.sequencesort-3.4.0.tar.gz";
+        md5 = "cfc35fc426a47f5c0ee43c416224b864";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Sequence Sorting
+        '';
+      homepage = "http://cheeseshop.python.org/pypi/zope.sequencesort";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.openid-2.0.1" = self.buildPythonPackage {
+    name = "plone.openid-2.0.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.openid/plone.openid-2.0.1.zip";
+        md5 = "d4c36926a6dbefed035ed92c29329ce1";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.PluggableAuthService-1.10.0" self."python-openid-2.2.5" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        OpenID authentication support for PAS
+        '';
+      homepage = "http://svn.plone.org/svn/plone/plone.openid";
+      license = "BSD";
+    };
+  };
+
+
+  "plone.resourceeditor-1.0" = self.buildPythonPackage {
+    name = "plone.resourceeditor-1.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip";
+        md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.resource-1.0.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        UNKNOWN
+        '';
+      homepage = "https://github.com/plone/plone.resourceeditor";
+      license = "GPL";
+    };
+  };
+
+
+  "z3c.form-3.0" = self.buildPythonPackage {
+    name = "z3c.form-3.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.zip";
+        md5 = "f9fa3cf56c83722425b3b1be4467ce46";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."six-1.2.0" self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.site-3.9.2" self."zope.traversing-3.13.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        An advanced form and widget framework for Zope 3
+        '';
+      homepage = "https://launchpad.net/z3c.form";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.app.publication-3.12.0" = self.buildPythonPackage {
+    name = "zope.app.publication-3.12.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.app.publication/zope.app.publication-3.12.0.zip";
+        md5 = "d8c521287f52fb9f40fa9b8c2acb4675";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.authentication-3.7.1" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.error-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope publication
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.app.publication";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.schema-4.2.2" = self.buildPythonPackage {
+    name = "zope.schema-4.2.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz";
+        md5 = "e7e581af8193551831560a736a53cf58";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        zope.interface extension for defining data schemas
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.schema";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.ExternalEditor-1.1.0" = self.buildPythonPackage {
+    name = "Products.ExternalEditor-1.1.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip";
+        md5 = "475fea6e0b958c0c51cfdbfef2f4e623";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope External Editor
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.ExternalEditor";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.app.content-2.1.2" = self.buildPythonPackage {
+    name = "plone.app.content-2.1.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.2.zip";
+        md5 = "247eb174269b2ab03c05f318915f087e";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.batching-1.0" self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Content Views for Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.content";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Products.CMFDiffTool-2.1" = self.buildPythonPackage {
+    name = "Products.CMFDiffTool-2.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.CMFDiffTool/Products.CMFDiffTool-2.1.zip";
+        md5 = "7513d954294e9f318182f9d61660abdb";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Diff tool for Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.CMFDiffTool";
+      license = "GPL";
+    };
+  };
+
+
+  "repoze.lru-0.6" = self.buildPythonPackage {
+    name = "repoze.lru-0.6";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/r/repoze.lru/repoze.lru-0.6.tar.gz";
+        md5 = "2c3b64b17a8e18b405f55d46173e14dd";
+    };
+    doCheck = true;
+    buildInputs = [ self."nose-1.3.0" ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A tiny LRU cache implementation and decorator
+        '';
+      homepage = "http://www.repoze.org";
+      license = "BSD-derived (http://www.repoze.org/LICENSE.txt)";
+    };
+  };
+
+
+  "Markdown-2.0.3" = self.buildPythonPackage {
+    name = "Markdown-2.0.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.3.tar.gz";
+        md5 = "751e8055be2433dfd1a82e0fb1b12f13";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Python implementation of Markdown.
+        '';
+      homepage = "http://www.freewisdom.org/projects/python-markdown";
+      license = "BSD License";
+    };
+  };
+
+
+  "diazo-1.0.3" = self.buildPythonPackage {
+    name = "diazo-1.0.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/d/diazo/diazo-1.0.3.zip";
+        md5 = "d3c2b017af521db4c86fb360c86e0bc8";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."experimental.cssselect-0.3" self."lxml-2.3.6" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Diazo implements a Deliverance like language using a pure XSLT engine. With Diazo, you
+"compile" your theme and ruleset in one step, then use a superfast/simple
+transform on each request thereafter. Alternatively, compile your theme during
+development, check it into Subversion, and not touch Diazo during deployment.
+        '';
+      homepage = "http://diazo.org";
+      license = "New BSD";
+    };
+  };
+
+
+  "plone.behavior-1.0.2" = self.buildPythonPackage {
+    name = "plone.behavior-1.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.behavior/plone.behavior-1.0.2.zip";
+        md5 = "4459b91287ebc2f2cf4fa38728b2a739";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Infrastructure for maintaining a registry of available behaviors
+        '';
+      homepage = "http://code.google.com/p/dexterity";
+      license = "BSD";
+    };
+  };
+
+
+  "zc.lockfile-1.0.2" = self.buildPythonPackage {
+    name = "zc.lockfile-1.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.2.tar.gz";
+        md5 = "f099d4cf2583a0c7bea0146a44dc4d59";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Basic inter-process locks
+        '';
+      homepage = "http://www.python.org/pypi/zc.lockfile";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.tales-3.5.3" = self.buildPythonPackage {
+    name = "zope.tales-3.5.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.tales/zope.tales-3.5.3.tar.gz";
+        md5 = "a2dbc6e41140c29de81b66a4d703fc3f";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.tal-3.5.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Template Application Language Expression Syntax (TALES)
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.tales";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "DateTime-3.0.3" = self.buildPythonPackage {
+    name = "DateTime-3.0.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/D/DateTime/DateTime-3.0.3.zip";
+        md5 = "5ebf0a8e3775b744c5de2e6685b37ae9";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."pytz-2013b" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        This package provides a DateTime data type, as known from Zope 2.Unless you need to communicate with Zope 2 APIs, you're probablybetter off using Python's built-in datetime module.
+        '';
+      homepage = "http://pypi.python.org/pypi/DateTime";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "z3c.autoinclude-0.3.4" = self.buildPythonPackage {
+    name = "z3c.autoinclude-0.3.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/z3c.autoinclude/z3c.autoinclude-0.3.4.zip";
+        md5 = "6a615ae18c12b459bceb3ae28e8e7709";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zc.buildout-1.7.1" self."zope.configuration-3.7.4" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Automatically include ZCML
+        '';
+      homepage = "UNKNOWN";
+      license = "ZPL";
+    };
+  };
+
+
+  "pytz-2013b" = self.buildPythonPackage {
+    name = "pytz-2013b";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/pytz/pytz-2013b.tar.bz2";
+        md5 = "34f47470eedd5cd1faf6c3da2741967b";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        World timezone definitions, modern and historical
+        '';
+      homepage = "http://pytz.sourceforge.net";
+      license = "MIT";
+    };
+  };
+
+
+  "zope.location-4.0.2" = self.buildPythonPackage {
+    name = "zope.location-4.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.2.zip";
+        md5 = "44d865b2c0b1e1cc93898c7df938d353";
+    };
+    doCheck = true;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.interface-4.0.5" self."zope.proxy-4.1.3" self."zope.schema-4.3.2" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Location
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.location/";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.app.iterate-2.1.10" = self.buildPythonPackage {
+    name = "plone.app.iterate-2.1.10";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.iterate/plone.app.iterate-2.1.10.zip";
+        md5 = "8bd270d8a3c9509e524a06e092a9b4c4";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.1" self."Products.CMFCore-2.2.7" self."Products.CMFEditions-2.2.8" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.DCWorkflow-2.2.4" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        check-out/check-in staging for Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.iterate";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Products.PortalTransforms-2.1.2" = self.buildPythonPackage {
+    name = "Products.PortalTransforms-2.1.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.2.zip";
+        md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Markdown-2.0.3" self."plone.intelligenttext-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.MimetypesRegistry-2.0.4" self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        MIME based content transformations
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.PortalTransforms";
+      license = "UNKNOWN";
+    };
+  };
+
+
+  "Products.MailHost-2.13.1" = self.buildPythonPackage {
+    name = "Products.MailHost-2.13.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.MailHost/Products.MailHost-2.13.1.zip";
+        md5 = "1102e523435d8bf78a15b9ddb57478e1";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        zope.sendmail integration for Zope 2.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.MailHost";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "lxml-3.2.3" = self.buildPythonPackage {
+    name = "lxml-3.2.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/l/lxml/lxml-3.2.3.tar.gz";
+        md5 = "fef47bb4ac72ac38ce778518dac42236";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.
+        '';
+      homepage = "http://lxml.de/";
+      license = "UNKNOWN";
+    };
+  };
+
+
+  "DocumentTemplate-2.13.2" = self.buildPythonPackage {
+    name = "DocumentTemplate-2.13.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip";
+        md5 = "07bb086c77c1dfe94125ad2efbba94b7";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."RestrictedPython-3.6.0" self."zExceptions-2.13.0" self."zope.sequencesort-3.4.0" self."zope.structuredtext-3.5.1" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Document Templating Markup Language (DTML)
+        '';
+      homepage = "http://pypi.python.org/pypi/DocumentTemplate";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.app.controlpanel-2.3.6" = self.buildPythonPackage {
+    name = "plone.app.controlpanel-2.3.6";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.6.zip";
+        md5 = "ca5e0e0c8497d9860603e39e0eeba9b8";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.form-2.2.2" self."plone.app.vocabularies-2.1.10" self."plone.app.workflow-2.1.5" self."plone.fieldsets-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.PlonePAS-4.1.1" self."Products.PortalTransforms-2.1.2" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.cachedescriptors-3.5.1" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.ramcache-1.0" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Formlib-based controlpanels for Plone.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.controlpanel";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "zope.ptresource-3.9.0" = self.buildPythonPackage {
+    name = "zope.ptresource-3.9.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.ptresource/zope.ptresource-3.9.0.tar.gz";
+        md5 = "f4645e51c15289d3fdfb4139039e18e9";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.browserresource-3.10.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Page template resource plugin for zope.browserresource
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.ptresource/";
+      license = "UNKNOWN";
+    };
+  };
+
+
+  "Products.MimetypesRegistry-2.0.4" = self.buildPythonPackage {
+    name = "Products.MimetypesRegistry-2.0.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.4.zip";
+        md5 = "898166bb2aaececc8238ad4ee4826793";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        MIME type handling for Zope
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.MimetypesRegistry";
+      license = "UNKNOWN";
+    };
+  };
+
+
+  "docutils-0.9.1" = self.buildPythonPackage {
+    name = "docutils-0.9.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/d/docutils/docutils-0.9.1.tar.gz";
+        md5 = "b0d5cd5298fedf9c62f5fd364a274d56";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Docutils -- Python Documentation Utilities
+        '';
+      homepage = "http://docutils.sourceforge.net/";
+      license = "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)";
+    };
+  };
+
+
+  "beautifulsoup4-4.3.0" = self.buildPythonPackage {
+    name = "beautifulsoup4-4.3.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.3.0.tar.gz";
+        md5 = "8341b12402d942661bbfcc9f35420529";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Improvements to the lxml tree builder.
+        '';
+      homepage = "http://www.crummy.com/software/BeautifulSoup/bs4/";
+      license = "MIT";
+    };
+  };
+
+
+  "nose-1.3.0" = self.buildPythonPackage {
+    name = "nose-1.3.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/n/nose/nose-1.3.0.tar.gz";
+        md5 = "95d6d32b9d6b029c3c65674bd9e7eabe";
+    };
+    doCheck = true;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        nose extends unittest to make testing easier
+        '';
+      homepage = "http://readthedocs.org/docs/nose/";
+      license = "GNU LGPL";
+    };
+  };
+
+
+  "Distutils2-1.0a4" = self.buildPythonPackage {
+    name = "Distutils2-1.0a4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/D/Distutils2/Distutils2-1.0a4.tar.gz";
+        md5 = "52bc9dffb394970c27e02853ae3a3241";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Python Packaging Library
+        '';
+      homepage = "http://wiki.python.org/moin/Distutils2";
+      license = "Python license";
+    };
+  };
+
+
+  "plone.app.upgrade-1.3.3" = self.buildPythonPackage {
+    name = "plone.app.upgrade-1.3.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.3.zip";
+        md5 = "1c45e809fba27bec11e8a40f686f0f5b";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."borg.localrole-3.0.2" self."five.localsitemanager-2.0.5" self."plone.app.folder-1.0.5" self."plone.app.portlets-2.4.4" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.1" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.contentmigration-2.1.4" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.SecureMailHost-1.1.2" self."Products.ZCatalog-2.13.23" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.ramcache-1.0" self."zope.site-3.9.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Upgrade machinery for Plone.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.upgrade";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "zope.error-3.7.4" = self.buildPythonPackage {
+    name = "zope.error-3.7.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.error/zope.error-3.7.4.tar.gz";
+        md5 = "281445a906458ff5f18f56923699a127";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.exceptions-3.6.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        An error reporting utility for Zope3
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.error";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.app.openid-2.0.2" = self.buildPythonPackage {
+    name = "plone.app.openid-2.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.openid/plone.app.openid-2.0.2.tar.gz";
+        md5 = "ae0748f91cab0612a498926d405d8edd";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."plone.app.portlets-2.4.4" self."plone.openid-2.0.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Plone OpenID authentication support
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.openid";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "five.globalrequest-1.0" = self.buildPythonPackage {
+    name = "five.globalrequest-1.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz";
+        md5 = "87f8996bd21d4aa156aa26e7d21b8744";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.globalrequest-1.0" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope 2 integration for zope.globalrequest
+        '';
+      homepage = "http://pypi.python.org/pypi/five.globalrequest";
+      license = "ZPL";
+    };
+  };
+
+
+  "plone.indexer-1.0.2" = self.buildPythonPackage {
+    name = "plone.indexer-1.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip";
+        md5 = "538aeee1f9db78bc8c85ae1bcb0153ed";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Hooks to facilitate managing custom index values in Zope 2/CMF applications
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.indexer";
+      license = "BSD";
+    };
+  };
+
+
+  "plone.keyring-2.0.1" = self.buildPythonPackage {
+    name = "plone.keyring-2.0.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.keyring/plone.keyring-2.0.1.zip";
+        md5 = "f3970e9bddb2cc65e461a2c62879233f";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Manage secrets
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.keyring";
+      license = "BSD";
+    };
+  };
+
+
+  "plone.app.portlets-2.4.4" = self.buildPythonPackage {
+    name = "plone.app.portlets-2.4.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.4.zip";
+        md5 = "c1144f7686cacf3d64fcd202ab2e5e2d";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."feedparser-5.0.1" self."five.customerize-1.1" self."five.formlib-1.0.4" self."plone.app.form-2.2.2" self."plone.app.i18n-2.0.2" self."plone.app.vocabularies-2.1.10" self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Plone integration for the basic plone.portlets package
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.portlets";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "plone.dexterity-2.1.3" = self.buildPythonPackage {
+    name = "plone.dexterity-2.1.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.1.3.zip";
+        md5 = "7f6444a2c26488e4068217266fd243b7";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.alterego-1.0" self."plone.autoform-1.4" self."plone.behavior-1.0.2" self."plone.folder-1.0.4" self."plone.memoize-1.1.1" self."plone.rfc822-1.0.1" self."plone.supermodel-1.2.2" self."plone.synchronize-1.0.1" self."plone.uuid-1.0.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.dottedname-3.4.6" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Flexible CMF content
+        '';
+      homepage = "http://code.google.com/p/dexterity";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "feedparser-5.0.1" = self.buildPythonPackage {
+    name = "feedparser-5.0.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/f/feedparser/feedparser-5.0.1.tar.bz2";
+        md5 = "702835de74bd4a578524f311e62c2877";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        
+        '';
+      homepage = "https://code.google.com/p/feedparser/";
+      license = "";
+    };
+  };
+
+
+  "Products.BTreeFolder2-2.13.3" = self.buildPythonPackage {
+    name = "Products.BTreeFolder2-2.13.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.BTreeFolder2/Products.BTreeFolder2-2.13.3.tar.gz";
+        md5 = "f57c85673036af7ccd34c3fa251f6bb2";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.lifecycleevent-3.6.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A BTree based implementation for Zope 2's OFS.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.BTreeFolder2";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.MIMETools-2.13.0" = self.buildPythonPackage {
+    name = "Products.MIMETools-2.13.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip";
+        md5 = "ad5372fc1190599a19493db0864448ec";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."DocumentTemplate-2.13.2" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        MIMETools provides the &lt;!--#mime--&gt; tag for DocumentTemplate.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.MIMETools";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.testing-3.9.7" = self.buildPythonPackage {
+    name = "zope.testing-3.9.7";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.testing/zope.testing-3.9.7.tar.gz";
+        md5 = "8999f3d143d416dc3c8b2a5bd6f33e28";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.exceptions-3.6.2" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope testing framework, including the testrunner script.
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.testing";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.lifecycleevent-3.6.2" = self.buildPythonPackage {
+    name = "zope.lifecycleevent-3.6.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.lifecycleevent/zope.lifecycleevent-3.6.2.tar.gz";
+        md5 = "3ba978f3ba7c0805c81c2c79ea3edb33";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Object life-cycle events
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.lifecycleevent";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "ExtensionClass-2.13.2" = self.buildPythonPackage {
+    name = "ExtensionClass-2.13.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip";
+        md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Metaclass for subclassable extension types
+        '';
+      homepage = "http://pypi.python.org/pypi/ExtensionClass";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.app.contentrules-3.0.3" = self.buildPythonPackage {
+    name = "plone.app.contentrules-3.0.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.3.zip";
+        md5 = "518c1e22a9cfe187b6770e62be4f8bd8";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.formlib-1.0.4" self."plone.app.form-2.2.2" self."plone.app.vocabularies-2.1.10" self."plone.contentrules-2.0.3" self."plone.memoize-1.1.1" self."plone.stringinterp-1.0.10" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Plone integration for plone.contentrules
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.contentrules";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "translationstring-1.1" = self.buildPythonPackage {
+    name = "translationstring-1.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/t/translationstring/translationstring-1.1.tar.gz";
+        md5 = "0979b46d8f0f852810c8ec4be5c26cf2";
+    };
+    doCheck = true;
+    buildInputs = [ self."nose-1.3.0" ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Utility library for i18n relied on by various Repoze and Pyramid packages
+        '';
+      homepage = "http://pylonsproject.org";
+      license = "BSD-like (http://repoze.org/license.html)";
+    };
+  };
+
+
+  "MarkupSafe-0.18" = self.buildPythonPackage {
+    name = "MarkupSafe-0.18";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-0.18.tar.gz";
+        md5 = "f8d252fd05371e51dec2fe9a36890687";
+    };
+    doCheck = true;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Implements a XML/HTML/XHTML Markup safe string for Python
+        '';
+      homepage = "http://github.com/mitsuhiko/markupsafe";
+      license = "BSD";
+    };
+  };
+
+
+  "zope.pagetemplate-3.6.3" = self.buildPythonPackage {
+    name = "zope.pagetemplate-3.6.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.pagetemplate/zope.pagetemplate-3.6.3.zip";
+        md5 = "834a4bf702c05fba1e669677b4dc871f";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.security__untrustedpython-3.7.4" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Page Templates
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.pagetemplate";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "python-gettext-1.2" = self.buildPythonPackage {
+    name = "python-gettext-1.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/python-gettext/python-gettext-1.2.zip";
+        md5 = "cd4201d440126d1296d1d2bc2b4795f3";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."unittest2-0.5.1" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Python Gettext po to mo file compiler.
+        '';
+      homepage = "http://pypi.python.org/pypi/python-gettext";
+      license = "BSD";
+    };
+  };
+
+
+  "zc.buildout-1.7.1" = self.buildPythonPackage {
+    name = "zc.buildout-1.7.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-1.7.1.tar.gz";
+        md5 = "8834a21586bf2be53dc412002241a996";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        System for managing development buildouts
+        '';
+      homepage = "http://pypi.python.org/pypi/zc.buildout";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "archetypes.schemaextender-2.1.2" = self.buildPythonPackage {
+    name = "archetypes.schemaextender-2.1.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/a/archetypes.schemaextender/archetypes.schemaextender-2.1.2.zip";
+        md5 = "865aa5b4b6b26e3bb650d89ddfe77c87";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Dynamically extend Archetypes schemas with named adapters.
+        '';
+      homepage = "http://pypi.python.org/pypi/archetypes.schemaextender";
+      license = "GPL";
+    };
+  };
+
+
+  "zope.tal-3.5.2" = self.buildPythonPackage {
+    name = "zope.tal-3.5.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.tal/zope.tal-3.5.2.zip";
+        md5 = "13869f292ba36b294736b7330b1396fd";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope 3 Template Application Languate (TAL)
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.tal";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.OFSP-2.13.2" = self.buildPythonPackage {
+    name = "Products.OFSP-2.13.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.OFSP/Products.OFSP-2.13.2.zip";
+        md5 = "c76d40928753c2ee56db873304e65bd5";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Persistence-2.13.2" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        General Zope 2 help screens.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.OFSP";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "cssselect-0.8" = self.buildPythonPackage {
+    name = "cssselect-0.8";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/c/cssselect/cssselect-0.8.tar.gz";
+        md5 = "c4683e050351abcbbd5990b01f5344e2";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        cssselect parses CSS3 Selectors and translates them to XPath 1.0
+        '';
+      homepage = "http://packages.python.org/cssselect/";
+      license = "BSD";
+    };
+  };
+
+
+  "plone.app.search-1.1.4" = self.buildPythonPackage {
+    name = "plone.app.search-1.1.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.4.zip";
+        md5 = "fb24320380ed2ba11e6f20cc1fe3b6df";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.app.contentlisting-1.0.4" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Search user interface for Plone CMS.
+        '';
+      homepage = "http://github.com/plone/plone.app.search";
+      license = "GPL";
+    };
+  };
+
+
+  "zope.container-3.11.2" = self.buildPythonPackage {
+    name = "zope.container-3.11.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.container/zope.container-3.11.2.tar.gz";
+        md5 = "fc66d85a17b8ffb701091c9328983dcc";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.broken-3.6.0" self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.filerepresentation-3.6.1" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."zope.traversing-3.13.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Container
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.container";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.PloneTestCase-0.9.17" = self.buildPythonPackage {
+    name = "Products.PloneTestCase-0.9.17";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.PloneTestCase/Products.PloneTestCase-0.9.17.zip";
+        md5 = "2a5bfb94220a520961d710abc92280f2";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.ATContentTypes-2.1.13" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Integration testing framework for Plone.
+        '';
+      homepage = "http://plone.org/products/plonetestcase";
+      license = "GPL";
+    };
+  };
+
+
+  "unittest2-0.5.1" = self.buildPythonPackage {
+    name = "unittest2-0.5.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/u/unittest2/unittest2-0.5.1.tar.gz";
+        md5 = "a0af5cac92bbbfa0c3b0e99571390e0f";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        The new features in unittest for Python 2.7 backported to Python 2.3+.
+        '';
+      homepage = "http://pypi.python.org/pypi/unittest2";
+      license = "UNKNOWN";
+    };
+  };
+
+
+  "zExceptions-2.13.0" = self.buildPythonPackage {
+    name = "zExceptions-2.13.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zExceptions/zExceptions-2.13.0.zip";
+        md5 = "4c679696c959040d8e656ef85ae40136";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        zExceptions contains common exceptions used in Zope2.
+        '';
+      homepage = "http://pypi.python.org/pypi/zExceptions";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Persistence-2.13.2" = self.buildPythonPackage {
+    name = "Persistence-2.13.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip";
+        md5 = "92693648ccdc59c8fc71f7f06b1d228c";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."ZODB3-3.10.5" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Persistent ExtensionClass
+        '';
+      homepage = "http://pypi.python.org/pypi/Persistence";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.CMFDynamicViewFTI-4.0.5" = self.buildPythonPackage {
+    name = "Products.CMFDynamicViewFTI-4.0.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.5.zip";
+        md5 = "2d31b1700ed8b1441adc737b454af693";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        CMFDynamicViewFTI is a product for dynamic views in CMF.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.CMFDynamicViewFTI";
+      license = "ZPL";
+    };
+  };
+
+
+  "zope.publisher-3.12.6" = self.buildPythonPackage {
+    name = "zope.publisher-3.12.6";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.publisher/zope.publisher-3.12.6.tar.gz";
+        md5 = "495131970cc7cb14de8e517fb3857ade";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.security__untrustedpython-3.7.4" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        The Zope publisher publishes Python objects on the web.
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.publisher";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.browserpage-3.12.2" = self.buildPythonPackage {
+    name = "zope.browserpage-3.12.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz";
+        md5 = "a543ef3cb1b42f7233b3fca23dc9ea60";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        ZCML directives for configuring browser views for Zope.
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.browserpage/";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.app.i18n-2.0.2" = self.buildPythonPackage {
+    name = "plone.app.i18n-2.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.i18n/plone.app.i18n-2.0.2.zip";
+        md5 = "a10026573463dfc1899bf4062cebdbf2";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Plone specific i18n extensions.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.i18n";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "zope.security__untrustedpython-3.7.4" = self.buildPythonPackage {
+    name = "zope.security__untrustedpython-3.7.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz";
+        md5 = "072ab8d11adc083eace11262da08630c";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.schema-4.2.2" self."RestrictedPython-3.6.0" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Security Framework
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.security";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.cachepurging-1.0.4" = self.buildPythonPackage {
+    name = "plone.cachepurging-1.0.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.cachepurging/plone.cachepurging-1.0.4.zip";
+        md5 = "886814ac4deef0f1ed99a2eb60864264";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Cache purging support for Zope 2 applications
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.cachepurging";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "plone.app.jquerytools-1.5.5" = self.buildPythonPackage {
+    name = "plone.app.jquerytools-1.5.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.5.zip";
+        md5 = "7a4957a3a8482e4963e49e2d02772e33";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        jQuery Tools integration for Plone plus overlay and AJAX form helpers.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.jquerytools";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "zope.component__zcml-3.9.5" = self.buildPythonPackage {
+    name = "zope.component__zcml-3.9.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-3.9.5.tar.gz";
+        md5 = "22780b445b1b479701c05978055d1c82";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Component Architecture
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.component";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.viewlet-3.7.2" = self.buildPythonPackage {
+    name = "zope.viewlet-3.7.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.viewlet/zope.viewlet-3.7.2.tar.gz";
+        md5 = "367e03096df57e2f9b74fff43f7901f9";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Viewlets
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.viewlet";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.i18n__zcml-3.7.4" = self.buildPythonPackage {
+    name = "zope.i18n__zcml-3.7.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.i18n/zope.i18n-3.7.4.tar.gz";
+        md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."pytz-2013b" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.schema-4.2.2" self."zope.configuration-3.7.4" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Internationalization Support
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.i18n";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.ATContentTypes-2.1.13" = self.buildPythonPackage {
+    name = "Products.ATContentTypes-2.1.13";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.13.zip";
+        md5 = "093899fc74f5e2a83db464c96d0f5293";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.referencebrowserwidget-2.4.18" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.5" self."plone.app.layout-2.3.5" self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.1" self."Products.ATReferenceBrowserWidget-3.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PortalTransforms-2.1.2" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."ZConfig-2.9.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.tal-3.5.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Default Content Types for Plone
+        '';
+      homepage = "http://plone.org/";
+      license = "GPL";
+    };
+  };
+
+
+  "zope.browserresource-3.10.3" = self.buildPythonPackage {
+    name = "zope.browserresource-3.10.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-3.10.3.zip";
+        md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Browser resources implementation for Zope.
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.browserresource/";
+      license = "UNKNOWN";
+    };
+  };
+
+
+  "Products.ResourceRegistries-2.2.9" = self.buildPythonPackage {
+    name = "Products.ResourceRegistries-2.2.9";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.9.zip";
+        md5 = "8dd4f36eb894d868366b51941f6f0966";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Registry for managing CSS and JS
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.ResourceRegistries";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "five.formlib-1.0.4" = self.buildPythonPackage {
+    name = "five.formlib-1.0.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/f/five.formlib/five.formlib-1.0.4.zip";
+        md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self.setuptools self."transaction-1.1.1" self."zope.app.form-4.0.2" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        zope.formlib integration for Zope 2
+        '';
+      homepage = "http://pypi.python.org/pypi/five.formlib";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.statusmessages-4.0" = self.buildPythonPackage {
+    name = "Products.statusmessages-4.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.statusmessages/Products.statusmessages-4.0.zip";
+        md5 = "265324b0a58a032dd0ed038103ed0473";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        statusmessages provides an easy way of handling internationalized status messages managed via an BrowserRequest adapter storing status messages in client-side cookies.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.statusmessages";
+      license = "BSD";
+    };
+  };
+
+
+  "pyramid-1.4.3" = self.buildPythonPackage {
+    name = "pyramid-1.4.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/pyramid/pyramid-1.4.3.tar.gz";
+        md5 = "28fabf42cf585ecec7a57b5acc1174e3";
+    };
+    doCheck = true;
+    buildInputs = [ self."nose-1.3.0" self."WebTest-2.0.7" self."zope.component-4.1.0" self."zope.interface-4.0.5" ];
+    propagatedBuildInputs = [ self."Chameleon-2.11" self."Mako-0.8.1" self."PasteDeploy-1.5.0" self."repoze.lru-0.6" self.setuptools self."translationstring-1.1" self."venusian-1.0a8" self."WebOb-1.2.3" self."zope.deprecation-4.0.2" self."zope.interface-4.0.5" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        The Pyramid web application development framework, a Pylons project
+        '';
+      homepage = "http://pylonsproject.org";
+      license = "BSD-derived (http://www.repoze.org/LICENSE.txt)";
+    };
+  };
+
+
+  "python-dateutil-1.5" = self.buildPythonPackage {
+    name = "python-dateutil-1.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz";
+        md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Extensions to the standard python 2.3+ datetime module
+        '';
+      homepage = "http://labix.org/python-dateutil";
+      license = "PSF License";
+    };
+  };
+
+
+  "Products.PloneLanguageTool-3.2.7" = self.buildPythonPackage {
+    name = "Products.PloneLanguageTool-3.2.7";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip";
+        md5 = "bd9eb6278bf76e8cbce99437ca362164";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        PloneLanguageTool allows you to set the available languages in your Plone site, select various fallback mechanisms, and control the use of flags for language selection and translations.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.PloneLanguageTool";
+      license = "GPL";
+    };
+  };
+
+
+  "plone.intelligenttext-2.0.2" = self.buildPythonPackage {
+    name = "plone.intelligenttext-2.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.intelligenttext/plone.intelligenttext-2.0.2.zip";
+        md5 = "51688fa0815b49e00334e3ef948328ba";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Provides transforms from text/x-web-intelligent to text/html and vice versa.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.intelligenttext";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "plone.namedfile__scales-2.0.2" = self.buildPythonPackage {
+    name = "plone.namedfile__scales-2.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.2.zip";
+        md5 = "f6168ab9e38f3a171dc35483527b3e01";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.rfc822-1.0.1" self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" self."plone.scale__storage-1.3.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        File types and fields for images, files and blob files with filenames
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.namedfile";
+      license = "BSD";
+    };
+  };
+
+
+  "zope.contenttype-3.5.5" = self.buildPythonPackage {
+    name = "zope.contenttype-3.5.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.contenttype/zope.contenttype-3.5.5.zip";
+        md5 = "c6ac80e6887de4108a383f349fbdf332";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope contenttype
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.contenttype";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.proxy-4.1.3" = self.buildPythonPackage {
+    name = "zope.proxy-4.1.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-4.1.3.zip";
+        md5 = "8dbca0d33996511b9a9026da84a47109";
+    };
+    doCheck = true;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.interface-4.0.5" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Generic Transparent Proxies
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.proxy";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.globalrequest-1.0" = self.buildPythonPackage {
+    name = "zope.globalrequest-1.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.globalrequest/zope.globalrequest-1.0.zip";
+        md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Global way of retrieving the currently active request.
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.globalrequest";
+      license = "ZPL";
+    };
+  };
+
+
+  "plone.rfc822-1.0.1" = self.buildPythonPackage {
+    name = "plone.rfc822-1.0.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.rfc822/plone.rfc822-1.0.1.zip";
+        md5 = "b5b79bb5a9181da624a7e88940a45424";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."python-dateutil-1.5" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        RFC822 marshalling for zope.schema fields
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.rfc822";
+      license = "BSD";
+    };
+  };
+
+
+  "zope.sendmail-3.7.5" = self.buildPythonPackage {
+    name = "zope.sendmail-3.7.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.sendmail/zope.sendmail-3.7.5.tar.gz";
+        md5 = "8a513ecf2b41cad849f6607bf16d6818";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope sendmail
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.sendmail";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.locking-2.0.4" = self.buildPythonPackage {
+    name = "plone.locking-2.0.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip";
+        md5 = "a7f8b8db78f57272d351d7fe0d067eb2";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        webdav locking support
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.locking";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "zope.annotation-3.5.0" = self.buildPythonPackage {
+    name = "zope.annotation-3.5.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.annotation/zope.annotation-3.5.0.tar.gz";
+        md5 = "4238153279d3f30ab5613438c8e76380";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Object annotation mechanism
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.annotation";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.app.customerize-1.2.2" = self.buildPythonPackage {
+    name = "plone.app.customerize-1.2.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.customerize/plone.app.customerize-1.2.2.zip";
+        md5 = "6a3802c4e8fbd955597adc6a8298febf";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.customerize-1.1" self."plone.browserlayer-2.1.2" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Integrate five.customerize into Plone.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.customerize/";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "WebTest-2.0.7" = self.buildPythonPackage {
+    name = "WebTest-2.0.7";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/W/WebTest/WebTest-2.0.7.zip";
+        md5 = "4ca4e944a7f5f08b5aebd3bf90699890";
+    };
+    doCheck = true;
+    buildInputs = [ self."nose-1.3.0" self."unittest2-0.5.1" self."pyquery-1.2.4" self."WSGIProxy2-0.2" self."PasteDeploy-1.5.0" self."mock-1.0.1" self."coverage-3.6" pkgs.unzip ];
+    propagatedBuildInputs = [ self."beautifulsoup4-4.3.0" self."six-1.3.0" self."waitress-0.8.6" self."WebOb-1.2.3" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Helper to test WSGI applications
+        '';
+      homepage = "http://webtest.pythonpaste.org/";
+      license = "MIT";
+    };
+  };
+
+
+  "plone.app.registry-1.2.3" = self.buildPythonPackage {
+    name = "plone.app.registry-1.2.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.2.3.zip";
+        md5 = "b2269e10516e8f2faf83545e3d0163d8";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."lxml-2.3.6" self."plone.app.z3cform-0.7.3" self."plone.autoform-1.4" self."plone.registry-1.0.1" self."plone.supermodel-1.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope 2 and Plone  integration for plone.registry
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.registry";
+      license = "GPL";
+    };
+  };
+
+
+  "plone.session-3.5.3" = self.buildPythonPackage {
+    name = "plone.session-3.5.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.session/plone.session-3.5.3.zip";
+        md5 = "f95872454735abc8f27c3dcbc9434c11";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.keyring-2.0.1" self."plone.protect-2.0.2" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Session based authentication for Zope
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.session";
+      license = "BSD";
+    };
+  };
+
+
+  "z3c.caching__zcml-2.0a1" = self.buildPythonPackage {
+    name = "z3c.caching__zcml-2.0a1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/z3c.caching/z3c.caching-2.0a1.tar.gz";
+        md5 = "17f250b5084c2324a7d15c6810ee628e";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.configuration-3.7.4" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Caching infrastructure for web apps
+        '';
+      homepage = "UNKNOWN";
+      license = "ZPL";
+    };
+  };
+
+
+  "Products.ZCTextIndex-2.13.4" = self.buildPythonPackage {
+    name = "Products.ZCTextIndex-2.13.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.4.zip";
+        md5 = "8bbfa5fcd3609246990a9314d6f826b4";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Full text indexing for ZCatalog / Zope 2.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.ZCTextIndex";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.filerepresentation-3.6.1" = self.buildPythonPackage {
+    name = "zope.filerepresentation-3.6.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.filerepresentation/zope.filerepresentation-3.6.1.tar.gz";
+        md5 = "4a7a434094f4bfa99a7f22e75966c359";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        File-system Representation Interfaces
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.filerepresentation";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.memoize-1.1.1" = self.buildPythonPackage {
+    name = "plone.memoize-1.1.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.memoize/plone.memoize-1.1.1.zip";
+        md5 = "d07cd14b976160e1f26a859e3370147e";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.ramcache-1.0" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Decorators for caching the values of functions and methods
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.memoize";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "zope.interface-3.6.7" = self.buildPythonPackage {
+    name = "zope.interface-3.6.7";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.6.7.zip";
+        md5 = "9df962180fbbb54eb1875cff9fe436e5";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Interfaces for Python
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.interface";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.size-3.4.1" = self.buildPythonPackage {
+    name = "zope.size-3.4.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.size/zope.size-3.4.1.tar.gz";
+        md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Interfaces and simple adapter that give the size of an object
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.size";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "five.customerize-1.1" = self.buildPythonPackage {
+    name = "five.customerize-1.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/f/five.customerize/five.customerize-1.1.zip";
+        md5 = "80772212a2d55150a6c070fc4638b0c7";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.portlets-2.2" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        TTW customization of template-based Zope views
+        '';
+      homepage = "http://pypi.python.org/pypi/five.customerize";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.dottedname-3.4.6" = self.buildPythonPackage {
+    name = "zope.dottedname-3.4.6";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.dottedname/zope.dottedname-3.4.6.tar.gz";
+        md5 = "62d639f75b31d2d864fe5982cb23959c";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Resolver for Python dotted names.
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.dottedname";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.resource-1.0.2" = self.buildPythonPackage {
+    name = "plone.resource-1.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.resource/plone.resource-1.0.2.zip";
+        md5 = "594d41e3acd913ae92f2e9ef96503b9f";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.caching-1.0" self."python-dateutil-1.5" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        UNKNOWN
+        '';
+      homepage = "https://svn.plone.org/svn/plone/plone.resource";
+      license = "GPL";
+    };
+  };
+
+
+  "Products.DCWorkflow-2.2.4" = self.buildPythonPackage {
+    name = "Products.DCWorkflow-2.2.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz";
+        md5 = "c90a16c4f3611015592ba8173a5f1863";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        DCWorkflow product for the Zope Content Management Framework
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.DCWorkflow";
+      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
+    };
+  };
+
+
+  "plone.app.locales-4.3.1" = self.buildPythonPackage {
+    name = "plone.app.locales-4.3.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.1.zip";
+        md5 = "c88b2da05361a24a564bdef30fb371aa";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Translation files for Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.locales";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "collective.z3cform.datetimewidget-1.2.3" = self.buildPythonPackage {
+    name = "collective.z3cform.datetimewidget-1.2.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.3.zip";
+        md5 = "439117021c93f26c677510504ee245d3";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        z3c.form date and datetime widgets
+        '';
+      homepage = "https://github.com/collective/collective.z3cform.datetimewidget";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "plone.app.contentlisting-1.0.4" = self.buildPythonPackage {
+    name = "plone.app.contentlisting-1.0.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.4.zip";
+        md5 = "fa6eb45c4ffd0eb3817ad4813ca24916";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Listing of content for the Plone CMS
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.contentlisting";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Zope2-2.13.20" = self.buildPythonPackage {
+    name = "Zope2-2.13.20";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.20.zip";
+        md5 = "557b08fec37620c37e32f2dc01020f29";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."docutils-0.9.1" self."ExtensionClass-2.13.2" self."initgroups-2.13.0" self."Missing-2.13.1" self."MultiMapping-2.13.0" self."Persistence-2.13.2" self."Products.BTreeFolder2-2.13.3" self."Products.ExternalMethod-2.13.0" self."Products.MailHost-2.13.1" self."Products.MIMETools-2.13.0" self."Products.OFSP-2.13.2" self."Products.PythonScripts-2.13.2" self."Products.StandardCacheManagers-2.13.0" self."Products.ZCatalog-2.13.23" self."Products.ZCTextIndex-2.13.4" self."pytz-2013b" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."tempstorage-2.12.2" self."transaction-1.1.1" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zExceptions-2.13.0" self."zLOG-2.11.1" self."ZODB3-3.10.5" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.contenttype-3.5.5" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.processlifetime-1.0" self."zope.proxy-3.6.1" self."zope.ptresource-3.9.0" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.sendmail-3.7.5" self."zope.sequencesort-3.4.0" self."zope.site-3.9.2" self."zope.size-3.4.1" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.testbrowser-3.11.1" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."ZopeUndo-2.12.0" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope2 application server / web framework
+        '';
+      homepage = "http://zope2.zope.org";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.ExternalMethod-2.13.0" = self.buildPythonPackage {
+    name = "Products.ExternalMethod-2.13.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip";
+        md5 = "15ba953ef6cb632eb571977651252ea6";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        This package provides support for external Python methods within a Zope 2 environment.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.ExternalMethod";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.browserlayer-2.1.2" = self.buildPythonPackage {
+    name = "plone.browserlayer-2.1.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.browserlayer/plone.browserlayer-2.1.2.zip";
+        md5 = "bce02f4907a4f29314090c525e5fc28e";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Browser layer management for Zope 2 applications
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.browserlayer";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "plone.app.folder-1.0.5" = self.buildPythonPackage {
+    name = "plone.app.folder-1.0.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.folder/plone.app.folder-1.0.5.zip";
+        md5 = "8ea860daddb4c93c0b7f2b5f7106fef0";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.folder-1.0.4" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Integration package for `plone.folder` into Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.folder/";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Chameleon-2.11" = self.buildPythonPackage {
+    name = "Chameleon-2.11";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/C/Chameleon/Chameleon-2.11.tar.gz";
+        md5 = "df72458bf3dd26a744dcff5ad555c34b";
+    };
+    doCheck = false;
+    buildInputs = [ self."zope.event-4.0.2" ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Fast HTML/XML Template Compiler.
+        '';
+      homepage = "https://chameleon.readthedocs.org/en/latest/";
+      license = "BSD-like (http://repoze.org/license.html)";
+    };
+  };
+
+
+  "Products.StandardCacheManagers-2.13.0" = self.buildPythonPackage {
+    name = "Products.StandardCacheManagers-2.13.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.StandardCacheManagers/Products.StandardCacheManagers-2.13.0.zip";
+        md5 = "c5088b2b62bd26d63d9579a04369cb73";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."AccessControl-3.0.6" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Cache managers for Zope 2.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.StandardCacheManagers";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "RestrictedPython-3.6.0" = self.buildPythonPackage {
+    name = "RestrictedPython-3.6.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/R/RestrictedPython/RestrictedPython-3.6.0.zip";
+        md5 = "aa75a7dcc7fbc966357837cc66cacec6";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        RestrictedPython provides a restricted execution environment for Python, e.g. for running untrusted code.
+        '';
+      homepage = "http://pypi.python.org/pypi/RestrictedPython";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "tempstorage-2.12.2" = self.buildPythonPackage {
+    name = "tempstorage-2.12.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.2.zip";
+        md5 = "7a2b76b39839e229249b1bb175604480";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.testing-3.9.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A RAM-based storage for ZODB
+        '';
+      homepage = "http://pypi.python.org/pypi/tempstorage";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.app.uuid-1.0" = self.buildPythonPackage {
+    name = "plone.app.uuid-1.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.uuid/plone.app.uuid-1.0.zip";
+        md5 = "9ca8dcfb09a8a0d6bbee0f28073c3d3f";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.indexer-1.0.2" self."plone.uuid-1.0.3" self.setuptools self."zope.interface-3.6.7" self."zope.publisher-3.12.6" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Plone integration for the basic plone.uuid package
+        '';
+      homepage = "http://plone.org";
+      license = "GPL";
+    };
+  };
+
+
+  "Acquisition-2.13.8" = self.buildPythonPackage {
+    name = "Acquisition-2.13.8";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip";
+        md5 = "8c33160c157b50649e2b2b3224622579";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in.
+        '';
+      homepage = "http://pypi.python.org/pypi/Acquisition";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.datetime-3.4.1" = self.buildPythonPackage {
+    name = "zope.datetime-3.4.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.datetime/zope.datetime-3.4.1.tar.gz";
+        md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope datetime
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.datetime";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "lxml-2.3.6" = self.buildPythonPackage {
+    name = "lxml-2.3.6";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/l/lxml/lxml-2.3.6.tar.gz";
+        md5 = "d5d886088e78b1bdbfd66d328fc2d0bc";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.
+        '';
+      homepage = "http://lxml.de/";
+      license = "UNKNOWN";
+    };
+  };
+
+
+  "plone.app.dexterity-2.0.8" = self.buildPythonPackage {
+    name = "plone.app.dexterity-2.0.8";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.8.zip";
+        md5 = "2e0ec48224a3a8afd51656c22d574359";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.3" self."lxml-2.3.6" self."plone.app.content-2.1.2" self."plone.app.layout-2.3.5" self."plone.app.textfield-1.2.2" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.3" self."plone.autoform-1.4" self."plone.behavior-1.0.2" self."plone.contentrules-2.0.3" self."plone.dexterity-2.1.3" self."plone.formwidget.namedfile-1.0.6" self."plone.namedfile__scales-2.0.2" self."plone.portlets-2.2" self."plone.rfc822-1.0.1" self."plone.schemaeditor-1.3.2" self."plone.supermodel-1.2.2" self."plone.z3cform-0.8.0" self."Products.ATContentTypes-2.1.13" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self.setuptools self."z3c.form-3.0" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Dexterity is a content type framework for CMF applications, with particular emphasis on Plone. It can be viewed as an alternative to Archetypes that is more light-weight and modular.
+        '';
+      homepage = "http://plone.org/products/dexterity";
+      license = "GPL";
+    };
+  };
+
+
+  "zope.app.locales-3.6.2" = self.buildPythonPackage {
+    name = "zope.app.locales-3.6.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.app.locales/zope.app.locales-3.6.2.tar.gz";
+        md5 = "bd2b4c6040e768f33004b1210d3207fa";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope locale extraction and management utilities
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.app.locales";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.app.layout-2.3.5" = self.buildPythonPackage {
+    name = "plone.app.layout-2.3.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.5.zip";
+        md5 = "960665807ad60eb3e12c52a0cf092ceb";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.app.portlets-2.4.4" self."plone.app.viewletmanager-2.0.3" self."plone.i18n-2.0.8" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Layout mechanisms for Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.layout";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "zope.app.content-3.5.1" = self.buildPythonPackage {
+    name = "zope.app.content-3.5.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.app.content/zope.app.content-3.5.1.tar.gz";
+        md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.componentvocabulary-1.0.1" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Content Type
+        '';
+      homepage = "http://cheeseshop.python.org/pypi/zope.app.content";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "mechanize-0.2.5" = self.buildPythonPackage {
+    name = "mechanize-0.2.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz";
+        md5 = "32657f139fc2fb75bcf193b63b8c60b2";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Stateful programmatic web browsing.
+        '';
+      homepage = "http://wwwsearch.sourceforge.net/mechanize/";
+      license = "BSD";
+    };
+  };
+
+
+  "z3c.formwidget.query-0.9" = self.buildPythonPackage {
+    name = "z3c.formwidget.query-0.9";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/z3c.formwidget.query/z3c.formwidget.query-0.9.zip";
+        md5 = "d9f7960b1a5a81d8ba5241530f496522";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A source query widget for z3c.form.
+        '';
+      homepage = "http://pypi.python.org/pypi/z3c.formwidget.query";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.app.z3cform-0.7.3" = self.buildPythonPackage {
+    name = "plone.app.z3cform-0.7.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.3.zip";
+        md5 = "deddc1af36efb26a6792c9803531c665";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.3" self."plone.protect-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.formwidget.query-0.9" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A collection of widgets, templates and other components for use with z3c.form and Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.z3cform";
+      license = "GPL";
+    };
+  };
+
+
+  "plone.app.querystring-1.0.8" = self.buildPythonPackage {
+    name = "plone.app.querystring-1.0.8";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.querystring/plone.app.querystring-1.0.8.zip";
+        md5 = "3ad2155da0dd5c6b99643551ad494607";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."DateTime-3.0.3" self."plone.app.contentlisting-1.0.4" self."plone.app.layout-2.3.5" self."plone.app.vocabularies-2.1.10" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.globalrequest-1.0" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        UNKNOWN
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.querystring";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "zope.interface-4.0.5" = self.buildPythonPackage {
+    name = "zope.interface-4.0.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.interface/zope.interface-4.0.5.zip";
+        md5 = "caf26025ae1b02da124a58340e423dfe";
+    };
+    doCheck = true;
+    buildInputs = [ self."zope.event-4.0.2" pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Interfaces for Python
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.interface";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.i18n-2.0.8" = self.buildPythonPackage {
+    name = "plone.i18n-2.0.8";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.8.zip";
+        md5 = "572c21e86b99316a06dc9998454d7750";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."Unidecode-0.04.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Advanced i18n/l10n features
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.i18n";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Products.contentmigration-2.1.4" = self.buildPythonPackage {
+    name = "Products.contentmigration-2.1.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.4.zip";
+        md5 = "711f9d4ea3cc2130acaa74efb0f9da5e";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A generic content migration framework for Plone.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.contentmigration";
+      license = "LGPL";
+    };
+  };
+
+
+  "Missing-2.13.1" = self.buildPythonPackage {
+    name = "Missing-2.13.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip";
+        md5 = "9823cff54444cbbcaef8fc45d8e42572";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Special Missing objects used in Zope2.
+        '';
+      homepage = "http://pypi.python.org/pypi/Missing";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.cachedescriptors-3.5.1" = self.buildPythonPackage {
+    name = "zope.cachedescriptors-3.5.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip";
+        md5 = "263459a95238fd61d17e815d97ca49ce";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Method and property caching decorators
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.cachedescriptors";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.browsermenu-3.9.1" = self.buildPythonPackage {
+    name = "zope.browsermenu-3.9.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.browsermenu/zope.browsermenu-3.9.1.zip";
+        md5 = "a47c7b1e786661c912a1150bf8d1f83f";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Browser menu implementation for Zope.
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.browsermenu/";
+      license = "UNKNOWN";
+    };
+  };
+
+
+  "ZODB3-3.10.5" = self.buildPythonPackage {
+    name = "ZODB3-3.10.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz";
+        md5 = "6f180c6897a1820948fee2a6290503cd";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."transaction-1.1.1" self."zc.lockfile-1.0.2" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Object Database: object database and persistence
+        '';
+      homepage = "UNKNOWN";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "archetypes.referencebrowserwidget-2.4.18" = self.buildPythonPackage {
+    name = "archetypes.referencebrowserwidget-2.4.18";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.18.zip";
+        md5 = "6eff85cbde401ff1566a76323792d514";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.app.form-2.2.2" self."plone.app.jquerytools-1.5.5" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A referencebrowser implementation for Archetypes
+        '';
+      homepage = "http://pypi.python.org/pypi/archetypes.referencebrowserwidget";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.configuration-3.7.4" = self.buildPythonPackage {
+    name = "zope.configuration-3.7.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-3.7.4.zip";
+        md5 = "5b0271908ef26c05059eda76928896ea";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Configuration Markup Language (ZCML)
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.configuration";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "venusian-1.0a8" = self.buildPythonPackage {
+    name = "venusian-1.0a8";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/v/venusian/venusian-1.0a8.tar.gz";
+        md5 = "a1a72166fd7cccf0f30e3305e09ce5cf";
+    };
+    doCheck = false;
+    buildInputs = [ self."nose-1.3.0" ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A library for deferring decorator actions
+        '';
+      homepage = "http://pylonsproject.org";
+      license = "BSD-derived (http://www.repoze.org/LICENSE.txt)";
+    };
+  };
+
+
+  "plone.app.contentmenu-2.0.8" = self.buildPythonPackage {
+    name = "plone.app.contentmenu-2.0.8";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.contentmenu/plone.app.contentmenu-2.0.8.zip";
+        md5 = "8ba463f1a164c454c70d26507e5bd22a";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.content-2.1.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Plone's content menu implementation
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.contentmenu";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "plone.contentrules-2.0.3" = self.buildPythonPackage {
+    name = "plone.contentrules-2.0.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.3.zip";
+        md5 = "e743dca41b07b7ac1c2a65b652679201";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Plone ContentRules Engine
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.contentrules";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "plone.protect-2.0.2" = self.buildPythonPackage {
+    name = "plone.protect-2.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.protect/plone.protect-2.0.2.zip";
+        md5 = "74925ffb08782e72f9b1e850fa78fffa";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.keyring-2.0.1" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Security for browser forms
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.protect";
+      license = "BSD";
+    };
+  };
+
+
+  "transaction-1.1.1" = self.buildPythonPackage {
+    name = "transaction-1.1.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/t/transaction/transaction-1.1.1.tar.gz";
+        md5 = "30b062baa34fe1521ad979fb088c8c55";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Transaction management for Python
+        '';
+      homepage = "http://www.zope.org/Products/ZODB";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.app.theming-1.1.1" = self.buildPythonPackage {
+    name = "plone.app.theming-1.1.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip";
+        md5 = "a694b7a050b6e7c25d720d1e99bb73fa";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."diazo-1.0.3" self."docutils-0.9.1" self."five.globalrequest-1.0" self."lxml-2.3.6" self."plone.app.registry-1.2.3" self."plone.resource-1.0.2" self."plone.resourceeditor-1.0" self."plone.subrequest-1.6.7" self."plone.transformchain-1.0.3" self."Products.CMFPlone-4.3.1" self."repoze.xmliter-0.5" self."roman-1.4.0" self.setuptools self."zope.traversing-3.13.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Integrates the Diazo theming engine with Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.theming";
+      license = "GPL";
+    };
+  };
+
+
+  "plone.app.discussion-2.2.6" = self.buildPythonPackage {
+    name = "plone.app.discussion-2.2.6";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.6.zip";
+        md5 = "36cf9cd22119282f49facd03fb3c2632";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."collective.monkeypatcher-1.0.1" self."plone.app.layout-2.3.5" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.3" self."plone.indexer-1.0.2" self."plone.registry-1.0.1" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.site-3.9.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Enhanced discussion support for Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.discussion";
+      license = "GPL";
+    };
+  };
+
+
+  "borg.localrole-3.0.2" = self.buildPythonPackage {
+    name = "borg.localrole-3.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/b/borg.localrole/borg.localrole-3.0.2.zip";
+        md5 = "04082694dfda9ae5cda62747b8ac7ccf";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A PAS plugin which can manage local roles via an adapter lookup on the current context
+        '';
+      homepage = "http://pypi.python.org/pypi/borg.localrole";
+      license = "LGPL";
+    };
+  };
+
+
+  "Products.ZCatalog-2.13.23" = self.buildPythonPackage {
+    name = "Products.ZCatalog-2.13.23";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.ZCatalog/Products.ZCatalog-2.13.23.zip";
+        md5 = "d425171516dfc70e543a4e2b852301cb";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Products.ZCTextIndex-2.13.4" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope 2's indexing and search solution.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.ZCatalog";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.TinyMCE-1.3.4" = self.buildPythonPackage {
+    name = "Products.TinyMCE-1.3.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.4.zip";
+        md5 = "e697dfdd72f3b6238e26908bb455d39a";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.app.imaging-1.0.9" self."plone.app.layout-2.3.5" self."plone.caching-1.0" self."plone.namedfile__scales-2.0.2" self."plone.outputfilters-1.10" self."Products.Archetypes-1.9.1" self."Products.ResourceRegistries-2.2.9" self.setuptools self."zope.app.content-3.5.1" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Adds support for TinyMCE, a platform independent web based Javascript HTML WYSIWYG editor, to Plone.
+        '';
+      homepage = "http://plone.org/products/tinymce";
+      license = "LGPL";
+    };
+  };
+
+
+  "python-openid-2.2.5" = self.buildPythonPackage {
+    name = "python-openid-2.2.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.tar.gz";
+        md5 = "393f48b162ec29c3de9e2973548ea50d";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        OpenID support for servers and consumers.
+        '';
+      homepage = "http://github.com/openid/python-openid";
+      license = "UNKNOWN";
+    };
+  };
+
+
+  "plone.supermodel-1.2.2" = self.buildPythonPackage {
+    name = "plone.supermodel-1.2.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.2.zip";
+        md5 = "6e829dc362d6ff8e3c7696277e11e322";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools self."z3c.zcmlhook-1.0b1" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Serialize Zope schema definitions to and from XML
+        '';
+      homepage = "http://code.google.com/p/dexterity";
+      license = "BSD";
+    };
+  };
+
+
+  "zope.exceptions-3.6.2" = self.buildPythonPackage {
+    name = "zope.exceptions-3.6.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-3.6.2.tar.gz";
+        md5 = "d7234d99d728abe3d9275346e8d24fd9";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Exceptions
+        '';
+      homepage = "http://cheeseshop.python.org/pypi/zope.exceptions";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.app.users-1.2a2" = self.buildPythonPackage {
+    name = "plone.app.users-1.2a2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.users/plone.app.users-1.2a2.zip";
+        md5 = "a96e42e34d97162363cb3bbc8483d2ba";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."five.formlib-1.0.4" self."plone.app.controlpanel-2.3.6" self."plone.app.layout-2.3.5" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A package for all things users and groups related (specific to plone)
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.users";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "plone.z3cform-0.8.0" = self.buildPythonPackage {
+    name = "plone.z3cform-0.8.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.8.0.zip";
+        md5 = "bdb23dd162544964d2f8f8f5f002e874";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.batching-1.0" self.setuptools self."z3c.form-3.0" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.z3cform";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.app.caching-1.1.4" = self.buildPythonPackage {
+    name = "plone.app.caching-1.1.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.4.zip";
+        md5 = "bbb46c9dc36f0ac6cc833ee152203a81";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.registry-1.2.3" self."plone.app.z3cform-0.7.3" self."plone.cachepurging-1.0.4" self."plone.caching-1.0" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self."python-dateutil-1.5" self.setuptools self."z3c.form-3.0" self."z3c.zcmlhook-1.0b1" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Plone UI and default rules for plone.caching/z3c.caching
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.caching";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Record-2.13.0" = self.buildPythonPackage {
+    name = "Record-2.13.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/R/Record/Record-2.13.0.zip";
+        md5 = "cfed6a89d4fb2c9cb995e9084c3071b7";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Special Record objects used in Zope2.
+        '';
+      homepage = "http://pypi.python.org/pypi/Record";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "AccessControl-3.0.6" = self.buildPythonPackage {
+    name = "AccessControl-3.0.6";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/A/AccessControl/AccessControl-3.0.6.zip";
+        md5 = "a8ce472482adabf9ec969f3971a39a19";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self."Record-2.13.0" self."RestrictedPython-3.6.0" self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.testing-3.9.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Security framework for Zope2.
+        '';
+      homepage = "http://pypi.python.org/pypi/AccessControl";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.CMFPlacefulWorkflow-1.5.9" = self.buildPythonPackage {
+    name = "Products.CMFPlacefulWorkflow-1.5.9";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.9.zip";
+        md5 = "9041e1f52eab5b348c0dfa85be438722";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self."Products.PloneTestCase-0.9.17" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.testing-3.9.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Workflow policies for CMF and Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.CMFPlacefulWorkflow";
+      license = "GPL";
+    };
+  };
+
+
+  "plone.app.textfield-1.2.2" = self.buildPythonPackage {
+    name = "plone.app.textfield-1.2.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.2.zip";
+        md5 = "f832887a40826d6f68c48b48f071fb9c";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Text field with MIME type support
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.textfield";
+      license = "GPL";
+    };
+  };
+
+
+  "zope.event-3.5.2" = self.buildPythonPackage {
+    name = "zope.event-3.5.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz";
+        md5 = "6e8af2a16157a74885d4f0d88137cefb";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Very basic event publishing system
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.event";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "pyquery-1.2.4" = self.buildPythonPackage {
+    name = "pyquery-1.2.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.4.tar.gz";
+        md5 = "268f08258738d21bc1920d7522f2a63b";
+    };
+    doCheck = true;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."cssselect-0.8" self."lxml-3.2.3" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A jquery-like library for python
+        '';
+      homepage = "https://github.com/gawel/pyquery";
+      license = "BSD";
+    };
+  };
+
+
+  "initgroups-2.13.0" = self.buildPythonPackage {
+    name = "initgroups-2.13.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/i/initgroups/initgroups-2.13.0.zip";
+        md5 = "38e842dcab8445f65e701fec75213acd";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Convenience uid/gid helper function used in Zope2.
+        '';
+      homepage = "http://pypi.python.org/pypi/initgroups";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zdaemon-2.0.7" = self.buildPythonPackage {
+    name = "zdaemon-2.0.7";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zdaemon/zdaemon-2.0.7.tar.gz";
+        md5 = "291a875f82e812110557eb6704af8afe";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."ZConfig-2.9.1" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Daemon process control library and tools for Unix-based systems
+        '';
+      homepage = "http://www.python.org/pypi/zdaemon";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.alterego-1.0" = self.buildPythonPackage {
+    name = "plone.alterego-1.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.alterego/plone.alterego-1.0.zip";
+        md5 = "b7b6dbcbba00505d98d5aba83e016408";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Low level support for dynamic modules
+        '';
+      homepage = "http://code.google.com/p/dexterity";
+      license = "LGPL";
+    };
+  };
+
+
+  "z3c.zcmlhook-1.0b1" = self.buildPythonPackage {
+    name = "z3c.zcmlhook-1.0b1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/z3c.zcmlhook/z3c.zcmlhook-1.0b1.tar.gz";
+        md5 = "7b6c80146f5930409eb0b355ddf3daeb";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Easily hook into the ZCML processing machinery
+        '';
+      homepage = "UNKNOWN";
+      license = "ZPL";
+    };
+  };
+
+
+  "zope.authentication-3.7.1" = self.buildPythonPackage {
+    name = "zope.authentication-3.7.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.authentication/zope.authentication-3.7.1.zip";
+        md5 = "7d6bb340610518f2fc71213cfeccda68";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Definition of authentication basics for the Zope Framework
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.authentication";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "eggtestinfo-0.3" = self.buildPythonPackage {
+    name = "eggtestinfo-0.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/e/eggtestinfo/eggtestinfo-0.3.tar.gz";
+        md5 = "6f0507aee05f00c640c0d64b5073f840";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Add test information to .egg-info
+        '';
+      homepage = "http://pypi.python.org/pypi/eggtestinfo";
+      license = "PSF or ZPL";
+    };
+  };
+
+
+  "plone.portlet.collection-2.1.5" = self.buildPythonPackage {
+    name = "plone.portlet.collection-2.1.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.1.5.zip";
+        md5 = "065f0d9141860229cf66d0ff2ed6d4ea";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.app.form-2.2.2" self."plone.app.portlets-2.4.4" self."plone.app.vocabularies-2.1.10" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A portlet that fetches results from a collection
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.portlet.collection";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "zope.browser-1.3" = self.buildPythonPackage {
+    name = "zope.browser-1.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.browser/zope.browser-1.3.zip";
+        md5 = "4ff0ddbf64c45bfcc3189e35f4214ded";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Shared Zope Toolkit browser components
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.browser";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.app.collection-1.0.10" = self.buildPythonPackage {
+    name = "plone.app.collection-1.0.10";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.10.zip";
+        md5 = "1042ac059be2311d4758452a3fa4f82e";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."archetypes.querywidget-1.0.8" self."plone.app.contentlisting-1.0.4" self."plone.app.form-2.2.2" self."plone.app.portlets-2.4.4" self."plone.app.vocabularies-2.1.10" self."plone.portlet.collection-2.1.5" self."plone.portlets-2.2" self."Products.Archetypes-1.9.1" self."Products.CMFCore-2.2.7" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        This package adds 'saved search' functionality to Plone.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.collection";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Products.CMFCalendar-2.2.2" = self.buildPythonPackage {
+    name = "Products.CMFCalendar-2.2.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.2.tar.gz";
+        md5 = "49458e68dc3b6826ea9a3576ac014419";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Calendar product for the Zope Content Management Framework
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.CMFCalendar";
+      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
+    };
+  };
+
+
+  "Products.PluggableAuthService-1.10.0" = self.buildPythonPackage {
+    name = "Products.PluggableAuthService-1.10.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.PluggableAuthService/Products.PluggableAuthService-1.10.0.tar.gz";
+        md5 = "1a1db6b1d9dd34f8b93a8a3104385a37";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."Products.GenericSetup-1.7.3" self."Products.PluginRegistry-1.3" self.setuptools self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Pluggable Zope2 authentication / authorization framework
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.PluggableAuthService";
+      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
+    };
+  };
+
+
+  "Plone-4.3.1" = self.buildPythonPackage {
+    name = "Plone-4.3.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.1.zip";
+        md5 = "faefd5d2044a9f7660fd18388fd71a4e";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.app.caching-1.1.4" self."plone.app.dexterity-2.0.8" self."plone.app.iterate-2.1.10" self."plone.app.openid-2.0.2" self."plone.app.theming-1.1.1" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.CMFPlone-4.3.1" self.setuptools self."wicked-1.1.10" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        The Plone Content Management System
+        '';
+      homepage = "http://plone.org/";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "wicked-1.1.10" = self.buildPythonPackage {
+    name = "wicked-1.1.10";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip";
+        md5 = "f65611f11d547d7dc8e623bf87d3929d";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.container-3.11.2" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        wicked is a compact syntax for doing wiki-like content linking and creation in zope and plone
+        '';
+      homepage = "http://pypi.python.org/pypi/wicked";
+      license = "GPL";
+    };
+  };
+
+
+  "zope.broken-3.6.0" = self.buildPythonPackage {
+    name = "zope.broken-3.6.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.broken/zope.broken-3.6.0.zip";
+        md5 = "eff24d7918099a3e899ee63a9c31bee6";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Broken Object Interfaces
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.broken";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.formwidget.namedfile-1.0.6" = self.buildPythonPackage {
+    name = "plone.formwidget.namedfile-1.0.6";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.6.zip";
+        md5 = "afd20f030906a72fca7548876bdcbb48";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.namedfile__scales-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Image widget for z3c.form and Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.formwidget.namedfile";
+      license = "GPL";
+    };
+  };
+
+
+  "plone.app.viewletmanager-2.0.3" = self.buildPythonPackage {
+    name = "plone.app.viewletmanager-2.0.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.3.zip";
+        md5 = "1dbc51c7664ce3e6ca4dcca1b7b86082";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.vocabularies-2.1.10" self."Products.GenericSetup-1.7.3" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        configurable viewlet manager
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Products.GenericSetup-1.7.3" = self.buildPythonPackage {
+    name = "Products.GenericSetup-1.7.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.3.tar.gz";
+        md5 = "c48967c81c880ed33ee16a14caab3b11";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self.setuptools self."zope.formlib-4.0.6" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Read Zope configuration state from profile dirs / tarballs
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.GenericSetup";
+      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
+    };
+  };
+
+
+  "plone.app.jquery-1.7.2" = self.buildPythonPackage {
+    name = "plone.app.jquery-1.7.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.jquery/plone.app.jquery-1.7.2.tar.gz";
+        md5 = "e204cf45456d26217263531832b5bdac";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        jQuery integration for Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.jquery";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "plone.schemaeditor-1.3.2" = self.buildPythonPackage {
+    name = "plone.schemaeditor-1.3.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.schemaeditor/plone.schemaeditor-1.3.2.zip";
+        md5 = "ab9cb4e929f305063dc8f33e9a33fd21";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.autoform-1.4" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Provides through-the-web editing of a zope schema/interface.
+        '';
+      homepage = "http://svn.plone.org/svn/plone/plone.schemaeditor";
+      license = "BSD";
+    };
+  };
+
+
+  "zope.structuredtext-3.5.1" = self.buildPythonPackage {
+    name = "zope.structuredtext-3.5.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.structuredtext/zope.structuredtext-3.5.1.tar.gz";
+        md5 = "eabbfb983485d0879322bc878d2478a0";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        StructuredText parser
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.structuredtext";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.ramcache-1.0" = self.buildPythonPackage {
+    name = "zope.ramcache-1.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.ramcache/zope.ramcache-1.0.zip";
+        md5 = "87289e15f0e51f50704adda1557c02a7";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.testing-3.9.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope RAM Cache
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.ramcache";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "ZopeUndo-2.12.0" = self.buildPythonPackage {
+    name = "ZopeUndo-2.12.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/Z/ZopeUndo/ZopeUndo-2.12.0.zip";
+        md5 = "2b8da09d1b98d5558f62e12f6e52c401";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        ZODB undo support for Zope2.
+        '';
+      homepage = "http://pypi.python.org/pypi/ZopeUndo";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.traversing-3.13.2" = self.buildPythonPackage {
+    name = "zope.traversing-3.13.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.traversing/zope.traversing-3.13.2.zip";
+        md5 = "eaad8fc7bbef126f9f8616b074ec00aa";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Resolving paths in the object hierarchy
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.traversing";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.contentprovider-3.7.2" = self.buildPythonPackage {
+    name = "zope.contentprovider-3.7.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.contentprovider/zope.contentprovider-3.7.2.tar.gz";
+        md5 = "1bb2132551175c0123f17939a793f812";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.tales-3.5.3" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Content Provider Framework for Zope Templates
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.contentprovider";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plonetheme.classic-1.3.2" = self.buildPythonPackage {
+    name = "plonetheme.classic-1.3.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.2.zip";
+        md5 = "c77d4c34afaf7c02df44d4df72328155";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        The classic Plone 3 default theme.
+        '';
+      homepage = "http://pypi.python.org/pypi/plonetheme.classic";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Products.CMFCore-2.2.7" = self.buildPythonPackage {
+    name = "Products.CMFCore-2.2.7";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.7.tar.gz";
+        md5 = "9320a4023b8575097feacfd4a400e930";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self."Products.GenericSetup-1.7.3" self."Products.ZSQLMethods-2.13.4" self.setuptools self."zope.app.publication-3.12.0" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Content Management Framework core components
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.CMFCore";
+      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
+    };
+  };
+
+
+  "plone.scale__storage-1.3.2" = self.buildPythonPackage {
+    name = "plone.scale__storage-1.3.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.2.zip";
+        md5 = "584ccbf515aff9fef363c2cc8abac789";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."Persistence-2.13.2" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Image scaling
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.scale";
+      license = "BSD";
+    };
+  };
+
+
+  "plone.portlet.static-2.0.2" = self.buildPythonPackage {
+    name = "plone.portlet.static-2.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip";
+        md5 = "ec0dc691b4191a41ff97779b117f9985";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.app.form-2.2.2" self."plone.app.portlets-2.4.4" self."plone.i18n-2.0.8" self."plone.portlets-2.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A simple static HTML portlet for Plone.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.portlet.static";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "plone.app.imaging-1.0.9" = self.buildPythonPackage {
+    name = "plone.app.imaging-1.0.9";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.9.zip";
+        md5 = "e680c5540021a70266343b935ac732a7";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.scale__storage-1.3.2" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        User-configurable, blob-aware image scaling for Plone.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.imaging";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Products.SecureMailHost-1.1.2" = self.buildPythonPackage {
+    name = "Products.SecureMailHost-1.1.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.SecureMailHost/Products.SecureMailHost-1.1.2.zip";
+        md5 = "7db0f1fa867bd0df972082f502a7a707";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        SecureMailHost is a reimplementation of the standard Zope2 MailHost with some security and usability enhancements.
+        '';
+      homepage = "http://svn.plone.org/svn/collective/SecureMailHost/trunk";
+      license = "ZPL";
+    };
+  };
+
+
+  "plone.portlets-2.2" = self.buildPythonPackage {
+    name = "plone.portlets-2.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.portlets/plone.portlets-2.2.zip";
+        md5 = "5b7e06bee6e40af83694b82e1fee8c2d";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        An extension of zope.viewlet to support dynamic portlets
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.portlets";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "archetypes.querywidget-1.0.8" = self.buildPythonPackage {
+    name = "archetypes.querywidget-1.0.8";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.8.zip";
+        md5 = "3416b6b4948c624e1b5b8dd8d7e33f59";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.app.jquerytools-1.5.5" self."plone.app.querystring-1.0.8" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        UNKNOWN
+        '';
+      homepage = "http://pypi.python.org/pypi/archetypes.querywidget";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Products.PluginRegistry-1.3" = self.buildPythonPackage {
+    name = "Products.PluginRegistry-1.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz";
+        md5 = "5b166193ca1eb84dfb402051f779ebab";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Configure application plugins based on interfaces
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.PluginRegistry";
+      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
+    };
+  };
+
+
+  "repoze.xmliter-0.5" = self.buildPythonPackage {
+    name = "repoze.xmliter-0.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/r/repoze.xmliter/repoze.xmliter-0.5.zip";
+        md5 = "99da76bcbad6fbaced4a273bde29b10e";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Wrapper for ``lxml`` trees which serializes to string upon iteration.
+        '';
+      homepage = "http://www.repoze.org";
+      license = "BSD-derived (http://www.repoze.org/LICENSE.txt)";
+    };
+  };
+
+
+  "zLOG-2.11.1" = self.buildPythonPackage {
+    name = "zLOG-2.11.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zLOG/zLOG-2.11.1.tar.gz";
+        md5 = "68073679aaa79ac5a7b6a5c025467147";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."ZConfig-2.9.1" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A general logging facility
+        '';
+      homepage = "http://cheeseshop.python.org/pypi/zLOG";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.location-3.9.1" = self.buildPythonPackage {
+    name = "zope.location-3.9.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-3.9.1.tar.gz";
+        md5 = "1684a8f986099d15296f670c58e713d8";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.proxy-3.6.1" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope Location
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.location/";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "experimental.cssselect-0.3" = self.buildPythonPackage {
+    name = "experimental.cssselect-0.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/e/experimental.cssselect/experimental.cssselect-0.3.zip";
+        md5 = "3fecdcf1fbc3ea6025e115a56a262957";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Experimental version of lxml.cssselect
+        '';
+      homepage = "https://github.com/lrowe/experimental.cssselect";
+      license = "UNKNOWN";
+    };
+  };
+
+
+  "zope.formlib-4.0.6" = self.buildPythonPackage {
+    name = "zope.formlib-4.0.6";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.formlib/zope.formlib-4.0.6.zip";
+        md5 = "eed9c94382d11a4dececd0a48ac1d3f2";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."pytz-2013b" self.setuptools self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.datetime-3.4.1" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Form generation and validation library for Zope
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.formlib";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.copy-3.5.0" = self.buildPythonPackage {
+    name = "zope.copy-3.5.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.copy/zope.copy-3.5.0.tar.gz";
+        md5 = "a9836a5d36cd548be45210eb00407337";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Pluggable object copying mechanism
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.copy";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.subrequest-1.6.7" = self.buildPythonPackage {
+    name = "plone.subrequest-1.6.7";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.subrequest/plone.subrequest-1.6.7.zip";
+        md5 = "cc12f68a22565415b10dbeef0020baa4";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."five.globalrequest-1.0" self.setuptools self."zope.globalrequest-1.0" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Subrequests for Zope2
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.subrequest/";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "plone.app.vocabularies-2.1.10" = self.buildPythonPackage {
+    name = "plone.app.vocabularies-2.1.10";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.10.tar.gz";
+        md5 = "166a0d6f9a3e3cd753efa56aaef585be";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A collection of generally useful vocabularies.
+        '';
+      homepage = "https://github.com/plone/plone.app.vocabularies";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "plone.registry-1.0.1" = self.buildPythonPackage {
+    name = "plone.registry-1.0.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.registry/plone.registry-1.0.1.zip";
+        md5 = "6be3d2ec7e2d170e29b8c0bc65049aff";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        A debconf-like (or about:config-like) registry for storing application settings
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.registry";
+      license = "GPL";
+    };
+  };
+
+
+  "Products.ExtendedPathIndex-3.1" = self.buildPythonPackage {
+    name = "Products.ExtendedPathIndex-3.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/Products.ExtendedPathIndex-3.1.zip";
+        md5 = "00c048a4b103200bdcbda61fa22c66df";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."AccessControl-3.0.6" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Zope catalog index for paths
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.ExtendedPathIndex";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "zope.i18nmessageid-3.5.3" = self.buildPythonPackage {
+    name = "zope.i18nmessageid-3.5.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-3.5.3.tar.gz";
+        md5 = "cb84bf61c2b7353e3b7578057fbaa264";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Message Identifiers for internationalization
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.i18nmessageid";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.app.linkintegrity-1.5.2" = self.buildPythonPackage {
+    name = "plone.app.linkintegrity-1.5.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.2.zip";
+        md5 = "f97c61da9f243391cafdfe3fe1cf6d6c";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Manage link integrity in Plone.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.linkintegrity";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Products.CMFActionIcons-2.1.3" = self.buildPythonPackage {
+    name = "Products.CMFActionIcons-2.1.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.CMFActionIcons/Products.CMFActionIcons-2.1.3.tar.gz";
+        md5 = "ab1dc62404ed11aea84dc0d782b2235e";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."eggtestinfo-0.3" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Action icons product for the Zope Content Management Framework
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.CMFActionIcons";
+      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
+    };
+  };
+
+
+  "zope.app.form-4.0.2" = self.buildPythonPackage {
+    name = "zope.app.form-4.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.app.form/zope.app.form-4.0.2.tar.gz";
+        md5 = "3d2b164d9d37a71490a024aaeb412e91";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."transaction-1.1.1" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.datetime-3.4.1" self."zope.exceptions-3.6.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.proxy-3.6.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        The Original Zope 3 Form Framework
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.app.form";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "five.localsitemanager-2.0.5" = self.buildPythonPackage {
+    name = "five.localsitemanager-2.0.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/f/five.localsitemanager/five.localsitemanager-2.0.5.zip";
+        md5 = "5e3a658e6068832bd802018ebc83f2d4";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Local site manager implementation for Zope 2
+        '';
+      homepage = "http://pypi.python.org/pypi/five.localsitemanager";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.PythonScripts-2.13.2" = self.buildPythonPackage {
+    name = "Products.PythonScripts-2.13.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.PythonScripts/Products.PythonScripts-2.13.2.zip";
+        md5 = "04c86f2c45a29a162297a80dac61d14f";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+
+    meta = {
+      description = ''
+        Provides support for restricted execution of Python scripts in Zope 2.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.PythonScripts";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+}
+
diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json
new file mode 100644
index 000000000000..cc345d5c5bc8
--- /dev/null
+++ b/pkgs/top-level/python-packages.json
@@ -0,0 +1,112 @@
+[
+  { "name": "pyramid",
+    "buildInputs": [ "pkgs.libxml2", "pkgs.libxslt" ],
+    "override": {
+      "pyramid": {
+        "buildInputs": [
+          "nose",
+          "WebTest",
+          "zope.component",
+          "zope.interface"
+        ]
+      },
+      "cssselect": {
+        "doCheck": false
+      },
+      "lxml": {
+        "buildInputs": [ "pkgs.libxml2", "pkgs.libxslt" ],
+        "doCheck": false
+      },
+      "six": {
+        "doCheck": false
+      },
+      "beautifulsoup4": {
+        "doCheck": false
+      },
+      "zope.exceptions": {
+        "doCheck": false
+      },
+      "zope.component": {
+        "doCheck": false
+      },
+      "zope.schema": {
+        "doCheck": false
+      },
+      "zope.testing": {
+        "buildInputs": [ "zope.location" ]
+      },
+      "waitress": {
+        "doCheck": false
+      },
+      "venusian": {
+        "buildInputs": [ "nose" ],
+        "doCheck": false
+      },
+      "Mako": {
+        "buildInputs": [ "nose" ]
+      },
+      "WebOb": {
+        "buildInputs": [ "nose" ],
+        "propagatedBuildInputs": [ "python.modules.ssl" ]
+      },
+      "WebTest": {
+        "buildInputs": [
+          "nose",
+          "unittest2",
+          "pyquery",
+          "WSGIProxy2",
+          "PasteDeploy",
+          "mock",
+          "coverage"
+        ]
+      },
+      "mock": {
+        "buildInputs": [ "unittest2" ]
+      },
+      "PasteDeploy": {
+        "buildInputs": [ "nose" ]
+      },
+      "Chameleon": {
+        "buildInputs": [ "zope.event" ],
+        "doCheck": false
+      },
+      "zope.interface": {
+        "buildInputs": [ "zope.event" ]
+      },
+      "translationstring": {
+        "buildInputs": [ "nose" ]
+      },
+      "repoze.lru": {
+        "buildInputs": [ "nose" ]
+      }
+    }
+  },
+  { "name": "Plone",
+    "extends": "http://dist.plone.org/release/4.3.1/versions.cfg",
+    "doCheck": false,
+    "installCommand": "easy_install --always-unzip --no-deps --prefix=\"$out\" .",
+    "override": {
+      "Products.DCWorkflow": {
+        "propagatedBuildInputs": [ "eggtestinfo" ]
+      },
+      "Products.CMFDefault": {
+        "propagatedBuildInputs": [ "eggtestinfo" ]
+      },
+      "Products.CMFQuickInstallerTool": {
+        "propagatedBuildInputs": [ "eggtestinfo" ]
+      },
+      "Products.CMFUid": {
+        "propagatedBuildInputs": [ "eggtestinfo" ]
+      },
+      "Products.CMFActionIcons": {
+        "propagatedBuildInputs": [ "eggtestinfo" ]
+      },
+      "Products.CMFCalendar": {
+        "propagatedBuildInputs": [ "eggtestinfo" ]
+      }
+    }
+  },
+  { "name": "Distutils2",
+    "doCheck": false
+  }
+]
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0162bae4fa25..421efb6de5be 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5,9 +5,13 @@ 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; };
+modules = python.modules or { readline = null; sqlite3 = null; curses = null; ssl = null; crypt = null; };
 
-pythonPackages = modules // rec {
+pythonPackages = modules // import ./python-packages-generated.nix {
+  inherit pkgs python;
+  inherit (pkgs) stdenv fetchurl;
+  self = pythonPackages;
+} // rec {
 
   inherit python;
   inherit (pkgs) fetchurl fetchsvn fetchgit stdenv;
@@ -68,6 +72,10 @@ pythonPackages = modules // rec {
 
   nixpart = callPackage ../tools/filesystems/nixpart { };
 
+  # This is used for NixOps to make sure we won't break it with the next major
+  # version of nixpart.
+  nixpart0 = nixpart;
+
   pil = import ../development/python-modules/pil {
     inherit (pkgs) fetchurl stdenv libjpeg zlib freetype;
     inherit python buildPythonPackage;
@@ -341,24 +349,6 @@ pythonPackages = modules // rec {
     };
   });
 
-
-  awscli = buildPythonPackage rec {
-    name = "awscli-0.8.3";
-    namePrefix = "";
-
-    src = fetchurl {
-      url = https://github.com/aws/aws-cli/archive/0.8.3.tar.gz;
-      sha256 = "0v7igh00zja560v8qz315g3m7x9six1hprrrb10cpp9sy8n58xnn";
-    };
-
-    propagatedBuildInputs =
-      [ pythonPackages.argparse
-        pythonPackages.botocore
-        pythonPackages.colorama
-      ];
-  };
-
-
   beautifulsoup = buildPythonPackage (rec {
     name = "beautifulsoup-3.2.1";
 
@@ -546,11 +536,12 @@ pythonPackages = modules // rec {
 
 
   boto = buildPythonPackage rec {
-    name = "boto-2.6.0";
+    name = "boto-${version}";
+    version = "2.9.9";
 
     src = fetchurl {
-      url = "https://github.com/downloads/boto/boto/${name}.tar.gz";
-      sha256 = "1wnzs9frf44mrnw7l2vijc5anbcvcqqrv7237gjn27v0ja76slff";
+      url = "https://github.com/boto/boto/archive/${version}.tar.gz";
+      sha256 = "18wqpzd1zf8nivcn2rl1wnladf7hhyy5p75b5l6kafynm4l9j6jq";
     };
 
     # The tests seem to require AWS credentials.
@@ -573,11 +564,12 @@ pythonPackages = modules // rec {
 
 
   botocore = buildPythonPackage rec {
-    name = "botocore-0.8.3";
+    version = "0.13.1";
+    name = "botocore-${version}";
 
     src = fetchurl {
-      url = https://github.com/boto/botocore/archive/0.8.3.tar.gz;
-      sha256 = "0dbm2clrh7zs4brqqj3xssz3nymdg24ff2lww27s3wliirwqdiv1";
+      url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz";
+      sha256 = "192kxgw76b22zmk5mxjkij5rskibb9jfaggvpznzy3ggsgja7yy8";
     };
 
     propagatedBuildInputs =
@@ -821,11 +813,11 @@ pythonPackages = modules // rec {
 
 
   colander = buildPythonPackage rec {
-    name = "colander-0.9.6";
+    name = "colander-1.0a5";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/c/colander/${name}.tar.gz";
-      md5 = "2d9f65a64cb6b7f35d6a0d7b607ce4c6";
+      md5 = "569dea523561f5d94338ef9d9a98d249";
     };
 
     propagatedBuildInputs = [ pythonPackages.translationstring ];
@@ -907,6 +899,102 @@ pythonPackages = modules // rec {
     propagatedBuildInputs = [ pythonPackages.coverage ];
   };
 
+  cryptacular = buildPythonPackage rec {
+    name = "cryptacular-1.4.1";
+
+    buildInputs = [ coverage nose ];
+    propagatedBuildInputs = [ pbkdf2 modules.crypt ];
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/c/cryptacular/${name}.tar.gz";
+      md5 = "fe12232ac660185186dd8057d8ca7b0e";
+    };
+
+    # TODO: tests fail: TypeError: object of type 'NoneType' has no len()
+    doCheck = false;
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+  pbkdf2 = buildPythonPackage rec {
+    name = "pbkdf2-1.3";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pbkdf2/${name}.tar.gz";
+      md5 = "40cda566f61420490206597243dd869f";
+    };
+
+    # ImportError: No module named test
+    doCheck = false;
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+  bcrypt = buildPythonPackage rec {
+    name = "bcrypt-1.0.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/b/bcrypt/${name}.tar.gz";
+      md5 = "c5df008669d17dd6eeb5e2042d5e136f";
+    };
+
+    buildInputs = [ cffi pycparser mock pytest py ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+  cffi = buildPythonPackage rec {
+    name = "cffi-0.7.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/c/cffi/${name}.tar.gz";
+      md5 = "d329f5cb2053fd31dafc02e2c9ef0299";
+    };
+
+    buildInputs = [ pkgs.libffi pycparser ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+  pycparser = buildPythonPackage rec {
+    name = "pycparser-2.10";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pycparser/${name}.tar.gz";
+      md5 = "d87aed98c8a9f386aa56d365fe4d515f";
+    };
+
+    # ImportError: No module named test
+    doCheck = false;
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+  pytest = buildPythonPackage rec {
+    name = "pytest-2.3.5";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pytest/${name}.tar.gz";
+      md5 = "18f150e7be96b5fe3c388b0e817b8087";
+    };
+
+    buildInputs = [ py ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
   cssselect = buildPythonPackage rec {
     name = "cssselect-0.7.1";
     src = fetchurl {
@@ -1018,11 +1106,11 @@ pythonPackages = modules // rec {
 
 
   deform = buildPythonPackage rec {
-    name = "deform-0.9.4";
+    name = "deform-0.9.7";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz";
-      md5 = "2ed7b69644a6d8f4e1404e1892329240";
+      md5 = "d450eef05432d473257da5621c72c8b7";
     };
 
     buildInputs = [] ++ optional isPy26 unittest2;
@@ -1033,6 +1121,9 @@ pythonPackages = modules // rec {
         pythonPackages.colander
         pythonPackages.translationstring
         pythonPackages.chameleon
+        pythonPackages.zope_deprecation
+        pythonPackages.coverage
+        pythonPackages.nose
       ];
 
     meta = {
@@ -1239,11 +1330,11 @@ pythonPackages = modules // rec {
 
 
   pyramid = buildPythonPackage rec {
-    name = "pyramid-1.3.4";
+    name = "pyramid-1.4.3";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pyramid/${name}.tar.gz";
-      md5 = "967a04fcb2143b31b279c3013a778a2b";
+      md5 = "28fabf42cf585ecec7a57b5acc1174e3";
     };
 
     buildInputs = [
@@ -1351,6 +1442,176 @@ pythonPackages = modules // rec {
   };
 
 
+  raven = buildPythonPackage rec {
+    name = "raven-3.4.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/r/raven/${name}.tar.gz";
+      md5 = "6a9264133bf646149ffb9118d81445be";
+    };
+
+    # way too many dependencies to run tests
+    # see https://github.com/getsentry/raven-python/blob/master/setup.py
+    doCheck = false;
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  hypatia = buildPythonPackage rec {
+    name = "hypatia-0.1a6";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/h/hypatia/${name}.tar.gz";
+      md5 = "3a67683c578754cd8f23317db6d28ffd";
+    };
+ 
+    buildInputs = [ zope_interface zodb3 ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  zope_copy = buildPythonPackage rec {
+    name = "zope.copy-4.0.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.copy/${name}.zip";
+      md5 = "36aa2c96dec4cfeea57f54da2b733eb9";
+    };
+ 
+    buildInputs = [ pkgs.unzip zope_interface zope_location zope_schema ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  statsd = buildPythonPackage rec {
+    name = "statsd-2.0.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/s/statsd/${name}.tar.gz";
+      md5 = "476ef5b9004f6e2cb25c7da440bb53d0";
+    };
+ 
+    buildInputs = [ ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  pyramid_zodbconn = buildPythonPackage rec {
+    name = "pyramid_zodbconn-0.4";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pyramid_zodbconn/${name}.tar.gz";
+      md5 = "22e88cc82cafbbe00274e7378434e5fe";
+    };
+ 
+    buildInputs = [ pyramid mock ];
+    propagatedBuildInputs = [ zodb3 zodburi ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  pyramid_mailer = buildPythonPackage rec {
+    name = "pyramid_mailer-0.13";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pyramid_mailer/${name}.tar.gz";
+      md5 = "43800c7c894097a23140da58e3638c93";
+    };
+ 
+    buildInputs = [ pyramid transaction ];
+    propagatedBuildInputs = [ repoze_sendmail ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  repoze_sendmail = buildPythonPackage rec {
+    name = "repoze.sendmail-4.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/r/repoze.sendmail/${name}.tar.gz";
+      md5 = "81d15f1f03cc67d6f56f2091c594ef57";
+    };
+ 
+    buildInputs = [ transaction ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  zodburi = buildPythonPackage rec {
+    name = "zodburi-2.0b1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zodburi/${name}.tar.gz";
+      md5 = "52cc13c32ffe4ee7b5f5abc79f70f3c2";
+    };
+ 
+    buildInputs = [ zodb3 mock ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  substanced = buildPythonPackage rec {
+    # no release yet
+    rev = "bd8822be62f0f356e4e44d5c614fe14d3fa08f45";
+    name = "substanced-${rev}";
+
+    src = fetchgit {
+      inherit rev;
+      url = "https://github.com/Pylons/substanced.git";
+    };
+
+    buildInputs = [ mock ];
+
+    propagatedBuildInputs = [
+      pyramid
+      pytz
+      zodb3
+      venusian
+      colander
+      deform
+      deform_bootstrap
+      python_magic
+      pyyaml
+      cryptacular
+      hypatia
+      zope_copy
+      zope_component
+      zope_deprecation
+      statsd
+      pyramid_zodbconn
+      pyramid_mailer
+    ];
+
+    meta = with stdenv.lib; {
+      maintainers = [ maintainers.iElectric ];
+    };
+  };
+
+
   repoze_lru = buildPythonPackage rec {
     name = "repoze.lru-0.4";
 
@@ -1407,6 +1668,8 @@ pythonPackages = modules // rec {
   };
 
 
+
+
   zope_deprecation = buildPythonPackage rec {
     name = "zope.deprecation-3.5.0";
 
@@ -1640,6 +1903,26 @@ pythonPackages = modules // rec {
   };
 
 
+  django_tagging = buildPythonPackage rec {
+    name = "django-tagging-0.3.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/d/django-tagging/${name}.tar.gz";
+      md5 = "a0855f2b044db15f3f8a025fa1016ddf";
+    };
+
+    # error: invalid command 'test'
+    doCheck = false;
+
+    propagatedBuildInputs = [ django_1_3 ];
+
+    meta = {
+      description = "A generic tagging application for Django projects";
+      homepage = http://code.google.com/p/django-tagging/;
+    };
+  };
+
+
   djblets = buildPythonPackage rec {
     name = "Djblets-0.6.28";
 
@@ -2039,7 +2322,6 @@ pythonPackages = modules // rec {
     meta = {
       description = "automatically generated zsh completion function for Python's option parser modules";
       license = "BSD";
-      maintainers = [ stdenv.lib.maintainers.simons ];
     };
   };
 
@@ -2295,11 +2577,11 @@ pythonPackages = modules // rec {
 
 
   jmespath = buildPythonPackage rec {
-    name = "jmespath-0.0.1";
+    name = "jmespath-0.0.2";
 
     src = fetchurl {
-      url = "https://github.com/boto/jmespath/archive/0.0.1.tar.gz";
-      sha256 = "1a5d62qbgfjbaw8wgkfh78gairnpy6bbdsygwm1prqwap1kyq6ch";
+      url = "https://github.com/boto/jmespath/archive/0.0.2.tar.gz";
+      sha256 = "0wr1gq3gdyn3n21pvj62csdm095512zxd10gkg5ai1vvxh0mbn3r";
     };
 
     propagatedBuildInputs = [ ply ];
@@ -2443,6 +2725,31 @@ pythonPackages = modules // rec {
   });
 
 
+  python_magic = buildPythonPackage rec {
+    name = "python-magic-0.4.3";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/python-magic/${name}.tar.gz";
+      md5 = "eec9e2b1bcaf43308b7dacb3f2ecd8c1";
+    };
+
+    propagatedBuildInputs = [ pkgs.file ];
+
+    patchPhase = ''
+      substituteInPlace magic.py --replace "ctypes.CDLL(dll)" "ctypes.CDLL('${pkgs.file}/lib/libmagic.so')"
+    '';
+
+    # TODO: tests are failing
+    #checkPhase = ''
+    #  ${python}/bin/${python.executable} ./test.py
+    #'';
+
+    meta = {
+      description = "python-magic is a python interface to the libmagic file type identification library";
+      homepage = https://github.com/ahupp/python-magic;
+    };
+  };
+
   magic = pkgs.stdenv.mkDerivation rec {
     name = "python-${pkgs.file.name}";
 
@@ -2489,11 +2796,11 @@ pythonPackages = modules // rec {
 
 
   Mako = buildPythonPackage rec {
-    name = "Mako-0.7.3";
+    name = "Mako-0.8.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/M/Mako/${name}.tar.gz";
-      md5 = "daf7cc50f997533b573f9b40193139a2";
+      md5 = "96d962464ce6316004af0cc48495d73e";
     };
 
     buildInputs = [ markupsafe nose ];
@@ -2590,7 +2897,7 @@ pythonPackages = modules // rec {
     meta = with stdenv.lib; {
       description = "python plotting library, making publication quality plots";
       homepage    = "http://matplotlib.sourceforge.net/";
-      maintainers = with maintainers; [ lovek323 simons ];
+      maintainers = with maintainers; [ lovek323 ];
       platforms   = platforms.unix;
     };
   });
@@ -3285,14 +3592,16 @@ pythonPackages = modules // rec {
   };
 
   paramiko = buildPythonPackage rec {
-    name = "paramiko-1.10.1";
+    name = "paramiko-1.11.0";
 
     src = fetchurl {
-      url = https://pypi.python.org/packages/source/p/paramiko/paramiko-1.10.1.tar.gz;
-      sha256 = "1g5sbzfxdhps61z3vm30wa87m5xq1j9ar3qvgr5bz63l7nxhvb2z";
+      url = "http://pypi.python.org/packages/source/p/paramiko/${name}.tar.gz";
+      md5 = "a2c55dc04904bd08d984533703177084";
     };
 
-    buildInputs = [ pycrypto ];
+    propagatedBuildInputs = [ pycrypto ];
+
+    checkPhase = "python test.py";
 
     meta = {
       homepage = "http://www.lag.net/paramiko/";
@@ -3415,8 +3724,6 @@ pythonPackages = modules // rec {
         does it require C extensions to be compiled. It should work on
         any platform that supports the standard Python pty module.
       '';
-
-      maintainers = [ stdenv.lib.maintainers.simons ];
     };
   };
 
@@ -3838,6 +4145,26 @@ pythonPackages = modules // rec {
     };
   });
 
+
+  pycurl2 = buildPythonPackage (rec {
+    name = "pycurl2-7.20.0";
+
+    src = fetchgit {
+      url = "https://github.com/Lispython/pycurl.git";
+      rev = "0f00109950b883d680bd85dc6e8a9c731a7d0d13";
+      sha256 = "0mhg7f9y5zl0m2xgz3rf1yqjd6l8n0qhfk7bpf36r44jfnhj75ld";
+    };
+
+    buildInputs = [ pkgs.curl simplejson unittest2 nose ];
+
+    meta = {
+      homepage = https://pypi.python.org/pypi/pycurl2;
+      description = "A fork from original PycURL library that no maintained from 7.19.0";
+      platforms = stdenv.lib.platforms.linux;
+    };
+  });
+
+
   pydot = buildPythonPackage rec {
     name = "pydot-1.0.2";
 
@@ -4170,8 +4497,7 @@ pythonPackages = modules // rec {
   });
 
   ldap = buildPythonPackage rec {
-    name = "python-ldap-2.4.10";
-    namePrefix = "";
+    name = "ldap-2.4.10";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/python-ldap/${name}.tar.gz";
@@ -4204,29 +4530,6 @@ pythonPackages = modules // rec {
   });
 
 
-  pylint = buildPythonPackage rec {
-    name = "pylint-0.26.0";
-    namePrefix = "";
-
-    src = fetchurl {
-      url = "http://download.logilab.org/pub/pylint/${name}.tar.gz";
-      sha256 = "1mg1ywpj0klklv63s2hwn5xwxi3wfwgnyz9d4pz32hzb53azq835";
-    };
-
-    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";
-    };
-  };
-
-
   pymacs = pkgs.stdenv.mkDerivation rec {
     version = "v0.25";
     name = "Pymacs-${version}";
@@ -4517,19 +4820,6 @@ pythonPackages = modules // rec {
   });
 
 
-  RBTools = buildPythonPackage rec {
-    name = "rbtools-0.4.1";
-    namePrefix = "";
-
-    src = fetchurl {
-      url = "http://downloads.reviewboard.org/releases/RBTools/0.4/RBTools-0.4.1.tar.gz";
-      sha256 = "1v0r7rfzrasj56s53mib51wl056g7ykh2y1c6dwv12r6hzqsycgv";
-    };
-
-    propagatedBuildInputs = [ setuptools ];
-  };
-
-
   recaptcha_client = buildPythonPackage rec {
     name = "recaptcha-client-1.0.6";
 
@@ -4965,11 +5255,11 @@ pythonPackages = modules // rec {
 
 
   supervisor = buildPythonPackage rec {
-    name = "supervisor-3.0b2";
+    name = "supervisor-3.0";
 
     src = fetchurl {
-      url = https://pypi.python.org/packages/source/s/supervisor/supervisor-3.0b2.tar.gz;
-      md5 = "e2557853239ee69955f993091b0eddc4";
+      url = "https://pypi.python.org/packages/source/s/supervisor/${name}.tar.gz";
+      md5 = "94ff3cf09618c36889425a8e002cd51a";
     };
 
     buildInputs = [ mock ];
@@ -5448,24 +5738,6 @@ pythonPackages = modules // rec {
     };
   };
 
-  vnc2flv = buildPythonPackage rec {
-    name = "vnc2flv-20100207";
-    namePrefix = "";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/v/vnc2flv/${name}.tar.gz";
-      md5 = "8492e46496e187b49fe5569b5639804e";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      description = "Tool to record VNC sessions to Flash Video";
-      homepage = http://www.unixuser.org/~euske/python/vnc2flv/;
-    };
-  };
-
   waitress = buildPythonPackage rec {
     name = "waitress-0.8.5";
 
@@ -6359,11 +6631,11 @@ pythonPackages = modules // rec {
   };
 
   translationstring = buildPythonPackage rec {
-    name = "translationstring-0.4";
+    name = "translationstring-1.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/t/translationstring/${name}.tar.gz";
-      md5 = "392287923c475b660b7549b2c2f03dbc";
+      md5 = "0979b46d8f0f852810c8ec4be5c26cf2";
     };
 
     meta = {
@@ -6470,8 +6742,7 @@ pythonPackages = modules // rec {
       sha256 = "0wjhd87pvpcpvaj3wql2d92g8lpp33iwmxdkp7npic5mjl2y0dsg";
     };
 
-    buildInputs = [ txamqp zope_interface twisted ];
-    propagatedBuildInputs = [ whisper ];
+    propagatedBuildInputs = [ whisper txamqp zope_interface twisted ];
 
     # error: invalid command 'test'
     doCheck = false;
@@ -6527,7 +6798,19 @@ pythonPackages = modules // rec {
       sha256 = "1gj8i6j2i172cldqw98395235bn78ciagw6v17fgv01rmind3lag";
     };
 
-    buildInputs = [ django pkgs.pycairo ldap memcached modules.sqlite3 ];
+    propagatedBuildInputs = [ django_1_3 django_tagging modules.sqlite3 whisper pkgs.pycairo ldap memcached ];
+
+    postInstall = ''
+      wrapProgram $out/bin/run-graphite-devel-server.py \
+        --prefix PATH : ${pkgs.which}/bin
+    '';
+
+    preConfigure = ''
+      substituteInPlace webapp/graphite/thirdparty/pytz/__init__.py --replace '/usr/share/zoneinfo' '/etc/zoneinfo'
+      substituteInPlace webapp/graphite/settings.py --replace "join(WEBAPP_DIR, 'content')" "join(WEBAPP_DIR, 'webapp', 'content')"
+      cp webapp/graphite/manage.py bin/manage-graphite.py
+      substituteInPlace bin/manage-graphite.py --replace 'settings' 'graphite.settings'
+    '';
 
     # error: invalid command 'test'
     doCheck = false;
@@ -6686,4 +6969,27 @@ pythonPackages = modules // rec {
     };
  };
 
+# python2.7 specific eggs
+} // pkgs.lib.optionalAttrs (python.majorVersion == "2.7") {
+
+  pypi2nix = pythonPackages.buildPythonPackage rec {
+    rev = "e231db7e8874d4543a6f0fffc46c0fffbe6108c5";
+    name = "pypi2nix-1.0_${rev}";
+
+    src = pkgs.fetchurl {
+      url = "https://github.com/garbas/pypi2nix/tarball/${rev}";
+      name = "${name}.tar.bz";
+      sha256 = "0wqk6milnagr0b0v8igjp8p25d5y63pki3pkdy7hbgjxvyw8wril";
+    };
+
+    propagatedBuildInputs = [ pythonPackages."Distutils2-1.0a4" ];
+    doCheck = false;
+
+    meta = {
+      homepage = https://github.com/garbas/pypi2nix;
+      description = "";
+      maintainers = [ pkgs.stdenv.lib.maintainers.garbas ];
+    };
+  };
+
 }; in pythonPackages
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index e09c3a76ddcd..770a434c8d7d 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -1741,7 +1741,6 @@ let
   wdfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   webkit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   webkit_gtk2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  webkitSVN = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   weechat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   welkin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   wesnoth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index b0c38eee9868..28d503d85fe3 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -92,6 +92,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
   qemu_kvm = linux;
   less = all;
   lftp = all;
+  liblapack = linux;
   libtool = all;
   libtool_2 = all;
   libxml2 = all;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 9734adc34973..1aae2ce4ee23 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -25,7 +25,7 @@ let
       unstable = pkgs.releaseTools.aggregate
         { name = "nixpkgs-${jobs.tarball.version}";
           meta.description = "Release-critical builds for the Nixpkgs unstable channel";
-          members =
+          constituents =
             [ jobs.tarball
               jobs.stdenv.x86_64-linux
               jobs.stdenv.i686-linux