diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 7bcbadd8ea9..f0cabe425a3 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 32e09086b87..9c117774fc4 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/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl
index 1eb6c51a16a..1d9f926ec55 100755
--- a/maintainers/scripts/nix-generate-from-cpan.pl
+++ b/maintainers/scripts/nix-generate-from-cpan.pl
@@ -51,15 +51,21 @@ print STDERR "unpacked to: $pkg_path\n";
 my $meta;
 if (-e "$pkg_path/META.yml") {
     eval {
-	$meta = YAML::XS::LoadFile("$pkg_path/META.yml");
+        $meta = YAML::XS::LoadFile("$pkg_path/META.yml");
     };
     if ($@) {
-	system("iconv -f windows-1252 -t utf-8 '$pkg_path/META.yml' > '$pkg_path/META.yml.tmp'");
-	$meta = YAML::XS::LoadFile("$pkg_path/META.yml.tmp");
+        system("iconv -f windows-1252 -t utf-8 '$pkg_path/META.yml' > '$pkg_path/META.yml.tmp'");
+        $meta = YAML::XS::LoadFile("$pkg_path/META.yml.tmp");
     }
+} elsif (-e "$pkg_path/META.json") {
+    local $/;
+    open(my $fh, '<', "$pkg_path/META.json") or die;
+    $meta = decode_json(<$fh>);
+} else {
+    warn "package has no META.yml or META.json\n";
 }
 
-print STDERR "metadata: ", encode_json($meta), "\n";
+print STDERR "metadata: ", encode_json($meta), "\n" if defined $meta;
 
 # Map a module to the attribute corresponding to its package
 # (e.g. HTML::HeadParser will be mapped to HTMLParser, because that
@@ -120,11 +126,13 @@ my $homepage = $meta->{resources}->{homepage};
 print STDERR "homepage: $homepage\n" if defined $homepage;
 
 my $description = $meta->{abstract};
-$description = uc(substr($description, 0, 1)) . substr($description, 1); # capitalise first letter
-$description =~ s/\.$//; # remove period at the end
-$description =~ s/\s*$//;
-$description =~ s/^\s*//;
-print STDERR "description: $description\n";
+if (defined $description) {
+    $description = uc(substr($description, 0, 1)) . substr($description, 1); # capitalise first letter
+    $description =~ s/\.$//; # remove period at the end
+    $description =~ s/\s*$//;
+    $description =~ s/^\s*//;
+    print STDERR "description: $description\n";
+}
 
 my $license = $meta->{license};
 if (defined $license) {
@@ -156,7 +164,7 @@ EOF
 print <<EOF if defined $homepage;
       homepage = $homepage;
 EOF
-print <<EOF;
+print <<EOF if defined $description;
       description = "$description";
 EOF
 print <<EOF if defined $license;
diff --git a/maintainers/scripts/nixpkgs-lint.nix b/maintainers/scripts/nixpkgs-lint.nix
new file mode 100644
index 00000000000..5eb7649d58d
--- /dev/null
+++ b/maintainers/scripts/nixpkgs-lint.nix
@@ -0,0 +1,22 @@
+{ stdenv, makeWrapper, perl, perlPackages }:
+
+stdenv.mkDerivation {
+  name = "nixpkgs-lint-1";
+
+  buildInputs = [ makeWrapper perl perlPackages.XMLSimple ];
+
+  unpackPhase = "true";
+  buildPhase = "true";
+
+  installPhase =
+    ''
+      mkdir -p $out/bin
+      cp ${./nixpkgs-lint.pl} $out/bin/nixpkgs-lint
+      wrapProgram $out/bin/nixpkgs-lint --set PERL5LIB $PERL5LIB
+    '';
+
+  meta = {
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    description = "A utility for Nixpkgs contributors to check Nixpkgs for common errors";
+  };
+}
diff --git a/maintainers/scripts/nixpkgs-lint.pl b/maintainers/scripts/nixpkgs-lint.pl
new file mode 100755
index 00000000000..baf2cbf8ba7
--- /dev/null
+++ b/maintainers/scripts/nixpkgs-lint.pl
@@ -0,0 +1,165 @@
+#! /run/current-system/sw/bin/perl -w
+
+use strict;
+use List::Util qw(min);
+use XML::Simple qw(:strict);
+use Getopt::Long qw(:config gnu_getopt);
+
+# Parse the command line.
+my $path = "<nixpkgs>";
+my $filter = "*";
+my $maintainer;
+
+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";
+
+# Check meta information.
+print "=== Package meta information ===\n\n";
+my $nrBadNames = 0;
+my $nrMissingMaintainers = 0;
+my $nrMissingDescriptions = 0;
+my $nrBadDescriptions = 0;
+my $nrMissingLicenses = 0;
+
+foreach my $attr (sort keys %{$info->{item}}) {
+    my $pkg = $info->{item}->{$attr};
+
+    my $pkgName = $pkg->{name};
+    my $pkgVersion = "";
+    if ($pkgName =~ /(.*)(-[0-9].*)$/) {
+        $pkgName = $1;
+        $pkgVersion = $2;
+    }
+
+    # Check the maintainers.
+    my @maintainers;
+    my $x = $pkg->{meta}->{maintainers};
+    if (defined $x && $x->{type} eq "strings") {
+        @maintainers = map { $_->{value} } @{$x->{string}};
+    } elsif (defined $x->{value}) {
+        @maintainers = ($x->{value});
+    }
+
+    if (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";
+        $nrMissingLicenses++;
+    }
+
+    # Check the description.
+    my $description = $pkg->{meta}->{description}->{value};
+    if (!$description) {
+        print "$attr: Lacks a description\n";
+        $nrMissingDescriptions++;
+    } else {
+        my $bad = 0;
+        if ($description =~ /^\s/) {
+            print "$attr: Description starts with whitespace\n";
+            $bad = 1;
+        }
+        if ($description =~ /\s$/) {
+            print "$attr: Description ends with whitespace\n";
+            $bad = 1;
+        }
+        if ($description =~ /\.$/) {
+            print "$attr: Description ends with a period\n";
+            $bad = 1;
+        }
+        if (index(lc($description), lc($attr)) != -1) {
+            print "$attr: Description contains package name\n";
+            $bad = 1;
+        }
+        $nrBadDescriptions++ if $bad;
+    }
+}
+
+print "\n";
+
+# Find packages that have the same name.
+print "=== Package name collisions ===\n\n";
+
+my %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}};
+
+    # Filter attributes that are aliases of each other (e.g. yield the
+    # same derivation path).
+    my %drvsSeen;
+    @pkgs = grep { my $x = $drvsSeen{$_->{drvPath}}; $drvsSeen{$_->{drvPath}} = 1; !defined $x } @pkgs;
+
+    # Filter packages that have a lower priority.
+    my $highest = min (map { $_->{meta}->{priority}->{value} // 0 } @pkgs);
+    @pkgs = grep { ($_->{meta}->{priority}->{value} // 0) == $highest } @pkgs;
+
+    next if scalar @pkgs == 1;
+
+    $nrCollisions++;
+    print "The following attributes evaluate to a package named ‘$name’:\n";
+    print "  ", join(", ", map { $_->{attrPath} } @pkgs), "\n\n";
+}
+
+print "=== Bottom line ===\n";
+print "Number of packages: ", scalar(keys %{$info->{item}}), "\n";
+print "Number of 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";
+print "Number of bad descriptions: $nrBadDescriptions\n";
+print "Number of name collisions: $nrCollisions\n";
diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index e8c37d25694..c6b5e9da0dd 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -61,7 +61,7 @@ in
 
     meta = {
       homepage = "http://lly.org/~rcw/abcde/page/";
-      licence = "GPLv2+";
+      license = "GPLv2+";
       description = "A Better CD Encoder (ABCDE)";
 
       longDescription = ''
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index 8a330800b9e..6e20acab523 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/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix
index 24e0be5eac0..c67830a94e7 100644
--- a/pkgs/applications/audio/cd-discid/default.nix
+++ b/pkgs/applications/audio/cd-discid/default.nix
@@ -19,7 +19,7 @@ in
 
     meta = {
       homepage = http://lly.org/~rcw/cd-discid/;
-      licence = "GPLv2+";
+      license = "GPLv2+";
       description = "cd-discid, a command-line utility to retrieve a disc's CDDB ID";
 
       longDescription = ''
@@ -28,4 +28,4 @@ in
         abcde), but can be used for any purpose requiring CDDB data.
       '';
     };
-  }
\ No newline at end of file
+  }
diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index 5e3d056f498..34e98ae620d 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = http://netcologne.dl.sourceforge.net/project/csound/csound5/csound5.18/Csound5.18.02.tar.gz;
+    url = mirror://sourceforge/csound/Csound5.18.02.tar.gz;
     sha256 = "4c461cf3bf60b83671224949dd33805379b7121bf2c0ad6af5e191e7f6f8adc8";
   };
 
diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index 18a31460987..c421dcc60cb 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -1,22 +1,32 @@
-{ stdenv, fetchurl, pkgconfig, gtk, libid3tag, id3lib, libvorbis, libogg, flac }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, glib, libid3tag, id3lib, taglib
+, libvorbis, libogg, flac
+}:
 
-let
-
-  version = "2.1.7";
-  sha256 = "bfed34cbdce96aca299a0db2b531dbc66feb489b911a34f0a9c67f2eb6ee9301";
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "easytag-${version}";
+  version = "2.1.8";
+
   src = fetchurl {
-    url = "mirror://sourceforge/easytag/easytag-${version}.tar.bz2";
-    inherit sha256;
+    url = "mirror://gnome/sources/easytag/2.1/${name}.tar.xz";
+    sha256 = "1ab5iv0a83cdf07qzi81ydfk5apay06nxags9m07msqalz4pabqs";
   };
 
-  buildInputs = [ pkgconfig gtk libid3tag id3lib libvorbis libogg flac ];
+  preConfigure = ''
+    # pkg-config v0.23 should be enough.
+    sed -i -e '/_pkg_min_version=0.24/s/24/23/' \
+           -e 's/have_mp3=no/have_mp3=yes/' \
+           -e 's/ID3TAG_DEPS="id3tag"/ID3TAG_DEPS=""/' configure
+  '';
+
+  NIX_LDFLAGS = "-lid3tag -lz";
+
+  buildInputs = [
+    pkgconfig intltool gtk glib libid3tag id3lib taglib libvorbis libogg flac
+  ];
 
   meta = {
-    description = "an utility for viewing and editing tags for various audio files";
-    homepage = http://http://easytag.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2;
+    description = "View and edit tags for various audio files";
+    homepage = "http://projects.gnome.org/easytag/";
+    license = stdenv.lib.licenses.gpl2Plus;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index 70a405b3fd6..b0c5a88cb1a 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -10,12 +10,24 @@ stdenv.mkDerivation  rec {
     sha256 = "1x73a5rsyvfmh1j0484kzgnk251q61g1g2jdja673l8fizi0xd24";
   };
 
-  buildInputs = [ alsaLib glib jackaudio libsndfile pkgconfig pulseaudio ];
+  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i '40 i\
+    #include <CoreAudio/AudioHardware.h>\
+    #include <CoreAudio/AudioHardwareDeprecated.h>' \
+    src/drivers/fluid_coreaudio.c
+  '';
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
+    "-framework CoreAudio";
+
+  buildInputs = [ glib libsndfile pkgconfig ]
+    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jackaudio ];
 
   meta = with stdenv.lib; {
-    description = "real-time software synthesizer based on the SoundFont 2 specifications";
-    homepage = http://www.fluidsynth.org;
-    license = licenses.lgpl2;
-    maintainers = [ maintainers.goibhniu ];
+    description = "Real-time software synthesizer based on the SoundFont 2 specifications";
+    homepage    = http://www.fluidsynth.org;
+    license     = licenses.lgpl2;
+    maintainers = with maintainers; [ goibhniu lovek323 ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix
index e93f6ffc584..44d946af2db 100644
--- a/pkgs/applications/audio/lingot/default.nix
+++ b/pkgs/applications/audio/lingot/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "lingot-0.9.0";
 
   src = fetchurl {
-    url = http://download.savannah.gnu.org/releases/lingot/lingot-0.9.0.tar.gz;
+    url = mirror://savannah/lingot/lingot-0.9.0.tar.gz;
     sha256 = "07z129lp8m4sz608q409wb11c639w7cbn497r7bscgg08p6c07xb";
   };
 
diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/applications/audio/mi2ly/default.nix
new file mode 100644
index 00000000000..1d736b06938
--- /dev/null
+++ b/pkgs/applications/audio/mi2ly/default.nix
@@ -0,0 +1,38 @@
+{stdenv, fetchurl}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="mi2ly";
+    version="0.12";
+    name="${baseName}-${version}";
+    hash="1b14zcwlvnxhjxr3ymyzg0mg4sbijkinzpxm641s859jxcgylmll";
+    url="http://download.savannah.gnu.org/releases/mi2ly/mi2ly.0.12.tar.bz2";
+    sha256="1b14zcwlvnxhjxr3ymyzg0mg4sbijkinzpxm641s859jxcgylmll";
+  };
+  buildInputs = [
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+
+  sourceRoot=".";
+
+  buildPhase = "./cc";
+  installPhase = ''
+    mkdir -p "$out"/{bin,share/doc/mi2ly}
+    cp mi2ly "$out/bin"
+    cp README Doc.txt COPYING Manual.txt "$out/share/doc/mi2ly"
+  '';
+
+  meta = {
+    inherit (s) version;
+    description = ''MIDI to Lilypond converter'';
+    license = stdenv.lib.licenses.gpl2Plus ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/audio/mi2ly/default.upstream b/pkgs/applications/audio/mi2ly/default.upstream
new file mode 100644
index 00000000000..131f0e3a71d
--- /dev/null
+++ b/pkgs/applications/audio/mi2ly/default.upstream
@@ -0,0 +1,3 @@
+url http://download.savannah.gnu.org/releases/mi2ly/
+ensure_choice
+version '.*/mi2ly[.]([0-9.]+)[.]tar.*' '\1'
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index d79ef44cabe..e31798a101b 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, fetchgit, pythonPackages, pygobject, gst_python
+{ stdenv, fetchurl, pythonPackages, pygobject, gst_python
 , gst_plugins_good, gst_plugins_base
 }:
 
 pythonPackages.buildPythonPackage rec {
   name = "mopidy-${version}";
 
-  version = "0.14.1";
+  version = "0.14.2";
 
-  src = fetchgit {
-    url = "https://github.com/mopidy/mopidy.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "0lgd8dpiri9m6sigpf1g1qzvz25lkb38lskgwvb8j7x64y104z0v";
+  src = fetchurl {
+    url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz";
+    sha256 = "0fqx7lk9g61d744b951cwx0szqbyji58dhw2ravnq9785nkhi7i4";
   };
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix
index ccaa428a3f4..2f00638961c 100644
--- a/pkgs/applications/audio/mpc123/default.nix
+++ b/pkgs/applications/audio/mpc123/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu; # arbitrary choice
   };
 }
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 80de5567000..029c2ba4bcd 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchurl, alsaLib }:
 
 stdenv.mkDerivation {
-  name = "mpg123-1.12.3";
+  name = "mpg123-1.15.4";
 
   src = fetchurl {
-    url = mirror://sourceforge/mpg123/mpg123-1.12.3.tar.bz2;
-    sha256 = "1ij689s7jch3d4g0ja3jylaphallc8vgrsrm9b12254phnyy23xf";
+    url = mirror://sourceforge/mpg123/mpg123-1.15.4.tar.bz2;
+    sha256 = "05aizspky9mp1bq2lfrkjzrsnjykl7gkbrhn93xcarj5b2izv1b8";
   };
 
-  buildInputs = [ alsaLib ];
+  buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
 
   crossAttrs = {
     configureFlags = if stdenv.cross ? mpg123 then
diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix
index 4ca0cc8f847..ffec1a5736c 100644
--- a/pkgs/applications/audio/mpg321/default.nix
+++ b/pkgs/applications/audio/mpg321/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     description = "mpg321, a command-line MP3 player";
     homepage = http://mpg321.sourceforge.net/;
     license = "GPLv2";
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;
   };
 }
diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix
index b6ac7f26d60..186c5265433 100644
--- a/pkgs/applications/audio/ncmpcpp/default.nix
+++ b/pkgs/applications/audio/ncmpcpp/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig}:
+{ stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig
+, libiconvOrEmpty }:
 
 stdenv.mkDerivation rec {
   version = "0.5.10";
@@ -9,14 +10,15 @@ stdenv.mkDerivation rec {
     sha256 = "ff6d5376a2d9caba6f5bb78e68af77cefbdb2f04cd256f738e39f8ac9a79a4a8";
   };
 
-  buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig ];
+  buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig ]
+    ++ libiconvOrEmpty;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Curses-based interface for MPD (music player daemon)";
-    homepage = http://unkart.ovh.org/ncmpcpp/;
-    license = "GPLv2+";
-    maintainers = [ stdenv.lib.maintainers.mornfall ];
-    platforms = stdenv.lib.platforms.all;
+    homepage    = http://unkart.ovh.org/ncmpcpp/;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ lovek323 mornfall ];
+    platforms   = platforms.all;
   };
 }
 
diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix
index e422eee363c..ca746f524c5 100644
--- a/pkgs/applications/audio/normalize/default.nix
+++ b/pkgs/applications/audio/normalize/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.7.7";
 
   src = fetchurl {
-    url = "http://savannah.nongnu.org/download/normalize/normalize-0.7.7.tar.gz";
+    url = "mirror://savannah/normalize/normalize-0.7.7.tar.gz";
     sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0";
   };
 
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index a73744ebbe8..02a27bedb67 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -1,18 +1,18 @@
-{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm, libsigcxx
-, libglademm, libcanberra, intltool, gettext }:
+{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm3
+, libcanberra_gtk3, intltool, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "pavucontrol-1.0";
+  name = "pavucontrol-2.0";
 
   src = fetchurl {
     url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz";
-    sha256 = "1plcyrc7p6gqxjhxx2xh6162bkb29wixjrqrjnl9b8g3nrjjigix";
+    sha256 = "02s775m1531sshwlbvfddk3pz8zjmwkv1sgzggn386ja3gc9vwi2";
   };
 
-  buildInputs = [ pkgconfig pulseaudio gtkmm libsigcxx libglademm libcanberra
+  buildInputs = [ pkgconfig pulseaudio gtkmm3 libcanberra_gtk3
     intltool gettext ];
 
-  configureFlags = "--disable-lynx --disable-gtk3";
+  configureFlags = "--disable-lynx";
 
   meta = {
     description = "PulseAudio Volume Control";
@@ -23,11 +23,11 @@ stdenv.mkDerivation rec {
       easily control the volume of all clients, sinks, etc.
     '';
 
-    homepage = http://0pointer.de/lennart/projects/pavucontrol/;
+    homepage = http://freedesktop.org/software/pulseaudio/pavucontrol/ ;
 
     license = "GPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index dccb6571f4d..1ce09a6dd88 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/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
new file mode 100644
index 00000000000..d9554d5f724
--- /dev/null
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, fetchurl, python, buildPythonPackage, mutagen, pygtk, pygobject
+, pythonDBus, gst_python, gst_plugins_base, gst_plugins_good, gst_plugins_ugly }:
+
+let version = "2.5"; in
+
+buildPythonPackage {
+  # call the package quodlibet and just quodlibet
+  name = "quodlibet-${version}";
+  namePrefix = "";
+
+  # XXX, tests fail
+  doCheck = false;
+
+  src = [
+    (fetchurl {
+      url = "https://quodlibet.googlecode.com/files/quodlibet-${version}.tar.gz";
+      sha256 = "0qrmlz7m1jpmriy8bgycjiwzbf3annznkn4x5k32yy9bylxa7lwb";
+     })
+    (fetchurl {
+      url = "https://quodlibet.googlecode.com/files/quodlibet-plugins-${version}.tar.gz";
+      sha256 = "0kf2mkq2zk38626bn48gscvy6ir04f5b2z57ahlxlqy8imv2cjff";
+     })
+  ];       
+
+  sourceRoot = "quodlibet-${version}";
+  postUnpack = ''
+    # the patch searches for plugins in directory ../plugins
+    # so link the appropriate directory there
+    ln -sf quodlibet-plugins-${version} plugins
+  '';
+  patches = [ ./quodlibet-package-plugins.patch ];
+
+  buildInputs = [
+    gst_plugins_base gst_plugins_good gst_plugins_ugly
+  ];
+
+  propagatedBuildInputs = [
+    mutagen pygtk pygobject pythonDBus gst_python
+  ];
+
+  postInstall = ''
+    # Wrap quodlibet so it finds the GStreamer plug-ins
+    wrapProgram "$out/bin/quodlibet" --prefix                                 \
+      GST_PLUGIN_PATH ":"                                                     \
+      "${gst_plugins_base}/lib/gstreamer-0.10:${gst_plugins_good}/lib/gstreamer-0.10:${gst_plugins_ugly}/lib/gstreamer-0.10"
+  '';
+
+  meta = {
+    description = "Quod Libet is a GTK+-based audio player written in Python, using the Mutagen tagging library.";
+
+    longDescription = ''
+      Quod Libet is a GTK+-based audio player written in Python, using
+      the Mutagen tagging library. It's designed around the idea that
+      you know how to organize your music better than we do. It lets
+      you make playlists based on regular expressions (don't worry,
+      regular searches work too). It lets you display and edit any
+      tags you want in the file. And it lets you do this for all the
+      file formats it supports. Quod Libet easily scales to libraries
+      of thousands (or even tens of thousands) of songs. It also
+      supports most of the features you expect from a modern media
+      player, like Unicode support, tag editing, Replay Gain, podcasts
+      & internet radio, and all major audio formats.
+    '';
+
+    homepage = http://code.google.com/p/quodlibet/;
+  };
+}
diff --git a/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch b/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch
new file mode 100644
index 00000000000..d518f857cf1
--- /dev/null
+++ b/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch
@@ -0,0 +1,18 @@
+diff -Naur quodlibet-2.5.orig/setup.py quodlibet-2.5.new/setup.py
+--- quodlibet-2.5.orig/setup.py	2012-12-19 08:47:41.000000000 +0000
++++ quodlibet-2.5.new/setup.py	2013-04-22 19:27:07.152631051 +0000
+@@ -337,5 +338,14 @@
+                 }
+             }
+         })
++    else:
++        from os.path import join
++
++        data_files = []
++        for type in ["playorder", "songsmenu", "editing", "events", "gstreamer"]:
++            data_files.append((join('quodlibet', 'plugins', type),
++                               glob.glob(join('..', 'plugins', type, '*.py'))))
++        setup_kwargs.update({ 'data_files': data_files });
++
+     setup(**setup_kwargs)
+ 
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index c295767687f..fe32aca029b 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -27,7 +27,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/snd/snd-${version}.tar.gz";
+    url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
     sha256 = "0zqgfnkvkqxby1k74mwba1r4pb520glcsz5jjmpzm9m41nqnghmm";
   };
 
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index ccdfcbb3d99..f4d264c0d8f 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng12, GConf, libgcrypt, chromium, sqlite, gst_plugins_base, gstreamer }:
+{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf, libgcrypt, chromium, sqlite, gst_plugins_base, gstreamer }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
@@ -73,7 +73,7 @@ stdenv.mkDerivation {
       mkdir -p $out/libexec/spotify
       gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
 
-      wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng12 cups libgcrypt sqlite gst_plugins_base gstreamer]}:$out/lib"
+      wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer]}:$out/lib"
     ''; # */
 
   dontStrip = true;
diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
index 501826b82df..0b8863752d2 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 ce1f4400b27..598c42199be 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/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 601aa7bf53a..9d5c728de26 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng12, libXmu
+{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng, libXmu
 , fontconfig, freetype, pam, dbus_libs }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs =
-    [ cmake pkgconfig x11 libjpeg libpng12 libXmu fontconfig freetype
+    [ cmake pkgconfig x11 libjpeg libpng libXmu fontconfig freetype
       pam dbus_libs
     ];
 
diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix
index 4dfe3a204d3..84b810bf460 100644
--- a/pkgs/applications/editors/bvi/default.nix
+++ b/pkgs/applications/editors/bvi/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "bvi-1.3.2";
 
   src = fetchurl {
-    url = http://prdownloads.sourceforge.net/bvi/bvi-1.3.2.src.tar.gz;
+    url = mirror://sourceforge/bvi/bvi-1.3.2.src.tar.gz;
     sha256 = "110wxqnyianqamxq4y53drqqxb9vp4k2fcvic45qggvlqkqhlfgz";
   };
 
diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix
new file mode 100644
index 00000000000..45b7de900e2
--- /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/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index eb364ec730e..3e22cfd0412 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/ed/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix
index 7b1ecf9d2fe..ab5c8e49e7f 100644
--- a/pkgs/applications/editors/emacs-23/default.nix
+++ b/pkgs/applications/editors/emacs-23/default.nix
@@ -66,7 +66,7 @@ EOF
     homepage = http://www.gnu.org/software/emacs/;
     license = "GPLv3+";
 
-    maintainers = with stdenv.lib.maintainers; [ ludo simons chaoflow ];
+    maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index a781cb37346..0e4c9a14d20 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -26,8 +26,10 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isLinux dbus;
 
   configureFlags =
-    stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft"]
-
+    (if gtk != null then 
+      [ "--with-x-toolkit=gtk" "--with-xft"]
+    else
+      [ "--with-x-toolkit=no" ])
     # On NixOS, help Emacs find `crt*.o'.
     ++ stdenv.lib.optional (stdenv ? glibc)
          [ "--with-crt-dir=${stdenv.glibc}/lib" ];
@@ -44,7 +46,7 @@ EOF
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "GNU Emacs 24, the extensible, customizable text editor";
 
     longDescription = ''
@@ -67,7 +69,7 @@ EOF
     homepage = "http://www.gnu.org/software/emacs/";
     license = "GPLv3+";
 
-    maintainers = with stdenv.lib.maintainers; [ ludo simons chaoflow ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = with maintainers; [ chaoflow lovek323 simons ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
index ec7a3e8e600..da92c38d078 100644
--- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix
+++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
@@ -4,6 +4,7 @@ stdenv.mkDerivation {
   name = "bbdb-2.35";
 
   src = fetchurl {
+    # not using mirror:// because it produces a different file
     url = http://bbdb.sourceforge.net/bbdb-2.35.tar.gz;
     sha256 = "3fb1316e2ed74d47ca61187fada550e58797467bd9e8ad67343ed16da769f916";
   };
diff --git a/pkgs/applications/editors/emacs-modes/color-theme/default.nix b/pkgs/applications/editors/emacs-modes/color-theme/default.nix
index 9cc0e7fd42b..327e11bf086 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme/default.nix
+++ b/pkgs/applications/editors/emacs-modes/color-theme/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "color-theme-6.6.0";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/color-theme/${name}.tar.gz";
+    url = "mirror://savannah/color-theme/${name}.tar.gz";
     sha256 = "0yx1ghcjc66s1rl0v3d4r1k88ifw591hf814ly3d73acvh15zlsn";
   };
 
diff --git a/pkgs/applications/editors/emacs-modes/ecb/default.nix b/pkgs/applications/editors/emacs-modes/ecb/default.nix
index f94d594519c..33f0299f5f0 100644
--- a/pkgs/applications/editors/emacs-modes/ecb/default.nix
+++ b/pkgs/applications/editors/emacs-modes/ecb/default.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://ecb.sourceforge.net/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
index 5c425326aaa..e0373fca5df 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://emacs-w3m.namazu.org/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
index 7e490f253d1..a1e52e1c301 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, fetchurl, emacs }:
+{ stdenv, fetchurl, emacs, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "haskell-mode-2.9.1-102-g8d4b965";
+  name = "haskell-mode-13.07";
 
   src = fetchurl {
-    url = "https://github.com/haskell/haskell-mode/tarball/8d4b9651a69b62fcbedbac63de29a1e87ff0e97f";
-    sha256 = "02sil43885xjbfqakrxkm7bjnjd930lx6845fc2rxmkq5plkq85a";
-    name = "${name}.tar.gz";
+    url = "https://github.com/haskell/haskell-mode/archive/v13.07.tar.gz";
+    sha256 = "15c8ncj9mykkrizy1a8l94gq37s8hj13v3p5rgyaj9z0cwgl85kx";
   };
 
-  buildInputs = [emacs];
+  buildInputs = [ emacs texinfo ];
 
   installPhase = ''
     mkdir -p "$out/share/emacs/site-lisp"
diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix
index f6ff60052c9..b25d178d164 100644
--- a/pkgs/applications/editors/emacs-modes/jdee/default.nix
+++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix
@@ -91,7 +91,7 @@ in
 
       license = "GPLv2+";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
       platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
     };
   }
diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix
index a9149a0f919..4e2601cc106 100644
--- a/pkgs/applications/editors/emacs-modes/magit/default.nix
+++ b/pkgs/applications/editors/emacs-modes/magit/default.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ simons ludo ];
+    maintainers = with stdenv.lib.maintainers; [ simons ];
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index e045b83a74d..51263a6aa0e 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = with stdenv.lib.maintainers; [ ludo chaoflow ];
+    maintainers = with stdenv.lib.maintainers; [ chaoflow ];
     platforms = stdenv.lib.platforms.gnu;
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/php/default.nix b/pkgs/applications/editors/emacs-modes/php/default.nix
index ec160dccd9f..2b3cf7b2971 100644
--- a/pkgs/applications/editors/emacs-modes/php/default.nix
+++ b/pkgs/applications/editors/emacs-modes/php/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "php-mode-1.5.0";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/php-mode/${name}.tar.gz";
+    url = "mirror://sourceforge/php-mode/${name}.tar.gz";
     sha256 = "1bffgg4rpiggxqc1hvjcby24sfyzj5728zg7r6f4v6a126a7kcfq";
   };
 
diff --git a/pkgs/applications/editors/emacs-modes/quack/default.nix b/pkgs/applications/editors/emacs-modes/quack/default.nix
index e57182b40c8..bef1ebe5859 100644
--- a/pkgs/applications/editors/emacs-modes/quack/default.nix
+++ b/pkgs/applications/editors/emacs-modes/quack/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation {
     description = "Enhanced Emacs support for editing and running Scheme code";
     homepage = http://www.neilvandyke.org/quack/;
     license = "GPLv2+";
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/default.nix b/pkgs/applications/editors/emacs-modes/scala-mode/default.nix
index 71a2993aba8..f82d467066a 100644
--- a/pkgs/applications/editors/emacs-modes/scala-mode/default.nix
+++ b/pkgs/applications/editors/emacs-modes/scala-mode/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     # non-copyleft, BSD-style
     license = "permissive";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
index 185bc20021e..0d2fcf09786 100644
--- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
+++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
@@ -4,8 +4,7 @@ stdenv.mkDerivation rec {
   name = "session-management-for-emacs-2.2a";
   
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/emacs-session/session/2.2a/session-2.2a.tar.gz";
-#    url = "mirror://sourceforge.net/sourceforge/emacs-session/session-2.2a.tar.gz";
+    url = "mirror://sourceforge/emacs-session/session-2.2a.tar.gz";
     sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144";
   };
 
diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
new file mode 100644
index 00000000000..ca481f1081d
--- /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/kile/default.nix b/pkgs/applications/editors/kile/default.nix
index 6b14b40a2c9..b428289b95d 100644
--- a/pkgs/applications/editors/kile/default.nix
+++ b/pkgs/applications/editors/kile/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, kdelibs, cmake, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "kile-2.1.2";
+  name = "kile-2.1.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/kile/${name}.tar.bz2";
-    sha256 = "0nx5fmjrxrndnzvknxnybd8qh15jzfxzbny2rljq3amjw02y9lc2";
+    sha256 = "18nfi37s46v9xav7vyki3phasddgcy4m7nywzxis198vr97yqqx0";
   };
 
   nativeBuildInputs = [ cmake gettext ];
diff --git a/pkgs/applications/editors/mg/configure.patch b/pkgs/applications/editors/mg/configure.patch
new file mode 100644
index 00000000000..11105299eb4
--- /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 00000000000..ce69b5c0b5a
--- /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/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix
new file mode 100644
index 00000000000..29402f3b3d8
--- /dev/null
+++ b/pkgs/applications/editors/nvpy/default.nix
@@ -0,0 +1,35 @@
+{ pkgs, fetchurl, tk, buildPythonPackage, pythonPackages }:
+
+buildPythonPackage rec {
+  version = "0.9.2";
+  name = "nvpy-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/cpbotha/nvpy/archive/v${version}.tar.gz";
+    sha256 = "78e41b80fc5549cba8cfd92b52d6530e8dfc8e8f37e96e4b219f30c266af811d";
+  };
+
+  buildInputs = [tk];
+
+  propagatedBuildInputs = [
+    pythonPackages.markdown
+    pythonPackages.tkinter
+  ];
+
+  postInstall = ''
+    install -dm755 "$out/share/licenses/nvpy/"
+    install -m644 LICENSE.txt "$out/share/licenses/nvpy/LICENSE"
+
+    install -dm755 "$out/share/doc/nvpy/"
+    install -m644 README.rst "$out/share/doc/nvpy/README"
+
+    wrapProgram $out/bin/nvpy --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
+  '';
+
+  meta = with pkgs.lib; {
+    description = "A simplenote-syncing note-taking tool inspired by Notational Velocity";
+    homepage = "https://github.com/cpbotha/nvpy";
+    platforms = platforms.linux;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix
index a1f39792225..1c6d86a2f3d 100644
--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/pkgs/applications/editors/texmacs/default.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
       '';
     homepage = http://texmacs.org/;
     license = "GPLv2+";
-    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.roconnor ];
+    maintainers = [ stdenv.lib.maintainers.roconnor ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/applications/editors/tiled-qt/default.nix b/pkgs/applications/editors/tiled-qt/default.nix
new file mode 100644
index 00000000000..05020df01a0
--- /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 066c8fddd96..b3992dfec30 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 ff8da0e0947..2a2b3dd6be4 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 ];
@@ -41,8 +43,10 @@ stdenv.mkDerivation rec {
     sed -i -e 's/as_fn_error.*int32.*/:/' src/auto/configure
   '';
   
-  meta = {
+  meta = with stdenv.lib; {
     description = "The most popular clone of the VI editor";
-    homepage = http://www.vim.org;
+    homepage    = http://www.vim.org;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index 5929f4c76c8..87ea7ee6854 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix
index 2f31b568e34..6a212a7a931 100644
--- a/pkgs/applications/graphics/alchemy/default.nix
+++ b/pkgs/applications/graphics/alchemy/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, jre}:
 
 stdenv.mkDerivation {
-  name = "alchemy-007-alpha";
+  name = "alchemy-007";
   enableParallelBuilding = true;
 
   src = fetchurl {
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 91c91dc3925..315e101857e 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -8,12 +8,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "1.2";
+  version = "1.2.2";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/darktable/darktable/1.2/darktable-${version}.tar.xz";
-    sha256 = "0l2lrly46nda7b2y4gskqqxaajia34g487bgjcpd5ysxbhmmhlnw";
+    sha256 = "0nf85wjhlisbgwkfkc1wb8y7dpnx3v8zk9g3ghbd51gi7s62x40j";
   };
 
   buildInputs =
diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix
index 65c86a6cf97..7b415df42f5 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/pkgs/applications/graphics/exrdisplay/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name ="openexr_viewers-1.0.1";
 
   src = fetchurl {
-    url =  "http://download.savannah.nongnu.org/releases/openexr/openexr_viewers-1.0.1.tar.gz";
+    url =  "mirror://savannah/openexr/openexr_viewers-1.0.1.tar.gz";
     sha256 = "1w5qbcdp7sw48z1wk2v07f7p14vqqb1m2ncxyxnbkm9f4ab0ymg6";
   };
 
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 2506b26e238..ff1e5052054 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://geeqie.sourceforge.net;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;
   };
 }
diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 4a9890720a3..4e12e232081 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf
-, pango, cairo, freetype, fontconfig, lcms2, libpng, libjpeg, poppler, libtiff
+, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
 , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
 , python, pygtk, libart_lgpl, libexif, gettext, xlibs }:
 
 stdenv.mkDerivation rec {
-  name = "gimp-2.8.4";
-  
+  name = "gimp-2.8.6";
+
   src = fetchurl {
     url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
-    md5 = "392592e8755d046317878d226145900f";
+    md5 = "12b3fdf33d1f07ae79b412a9e38b9693";
   };
-  
-  buildInputs = 
+
+  buildInputs =
     [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo
-      freetype fontconfig lcms2 libpng libjpeg poppler libtiff webkit
+      freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
       libmng librsvg libwmf zlib libzip ghostscript aalib jasper
-      python pygtk libart_lgpl libexif gettext 
+      python pygtk libart_lgpl libexif gettext xlibs.libXpm
     ];
 
   passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index b59b2bb6750..33d52c6645b 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchurl, pkgconfig, gtk, freetype
-, fontconfig, libart_lgpl, libtiff, libjpeg, libpng12, libexif, zlib, perl
+, fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
 , perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl_0_0_22, gegl_0_0_22
 }:
 
 stdenv.mkDerivation rec {
   name = "gimp-2.6.12";
-  
+
   src = fetchurl {
     url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
     sha256 = "0qpcgaa4pdqqhyyy8vjvzfflxgsrrs25zk79gixzlnbzq3qwjlym";
   };
-  
+
   buildInputs = [
     pkgconfig gtk freetype fontconfig
-    libart_lgpl libtiff libjpeg libpng12 libexif zlib perl
+    libart_lgpl libtiff libjpeg libpng libexif zlib perl
     perlXMLParser python pygtk gettext intltool babl_0_0_22 gegl_0_0_22
   ];
 
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 962cb387c73..d314d93ea4c 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -107,7 +107,7 @@ rec {
     name = "texturize-2.1";
     buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
     src = fetchurl {
-      url = http://prdownloads.sourceforge.net/gimp-texturize/texturize-2.1_src.tgz;
+      url = mirror://sourceforge/gimp-texturize/texturize-2.1_src.tgz;
       sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3";
     };
     installPhase = "installPlugins src/texturize";
@@ -148,7 +148,7 @@ rec {
       name = "gmic-1.3.2.0";
       buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.nativeBuildInputs;
       src = fetchurl {
-        url = http://dfn.dl.sourceforge.net/sourceforge/gmic/gmic_1.3.2.0.tar.gz;
+        url = mirror://sourceforge/gmic/gmic_1.3.2.0.tar.gz;
         sha256 = "0mxq664vzzc2l6k6sqm9syp34mihhi262i6fixk1g12lmc28797h";
       };
       preConfigure = ''
diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix
index 88ca6a6c541..482b57d03d2 100644
--- a/pkgs/applications/graphics/ocrad/default.nix
+++ b/pkgs/applications/graphics/ocrad/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix
index b845abacf7e..b54d73b4964 100644
--- a/pkgs/applications/graphics/pinta/default.nix
+++ b/pkgs/applications/graphics/pinta/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pinta-1.4";
 
   src = fetchurl {
-    url = "https://github.com/PintaProject/pinta/tarball/3f7ccfa93d";
+    url = "https://github.com/PintaProject/Pinta/tarball/3f7ccfa93d";
     name = "pinta-1.4.tar.gz";
     sha256 = "1kgb4gy5l6bd0akniwhiqqkvqayr5jgdsvn2pgg1038q9raafnpn";
   };
diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix
index e83824bd685..2ff82412409 100644
--- a/pkgs/applications/graphics/rapcad/default.nix
+++ b/pkgs/applications/graphics/rapcad/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "rapcad-${version}";
 
   src = fetchgit {
-    url = "git://git.rapcad.org/rapcad";
+    url = "https://github.com/GilesBathgate/RapCAD.git";
     rev = "refs/tags/v${version}";
     sha256 = "37c7107dc4fcf8942a4ad35377c4e42e6aedfa35296e5fcf8d84882ae35087c7";
   };
diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix
index 2455923bbb8..c9cea4109dc 100644
--- a/pkgs/applications/graphics/sane/backends-git.nix
+++ b/pkgs/applications/graphics/sane/backends-git.nix
@@ -5,12 +5,12 @@ in
 assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
 
 stdenv.mkDerivation {
-  name = "sane-backends-1.0.22.482-g071f226";
+  name = "sane-backends-1.0.23.296-gf139120";
 
   src = fetchgit {
     url = "http://git.debian.org/git/sane/sane-backends.git";
-    rev = "071f2269cd68d3411cbfa05a3d028b74496db970";
-    sha256 = "178xkv30m6irk4k0gqnfcl5kramm1qyj24dar8gp32428z1444xf";
+    rev = "f139120c72db6de98be95b52c206c2a4d8071e92";
+    sha256 = "1b2fv19c8ijh9l0jjilli3j70n17wvcgpqq1nxmiby3ai6nrzk8d";
   };
 
   udevSupport = hotplugSupport;
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.sane-project.org/";
     description = "Scanner Access Now Easy";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
 
     maintainers = [ stdenv.lib.maintainers.simons ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix
index 7cca0c8f8ab..23a2d23b1ae 100644
--- a/pkgs/applications/graphics/seg3d/default.nix
+++ b/pkgs/applications/graphics/seg3d/default.nix
@@ -4,7 +4,7 @@ libuuid }:
 assert (stdenv ? glibc);
 
 stdenv.mkDerivation {
-  name = "seg3d-1.12";
+  name = "seg3d-1.12_20090930";
   src = fetchurl {
     url = http://www.sci.utah.edu/releases/seg3d_v1.12/Seg3D_1.12_20090930_source.tgz;
     sha256 = "1wr6rc6v5qjjkmws8yrc03z35h3iydxk1z28p06v1wdnca0y71z8";
diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix
index 09dd51743fc..6ec1c5fafdc 100644
--- a/pkgs/applications/graphics/ufraw/default.nix
+++ b/pkgs/applications/graphics/ufraw/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # needs GTK+
   };
 }
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 23b5092cd4d..01060909f3d 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite
-, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, udisks, libusb1, libmtp
+, imagemagick, libjpeg, fontconfig, podofo, qt48, icu, sqlite
+, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-0.8.70";
-  # 0.9.* versions won't build: https://bugs.launchpad.net/calibre/+bug/1094719
+  name = "calibre-0.9.11";
+  # 0.9.12+ versions won't build due to missing qt4 private headers: https://bugs.launchpad.net/calibre/+bug/1094719
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "12avwp8r6cnrw6c32gmd2hksa9rszdb76zs6fcmr3n8r1wkwa71g";
+    sha256 = "0jjs2cx222pbv4nrivlxag5fxa0v9m63x7arcll6xi173zdn4gg8";
   };
 
   inherit python;
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg
-      fontconfig podofo qt4 pil chmlib icu
+      fontconfig podofo qt48 pil chmlib icu
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
-      pythonPackages.cssutils pythonPackages.beautifulsoup
-      pythonPackages.sqlite3 sqlite udisks libusb1 libmtp
+      pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
+      pythonPackages.sqlite3 pythonPackages.netifaces sqlite libusb1 libmtp
     ];
 
   installPhase = ''
@@ -46,11 +46,11 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Comprehensive e-book software";
     homepage = http://calibre-ebook.com;
-    license = "GPLv3";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ viric iElectric ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 1eb0949aeb4..cb594e494db 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/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix
index 58b4f0d01bf..635775e75ac 100644
--- a/pkgs/applications/misc/evtest/default.nix
+++ b/pkgs/applications/misc/evtest/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoconf, automake, pkgconfig, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "evtest-1.30";
+  name = "evtest-1.31";
 
   preConfigure = "autoreconf -iv";
 
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://anongit.freedesktop.org/evtest";
-    rev = "1a50f2479c4775e047f234a24d95dda82441bfbd";
+    rev = "871371806017301373b8b0e5b7e8f168ce1ea13f";
+    sha256 = "1hxldlldlrb9lnnybn839a97fpqd1cixbmci2wzgr0rzhjbwhcgp";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix
index 0e222366729..308b181fe88 100644
--- a/pkgs/applications/misc/get_iplayer/default.nix
+++ b/pkgs/applications/misc/get_iplayer/default.nix
@@ -1,19 +1,23 @@
-{stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl}:
-
-stdenv.mkDerivation {
-  name = "get_iplayer-2.80";
+{stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, vlc, rtmpdump}:
+buildPerlPackage {
+  name = "get_iplayer-2.83";
 
   buildInputs = [makeWrapper perl];
+  propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP];
+
+  preConfigure = "touch Makefile.PL";
+  doCheck = false;
 
   installPhase = '' 
     mkdir -p $out/bin
     cp get_iplayer $out/bin
-    wrapProgram $out/bin/get_iplayer --suffix PATH ${ffmpeg}/bin:${flvstreamer}/bin
+    sed -i 's|^update_script|#update_script|' $out/bin/get_iplayer
+    wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin
   '';  
   
   src = fetchurl {
-    url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.80.tar.gz;
-    sha256 = "1hnadryyzca3bv1hfk2q3np9ihwvyxa3prwcrply6ywy4vnayjf8";
+    url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.83.tar.gz;
+    sha256 = "169zji0rr3z5ng6r4cyzvs89779m4iklln9gsqpryvm81ipalfga";
   };
   
 }
diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix
index 930df87214a..0b19eef3c8c 100644
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/pkgs/applications/misc/gmrun/default.nix
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
   name = "gmrun-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/gmrun/gmrun/${version}/${name}.tar.gz";
-    md5 = "6cef37a968006d9496fc56a7099c603c";
+    url = "mirror://sourceforge/gmrun/${name}.tar.gz";
+    sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p";
   };
 
   buildInputs = [ glib gtk2 pkgconfig popt ];
diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix
index 70e810bb8d7..efd9cf263e7 100644
--- a/pkgs/applications/misc/gv/default.nix
+++ b/pkgs/applications/misc/gv/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     '';
 
     license = "GPLv3+";
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index de1df426052..baf97e7a824 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
 
 let
   name = "ikiwiki";
-  version = "3.20130212";
+  version = "3.20130518";
 
   lib = stdenv.lib;
 in
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "1svajjhrwaq7wwgmhaxc2ld12cla3pdi9i7m8ll2rfa11cdhhf6m";
+    sha256 = "00mmxxlbzv6bz3cz3746r5lqwby6liwsg7m3jfba8258y52w13qp";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index 07de6271289..31c00626847 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "WYSIWYM frontend for LaTeX, DocBook, etc.";
     homepage = "http://www.lyx.org";
     license = "GPL2";
-    maintainers = [ stdenv.lib.maintainers.neznalek ];
+    maintainers = [ stdenv.lib.maintainers.vcunat ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix
index 157ecc0ffd8..078ea7fcbd8 100644
--- a/pkgs/applications/misc/nut/default.nix
+++ b/pkgs/applications/misc/nut/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }:
+{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi
+, libtool }:
 
 stdenv.mkDerivation rec {
   name = "nut-2.6.5";
@@ -8,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0gxrzsblx0jc4g9w0903ybwqbv1d79vq5hnks403fvnay4fgg3b1";
   };
 
-  buildInputs = [ neon libusb openssl udev avahi freeipmi ];
+  buildInputs = [ neon libusb openssl udev avahi freeipmi libtool ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 6d4fa97c8cb..aac15789a2d 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/qgis/default.nix b/pkgs/applications/misc/qgis/default.nix
index 834b3f0cfbe..d6711c82968 100644
--- a/pkgs/applications/misc/qgis/default.nix
+++ b/pkgs/applications/misc/qgis/default.nix
@@ -1,25 +1,32 @@
 { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl,
-  pyqt4, qwt, fcgi, python }:
+  pyqt4, qwt, fcgi, python, libspatialindex, libspatialite }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-1.6.0";
+  name = "qgis-1.8.0";
 
   buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt
-    fcgi ];
+    fcgi libspatialindex libspatialite ];
 
-  nativeBuildInputs = [ cmake python];
+  nativeBuildInputs = [ cmake python ];
 
-  patches = [ ./r14988.diff ];
+  enableParallelBuilding = true;
+
+  # To handle the lack of 'local' RPATH; required, as they call one of
+  # their built binaries requiring their libs, in the build process.
+  preBuild = ''
+    export LD_LIBRARY_PATH=`pwd`/output/lib:$LD_LIBRARY_PATH
+  '';
 
   src = fetchurl {
     url = "http://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "0vlz1z3scj3k6nxf3hzfiq7k2773i6xvk6dvj4axs2f4njpnx7pr";
+    sha256 = "1aq32ch61bqsvh39lmrxah1fmh18cd3nqyi1l0sn6ssa3kwf82vh";
   };
 
   meta = {
-    description = "user friendly Open Source Geographic Information System";
-    homepage = ttp://www.qgis.org;
-    # you can choose one of the following licenses:
-    license = [ "GPL" ];
+    description = "User friendly Open Source Geographic Information System";
+    homepage = http://www.qgis.org;
+    license = "GPLv2+";
+    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [viric];
   };
 }
diff --git a/pkgs/applications/misc/qgis/r14988.diff b/pkgs/applications/misc/qgis/r14988.diff
deleted file mode 100644
index 95d55047e1d..00000000000
--- a/pkgs/applications/misc/qgis/r14988.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: qgis/python/core/conversions.sip
-===================================================================
---- qgis/python/core/conversions.sip	(revision 14323)
-+++ qgis/python/core/conversions.sip	(revision 14988)
-@@ -16,4 +16,5 @@
- 
- %Feature QSETINT_CONVERSION
-+%Feature QSETTYPE_CONVERSION
- 
- %ModuleHeaderCode
-@@ -321,5 +322,5 @@
- %End
- 
--
-+%If (QSETTYPE_CONVERSION)
- template <TYPE>
- %MappedType QSet<TYPE>
-@@ -395,6 +396,5 @@
- 
- };
--
--
-+%End
- 
- template<TYPE>
-Index: qgis/python/CMakeLists.txt
-===================================================================
---- qgis/python/CMakeLists.txt	(revision 14330)
-+++ qgis/python/CMakeLists.txt	(revision 14988)
-@@ -44,4 +44,8 @@
- ENDIF(NOT PYQT4_VERSION_NUM LESS 263941)
- 
-+IF(NOT PYQT4_VERSION_NUM LESS 264194)	# 0x040802
-+  SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION)
-+ENDIF(NOT PYQT4_VERSION_NUM LESS 264194)
-+
- # core module
- FILE(GLOB sip_files_core core/*.sip)
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index feced2f4538..e9fe255aea8 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/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix
index fe8118b1976..6587fb2debf 100644
--- a/pkgs/applications/misc/rsibreak/default.nix
+++ b/pkgs/applications/misc/rsibreak/default.nix
@@ -1,11 +1,13 @@
 { stdenv, fetchurl, kdelibs, kdebase_workspace, gettext }:
 
+let version = "0.11";
+in
 stdenv.mkDerivation rec {
-  name = "rsibreak-0.11";
+  name = "rsibreak-${version}";
 
   src = fetchurl {
-    url = "${meta.homepage}/files/${name}.tar.bz2";
-    sha256 = "1yrf73r8mixskh8b531wb8dfs9z7rrw010xsrflhjhjmqh94h8mw";
+    url = "mirror://debian/pool/main/r/rsibreak/rsibreak_${version}.orig.tar.gz";
+    sha256 = "0g27aswh8iz5v67v1wkjny4p100vs2gm0lw0qzfkg6sw1pb4i519";
   };
 
   nativeBuildInputs = [ gettext ];
@@ -13,8 +15,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ kdelibs kdebase_workspace ];
 
   meta = {
-    homepage = http://www.rsibreak.org/;
-    description = "Repetitive Strain Injury prevention";
+    homepage = http://userbase.kde.org/RSIBreak; # http://www.rsibreak.org/ is down since 2011
+    description = "Utility to help prevent repetitive strain injury for KDE 4";
     inherit (kdelibs.meta) platforms maintainers;
   };
 }
diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix
index 13597f3ee9b..c3b5fc861a8 100644
--- a/pkgs/applications/misc/rxvt/default.nix
+++ b/pkgs/applications/misc/rxvt/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "rxvt-2.6.4";
 
   src = fetchurl {
-    url = http://downloads.sourceforge.net/rxvt/rxvt-2.6.4.tar.gz;
+    url = mirror://sourceforge/rxvt/rxvt-2.6.4.tar.gz;
     sha256 = "0hi29whjv8v11nkjbq1i6ms411v6csykghmlpkmayfjn9nxr02xg";
   };
 
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index d52fd178165..2afa6c08696 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl,
-  fontconfig, freetype, pkgconfig, libXrender }:
+  fontconfig, freetype, pkgconfig, libXrender, gdkPixbufSupport, gdk_pixbuf }:
 
 let 
   name = "rxvt-unicode";
@@ -19,7 +19,8 @@ stdenv.mkDerivation (rec {
   buildInputs =
     [ libX11 libXt libXft ncurses /* required to build the terminfo file */ 
       fontconfig freetype pkgconfig libXrender ]
-    ++ stdenv.lib.optional perlSupport perl;
+    ++ stdenv.lib.optional perlSupport perl
+    ++ stdenv.lib.optional gdkPixbufSupport gdk_pixbuf;
 
   preConfigure =
     ''
diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix
index 8ac4730de9a..3859d2c82ab 100644
--- a/pkgs/applications/misc/sdcv/default.nix
+++ b/pkgs/applications/misc/sdcv/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
     sed -i 's/guint32 page_size/size_t page_size/' src/lib/lib.cpp
   '';
 
-  NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__";
+  NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"
+    + stdenv.lib.optionalString stdenv.isDarwin " -lintl";
 }
 
diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
new file mode 100644
index 00000000000..aa2ceb08e80
--- /dev/null
+++ b/pkgs/applications/misc/slic3r/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchgit, perl, makeWrapper, makeDesktopItem
+# Perl modules:
+, EncodeLocale, MathClipper, ExtUtilsXSpp, BoostGeometryUtils
+, MathConvexHullMonotoneChain, MathGeometryVoronoi, MathPlanePath, Moo
+, IOStringy, ClassXSAccessor, Wx, GrowlGNTP, NetDBus }:
+
+stdenv.mkDerivation rec {
+  version = "0.9.10b";
+  name = "slic3r-${version}";
+
+  # Slic3r doesn't put out tarballs, only a git repository is available
+  src = fetchgit {
+    url = "git://github.com/alexrj/Slic3r";
+    rev = "refs/tags/${version}";
+    sha256 = "0j06h0z65qn4kyb2b7pnq6bcn4al60q227iz9jlrin0ffx3l0ra7";
+  };
+
+  buildInputs = [ perl makeWrapper
+    EncodeLocale MathClipper ExtUtilsXSpp BoostGeometryUtils
+    MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo
+    IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus
+  ];
+
+  desktopItem = makeDesktopItem {
+    name = "slic3r";
+    exec = "slic3r";
+    icon = "slic3r";
+    comment = "G-code generator for 3D printers";
+    desktopName = "Slic3r";
+    genericName = "3D printer tool";
+    categories = "Application;Development;";
+  };
+
+  # Nothing to do here
+  buildPhase = "true";
+
+  installPhase = ''
+    mkdir -p "$out/share/slic3r/"
+    cp -r * "$out/share/slic3r/"
+    wrapProgram "$out/share/slic3r/slic3r.pl" --prefix PERL5LIB : $PERL5LIB
+    mkdir -p "$out/bin"
+    ln -s "$out/share/slic3r/slic3r.pl" "$out/bin/slic3r"
+    mkdir -p "$out/share/pixmaps/"
+    ln -s "$out/share/slic3r/var/Slic3r.png" "$out/share/pixmaps/slic3r.png"
+    mkdir -p "$out/share/applications"
+    cp "$desktopItem"/share/applications/* "$out/share/applications/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "G-code generator for 3D printers";
+    longDescription = ''
+      Slic3r is the tool you need to convert a digital 3D model into printing
+      instructions for your 3D printer. It cuts the model into horizontal
+      slices (layers), generates toolpaths to fill them and calculates the
+      amount of material to be extruded.'';
+    homepage = http://slic3r.org/;
+    license = licenses.agpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/applications/misc/vanitygen/default.nix b/pkgs/applications/misc/vanitygen/default.nix
index 1aa3f57ecca..c68767290ee 100644
--- a/pkgs/applications/misc/vanitygen/default.nix
+++ b/pkgs/applications/misc/vanitygen/default.nix
@@ -1,13 +1,13 @@
-{ fetchurl, stdenv, openssl, pcre }:
+{ fetchgit, stdenv, openssl, pcre }:
 
 stdenv.mkDerivation rec {
   version = "0.21";
   name = "vanitygen-${version}";
 
-  src = fetchurl {
-    name = "vanitygen-${version}.tar.gz";
-    url = "https://github.com/samr7/vanitygen/tarball/0.21";
-    sha256 = "1lj0gi08lg0pcby5pbpi08ysynzy24qa1n1065112shkpasi0kxv";
+  src = fetchgit {
+    url = "https://github.com/samr7/vanitygen";
+    rev = "refs/tags/${version}";
+    sha256  = "1vzfv74hhiyrrpvjca8paydx1ashgbgn5plzrx4swyzxy1xkamah";
   };
 
   buildInputs = [ openssl pcre ];
diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix
index 6f270f5c7cf..7230e84601e 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/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix
index 86213a8b3d6..7594014d769 100644
--- a/pkgs/applications/misc/wordnet/default.nix
+++ b/pkgs/applications/misc/wordnet/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
     homepage = http://wordnet.princeton.edu/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix
index 3179e1f3440..b159dd282e2 100644
--- a/pkgs/applications/misc/xfontsel/default.nix
+++ b/pkgs/applications/misc/xfontsel/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "xfontsel-1.0.2";
 
   src = fetchurl {
-    url = "http://www.x.org/releases/individual/app/${name}.tar.bz2";
+    url = "mirror://xorg/individual/app/${name}.tar.bz2";
     sha256 = "1a86a08sf0wjrki9ydh7hr5qf6hrixc4ljlxizakjzmx20wvlrks";
   };
 
diff --git a/pkgs/applications/misc/xlsfonts/default.nix b/pkgs/applications/misc/xlsfonts/default.nix
index 8fe930ce9a5..879f5ae568c 100644
--- a/pkgs/applications/misc/xlsfonts/default.nix
+++ b/pkgs/applications/misc/xlsfonts/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "xlsfonts-1.0.2";
 
   src = fetchurl {
-    url = "http://www.x.org/releases/individual/app/${name}.tar.bz2";
+    url = "mirror://xorg/individual/app/${name}.tar.bz2";
     sha256 = "070iym754g3mf9x6xczl4gdnpvlk6rdyl1ndwhpjl21vg2dm2vnc";
   };
 
diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index db2b9eb94e3..42d11308267 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/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix
index ae339abb799..a8c4a535258 100644
--- a/pkgs/applications/networking/bittorrentsync/default.nix
+++ b/pkgs/applications/networking/bittorrentsync/default.nix
@@ -14,9 +14,9 @@ let
     else if stdenv.system == "i686-linux" then "ld-linux.so.2"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  version = "1.0.134";
-  sha256 = if stdenv.system == "x86_64-linux" then "1kyxiqjabqgsg7n0a8snh03axxzpniazp93shb2l1b6x0f7d24n7"
-    else if stdenv.system == "i686-linux" then "02wb8pqcb1rk108r49cqyg7s14grmjnkr6p3068pkiwdwwgi8jak"
+  version = "1.1.42";
+  sha256 = if stdenv.system == "x86_64-linux" then "07gcjzhhr8simkjjxhyzkvh3748ll81d742fz7j31nwdi34my8ri"
+    else if stdenv.system == "i686-linux" then "0awf5bfhb4dp4aydzrgdp3wqv1mz6ys1z45i0r1hbqszvf44xj7c"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
 in stdenv.mkDerivation {
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 4fd6a24cc14..00000000000
--- 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 b5557cc1200..df2a8ca5ce7 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -18,6 +18,9 @@
 # optional dependencies
 , libgcrypt ? null # gnomeSupport || cupsSupport
 
+# dependency for version 30
+, file
+
 # package customization
 , channel ? "stable"
 , enableSELinux ? false, libselinux ? null
@@ -87,7 +90,9 @@ let
   # user namespace sandbox patch
   userns_patch = if versionOlder sourceInfo.version "29.0.0.0"
                  then ./sandbox_userns.patch
-                 else ./sandbox_userns_29.patch;
+                 else if versionOlder sourceInfo.version "30.0.0.0"
+                      then ./sandbox_userns_29.patch
+                      else ./sandbox_userns_30.patch;
 
 in stdenv.mkDerivation rec {
   name = "${packageName}-${version}";
@@ -115,20 +120,23 @@ in stdenv.mkDerivation rec {
     ++ optionals gnomeSupport [ gconf libgcrypt ]
     ++ optional enableSELinux libselinux
     ++ optional cupsSupport libgcrypt
-    ++ optional pulseSupport pulseaudio;
+    ++ optional pulseSupport pulseaudio
+    ++ optional (!versionOlder sourceInfo.version "30.0.0.0") file;
 
   opensslPatches = optional useOpenSSL openssl.patches;
 
   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 // {
@@ -145,6 +153,15 @@ in stdenv.mkDerivation rec {
     use_cups = cupsSupport;
     linux_sandbox_path="${libExecPath}/${packageName}_sandbox";
     linux_sandbox_chrome_path="${libExecPath}/${packageName}";
+    werror = "";
+
+    # Google API keys, see http://www.chromium.org/developers/how-tos/api-keys.
+    # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
+    # please get your own set of keys.
+    google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
+    google_default_client_id = "404761575300.apps.googleusercontent.com";
+    google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D";
+
   } // optionalAttrs proprietaryCodecs {
     # enable support for the H.264 codec
     proprietary_codecs = true;
@@ -198,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/sandbox_userns_30.patch b/pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch
new file mode 100644
index 00000000000..ef1a08ee313
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch
@@ -0,0 +1,287 @@
+commit b9a1fa30eb3296b169f51ffa8ee05513c5c1dbae
+Author: aszlig <aszlig@redmoonstudios.org>
+Date:   Thu May 16 14:17:56 2013 +0200
+
+    zygote: Add support for user namespaces on Linux.
+    
+    The implementation is done by patching the Zygote host to execute the sandbox
+    binary with CLONE_NEWUSER and setting the uid and gid mapping so that the child
+    process is using uid 0 and gid 0 which map to the current user of the parent.
+    Afterwards, the sandbox will continue as if it was called as a setuid binary.
+    
+    In addition, this adds new_user_namespace as an option in process_util in order
+    to set the UID and GID mapping correctly. The reason for this is that just
+    passing CLONE_NEWUSER to clone_flags doesn't help in LaunchProcess(), because
+    without setting the mappings exec*() will clear the process's capability sets.
+    
+    If the kernel doesn't support unprivileged user namespaces and the sandbox
+    binary doesn't have the setuid flag, the Zygote main process will run without a
+    sandbox. This is to mimic the behaviour if no SUID sandbox binary path is set.
+    
+    Signed-off-by: aszlig <aszlig@redmoonstudios.org>
+
+diff --git a/base/process/launch.h b/base/process/launch.h
+index 45b1053..ce71418 100644
+--- a/base/process/launch.h
++++ b/base/process/launch.h
+@@ -51,6 +51,7 @@ struct LaunchOptions {
+         new_process_group(false)
+ #if defined(OS_LINUX)
+         , clone_flags(0)
++        , new_user_namespace(false)
+ #endif  // OS_LINUX
+ #if defined(OS_CHROMEOS)
+         , ctrl_terminal_fd(-1)
+@@ -125,6 +126,9 @@ struct LaunchOptions {
+ #if defined(OS_LINUX)
+   // If non-zero, start the process using clone(), using flags as provided.
+   int clone_flags;
++
++  // If true, start the process in a new user namespace.
++  bool new_user_namespace;
+ #endif  // defined(OS_LINUX)
+ 
+ #if defined(OS_CHROMEOS)
+diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc
+index 336633c..4b50a5d 100644
+--- a/base/process/launch_posix.cc
++++ b/base/process/launch_posix.cc
+@@ -36,6 +36,13 @@
+ #include "base/threading/platform_thread.h"
+ #include "base/threading/thread_restrictions.h"
+ 
++#if defined(OS_LINUX)
++#include <sched.h>
++#if !defined(CLONE_NEWUSER)
++#define CLONE_NEWUSER 0x10000000
++#endif
++#endif
++
+ #if defined(OS_CHROMEOS)
+ #include <sys/ioctl.h>
+ #endif
+@@ -395,8 +402,19 @@ bool LaunchProcess(const std::vector<std::string>& argv,
+ 
+   pid_t pid;
+ #if defined(OS_LINUX)
+-  if (options.clone_flags) {
+-    pid = syscall(__NR_clone, options.clone_flags, 0, 0, 0);
++  int map_pipe_fd[2];
++  int flags = options.clone_flags;
++
++  if (options.new_user_namespace) {
++    flags |= CLONE_NEWUSER;
++    if (pipe(map_pipe_fd) < 0) {
++      DPLOG(ERROR) << "user namespace pipe";
++      return false;
++    }
++  }
++
++  if (options.clone_flags || options.new_user_namespace) {
++    pid = syscall(__NR_clone, flags, 0, 0, 0);
+   } else
+ #endif
+   {
+@@ -409,6 +427,21 @@ bool LaunchProcess(const std::vector<std::string>& argv,
+   } else if (pid == 0) {
+     // Child process
+ 
++#if defined(OS_LINUX)
++    if (options.new_user_namespace) {
++      // Close the write end of the pipe so we get an EOF when the parent closes
++      // the FD. This is to avoid race conditions when the UID/GID mappings are
++      // written _after_ execvp().
++      close(map_pipe_fd[1]);
++
++      char dummy;
++      if (HANDLE_EINTR(read(map_pipe_fd[0], &dummy, 1)) != 0) {
++        RAW_LOG(ERROR, "Unexpected input in uid/gid mapping pipe.");
++        _exit(127);
++      }
++    }
++#endif
++
+     // DANGER: fork() rule: in the child, if you don't end up doing exec*(),
+     // you call _exit() instead of exit(). This is because _exit() does not
+     // call any previously-registered (in the parent) exit handlers, which
+@@ -523,6 +556,40 @@ bool LaunchProcess(const std::vector<std::string>& argv,
+     _exit(127);
+   } else {
+     // Parent process
++#if defined(OS_LINUX)
++    if (options.new_user_namespace) {
++      // We need to write UID/GID mapping here to map the current user outside
++      // the namespace to the root user inside the namespace in order to
++      // correctly "fool" the child process.
++      char buf[256];
++      int map_fd, map_len;
++
++      snprintf(buf, sizeof(buf), "/proc/%d/uid_map", pid);
++      map_fd = open(buf, O_RDWR);
++      DPCHECK(map_fd >= 0);
++      snprintf(buf, sizeof(buf), "0 %d 1", geteuid());
++      map_len = strlen(buf);
++      if (write(map_fd, buf, map_len) != map_len) {
++        RAW_LOG(WARNING, "Can't write to uid_map.");
++      }
++      close(map_fd);
++
++      snprintf(buf, sizeof(buf), "/proc/%d/gid_map", pid);
++      map_fd = open(buf, O_RDWR);
++      DPCHECK(map_fd >= 0);
++      snprintf(buf, sizeof(buf), "0 %d 1", getegid());
++      map_len = strlen(buf);
++      if (write(map_fd, buf, map_len) != map_len) {
++        RAW_LOG(WARNING, "Can't write to gid_map.");
++      }
++      close(map_fd);
++
++      // Close the pipe on the parent, so the child can continue doing the
++      // execvp() call.
++      close(map_pipe_fd[1]);
++    }
++#endif
++
+     if (options.wait) {
+       // While this isn't strictly disk IO, waiting for another process to
+       // finish is the sort of thing ThreadRestrictions is trying to prevent.
+diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc
+index bb84e62..bce0d18 100644
+--- a/content/browser/zygote_host/zygote_host_impl_linux.cc
++++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
+@@ -119,25 +119,31 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
+ 
+   sandbox_binary_ = sandbox_cmd.c_str();
+ 
+-  // A non empty sandbox_cmd means we want a SUID sandbox.
+-  using_suid_sandbox_ = !sandbox_cmd.empty();
++  bool userns_sandbox = false;
++  const std::vector<std::string> cmd_line_unwrapped(cmd_line.argv());
+ 
+-  if (using_suid_sandbox_) {
++  if (!sandbox_cmd.empty()) {
+     struct stat st;
+     if (stat(sandbox_binary_.c_str(), &st) != 0) {
+       LOG(FATAL) << "The SUID sandbox helper binary is missing: "
+                  << sandbox_binary_ << " Aborting now.";
+     }
+ 
+-    if (access(sandbox_binary_.c_str(), X_OK) == 0 &&
+-        (st.st_uid == 0) &&
+-        (st.st_mode & S_ISUID) &&
+-        (st.st_mode & S_IXOTH)) {
++    if (access(sandbox_binary_.c_str(), X_OK) == 0) {
++      using_suid_sandbox_ = true;
++
+       cmd_line.PrependWrapper(sandbox_binary_);
+ 
+       scoped_ptr<sandbox::SetuidSandboxClient>
+           sandbox_client(sandbox::SetuidSandboxClient::Create());
+       sandbox_client->SetupLaunchEnvironment();
++
++      if (!((st.st_uid == 0) &&
++            (st.st_mode & S_ISUID) &&
++            (st.st_mode & S_IXOTH))) {
++        userns_sandbox = true;
++        sandbox_client->SetNoSuid();
++      }
+     } else {
+       LOG(FATAL) << "The SUID sandbox helper binary was found, but is not "
+                     "configured correctly. Rather than run without sandboxing "
+@@ -161,7 +167,19 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
+   base::ProcessHandle process = -1;
+   base::LaunchOptions options;
+   options.fds_to_remap = &fds_to_map;
++  if (userns_sandbox)
++    options.new_user_namespace = true;
+   base::LaunchProcess(cmd_line.argv(), options, &process);
++
++  if (process == -1 && userns_sandbox) {
++    LOG(ERROR) << "User namespace sandbox failed to start, running without "
++               << "sandbox! You need at least kernel 3.8.0 with CONFIG_USER_NS "
++               << "enabled in order to use the sandbox without setuid bit.";
++    using_suid_sandbox_ = false;
++    options.new_user_namespace = false;
++    base::LaunchProcess(cmd_line_unwrapped, options, &process);
++  }
++
+   CHECK(process != -1) << "Failed to launch zygote process";
+ 
+   if (using_suid_sandbox_) {
+diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc
+index dcea4c0..c06b4ae 100644
+--- a/content/zygote/zygote_main_linux.cc
++++ b/content/zygote/zygote_main_linux.cc
+@@ -398,6 +398,13 @@ static bool EnterSandbox(sandbox::SetuidSandboxClient* setuid_sandbox,
+       *has_started_new_init = true;
+     }
+ 
++    // Don't set non-dumpable, as it causes trouble when the host tries to find
++    // the zygote process (XXX: Not quite sure why this happens with user
++    // namespaces). Fortunately, we also have the seccomp filter sandbox which
++    // should disallow the use of ptrace.
++    if (setuid_sandbox->IsNoSuid())
++      return true;
++
+ #if !defined(OS_OPENBSD)
+     // Previously, we required that the binary be non-readable. This causes the
+     // kernel to mark the process as non-dumpable at startup. The thinking was
+diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc
+index 34231d4..36e3201 100644
+--- a/sandbox/linux/suid/client/setuid_sandbox_client.cc
++++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc
+@@ -166,6 +166,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const {
+   return env_->HasVar(kSandboxNETNSEnvironmentVarName);
+ }
+ 
++bool SetuidSandboxClient::IsNoSuid() const {
++  return env_->HasVar(kSandboxNoSuidVarName);
++}
++
+ bool SetuidSandboxClient::IsSandboxed() const {
+   return sandboxed_;
+ }
+@@ -175,5 +179,9 @@ void SetuidSandboxClient::SetupLaunchEnvironment() {
+   SetSandboxAPIEnvironmentVariable(env_);
+ }
+ 
++void SetuidSandboxClient::SetNoSuid() {
++  env_->SetVar(kSandboxNoSuidVarName, "1");
++}
++
+ }  // namespace sandbox
+ 
+diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h
+index a9f6536..2e8113a 100644
+--- a/sandbox/linux/suid/client/setuid_sandbox_client.h
++++ b/sandbox/linux/suid/client/setuid_sandbox_client.h
+@@ -39,6 +39,8 @@ class SetuidSandboxClient {
+   bool IsInNewPIDNamespace() const;
+   // Did the setuid helper create a new network namespace ?
+   bool IsInNewNETNamespace() const;
++  // Is sandboxed without SUID binary ?
++  bool IsNoSuid() const;
+   // Are we done and fully sandboxed ?
+   bool IsSandboxed() const;
+ 
+@@ -46,6 +48,8 @@ class SetuidSandboxClient {
+   // helper.
+   void SetupLaunchEnvironment();
+ 
++  void SetNoSuid();
++
+  private:
+   // Holds the environment. Will never be NULL.
+   base::Environment* env_;
+diff --git a/sandbox/linux/suid/common/sandbox.h b/sandbox/linux/suid/common/sandbox.h
+index aad4ff8..bd710d5 100644
+--- a/sandbox/linux/suid/common/sandbox.h
++++ b/sandbox/linux/suid/common/sandbox.h
+@@ -18,6 +18,7 @@ static const char kAdjustLowMemMarginSwitch[] = "--adjust-low-mem";
+ 
+ static const char kSandboxDescriptorEnvironmentVarName[] = "SBX_D";
+ static const char kSandboxHelperPidEnvironmentVarName[] = "SBX_HELPER_PID";
++static const char kSandboxNoSuidVarName[] = "SBX_NO_SUID";
+ 
+ static const long kSUIDSandboxApiNumber = 1;
+ static const char kSandboxEnvironmentApiRequest[] = "SBX_CHROME_API_RQ";
diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index dce02893a56..a4769d172cd 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "29.0.1541.2";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1541.2.tar.xz";
-    sha256 = "0i3vp2zrk1sjdhkwdhig08jh0qmzahn96pm0i22r63cp8i9vny1p";
+    version = "30.0.1588.0";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1588.0.tar.xz";
+    sha256 = "1jwc2pkd75gax8vj8wzahhpzl6ilgrlj3bcbah975yy67m7c8p13";
   };
   beta = {
-    version = "28.0.1500.52";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.52.tar.xz";
-    sha256 = "1d0q8lsvwqkaninmnyc8jjj0pnqxc5rr3lr3mgzj37avksxvyg3v";
+    version = "29.0.1547.49";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.49.tar.xz";
+    sha256 = "03r64rydi2kbxgi2dcpslmpb716ppadqy1jzrbw39icz5xpgmg3k";
   };
   stable = {
-    version = "28.0.1500.52";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.52.tar.xz";
-    sha256 = "1d0q8lsvwqkaninmnyc8jjj0pnqxc5rr3lr3mgzj37avksxvyg3v";
+    version = "28.0.1500.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/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix
index b50266e2761..b44a39d87aa 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchurl, unzip, xulrunner, makeWrapper }:
+{ stdenv, fetchgit, unzip, xulrunner, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "conkeror-1.0pre-20130401";
-  
-  src = fetchurl {
-    url = http://repo.or.cz/w/conkeror.git/snapshot/0341e791c78653a2f5bbbff9a1dac04bf898dd65.zip;
-    sha256 = "11v7p40lcz6r5z0w54f8pk6hyn9mqjcw44fqszjyz25rkhx951ry";
+  name = "conkeror-1.0pre-20130817-1";
+
+  src = fetchgit {
+    url = git://repo.or.cz/conkeror.git;
+    rev = "refs/tags/debian-1.0--pre+git130817-1";
+    sha256 = "aef3c782ac98c031e7b99852f42538e225e151cd226cde3094823a5cae015fcf";
   };
-  
+
   buildInputs = [ unzip makeWrapper ];
-  
+
   installPhase = ''
     mkdir -p $out/libexec/conkeror
     cp -r * $out/libexec/conkeror
diff --git a/pkgs/applications/networking/browsers/firefox/20.0.nix b/pkgs/applications/networking/browsers/firefox/20.0.nix
deleted file mode 100644
index 39cf69dcfb0..00000000000
--- a/pkgs/applications/networking/browsers/firefox/20.0.nix
+++ /dev/null
@@ -1,175 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
-, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
-
-, # If you want the resulting program to call itself "Firefox" instead
-  # of "Shiretoko" or whatever, enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-}:
-
-assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
-
-rec {
-
-  firefoxVersion = "20.0";
-
-  xulVersion = "20.0"; # this attribute is used by other packages
-
-
-  src = fetchurl {
-    urls = [
-        # It is better to use this url for official releases, to take load off Mozilla's ftp server.
-        "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
-        # 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 = "6d776c29da0be0d2a50abeb504d63b06b7861218";
-  };
-
-  commonConfigureFlags =
-    [ "--enable-optimize"
-      #"--enable-profiling"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-system-jpeg" # now we use recent libjpeg-turbo
-      "--with-system-zlib"
-      "--with-system-bz2"
-      "--with-system-nspr"
-      "--with-system-nss"
-      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-      # "--enable-system-cairo" # <-- doesn't build
-      "--enable-system-sqlite"
-      "--disable-crashreporter"
-      "--disable-tests"
-      "--disable-necko-wifi" # maybe we want to enable this at some point
-      "--disable-installer"
-      "--disable-updater"
-    ];
-
-
-  xulrunner = stdenv.mkDerivation rec {
-    name = "xulrunner-${xulVersion}";
-
-    inherit src;
-
-    buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
-        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
-        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
-        alsaLib nspr nss libnotify xlibs.pixman yasm mesa
-        xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
-        xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
-      ];
-
-    configureFlags =
-      [ "--enable-application=xulrunner"
-        "--disable-javaxpcom"
-      ] ++ commonConfigureFlags;
-
-    enableParallelBuilding = true;
-
-    preConfigure =
-      ''
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
-
-        mkdir ../objdir
-        cd ../objdir
-        configureScript=../mozilla-release/configure
-      ''; # */
-
-    #installFlags = "SKIP_GRE_REGISTRATION=1";
-
-    postInstall = ''
-      # Fix run-mozilla.sh search
-      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
-      echo libDir: $libDir
-      test -n "$libDir"
-      cd $out/bin
-      rm xulrunner
-
-      for i in $out/lib/$libDir/*; do
-          file $i;
-          if file $i | grep executable &>/dev/null; then
-              echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
-              chmod a+x "$out/bin/$(basename "$i")";
-          fi;
-      done
-      for i in $out/lib/$libDir/*.so; do
-          patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
-      done
-      for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
-          wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
-      done
-      rm -f $out/bin/run-mozilla.sh
-    ''; # */
-
-    meta = {
-      description = "Mozilla Firefox XUL runner";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-    };
-
-    passthru = { inherit gtk; version = xulVersion; };
-  };
-
-
-  firefox = stdenv.mkDerivation rec {
-    name = "firefox-${firefoxVersion}";
-
-    inherit src;
-
-    enableParallelBuilding = true;
-
-    buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
-        dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
-        xlibs.pixman yasm mesa sqlite file unzip pysqlite
-      ];
-
-    propagatedBuildInputs = [xulrunner];
-
-    configureFlags =
-      [ "--enable-application=browser"
-        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
-        "--enable-chrome-format=jar"
-      ]
-      ++ commonConfigureFlags
-      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
-    makeFlags = [
-      "SYSTEM_LIBXUL=1"
-    ];
-
-    # Hack to work around make's idea of -lbz2 dependency
-    preConfigure =
-      ''
-        find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
-          stdenv.lib.concatStringsSep ":"
-            (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
-        }' ';'
-      '';
-
-    postInstall =
-      ''
-        ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
-        cd "$out/lib/"firefox-*
-        rm firefox
-        echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
-        chmod a+x firefox
-      ''; # */
-
-    meta = {
-      description = "Mozilla Firefox - the browser, reloaded";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-      maintainers = [ stdenv.lib.maintainers.eelco ];
-    };
-
-    passthru = {
-      inherit gtk xulrunner nspr;
-      isFirefox3Like = true;
-    };
-  };
-}
diff --git a/pkgs/applications/networking/browsers/firefox/21.0.nix b/pkgs/applications/networking/browsers/firefox/default.nix
similarity index 92%
rename from pkgs/applications/networking/browsers/firefox/21.0.nix
rename to pkgs/applications/networking/browsers/firefox/default.nix
index 35ba2cad124..b780152905d 100644
--- a/pkgs/applications/networking/browsers/firefox/21.0.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 = "21.0";
+  firefoxVersion = "23.0";
 
-  xulVersion = "21.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 = "e63b5488eaec1956947f59609d5839332ba7ffe1";
+    sha1 = "31936d2ddb727640c96a3ae697bf145c42a2a20e";
   };
 
   commonConfigureFlags =
@@ -46,7 +46,7 @@ in rec {
       "--with-system-nss"
       "--with-system-libevent"
       "--with-system-libvpx"
-      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
+      "--with-system-png"
       "--enable-startup-notification"
       "--enable-system-ffi"
       "--enable-system-hunspell"
@@ -66,7 +66,7 @@ in rec {
     inherit src;
 
     buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib bzip2
+      [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2
         python dbus dbus_glib pango freetype fontconfig xlibs.libXi
         xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
         alsaLib nspr nss libnotify xlibs.pixman yasm mesa
@@ -82,7 +82,7 @@ in rec {
 
     enableParallelBuilding = true;
 
-    patches = optional useSystemCairo ./system-cairo.patch; # probably in 22
+    patches = optional useSystemCairo ./system-cairo.patch;
 
     preConfigure =
       ''
@@ -136,7 +136,7 @@ in rec {
     enableParallelBuilding = true;
 
     buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 python
+      [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2 python
         dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
         xlibs.pixman yasm mesa sqlite file unzip pysqlite
         hunspell libevent libstartup_notification libvpx
diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix
index e916c34631e..7e181669cd1 100644
--- a/pkgs/applications/networking/browsers/icecat-3/default.nix
+++ b/pkgs/applications/networking/browsers/icecat-3/default.nix
@@ -107,7 +107,7 @@ stdenv.mkDerivation {
     homepage = http://www.gnu.org/software/gnuzilla/;
     licenses = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;
   };
 
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index b15c05c7b49..4d561737d27 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 10faa983cc1..0363176257f 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/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 8cc62aa02db..4f7d3feb8ad 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo
-, libpng12, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl
+, libpng, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl
 , dbus_glib, alsaLib, pulseaudio, udev, pango
 }:
 
@@ -14,7 +14,7 @@ let
       xorg.libXt
       xorg.libX11
       cairo
-      libpng12
+      libpng
       gtk
       glib
       fontconfig
@@ -47,18 +47,18 @@ stdenv.mkDerivation rec {
   name = "google-talk-plugin-${version}";
   # Use the following to determine the current upstream version:
   # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p'
-  version = "3.17.0.0";
+  version = "4.2.1.0";
 
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb";
-        sha256 = "1annx2zhxgn3wl468w7sk93k4xhmnx5bbdjr0d1ar7979hvrdl1x";
+        sha256 = "1g7kpz2lzzz1gri5rd3isp7cfyls6gzwcw2kc8jgrgrixq9iixfd";
       }
     else if stdenv.system == "i686-linux" then
       fetchurl {
         url = "${baseURL}/google-talkplugin_${version}-1_i386.deb";
-        sha256 = "13fza920vg3qig2pnlr65mzcmmy3izla95zdpa3pk28qlfij0ryc";
+        sha256 = "1z0zbblzlky9nyifxmnl49v4zafpqp3l08b9v1486sinm35rf58r";
       }
     else throw "Google Talk does not support your platform.";
 
@@ -79,13 +79,13 @@ stdenv.mkDerivation rec {
         $plugins/libnpgtpo3dautoplugin.so
 
       mkdir -p $out/libexec/google/talkplugin
-      cp opt/google/talkplugin/GoogleTalkPlugin $out/libexec/google/talkplugin/
-      
+      cp -prd opt/google/talkplugin/{GoogleTalkPlugin,locale,windowpicker.glade} $out/libexec/google/talkplugin/
+
       mkdir -p $out/libexec/google/talkplugin/lib
       cp opt/google/talkplugin/lib/libCg* $out/libexec/google/talkplugin/lib/
 
       patchelf --set-rpath "$out/libexec/google/talkplugin/lib" \
-        $out/libexec/google/talkplugin/lib/libCgGL.so 
+        $out/libexec/google/talkplugin/lib/libCgGL.so
 
       patchelf \
         --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
   dontPatchELF = true;
-  
+
   passthru.mozillaPlugin = "/lib/mozilla/plugins";
 
   meta = {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
index 9c543fed758..a643e39c31a 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
@@ -12,8 +12,8 @@
 #include <fcntl.h>
 #include <limits.h>
 
-char origDir [] = "/opt/google/talkplugin/GoogleTalkPlugin";
-char realDir [] = OUT "/libexec/google/talkplugin/GoogleTalkPlugin";
+char origDir [] = "/opt/google/talkplugin";
+char realDir [] = OUT "/libexec/google/talkplugin";
 
 const char * rewrite(const char * path, char * buf)
 {
@@ -29,3 +29,31 @@ int execvp(const char * path, char * const argv[])
     char buf[PATH_MAX];
     return _execvp(rewrite(path, buf), argv);
 }
+
+int open(const char *path, int flags, ...)
+{
+    char buf[PATH_MAX];
+    int (*_open) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open");
+    mode_t mode = 0;
+    if (flags & O_CREAT) {
+        va_list ap;
+        va_start(ap, flags);
+        mode = va_arg(ap, mode_t);
+        va_end(ap);
+    }
+    return _open(rewrite(path, buf), flags, mode);
+}
+
+int open64(const char *path, int flags, ...)
+{
+    char buf[PATH_MAX];
+    int (*_open64) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64");
+    mode_t mode = 0;
+    if (flags & O_CREAT) {
+        va_list ap;
+        va_start(ap, flags);
+        mode = va_arg(ap, mode_t);
+        va_end(ap);
+    }
+    return _open64(rewrite(path, buf), flags, mode);
+}
diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
new file mode 100644
index 00000000000..3bca5cc91da
--- /dev/null
+++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json_c, ncurses
+, gettext, libiconvOrEmpty, makeWrapper, perl }:
+
+stdenv.mkDerivation rec {
+  name = "newsbeuter-2.6";
+
+  src = fetchurl {
+    url = "http://www.newsbeuter.org/downloads/${name}.tar.gz";
+    sha256 = "1hywz5206k0ykjklkjvnfy9fm4jfv9phz8dkzzwhfcjvqv9zv29i";
+  };
+
+  buildInputs
+    # use gettext instead of libintlOrEmpty so we have access to the msgfmt
+    # command
+    = [ pkgconfig sqlite curl libxml2 stfl json_c ncurses gettext perl ]
+      ++ libiconvOrEmpty
+      ++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
+
+  preBuild = ''
+    sed -i -e 104,108d config.sh
+    sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl
+    export LDFLAGS=-lncursesw
+  '';
+
+  installPhase = ''
+    DESTDIR=$out prefix=\"\" make install
+  ''
+    + stdenv.lib.optionalString stdenv.isDarwin ''
+      for prog in $out/bin/*; do
+        wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
+      done
+    '';
+
+  meta = {
+    homepage    = http://www.newsbeuter.org;
+    description = "An open-source RSS/Atom feed reader for text terminals";
+    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
+    license     = stdenv.lib.licenses.mit;
+    platforms   = stdenv.lib.platforms.unix;
+  };
+}
+
diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
index 8bb28f7ce00..9cf2558ef32 100644
--- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
+++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
@@ -9,7 +9,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = http://downloads.sourceforge.net/funpidgin/carrier-2.5.0.tar.bz2;
+    url = mirror://sourceforge/funpidgin/carrier-2.5.0.tar.bz2;
     sha256 = "0m80s7hnvz5vc2dy3xiy1zfb6incmb7p28zahzxdif2vz44riz28";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index a4a32327d0c..c3af0ad0e34 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -1,21 +1,23 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip
-, speex, readline, mediastreamer, libsoup }:
+, speex, readline, mediastreamer, libsoup, udev, libnotify }:
 
 stdenv.mkDerivation rec {
-  name = "linphone-3.5.2";
+  name = "linphone-3.6.1";
 
   src = fetchurl {
-    url = "mirror://savannah/linphone/3.5.x/sources/${name}.tar.gz";
-    sha256 = "0830iam7kgqphgk3q6qx93kp5wrf0gnm5air82jamy7377jxadys";
+    url = "mirror://savannah/linphone/3.6.x/sources/${name}.tar.gz";
+    sha256 = "186jm4nd4ggb0j8cs8wnpm4sy9cr7chq0c6kx2yc6y4k7qi83fh5";
   };
 
-  patches = [ ./fix-deprecated.patch ];
-
-  buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex libsoup ];
+  buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex libsoup udev
+    libnotify ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
-  preConfigure = "rm -r mediastreamer2 oRTP";
+  preConfigure = ''
+    rm -r mediastreamer2 oRTP
+    sed -i s,/bin/echo,echo, coreapi/Makefile*
+  '';
 
   configureFlags = "--enable-external-ortp --enable-external-mediastreamer";
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix
index 868b5dbb342..7f7d5abccfd 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix
@@ -1,7 +1,7 @@
 args : with args; 
 rec {
   src = fetchurl {
-    url = http://mesh.dl.sourceforge.net/sourceforge/pidgin-latex/pidgin-latex-1.2.1.tar.bz2;
+    url = mirror://sourceforge/pidgin-latex/pidgin-latex-1.2.1.tar.bz2;
     sha256 = "19h76fwsx5y30l5wda2930k10r385aipngfljz5bdi7b9y52lii7";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix
new file mode 100644
index 00000000000..2401d796bfd
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix
@@ -0,0 +1,84 @@
+{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, pulseaudio, libsamplerate
+, commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus
+, autoconf, automake, libtool, gettext, perl
+, cmake, qt4
+, gtk, glib, dbus_glib, libnotify, intltool, makeWrapper }:
+
+let
+  name = "sflphone-1.2.3";
+
+  src = fetchurl {
+    url = "https://projects.savoirfairelinux.com/attachments/download/6423/${name}.tar.gz";
+    sha256 = "0aiwlky7mp5l51a7kkhkmaz7ivapypar291kdxzdxl1s3qy0x6fd";
+  };
+
+  meta = {
+    homepage = http://sflphone.org/;
+    license = "GPLv3+";
+    description = "Free software enterprise-class softphone for GNU/Linux";
+    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [viric];
+  };
+
+in
+rec {
+  daemon = stdenv.mkDerivation {
+    name = name + "-daemon";
+
+    inherit src;
+
+    patches = [ ./libzrtpcpp-cflags.patch ];
+
+    preConfigure = ''
+      cd daemon
+
+      # Post patch, required
+      autoreconf -vfi
+
+      cd libs
+      bash ./compile_pjsip.sh
+      cd ..
+    '';
+
+    configureFlags = "--with-expat --with-expat-inc=${expat}/include " +
+      "--with-expat-lib=-lexpat --with-opus ";
+
+    buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig pulseaudio libsamplerate 
+      commoncpp2 ccrtp libzrtpcpp dbus dbus_cplusplus expat pcre gsm speex ilbc libopus
+      autoconf automake libtool gettext perl ];
+  };
+
+  # This fails still.
+  # I don't know the best way to make this a KDE program (with switchable kde
+  # libs, like digikam for example)
+  /*
+  kde = stdenv.mkDerivation {
+    name = name + "-kde";
+
+    inherit src;
+
+    preConfigure = ''
+      cd kde
+    '';
+
+    buildInputs = [ daemon cmake qt4 pkgconfig ];
+  };
+  */
+
+  gnome = stdenv.mkDerivation {
+    name = name + "-gnome";
+
+    inherit src;
+
+    preConfigure = ''
+      cd gnome
+    '';
+
+    # gtk3 programs have the runtime dependency on XDG_DATA_DIRS
+    postInstall = ''
+      wrapProgram $out/bin/sflphone* --prefix XDG_DATA_DIRS ":" ${gtk}/share
+    '';
+
+    buildInputs = [ daemon pkgconfig gtk glib dbus_glib libnotify intltool makeWrapper ];
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch b/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch
new file mode 100644
index 00000000000..972d9c58808
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch
@@ -0,0 +1,15 @@
+diff --git a/daemon/src/audio/audiortp/Makefile.am b/daemon/src/audio/audiortp/Makefile.am
+index c27eedd..fe64077 100644
+--- a/daemon/src/audio/audiortp/Makefile.am
++++ b/daemon/src/audio/audiortp/Makefile.am
+@@ -4,6 +4,10 @@ noinst_LTLIBRARIES = libaudiortp.la
+ 
+ if BUILD_ZRTP
+ SFL_ZRTP_SRC=audio_zrtp_session.h audio_zrtp_session.cpp zrtp_session_callback.cpp zrtp_session_callback.h
++libaudiortp_la_CXXFLAGS = \
++		@CCGNU2_CFLAGS@ \
++		@ZRTPCPP_CFLAGS@ \
++		@CCRTP_CFLAGS@
+ endif
+ 
+ libaudiortp_la_SOURCES = \
diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix
index 1d4c772d6f7..f0a6dbbe7e7 100644
--- a/pkgs/applications/networking/iptraf/default.nix
+++ b/pkgs/applications/networking/iptraf/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation rec {
-  name = "iptraf-3.0.0";
+  name = "iptraf-3.0.1";
   
   src = fetchurl {
-    url = ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.0.tar.gz;
-    sha256 = "0qsi5f8d84mgdszvz22acyv6mjnbrpk55d54km9i5mkkapck7r4y";
+    url = ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.1.tar.gz;
+    md5 = "004c2c005a1b78739e22bc49d33e244d";
   };
 
   patchPhase = ''
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index bf9e19642b8..31e65a857df 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -11,7 +11,7 @@ assert sslSupport -> openssl != null;
 assert gpgSupport -> gpgme != null;
 
 stdenv.mkDerivation {
-  name = "sylpheed-3.2";
+  name = "sylpheed-3.2.0";
 
   src = fetchurl {
     url = http://sylpheed.sraoss.jp/sylpheed/v3.2/sylpheed-3.2.0.tar.bz2;
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 95ae70810a1..94d1d08b9e4 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.6"; 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 = "cb5cb5dbfe77179b5853345c826eaa2bc634d48c";
+    sha1 = "4bcbb33f0b3ea050e805723680b5669d80438812";
   };
 
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   buildInputs =
     [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr
diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index bf0ca68177b..584fdcd170a 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,18 +1,20 @@
 { stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn }:
+
 stdenv.mkDerivation rec {
-  name = "msmtp-1.4.30";
+  name = "msmtp-1.4.31";
 
   src = fetchurl {
     url = "mirror://sourceforge/msmtp/${name}.tar.bz2";
-    sha256 = "11lq82byx9xyfkf4nrcfjjfv5k8gk3bf8zlw0kml1qrndqlvjlpi";
+    sha256 = "0pr29kb7qsz4q6yfw5wvmw1wm4axi8kc97qhhmp50bx2bylzjyi4";
   };
 
   buildInputs = [ openssl pkgconfig gnutls gsasl libidn ];
 
   meta = {
-      description = "a MUA";
+      description = "Simple and easy to use SMTP client with excellent sendmail compatibility";
       homepage = "http://msmtp.sourceforge.net/";
       license = stdenv.lib.licenses.gpl3;
       maintainers = [ stdenv.lib.maintainers.garbas ];
+      platforms = stdenv.lib.platforms.linux;
     };
 }
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
new file mode 100644
index 00000000000..4703a4f28c8
--- /dev/null
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk2, gnome2 /*just GConf*/
+, libsoup, libunique, libxslt, webkit_gtk2, json_glib
+, libnotify /*optional*/ }:
+
+let version = "1.8.15";
+in
+stdenv.mkDerivation rec {
+  name = "liferea-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/liferea/Liferea%20Stable/${version}/${name}.tar.bz2";
+    sha256 = "12hhdl5biwcvr9ds7pdhhvlp4vggjix6xm4z5pnfaz53ai2dnc99";
+  };
+
+  buildInputs = [
+    pkgconfig intltool gtk2 gnome2.GConf
+    libsoup libunique libxslt webkit_gtk2 json_glib
+    libnotify
+  ];
+
+  meta = {
+    description = "A GTK-based news feed agregator";
+    homepage = http://lzone.de/liferea/;
+    maintainers = [ stdenv.lib.maintainers.vcunat ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix
index eb05461ec85..b6b9db99f90 100644
--- a/pkgs/applications/networking/p2p/gnunet/svn.nix
+++ b/pkgs/applications/networking/p2p/gnunet/svn.nix
@@ -4,7 +4,7 @@
 , makeWrapper, autoconf, automake }:
 
 let
-  rev = "27399";
+  rev = "27775";
 in
 stdenv.mkDerivation rec {
   name = "gnunet-svn-${rev}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchsvn {
     url =  https://gnunet.org/svn/gnunet;
     inherit rev;
-    sha256 = "0fn7ppfnc4v6lkxwww11s0h8mdvwyv7f40f6wrbfilqpn2ncrf8c";
+    sha256 = "1fa2g63rrn0mmim9v62gnm2hqr556mbcafb7cs7afycbinix4spf";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index 2dc909ca915..558394199f4 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssl, libsamplerate}:
 
 stdenv.mkDerivation rec {
-  name = "pjsip-1.8.10";
+  name = "pjsip-2.1";
 
   src = fetchurl {
-    url = http://www.pjsip.org/release/1.8.10/pjproject-1.8.10.tar.bz2;
-    sha256 = "1v2mgbgzn7d3msb406jmg69ms97a0rqg58asykx71dmjipbaiqc0";
+    url = http://www.pjsip.org/release/2.1/pjproject-2.1.tar.bz2;
+    md5 = "310eb63638dac93095f6a1fc8ee1f578";
   };
 
   buildInputs = [ openssl libsamplerate ];
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index d8634e31dad..8f89d70405a 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -21,11 +21,11 @@
 assert printerSupport -> cups != null;
 stdenv.mkDerivation rec {
   name = "freerdp-${version}";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchurl {
     url = "https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz";
-    sha256 = "1my8gamvfrn6v9gcqxsa9cgxr42shc0l826zvxj8wpcay6gd321w";
+    sha256 = "1w9dk7dsbppspnnms2xwwmbg7jm61i7aw5nkwzbpdyxngbgkgwf0";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/networking/siproxd/cheaders.patch b/pkgs/applications/networking/siproxd/cheaders.patch
new file mode 100644
index 00000000000..53c4813cc33
--- /dev/null
+++ b/pkgs/applications/networking/siproxd/cheaders.patch
@@ -0,0 +1,13 @@
+diff --git a/src/dejitter.c b/src/dejitter.c
+index 1904ab3..cb3624d 100644
+--- a/src/dejitter.c
++++ b/src/dejitter.c
+@@ -22,6 +22,8 @@
+ 
+ #include <errno.h>
+ 
++#include <string.h>
++#include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix
index 3395ba6947a..69ebab78f94 100644
--- a/pkgs/applications/networking/siproxd/default.nix
+++ b/pkgs/applications/networking/siproxd/default.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchurl, libosip }:
 
-stdenv.mkDerivation {
-  name = "siproxd-0.8.0";
+stdenv.mkDerivation rec {
+  name = "siproxd-0.8.1";
   
   src = fetchurl {
-    url = mirror://sourceforge/siproxd/siproxd-0.8.0.tar.gz;
-    sha256 = "0hl51z33cf68ki707jkrrjjc3a5vpaf49gbrsz3g4rfxypdhc0qs";
+    url = "mirror://sourceforge/siproxd/${name}.tar.gz";
+    sha256 = "1bcxl0h5nc28m8lcdhpbl5yc93w98xm53mfzrf04knsvmx7z0bfz";
   };
 
+  patches = [ ./cheaders.patch ];
+
   buildInputs = [ libosip ];
 
   meta = {
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 0865b12e972..eddaf8f33e7 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnucash.org/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons stdenv.lib.maintainers.iElectric ];
+    maintainers = [ stdenv.lib.maintainers.simons stdenv.lib.maintainers.iElectric ];
     platforms = stdenv.lib.platforms.gnu;
   };
 }
diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix
index d564f2f561e..b51fd6fe41e 100644
--- a/pkgs/applications/office/ledger/3.0.nix
+++ b/pkgs/applications/office/ledger/3.0.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python, texinfo }:
 
 let
-  rev = "2c7ab8be";
+  rev = "26d7197";
 in
 stdenv.mkDerivation {
-  name = "ledger3-2013.04.${rev}";
+  name = "ledger3-2013.06.${rev}";
 
   src = fetchgit {
-    url = "git://github.com/jwiegley/ledger.git";
+    url = "https://github.com/ledger/ledger.git";
     inherit rev;
-    sha256 = "1ng5ymzqzbgdrn2ghhr7jvcjv5y7ikhyck5p1yv5j024s17xdyj5";
+    sha256 = "02nf4kdrd61q9rf5rrarwmx47y2ya5qix7n82cj9qi9p4v3k3m2g";
   };
 
   buildInputs = [ cmake boost gmp mpfr libedit python texinfo ];
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index fc5f5058f97..6e3f83caae3 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -6,7 +6,7 @@
 , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus_glib, qt4, kde4, clucene_core_2, libcdr, lcms2, vigra
+, libwpg, dbus_glib, qt4, kde4, clucene_core, libcdr, lcms, vigra
 , libiodbc, mdds, saneBackends, mythes, libexttextcat, libvisio
 , fontsConf
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ]
@@ -162,10 +162,10 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs =
-    [ ant ArchiveZip autoconf automake bison boost cairo clucene_core_2
+    [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
       CompressZlib cppunit cups curl db4 dbus_glib expat file flex fontconfig
       freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk
-      hunspell icu jdk kde4.kdelibs lcms2 libcdr libexttextcat libiodbc libjpeg
+      hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat libiodbc libjpeg
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix
index 2b10ec238c9..c18a6ed7426 100644
--- a/pkgs/applications/science/geometry/drgeo/default.nix
+++ b/pkgs/applications/science/geometry/drgeo/default.nix
@@ -2,7 +2,7 @@ args : with args;
 let version = lib.attrByPath ["version"] "1.1.0" args; in
 rec {
   src = fetchurl {
-    url = http://downloads.sourceforge.net/ofset/drgeo-1.1.0.tar.gz;
+    url = mirror://sourceforge/ofset/drgeo-1.1.0.tar.gz;
     sha256 = "05i2czgzhpzi80xxghinvkyqx4ym0gm9f38fz53idjhigiivp4wc";
   };
 
diff --git a/pkgs/applications/science/logic/ssreflect/default.nix b/pkgs/applications/science/logic/ssreflect/default.nix
index 764954f54f8..6377db9c895 100644
--- a/pkgs/applications/science/logic/ssreflect/default.nix
+++ b/pkgs/applications/science/logic/ssreflect/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "${webpage}/${name}-coq8.4.tar.gz";
+    url = "http://ssr.msr-inria.inria.fr/FTP/${name}-coq8.4.tar.gz";
     sha256 = "1ysx29xw09i86lq0d92z9cnyx133jfgq4qddy3501000fn7xwi7h";
   };
 
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 5ceefb87af0..4c8204b37ee 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, blas, bzip2, gfortran, liblapack, libX11, libXmu, libXt
 , libjpeg, libpng, libtiff, ncurses, pango, pcre, perl, readline, tcl
-, texLive, tk, xz, zlib, less, texinfo, graphviz
+, texLive, tk, xz, zlib, less, texinfo, graphviz, icu, pkgconfig, bison
+, imake, which, jdk, atlas
 }:
 
 stdenv.mkDerivation rec {
@@ -13,15 +14,71 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt
     libXt libjpeg libpng libtiff ncurses pango pcre perl readline tcl
-    texLive tk xz zlib less texinfo graphviz ];
+    texLive tk xz zlib less texinfo graphviz icu pkgconfig bison imake
+    which jdk atlas
+  ];
+
+  patches = [ ./no-usr-local-search-paths.patch ];
+
+  preConfigure = ''
+    configureFlagsArray=(
+      --disable-lto
+      --with-blas="-L${atlas}/lib -lf77blas -latlas"
+      --with-lapack="-L${liblapack}/lib -llapack"
+      --with-readline
+      --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh"
+      --with-cairo
+      --with-libpng
+      --with-jpeglib
+      --with-libtiff
+      --with-system-zlib
+      --with-system-bzlib
+      --with-system-pcre
+      --with-system-xz
+      --with-ICU
+      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
+  '';
+
+  installTargets = [ "install" "install-info" "install-pdf" ];
+
+  doCheck = true;
 
   enableParallelBuilding = true;
 
   meta = {
-    description = "a free software environment for statistical computing and graphics";
     homepage = "http://www.r-project.org/";
+    description = "a free software environment for statistical computing and graphics";
     license = stdenv.lib.licenses.gpl2Plus;
 
+    longDescription = ''
+      GNU R is a language and environment for statistical computing and
+      graphics that provides a wide variety of statistical (linear and
+      nonlinear modelling, classical statistical tests, time-series
+      analysis, classification, clustering, ...) and graphical
+      techniques, and is highly extensible. One of R's strengths is the
+      ease with which well-designed publication-quality plots can be
+      produced, including mathematical symbols and formulae where
+      needed. R is an integrated suite of software facilities for data
+      manipulation, calculation and graphical display. It includes an
+      effective data handling and storage facility, a suite of operators
+      for calculations on arrays, in particular matrices, a large,
+      coherent, integrated collection of intermediate tools for data
+      analysis, graphical facilities for data analysis and display
+      either on-screen or on hardcopy, and a well-developed, simple and
+      effective programming language which includes conditionals, loops,
+      user-defined recursive functions and input and output facilities.
+    '';
+
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
diff --git a/pkgs/applications/science/math/R/no-usr-local-search-paths.patch b/pkgs/applications/science/math/R/no-usr-local-search-paths.patch
new file mode 100644
index 00000000000..6c7f6d4ee02
--- /dev/null
+++ b/pkgs/applications/science/math/R/no-usr-local-search-paths.patch
@@ -0,0 +1,24 @@
+diff -ubr R-3.0.1-orig/configure R-3.0.1/configure
+--- R-3.0.1-orig/configure	2013-07-04 10:46:42.336133947 +0200
++++ R-3.0.1/configure	2013-07-04 10:46:17.181919960 +0200
+@@ -3800,13 +3800,13 @@
+ : ${LIBnn=$libnn}
+ ## We provide these defaults so that headers and libraries in
+ ## '/usr/local' are found (by the native tools, mostly).
+-if test -f "/sw/etc/fink.conf"; then
+-  : ${CPPFLAGS="-I/sw/include -I/usr/local/include"}
+-  : ${LDFLAGS="-L/sw/lib -L/usr/local/lib"}
+-else
+-  : ${CPPFLAGS="-I/usr/local/include"}
+-  : ${LDFLAGS="-L/usr/local/${LIBnn}"}
+-fi
++# if test -f "/sw/etc/fink.conf"; then
++#   : ${CPPFLAGS="-I/sw/include -I/usr/local/include"}
++#   : ${LDFLAGS="-L/sw/lib -L/usr/local/lib"}
++# else
++#   : ${CPPFLAGS="-I/usr/local/include"}
++#   : ${LDFLAGS="-L/usr/local/${LIBnn}"}
++# fi
+ 
+ ## take care not to  override the command-line setting
+ if test "${libdir}" = '${exec_prefix}/lib'; then
diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix
index 51b2850347b..a056a32c64c 100644
--- a/pkgs/applications/science/math/glsurf/default.nix
+++ b/pkgs/applications/science/math/glsurf/default.nix
@@ -1,5 +1,4 @@
-
-{ stdenv, fetchdarcs, ocaml, findlib,  lablgl, camlimages, mesa, freeglut, ocaml_mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng12, giflib }:
+{ stdenv, fetchdarcs, ocaml, findlib,  lablgl, camlimages, mesa, freeglut, ocaml_mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng, giflib }:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -16,7 +15,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ ocaml findlib freeglut mesa
   	          lablgl camlimages ocaml_mysql mlgmp mpfr gmp
-		  libtiff libjpeg libpng12 giflib ];
+		  libtiff libjpeg libpng giflib ];
 
   installPhase = ''
     mkdir -p $out/bin $out/share/doc/glsurf
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 43291d792b7..5fda04fed4f 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -1,50 +1,25 @@
-x@{builderDefsPackage
-  , perl, zlib, gmp, readline
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, gmp, readline }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="pari";
-    version="2.5.0";
-    name="${baseName}-${version}";
-    url="http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
-    hash="18ipxj4hzj7s3fqz878fiypkzrkbjj8wvbygz9j8c3ya06q27jax";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "pari-2.5.4";
+
+  src = fetchurl {
+    url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
+    sha256 = "0gpsj5n8d1gyl7nq2y915sscs3d334ryrv8qgjdwqf3cr95f2dwz";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [gmp readline];
+
+  configureScript = "./Configure";
+  configureFlags =
+    "--with-gmp=${gmp} " +
+    "--with-readline=${readline}";
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-  configureCommand="./Configure";
-      
   meta = {
     description = "Computer algebra system for high-performance number theory computations";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = "GPLv2+";
-    homepage = "http://pari.math.u-bordeaux.fr/";
+    homepage    = "http://pari.math.u-bordeaux.fr/";
+    license     = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [ertes raskin];
+    platforms   = stdenv.lib.platforms.linux;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
-    };
-  };
-}) x
-
+}
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index 9d8bc705fa4..0bc5c3cb7c7 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "boinc-7.0.44";
 
   src = fetchgit {
-    url = "git://boinc.berkeley.edu/boinc.git";
+    url = "git://boinc.berkeley.edu/boinc-v2.git";
     rev = "7c449b1fb8a681ceb27d6895751b62a2b3adf0f2";
     sha256 = "0hdramyl9nip3gadp7xiaz8ngyld15i93d8ai1nsd04bmrvdfqia";
   };
diff --git a/pkgs/applications/science/misc/golly/src-for-default.nix b/pkgs/applications/science/misc/golly/src-for-default.nix
index 00038373d56..50d3d41a8ba 100644
--- a/pkgs/applications/science/misc/golly/src-for-default.nix
+++ b/pkgs/applications/science/misc/golly/src-for-default.nix
@@ -1,8 +1,8 @@
 rec {
-   version="2.4-src";
-   name="golly-2.4-src";
+   version="2.4";
+   name="golly-2.4";
    hash="06vajm019q4q4wfy6pc1669fbjqdb4jaxcc419bk0vzky40anl9w";
-   url="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz";
+   url="mirror://sourceforge/golly/golly-2.4-src.tar.gz";
    advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz";
   
   
diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix
index 5ba30a0f830..5fdede1abcd 100644
--- a/pkgs/applications/science/misc/simgrid/default.nix
+++ b/pkgs/applications/science/misc/simgrid/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix
index 84da6039822..e58183a4f40 100644
--- a/pkgs/applications/science/misc/tulip/default.nix
+++ b/pkgs/applications/science/misc/tulip/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index c687fd5908c..de4bb171497 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage    = "http://www.gromacs.org";
-    licence     = "GPLv2";
+    license     = "GPLv2";
     description = "The GROMACS molecular dynamics software package";
     longDescription = ''
       GROMACS is a versatile package to perform molecular dynamics,
diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix
index 0be984df761..0e43972fab6 100644
--- a/pkgs/applications/version-management/cvs/default.nix
+++ b/pkgs/applications/version-management/cvs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "cvs-1.12.13";
 
   src = fetchurl {
-    url = http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2;
+    url = mirror://savannah/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2;
     sha256 = "0pjir8cwn0087mxszzbsi1gyfc6373vif96cw4q3m1x6p49kd1bq";
   };
 
diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix
index 468e45fcff1..f33e479b3ad 100644
--- a/pkgs/applications/version-management/darcs/default.nix
+++ b/pkgs/applications/version-management/darcs/default.nix
@@ -15,11 +15,11 @@ cabal.mkDerivation (self: {
     utf8String vector zlib
   ];
   extraLibraries = [ curl ];
+  doCheck = false;
   postInstall = ''
     mkdir -p $out/etc/bash_completion.d
     mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
   '';
-  doCheck = false;
   meta = {
     homepage = "http://darcs.net/";
     description = "a distributed, interactive, smart revision control system";
diff --git a/pkgs/applications/version-management/diffuse/default.nix b/pkgs/applications/version-management/diffuse/default.nix
new file mode 100644
index 00000000000..92cdddd8dcb
--- /dev/null
+++ b/pkgs/applications/version-management/diffuse/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, python, pygtk, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  version = "0.4.7";
+  name = "diffuse-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${name}.tar.bz2";
+    sha256 = "1b1riy9wix2gby78v9i30ijycjhkcyqsllggjakbkx26sb5nmxdh";
+  };
+
+  buildInputs = [ python pygtk makeWrapper ];
+
+  buildPhase = ''
+    python ./install.py --prefix="$out" --sysconfdir="$out/etc" --pythonbin="${python}/bin/python"
+    wrapProgram "$out/bin/diffuse" --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0
+  '';
+
+  # no-op, everything is done in buildPhase
+  installPhase = "true";
+
+  # NOTE: diffuse installs a .desktop file itself
+
+  meta = with stdenv.lib; {
+    description = "Graphical diff and merge tool";
+    homepage = http://diffuse.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index fe5aebeb96e..b5b3d4044c5 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -9,8 +9,9 @@ rec {
 
   git = lib.makeOverridable (import ./git) {
     inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
-      asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt
-      cpio tcl tk makeWrapper subversionClient gzip;
+      asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl
+      tk makeWrapper subversionClient gzip;
+    texinfo = texinfo5;
     svnSupport = false;		# for git-svn support
     guiSupport = false;		# requires tcl/tk
     sendEmailSupport = false;	# requires plenty of perl libraries
@@ -88,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 9991a506485..d45e6e210f0 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,40 +1,41 @@
 { 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
 , networkProtocolXmpp, openssh, QuickCheck, random, regexTdfa
 , rsync, SafeSemaphore, SHA, stm, text, time, transformers
 , unixCompat, utf8String, uuid, wai, waiLogger, warp, which
-, xmlConduit, xmlTypes, yesod, yesodDefault, yesodForm, yesodStatic
+, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm
+, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "4.20130601";
-  sha256 = "0l6jbi9r26w5h9hfg9v9qybqvijp4n7c9l1zd4ikxg2nqcc8j8ln";
+  version = "4.20130815";
+  sha256 = "0c4fvqmnvyrncmiz0dxwax2rnb4yrqw1y54q2zkqiifzrihcyi71";
   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
-    uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault
-    yesodForm yesodStatic
+    uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodCore
+    yesodDefault yesodForm yesodStatic
   ];
   buildTools = [ bup curl git gnupg1 lsof openssh rsync which ];
   configureFlags = "-fS3
                     -fWebDAV
                     -fInotify
                     -fDbus
-                    -f-Assistant
-                    -f-Webapp
+                    -fAssistant
+                    -fWebapp
                     -fPairing
                     -fXMPP
                     -fDNS
@@ -51,7 +52,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://git-annex.branchable.com/";
     description = "manage files with git, without checking their contents into git";
-    license = "GPL";
+    license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
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 dd00572b150..00000000000
--- 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 f042b2e0faa..d88fad416dd 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -10,7 +10,7 @@
 
 let
 
-  version = "1.8.2.3";
+  version = "1.8.3.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";
-    sha1 = "2831f7deec472db4d0d0cdffb4d82d91cecdf295";
+    sha256 = "1nfr4hgqs3b6k9wanqcix0wlw71q61h5irxiavlspd4jvzrcv8nz";
   };
 
   patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   # required to support pthread_cancel()
   NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
 
-  makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
+  makeFlags = "prefix=\${out} sysconfdir=/etc/ PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
       + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1");
 
   # FIXME: "make check" requires Sparse; the Makefile must be tweaked
@@ -50,6 +50,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/
@@ -133,6 +140,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
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 963f4dd295b..d92b49b9ef6 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/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 6e099cd5608..9c547b2193d 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "meld-${version}";
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.xz";
+    url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
     sha256 = "00rsff0yl5qwzh0igkdns6ry2xsbxad70avpqpkbd2bldi94v76y";
   };
 
diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix
index 3a22338ed7e..264340b4826 100644
--- a/pkgs/applications/version-management/rapidsvn/default.nix
+++ b/pkgs/applications/version-management/rapidsvn/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python}:
 
 stdenv.mkDerivation {
-  name = "rapidsvn-0.12";
+  name = "rapidsvn-0.12.0-1";
 
   src = fetchurl {
     url = http://www.rapidsvn.org/download/release/0.12/rapidsvn-0.12.0-1.tar.gz;
diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index afc7bca2d1a..5f88bbc74cc 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       '';
 
     license = "GPLv3+";
-    maintainers = with stdenv.lib.maintainers; [ eelco simons ludo ];
+    maintainers = with stdenv.lib.maintainers; [ eelco simons ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 42503b97440..95b244e7d91 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 ]
@@ -49,6 +49,8 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules)
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace configure --replace "-no-cpp-precomp" ""
   '';
 
   postInstall = ''
@@ -74,7 +76,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A version control system intended to be a compelling replacement for CVS in the open source community";
     homepage = http://subversion.apache.org/;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix
index 696c1e4738c..30e0bdfb197 100644
--- a/pkgs/applications/video/kino/default.nix
+++ b/pkgs/applications/video/kino/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
   name = "kino-1.3.4";
 
   src = fetchurl {
-    url = http://downloads.sourceforge.net/kino/kino-1.3.4.tar.gz;
+    url = mirror://sourceforge/kino/kino-1.3.4.tar.gz;
     sha256 = "020s05k0ma83rq2kfs8x474pqicaqp9spar81qc816ddfrnh8k8i";
   };
 
diff --git a/pkgs/applications/video/kmplayer/builder.sh b/pkgs/applications/video/kmplayer/builder.sh
deleted file mode 100644
index 92c7515c9a9..00000000000
--- a/pkgs/applications/video/kmplayer/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-myPatchPhase()
-{
-    sed -i -e "s|files.length|files.size|" \
-           -e "s|chlds.length|chlds.size|" src/kmplayerapp.cpp
-}
-patchPhase=myPatchPhase
-genericBuild
diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix
index a762bed0e28..553b86a3801 100644
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/pkgs/applications/video/kmplayer/default.nix
@@ -1,17 +1,28 @@
-{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, pango, gtk, dbus_glib, kdelibs, automoc4, phonon}:
+{ stdenv, fetchurl, cmake, pkgconfig, gettext, makeWrapper
+, kdelibs, cairo, dbus_glib, mplayer
+}:
 
 stdenv.mkDerivation {
-  name = "kmplayer-0.11.2c";
+  name = "kmplayer-0.11.3d";
+
   src = fetchurl {
-    url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2c.tar.bz2;
-    sha256 = "1qhafq865bzpz6m9k7cjdv4884qfpn481ak77ly0nidpq2ab0l9m";
+    url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.3d.tar.bz2;
+    sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky";
   };
-  builder = ./builder.sh;
-  buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ];
+
+  buildInputs = [
+    cmake gettext pkgconfig makeWrapper
+    kdelibs cairo dbus_glib
+  ];
+
+  postInstall = ''
+    wrapProgram $out/bin/kmplayer --suffix PATH : ${mplayer}/bin
+  '';
+
   meta = {
     description = "MPlayer front-end for KDE";
     license = "GPL";
     homepage = http://kmplayer.kde.org;
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = [ stdenv.lib.maintainers.sander ];
   };
 }
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 7b74cfcdb11..714a2882d5f 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -10,18 +10,13 @@
 
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
-  version = "2.0.7";
+  version = "2.0.8";
 
   src = fetchurl {
     url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
-    sha256 = "052kfkpd0r2fwkyz97qhz2a368xqxa905qacrd1bkl2bkvahfc94";
+    sha256 = "00hpbm0v424yhfzqyxrvrvfjkbvf3f43yqk6h1qhwmnl8n1z4am0";
   };
 
-  postPatch = /* flac 1.3.0 fix */ ''
-    sed -i -e 's:stream_decoder.h:FLAC/stream_decoder.h:' modules/codec/flac.c
-    sed -i -e 's:stream_encoder.h:FLAC/stream_encoder.h:' modules/codec/flac.c
-  '';
-
   buildInputs =
     [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
       libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 997cc8bd49d..dcf5b4e5009 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,28 +1,53 @@
-{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman
-, attr, libcap }:
+{ 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.4.0";
+  name = n + (if x86Only then "-x86-only" else "");
 
   src = fetchurl {
-    url = "http://wiki.qemu.org/download/${name}.tar.bz2";
-    sha256 = "1a7d11vjs1p6i1ck2ff9annmkhpkbjl73hl9i1cbg3s0fznrfqh6";
+    url = "http://wiki.qemu.org/download/${n}.tar.bz2";
+    sha256 = "0l52jwlxmwp9g3jpq0g7ix9dq4qgh46nd2h58lh47f0a35yi8qgn";
   };
 
-  buildInputs = [
-    python zlib pkgconfig glib SDL ncurses perl pixman attr libcap
-  ];
+  buildInputs =
+    [ python zlib pkgconfig glib ncurses perl pixman attr libcap
+      vde2 alsaLib texinfo libuuid makeWrapper
+    ]
+    ++ stdenv.lib.optionals sdlSupport [ SDL ]
+    ++ stdenv.lib.optionals vncSupport [ libjpeg libpng ]
+    ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ];
 
   enableParallelBuilding = true;
 
-  configureFlags = [
-    "--enable-virtfs"
-  ];
+  configureFlags =
+    [ "--audio-drv-list=alsa"
+      "--smbd=smbd" # use `smbd' from $PATH
+    ]
+    ++ 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 = {
-    description = "QEmu processor emulator";
+    homepage = http://www.qemu.org/;
+    description = "A generic and open source machine emulator and virtualizer";
     license = "GPLv2+";
-    maintainers = with stdenv.lib.maintainers; [ viric shlevy ];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [ viric shlevy eelco ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 6ca2c66a35a..09b6e015a93 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 \
@@ -30,10 +30,25 @@ let
     done
   '';
 
-  extensionPack = fetchurl {
-    url = "http://download.virtualbox.org/virtualbox/${version}/Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
-    # Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
-    sha256 = "5813cae72790de4893cadb839ffbd148290a44ec6913d901d84c9b3740ab1b1e";
+  # See https://github.com/NixOS/nixpkgs/issues/672 for details
+  extpackRevision = "86992";
+  extensionPack = requireFile rec {
+    name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
+    # 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:
+
+      https://www.virtualbox.org/wiki/Downloads
+
+      Once you have downloaded the file, please use the following command and re-run the
+      installation:
+
+      nix-prefetch-url file://${name}
+    '';
   };
 
 in stdenv.mkDerivation {
@@ -41,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 e7843b07fc3..cca133685f6 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/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix
new file mode 100644
index 00000000000..3ce50a82915
--- /dev/null
+++ b/pkgs/applications/window-managers/herbstluftwm/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, glib, libX11, libXinerama }:
+
+stdenv.mkDerivation rec {
+  name = "herbstluftwm-0.5.2";
+
+  src = fetchurl {
+    url = "http://herbstluftwm.org/tarballs/${name}.tar.gz";
+    sha256 = "15crb77gw8p1h721r3dcgn0m1n03qk0g81rrnaqw8p7hz44k6gf5";
+  };
+
+  patchPhase = ''
+      sed -i -e "s:/usr/local:$\{out}:" \
+             -e "s:/etc:$\{out}/etc:" \
+          config.mk
+  '';
+
+  buildInputs = [ pkgconfig glib libX11 libXinerama ];
+
+  meta = {
+    description = "A manual tiling window manager for X";
+    homepage = "http://herbstluftwm.org/";
+    license = "BSD"; # Simplified BSD License
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 2331b1eaf81..c37ed0d85f2 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -1,16 +1,16 @@
 { fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
-  pam, libX11, libev, cairo }:
+  pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:
 
 stdenv.mkDerivation rec {
-  name = "i3lock-2.4.1";
+  name = "i3lock-2.5";
 
   src = fetchurl {
     url = "http://i3wm.org/i3lock/${name}.tar.bz2";
-    sha256 = "4d29e66841138de562e71903d31ecaaefd8ecffe5e68da0d6c8d560ed543047c";
+    sha256 = "0xqdklvfcn2accwdbzsly7add0f3rh9sxjnahawas4zwwk4p49xc";
   };
 
   buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
-    libev cairo ];
+    libev cairo libxkbcommon libxkbfile ];
 
   makeFlags = "all";
   installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix
index 27a4014d461..ed2637eff6e 100644
--- a/pkgs/applications/window-managers/matchbox/default.nix
+++ b/pkgs/applications/window-managers/matchbox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libmatchbox, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  name = "matchbox-1.2.2";
+  name = "matchbox-1.2";
 
   buildInputs = [ libmatchbox pkgconfig ];
 
diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
index 262b46190fb..27266653302 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/pkgs/applications/window-managers/ratpoison/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
        cripples Emacs and other quality pieces of software.
     '';
 
-    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.simons ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index db0b6e1037c..ab261a78fb0 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -12,7 +12,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/stumpwm/${pkgName}-${version}.tgz";
+    url = "mirror://savannah/stumpwm/${pkgName}-${version}.tgz";
     sha256 = "a0793d22ef90731d34f84e51deafb4bc2095a357c70b9505dc57516f481cdf78";
   };
 
diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix
new file mode 100644
index 00000000000..2b146a78cb3
--- /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/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix
index 3df24cf3360..a44c54f7b57 100644
--- a/pkgs/applications/window-managers/wmii/default.nix
+++ b/pkgs/applications/window-managers/wmii/default.nix
@@ -1,5 +1,5 @@
 args: with args; stdenv.mkDerivation {
-  name = "wmii-20071116";
+  name = "wmii-3.6";
 
   src = fetchurl {
     url = http://dl.suckless.org/wmii/wmii-3.6.tar.gz;
diff --git a/pkgs/applications/window-managers/xcompmgr/default.nix b/pkgs/applications/window-managers/xcompmgr/default.nix
index 3e402b05b94..930b612f691 100644
--- a/pkgs/applications/window-managers/xcompmgr/default.nix
+++ b/pkgs/applications/window-managers/xcompmgr/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "xcompmgr-1.1.6";
   src = fetchurl {
-    url = "http://www.x.org/releases/individual/app/${name}.tar.bz2";
+    url = "mirror://xorg/individual/app/${name}.tar.bz2";
     sha256 = "c98949d36793b30ed1ed47495c87a05fa245ac0fc2857d2abc54979124687c02";
   };
   buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender libXext ];
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
index 218e2126a15..5c00ddf0fd1 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xmonad-contrib";
-  version = "0.11.1";
-  sha256 = "1356dn8ipw7fgn2xijppn69f64zg36gcxbw9qndxbbmml5gq0zrl";
+  version = "0.11.2";
+  sha256 = "0qlc732m6mhvx7g10r69hk5x460kjv2r04s91cnn5yfiia1qfpai";
   buildDepends = [
     extensibleExceptions mtl random utf8String X11 X11Xft xmonad
   ];
diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh
index 4e34aad052b..c1b0db895bc 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/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 70a06735e68..b7461678fea 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -159,6 +159,7 @@ rec {
 
   # Debian.
   debian = [
+    ftp://ftp.au.debian.org/debian/
     ftp://ftp.de.debian.org/debian/
     ftp://ftp.es.debian.org/debian/
     ftp://ftp.fr.debian.org/debian/
diff --git a/pkgs/build-support/kernel/modules-closure.nix b/pkgs/build-support/kernel/modules-closure.nix
index cc197edbef1..cad0c7a21f9 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 aa2615eb578..d0ac88f6924 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 20dcf2fbd0c..3d593f0b6bb 100644
--- a/pkgs/build-support/release/default.nix
+++ b/pkgs/build-support/release/default.nix
@@ -40,13 +40,23 @@ rec {
     } // args);
 
   aggregate =
-    { name, members, meta ? { } }:
+    { name, constituents, meta ? { } }:
     pkgs.runCommand name
-      { inherit members meta;
+      { inherit constituents meta;
+        preferLocalBuild = true;
         _hydraAggregate = true;
       }
       ''
-        echo $members > $out
+        mkdir -p $out/nix-support
+        touch $out/nix-support/hydra-build-products
+        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 b1eb82ed830..996770d2fcc 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1,22 +1,17 @@
 { pkgs
-, linuxKernel ? pkgs.linux_3_9
+, kernel ? pkgs.linux_3_10
 , img ? "bzImage"
 , rootModules ?
-    [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "ext3"
-      "ext4" "unix" "hmac" "md4" "ecb" "des_generic" "sha256"
-    ]
+    [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" ]
 }:
 
 with pkgs;
 
 rec {
 
-  # The 15 second CIFS timeout is too short if the host if heavily
-  # loaded (e.g., in the Hydra build farm when it's running many jobs
-  # in parallel).  So apply a patch to increase the timeout to 120s.
-  kernel = assert pkgs.linux.features.cifsTimeout; linuxKernel;
+  qemu = pkgs.qemu_kvm;
 
-  kvm = pkgs.qemu_kvm;
+  qemuProg = "${qemu}/bin/qemu-kvm";
 
 
   modulesClosure = makeModulesClosure {
@@ -78,6 +73,8 @@ rec {
     mount -t proc none /proc
     mount -t sysfs none /sys
 
+    echo 2 > /proc/sys/vm/panic_on_oom
+
     for o in $(cat /proc/cmdline); do
       case $o in
         mountDisk=1)
@@ -94,21 +91,15 @@ rec {
       esac
     done
 
+    echo "loading kernel modules..."
     for i in $(cat ${modulesClosure}/insmod-list); do
-      args=
-      case $i in
-        */cifs.ko)
-          args="CIFSMaxBufSize=4194304"
-          ;;
-      esac
-      echo "loading module $(basename $i .ko)"
-      insmod $i $args
+      insmod $i
     done
 
     mount -t tmpfs none /dev
     ${createDeviceNodes "/dev"}
 
-    ifconfig eth0 up 10.0.2.15
+    ifconfig lo up
 
     mkdir /fs
 
@@ -123,14 +114,14 @@ rec {
 
     echo "mounting Nix store..."
     mkdir -p /fs/nix/store
-    mount -t cifs //10.0.2.4/store /fs/nix/store -o guest,sec=none,sec=ntlm
+    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 cifs //10.0.2.4/xchg /fs/tmp/xchg -o guest,sec=none,sec=ntlm
+    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
@@ -140,8 +131,9 @@ rec {
 
     mkdir -p /fs/etc
     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
@@ -195,54 +187,19 @@ rec {
 
 
   qemuCommandLinux = ''
-    ${kvm}/bin/qemu-kvm \
+    ${qemuProg} \
       ${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
       -nographic -no-reboot \
-      -net nic,model=virtio \
-      -chardev socket,id=samba,path=./samba \
-      -net user,guestfwd=tcp:10.0.2.4:445-chardev:samba \
+      -virtfs local,path=/nix/store,security_model=none,mount_tag=store \
+      -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \
       -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
   '';
 
 
-  startSamba =
-    ''
-      export WHO=`whoami`
-      mkdir -p $TMPDIR/xchg
-
-      cat > $TMPDIR/smb.conf <<SMB
-      [global]
-        private dir = $TMPDIR
-        smb ports = 0
-        socket address = 127.0.0.1
-        pid directory = $TMPDIR
-        lock directory = $TMPDIR
-        log file = $TMPDIR/log.smbd
-        smb passwd file = $TMPDIR/smbpasswd
-        security = share
-      [store]
-        force user = $WHO
-        path = /nix/store
-        read only = no
-        guest ok = yes
-      [xchg]
-        force user = $WHO
-        path = $TMPDIR/xchg
-        read only = no
-        guest ok = yes
-      $EXTRA_SAMBA_CONF
-      SMB
-
-      rm -f ./samba
-      ${socat}/bin/socat unix-listen:./samba exec:"${utillinux}/bin/setsid ${samba}/sbin/smbd -s $TMPDIR/smb.conf",nofork > /dev/null 2>&1 &
-      while [ ! -e ./samba ]; do sleep 0.1; done # ugly
-    '';
-
-
   vmRunCommand = qemuCommand: writeText "vm-run" ''
     export > saved-env
 
@@ -262,7 +219,6 @@ rec {
     diskImage=$diskImage
     TMPDIR=$TMPDIR
     cd $TMPDIR
-    ${startSamba}
     ${qemuCommand}
     EOF
 
@@ -285,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
@@ -294,8 +250,8 @@ rec {
 
   defaultCreateRootFS = ''
     mkdir /mnt
-    ${e2fsprogs}/sbin/mke2fs -F /dev/${hd}
-    ${utillinux}/bin/mount -t ext2 /dev/${hd} /mnt
+    ${e2fsprogs}/sbin/mkfs.ext4 /dev/${hd}
+    ${utillinux}/bin/mount -t ext4 /dev/${hd} /mnt
 
     if test -e /mnt/.debug; then
       exec ${bash}/bin/sh
@@ -309,9 +265,9 @@ rec {
 
   /* Run a derivation in a Linux virtual machine (using Qemu/KVM).  By
      default, there is no disk image; the root filesystem is a tmpfs,
-     and /nix/store is shared with the host (via the CIFS protocol to
-     a Samba instance automatically started by Qemu).  Thus, any pure
-     Nix derivation should run unmodified, e.g. the call
+     and /nix/store is shared with the host (via the 9P protocol).
+     Thus, any pure Nix derivation should run unmodified, e.g. the
+     call
 
        runInLinuxVM patchelf
 
@@ -319,7 +275,7 @@ rec {
      `preVM' can optionally contain a shell command to be evaluated
      *before* the VM is started (i.e., on the host).  The attribute
      `memSize' specifies the memory size of the VM in megabytes,
-     defaulting to 256.  The attribute `diskImage' can optionally
+     defaulting to 512.  The attribute `diskImage' can optionally
      specify a file system image to be attached to /dev/sda.  (Note
      that currently we expect the image to contain a filesystem, not a
      full disk image with a partition table etc.)
@@ -334,7 +290,7 @@ rec {
     args = ["-e" (vmRunCommand qemuCommandLinux)];
     origArgs = attrs.args;
     origBuilder = attrs.builder;
-    QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}";
+    QEMU_OPTS = "-m ${toString (attrs.memSize or 512)}";
   });
 
 
@@ -391,55 +347,6 @@ rec {
     });
 
 
-  qemuCommandGeneric = ''
-    PATH="${samba}/sbin:$PATH" \
-    ${kvm}/bin/qemu-kvm \
-      -nographic -no-reboot \
-      -smb $(pwd) -hda $diskImage \
-      $QEMU_OPTS
-  '';
-
-
-  /* Run a command in an x86 virtual machine image containing an
-     arbitrary OS.  The VM should be configured to do the following:
-
-     - Write log output to the serial port.
-
-     - Mount //10.0.2.4/qemu via SMB.
-
-     - Execute the command "cmd" on the SMB share.  It can access the
-       original derivation attributes in "saved-env" on the share.
-
-     - Produce output under "out" on the SMB share.
-
-     - Write an exit code to "in-vm-exit" on the SMB share ("0"
-       meaning success).
-
-     - Power-off or reboot the machine.
-  */
-  runInGenericVM = drv: lib.overrideDerivation drv (attrs: {
-    requiredSystemFeatures = [ "kvm" ];
-    builder = "${bash}/bin/sh";
-    args = ["-e" (vmRunCommand qemuCommandGeneric)];
-    QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}";
-
-    preVM = ''
-      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
-
-      echo "$buildCommand" > cmd
-
-      eval "$postPreVM"
-    '';
-
-    postVM = ''
-      cp -prvd out $out
-    '';
-  });
-
-
   /* Like runInLinuxVM, but run the build not using the stdenv from
      the Nix store, but using the tools provided by /bin, /usr/bin
      etc. from the specified filesystem image, which typically is a
@@ -454,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
@@ -551,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
@@ -691,8 +598,17 @@ rec {
             debs="$debs /inst/$i";
           done
           chroot=$(type -tP chroot)
+
+          # Create a fake start-stop-daemon script, as done in debootstrap.
+          mv "/mnt/sbin/start-stop-daemon" "/mnt/sbin/start-stop-daemon.REAL"
+          echo "#!/bin/true" > "/mnt/sbin/start-stop-daemon"
+          chmod 755 "/mnt/sbin/start-stop-daemon"
+
           PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
             /usr/bin/dpkg --install --force-all $debs < /dev/null || true
+
+          # Move the real start-stop-daemon back into its place.
+          mv "/mnt/sbin/start-stop-daemon.REAL" "/mnt/sbin/start-stop-daemon"
         done
 
         echo "running post-install script..."
@@ -1081,6 +997,30 @@ rec {
       packages = commonOpenSUSEPackages;
     };
 
+    centos64i386 = {
+      name = "centos-6.4-i386";
+      fullName = "CentOS 6.4 (i386)";
+      packagesList = fetchurl {
+        url = http://mirror.centos.org/centos/6.4/os/i386/repodata/87aa4c4e19f9a3ec93e3d820f1ea6b6ece8810cb45f117a16354465e57a1b50d-primary.xml.gz;
+        sha256 = "03dml5bmwijlcfhigwa5rc88ikkfdgmg286qwf9yr8zr3574ral7";
+      };
+      urlPrefix = http://mirror.centos.org/centos/6.4/os/i386/ ;
+      archs = ["noarch" "i386"];
+      packages = commonCentOSPackages;
+    };
+
+    centos64x86_64 = {
+      name = "centos-6.4-x86_64";
+      fullName = "CentOS 6.4 (x86_64)";
+      packagesList = fetchurl {
+        url = http://mirror.centos.org/centos/6.4/os/x86_64/repodata/4d4030b92f010f466eb4f004312b9f532b9e85e60c5e6421e8b429c180ac1efe-primary.xml.gz;
+        sha256 = "1zhymj0c2adlx0hn8phcws2rwaskkwmk217hnip4c3q15ywk0h2d";
+      };
+      urlPrefix = http://mirror.centos.org/centos/6.4/os/x86_64/ ;
+      archs = ["noarch" "x86_64"];
+      packages = commonCentOSPackages;
+    };
+
   };
 
 
@@ -1462,22 +1402,22 @@ rec {
     };
 
     debian70i386 = {
-      name = "debian-7.0.0-wheezy-i386";
-      fullName = "Debian 7.0.0 Wheezy (i386)";
+      name = "debian-7.1.0-wheezy-i386";
+      fullName = "Debian 7.1.0 Wheezy (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2;
-        sha256 = "712939639e2cc82615c85bdf81edf31edef0fda003ac2b32998e438aee403ab8";
+        sha256 = "c2751c48805b41c3eddd31cfe92ffa46df13a7d6ce7896b8dc5ce4b2f7f329c5";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
 
     debian70x86_64 = {
-      name = "debian-7.0.0-wheezy-amd64";
-      fullName = "Debian 7.0.0 Wheezy (amd64)";
+      name = "debian-7.1.0-wheezy-amd64";
+      fullName = "Debian 7.1.0 Wheezy (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2;
-        sha256 = "e79132f7db6655013be1f75feb9812b071386525246d8639679b322487d2732a";
+        sha256 = "9b15b4348cadbcf170c9e83d6fbcb64efac2b787ebdfef16ba21dd70dfca0001";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
@@ -1509,6 +1449,28 @@ rec {
     "unzip"
   ];
 
+  commonCentOSPackages = [
+    "autoconf"
+    "automake"
+    "basesystem"
+    "bzip2"
+    "curl"
+    "diffutils"
+    "centos-release"
+    "findutils"
+    "gawk"
+    "gcc-c++"
+    "gzip"
+    "make"
+    "patch"
+    "perl"
+    "pkgconfig"
+    "procps"
+    "rpm"
+    "rpm-build"
+    "tar"
+    "unzip"
+  ];
 
   /* Common packages for openSUSE images. */
   commonOpenSUSEPackages = [
diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix
index e59bc934d4b..d0d85fce366 100644
--- a/pkgs/build-support/vm/test.nix
+++ b/pkgs/build-support/vm/test.nix
@@ -7,8 +7,12 @@ rec {
   # Run the PatchELF derivation in a VM.
   buildPatchelfInVM = runInLinuxVM patchelf;
 
+  buildHelloInVM = runInLinuxVM hello;
 
-  testRPMImage = makeImageTestScript diskImages.fedora16i386;
+  buildPanInVM = runInLinuxVM pan;
+
+
+  testRPMImage = makeImageTestScript diskImages.fedora16x86_64;
 
 
   buildPatchelfRPM = buildRPM {
@@ -17,10 +21,10 @@ rec {
     diskImage = diskImages.fedora16x86_64;
   };
 
-  
+
   testUbuntuImage = makeImageTestScript diskImages.ubuntu810i386;
 
-  
+
   buildInDebian = runInLinuxImage (stdenv.mkDerivation {
     name = "deb-compile";
     src = patchelf.src;
@@ -32,39 +36,4 @@ rec {
     '';
   });
 
-/*
-  testFreeBSD = runInGenericVM {
-    name = "aterm-freebsd";
-    src = aterm242fixes.src;
-    diskImage = "/tmp/freebsd-7.0.qcow";
-
-    postPreVM = ''
-      cp $src aterm.tar.bz2
-    '';
-
-    buildCommand = ''
-      set > /tmp/my-env
-      . /mnt/saved-env
-      . /tmp/my-env
-      unset TEMP
-      unset TEMPDIR
-      unset TMP
-      unset TMPDIR
-
-      set -x
-
-      echo "Hello World!!!"
-      mkdir /mnt/out
-      echo "bar" > /mnt/out/foo
-
-      cd /tmp
-      tar xvf /mnt/aterm.tar.bz2
-      cd aterm-*
-      ./configure --prefix=/mnt/out
-      make
-      make install
-    '';
-  };
-*/  
-
 }
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index f1bc98c26cc..15b49a2a99e 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/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix
index 0ff2ec7ba16..92f61788892 100644
--- a/pkgs/data/fonts/freefont-ttf/default.nix
+++ b/pkgs/data/fonts/freefont-ttf/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     license = "GPLv3+";
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix
index 1690f82aa37..ea579a589c4 100644
--- a/pkgs/data/fonts/junicode/default.nix
+++ b/pkgs/data/fonts/junicode/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "junicode-0.6.15";
 
   src = fetchurl {
-    url = http://prdownloads.sourceforge.net/junicode/junicode-0.6.15.zip;
+    url = mirror://sourceforge/junicode/junicode-0.6.15.zip;
     sha256 = "0p16r5s6qwyz0hayb6k61s5r2sfachlx7r6gpqqx5myx6ipbfdns";
   };
 
diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
index 64b18ffdaaa..1dfaa376df4 100644
--- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix
+++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "ttf-bitstream-vera-1.10";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2;
+    url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2;
     sha256 = "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv";
   };
   buildPhase = "true";
diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix
index 698ecc53046..960c74f6841 100644
--- a/pkgs/data/fonts/wqy-zenhei/default.nix
+++ b/pkgs/data/fonts/wqy-zenhei/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "wqy-zenhei-0.4.23-1";
 
   src = fetchurl {
-    url = http://prdownloads.sourceforge.net/wqy/wqy-zenhei-0.4.23-1.tar.gz;
+    url = mirror://sourceforge/wqy/wqy-zenhei-0.4.23-1.tar.gz;
     sha256 = "138nn81ai240av0xvcq4ab3rl73n0qlj3gwr3a36i63ry8vdj5qm";
   };
 
diff --git a/pkgs/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 00000000000..57a6718669b
--- /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 00000000000..ee3d00ccf3e
--- /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/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix
index 23a800f6ae0..831028467f4 100644
--- a/pkgs/data/misc/shared-desktop-ontologies/default.nix
+++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "shared-desktop-ontologies-0.10.0";
+  name = "shared-desktop-ontologies-0.11.0";
   
   src = fetchurl {
     url = "mirror://sourceforge/oscaf/${name}.tar.bz2";
-    sha256 = "00y55bjmxrwiiw8q0n0jcv95l945hp7nglbwj408sk5m2vq026di";
+    sha256 = "1m5vnijg7rnwg41vig2ckg632dlczzdab1gsq51g4x7m9k1fdbw2";
   };
   
   buildInputs = [ cmake ];
diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
index 83505dc42fc..ed794715ff8 100644
--- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "gnome-python-${version}.1";
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/gnome-python/${version}/${name}.tar.bz2";
+    url = "mirror://gnome/sources/gnome-python/${version}/${name}.tar.bz2";
     sha256 = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8";
   };
 
diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
index c91522e695e..00072657e06 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "vte-0.28.0";
   
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/gnome/sources/vte/0.28/${name}.tar.bz2";
+    url = "mirror://gnome/sources/vte/0.28/${name}.tar.bz2";
     sha256 = "0blmblvjr35xajr0a07zcd58lk6x2hzympx17biw2mcym9kcarql";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index 4769247a516..847983e2c49 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -9,10 +9,16 @@ stdenv.mkDerivation {
     sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk";
   };
 
-  buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 polkit gtk ];
+  buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 gtk ]
+    # polkit requires pam, which requires shadow.h, which is not available on
+    # darwin
+    ++ stdenv.lib.optional (!stdenv.isDarwin) polkit;
+
   propagatedBuildInputs = [ glib ];
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
-  configureFlags = "--with-gtk=2.0";
+  configureFlags = [ "--with-gtk=2.0" ]
+    # fixes the "libgconfbackend-oldxml.so is not portable" error on darwin
+    ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ];
 }
diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
index 22c22c6bcf5..94aaf30a49d 100644
--- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
+++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl_gnome, pkgconfig, glib, libIDL}:
+{ stdenv, fetchurl_gnome, pkgconfig, glib, libIDL, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
@@ -14,5 +14,24 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ glib libIDL ];
+  propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty;
+
+  meta = with stdenv.lib; {
+    homepage    = https://projects.gnome.org/ORBit2/;
+    description = "A a CORBA 2.4-compliant Object Request Broker";
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ lovek323 ];
+
+    longDescription = ''
+      ORBit2 is a CORBA 2.4-compliant Object Request Broker (ORB) featuring
+      mature C, C++ and Python bindings. Bindings (in various degrees of
+      completeness) are also available for Perl, Lisp, Pascal, Ruby, and TCL;
+      others are in-progress. It supports POA, DII, DSI, TypeCode, Any, IR and
+      IIOP. Optional features including INS and threading are available. ORBit2
+      is engineered for the desktop workstation environment, with a focus on
+      performance, low resource usage, and security. The core ORB is written in
+      C, and runs under Linux, UNIX (BSD, Solaris, HP-UX, ...), and Windows.
+      ORBit2 is developed and released as open source software under GPL/LGPL.
+    '';
+  };
 }
diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
index 903387f50b1..55f0e0ae1a3 100644
--- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
index a406f9209a3..da7673de419 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, pkgconfig, gtk, gettext, intltool, libgnomecanvas, libgnomeprint, gnomeicontheme}:
 
 stdenv.mkDerivation {
-  name = "libgnomeprintui-2.11.1";
+  name = "libgnomeprintui-2.18.4";
 
   src = fetchurl {
     url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.4.tar.bz2;
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index de49bffc419..a9fce636937 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   name = "evince-3.6.1";
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/evince/3.6/${name}.tar.xz";
+    url = "mirror://gnome/sources/evince/3.6/${name}.tar.xz";
     sha256 = "1da1pij030dh8mb0pr0jnyszgsbjnh8lc17rj5ii52j3kmbv51qv";
   };
 
diff --git a/pkgs/desktops/kde-4.10/default.nix b/pkgs/desktops/kde-4.10/default.nix
index 9fbb58fe242..f56e64e2d15 100644
--- a/pkgs/desktops/kde-4.10/default.nix
+++ b/pkgs/desktops/kde-4.10/default.nix
@@ -1,8 +1,6 @@
-{ callPackage, callPackageOrig, stdenv, qt48 }:
+{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.10.5" }:
 
 let
-  release = "4.10.4";
-
   # Need callPackageOrig to avoid infinite cycle
   kde = callPackageOrig ./kde-package {
     inherit release ignoreList extraSubpkgs callPackage;
diff --git a/pkgs/desktops/kde-4.10/kde-package/4.10.4.nix b/pkgs/desktops/kde-4.10/kde-package/4.10.4.nix
deleted file mode 100644
index a2dafe03f58..00000000000
--- a/pkgs/desktops/kde-4.10/kde-package/4.10.4.nix
+++ /dev/null
@@ -1,399 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="analitza";value="1ikja551kp2i4x6mw64i12yf84vx0g5rfmqcq93lj2z4gii17nlq";}
-  {name="ark";value="06ymghs1rflhij7skw3hnk2w8kjmmaigh31raq690vbnpa9w8isb";}
-  {name="audiocd-kio";value="1pxza8v5gb34hzbky5jwm2fw3b4bynpzcrggw6vvhnb0gqrfm7x6";}
-  {name="blinken";value="12rl2jl91mkvls7lh38hxxc8qfrw9lq56syb2k5v81x0gxzgz7gx";}
-  {name="bomber";value="13qi8q3jyk9dn2pnljrgh00qp5k4dimdfj5z8r6gb05cvzn1g5zw";}
-  {name="bovo";value="1j180rm5wr1yy2wn76g3s6v7hl54rhahna32lll8dv9srrpqry12";}
-  {name="cantor";value="1406bkky7pglck0vad9id02w5gyfcva9slmy5gb06iwi9rcvl13y";}
-  {name="dragon";value="1zc14x60rcmgiim5wlss0pva1mc89r00xasic55zkb9w1xl2ymrd";}
-  {name="ffmpegthumbs";value="03hyypzdaf1v7hczbmhnkw3fc1va1mfmhl3kdzm40cak2wf3fd89";}
-  {name="filelight";value="0snjk95jmw3f5v21jwld8ywxpa65zayq9n9bsryipg5i7swa9ylk";}
-  {name="granatier";value="0qsxgs11caccz695a7lcrhrm3awdm390fa1hmxs6ijrfj9wx3qkf";}
-  {name="gwenview";value="0b00cvgh1f6abj9ijg32yk1l8mfb0ph5iwqnbwj86z95v0i9kwhl";}
-  {name="jovie";value="0g07d9zdfjpscc8y4nhfsy869iy2h4vin7inlfk59jih4zbh2yss";}
-  {name="juk";value="01nxn50nxdkg87fljiz7y6s02wxbbbifv84p8hp1rswi5mx929a4";}
-  {name="kaccessible";value="0biygax3c5hcqhfgmggn3gbg4skhr75bix8swdj1mp8ypbk7cwn5";}
-  {name="kactivities";value="07f38qxbd1ads5v912759da6b6hxq9jhiphjlq7ja04130h5425l";}
-  {name="kajongg";value="0mp329yqxjvi4rzfam0dxjx0gacpgvzcnd5dbbw43f0bdi28r6xg";}
-  {name="kalgebra";value="139n44rvxdhph1bpvj8x83d4qslhjqwxpw09pj76qskdda0bw1ga";}
-  {name="kalzium";value="0j5dhaffvi825jbgr4vbi3k4ykk7ha8gv2sas1garqfrqbc30p7n";}
-  {name="kamera";value="06ny4af8071bd22kgvfx0vw37arvzmv0vimci17glp1v37qfafl5";}
-  {name="kanagram";value="1nzchi9sjphkh1rsg42jfn2xia9fcjcwihkgan01wd82hrim34bd";}
-  {name="kapman";value="1hgifdlzhrxabn4ywpxmwqikfms8ihnjz0dwbrfwdji84aij9kxf";}
-  {name="kate";value="0m9j7a42vzkdzhcd7hhvswyi7rwvicnb9wjs5ff01lg7zdnbyqxx";}
-  {name="katomic";value="1fj06n77krwyxvjmqwbhfsmi6vii36smifrpzd0yd1f0g3yihiaf";}
-  {name="kblackbox";value="1irnlwagxsik35n6zkdg6vqvydvhka3yq6p3najdav1hbs7liav6";}
-  {name="kblocks";value="0b5n3sil6llnryfns5cff07ckids65pz99swkkcgpalpqvhg5xva";}
-  {name="kbounce";value="0mqaxkgnylirrcip70b330q56c4j31pb2f7c5j65gvzxlk7n1kh9";}
-  {name="kbreakout";value="1c4ycncf21br0ywdbx91gia62k5kkrgnaj38qclfljhzqx83pr3q";}
-  {name="kbruch";value="143wfqjpnwcd51zr14mgn2ak38szbr24k1phv5lmlc3whgz7q15v";}
-  {name="kcalc";value="18jcr6mzasrbs4zbilxhqdsb03965bzm30f74clh5czsyv8s5129";}
-  {name="kcharselect";value="0hj9ax570qpgkj666qab6bdnz0irzlzynsq28dw64sdmjcxs28k4";}
-  {name="kcolorchooser";value="00pr0sgq8s008lc0a22nmavsqap8dk00y6wd56a8zv2fpnrys5gn";}
-  {name="kdeadmin";value="1m5svs6wq393i2ja2z8vivbiw05z41r8nq07j0qypcgzm8a801ks";}
-  {name="kdeartwork";value="1ax5m70zb8jfil2llia5ph8ykz3xm1xnz0irp5ivp69hixnrrp09";}
-  {name="kde-baseapps";value="067a2s8kw26yjsm8lmn9xg3nw80yyfbkz2x96pj4qx1qxv4qviil";}
-  {name="kde-base-artwork";value="0rjxk5qbr15vi4vrd2x9ypqpbam3jbgiylzgk3bx5v367ldrrsbs";}
-  {name="kdegraphics-mobipocket";value="0fky12546bywjng8vab4nr7ih3zrmskp6kz49hqqbhpcxrnlihpf";}
-  {name="kdegraphics-strigi-analyzer";value="0g2zf9fmn6720j29pxsq9hw424p1p1pgz4smz1gb8casfrpc2mqa";}
-  {name="kdegraphics-thumbnailers";value="19nplbwhv0mdg6iawwm8vbmincccyabq9k8ywd8icr8vgj4ikvd4";}
-  {name="kdelibs";value="08249hp7q8ck1sgihia1idxllp7qb85xw9xv21snhccgdv3p1rd1";}
-  {name="kdenetwork";value="1fm9f7nln3735frlcrqvwpg10b31dgr4gf6xiyq068sixh4cv0g6";}
-  {name="kdepim";value="0v9mp548nbqvd03krq6z1djsvr5a6p21bz5dspqy6kp6xymblwzz";}
-  {name="kdepimlibs";value="09p60h7m41495664ijab33dc5n64spynnjqay1allx0mcldqnapq";}
-  {name="kdepim-runtime";value="1d47byk057jdgyvzjyhv7px39dl6qcg26i5r12p3q8y2lslnz5wr";}
-  {name="kdeplasma-addons";value="001yfb324wb7fpi57dz6rnnbjrip9n14bxa7yv20fpq8i6ngv8hl";}
-  {name="kde-runtime";value="065jhs3ajg3c6k25g5cwbxpp6wxmrd6qg0aza3lxfm87fb1v255n";}
-  {name="kdesdk";value="1bvmfaddvpgh5kx4nv4c3z33bka6m7wlsw1nzyip9gw1ghac6a2s";}
-  {name="kdetoys";value="1frkz6k7q99y2nn0j2xw00zsq4dbsmwyvq7jbh7y4wyzanbyxh0f";}
-  {name="kde-wallpapers";value="0gspx1xld9da4ppcgr20rvkbhy3jh4yqjzfvhsfi1qhh61jgfcks";}
-  {name="kdewebdev";value="178sq7r584qlkphzwdqhkjaq2h87vjjghq3ialmahzsas3qihkbs";}
-  {name="kde-workspace";value="1l927wa1qlj0vcahqb0h8vx23fyg9nwv07lmacb7igpv56ccgfam";}
-  {name="kdf";value="18b623q0p3sh5y69i6likknh90h85imgr2glddsjz4p38f575kis";}
-  {name="kdiamond";value="0smq3333k5qiny3663yj9h8j0smgybjxr0qpf2m139amr45qcyn4";}
-  {name="kfloppy";value="0xv1nsnv105b9dr2vdlns1vwq25963fgl130lhg31dafkiyn3ivr";}
-  {name="kfourinline";value="0d721glmhjp9dr6y60gv299jnjf96n8rkws759kizlq2x3ggn1gx";}
-  {name="kgamma";value="1hmw7pbsxclws57saha7s253172b61lvqxcqp2vpgvdgjdrraik5";}
-  {name="kgeography";value="1vnrm7rva467z582qppqryz0671b1bcmgxcxlc2f223kp9g0k8d5";}
-  {name="kgoldrunner";value="1d2sl02c2ys6vnxxy1rh9lsz3aj5rlzjmpx39dbvap5qqjsan58b";}
-  {name="kgpg";value="0k1ni2xb4p5p5r8vmnpxm77jqa4176apy7047dxc3w3v0qgqvj9n";}
-  {name="khangman";value="0bq0bdrx761fyaxfv43sfq68hfcwzhvagxm66jzk4wzd6pb1m6ky";}
-  {name="kig";value="0jmax8a357iqa3nggpmpbzk9vdnisdmilyqxgkrd1n43cs4cbc9h";}
-  {name="kigo";value="029xn39sxp2dpj8isq1gmis1858iya0bc758jy8d1rq4c046zmxj";}
-  {name="killbots";value="0arvfbzsax61nn3hz8nk82l3in802866fqsxhz2zrwh03dbrl30i";}
-  {name="kimono";value="1ic2xbgd8xwadrvc7qfq1ihkpnh4dx2pjrm5zbjgycyfvsmvl6sh";}
-  {name="kiriki";value="1dp1dp8s4r4501ldn0v5phkk3fj2kfrncz6h4pfylx27lhpbjbn0";}
-  {name="kiten";value="0jd17nvk6vqniqs8rzmzsnc5hr05i3fwmmvf44g35gpqmr88kb5b";}
-  {name="kjumpingcube";value="0z6a8iaprdaqpif054a6glbgcgwaxm2w4i1r9077k91nnsnwrmp3";}
-  {name="klettres";value="10jc56ll0cgaqkb2xf1gh0k75l90al046syj2q2dqsnaa7lazxp7";}
-  {name="klickety";value="0afb8llrx30zajsy2k0i22xf8ll9lrlmwzrqn4qq7s9wxzwy291v";}
-  {name="klines";value="0mkwb4d60zxalv0asw4qnvml6jf153ghzqcxgbac40nhzl2abdyz";}
-  {name="kmag";value="0pjq6nax82x3ldknld25xrx4adc2i7jcy0x4l343m83f5c79xyn6";}
-  {name="kmahjongg";value="1sx8yplpc70z1vdp9j1shmhc8cqbwmshdhl23hxpl1jydd36q1wj";}
-  {name="kmines";value="0qpcnp0hfhwybqfxgqvbwhin8lb50gca2kwvms10cayqmjafj9j8";}
-  {name="kmix";value="1k67gygq1j13p8nxk50n9q01yfkrv0safvxrbq5f70yvka1jdyj7";}
-  {name="kmousetool";value="17sylfp5zicq36c812jy9h6s4qprwwad05zbbj9701ax40iwrvlr";}
-  {name="kmouth";value="1bpqq919rzcaaqxp3md4w1lrhf5mxfjp07z5v7ii8mgji8wrq1g5";}
-  {name="kmplot";value="0dhdpx79klqc5xb9h4dcgriqivppcrw2ib2piqbqs882mi3pdzx2";}
-  {name="knavalbattle";value="07x4vh2h0d62kwwai5j0d6a2zf615y4mp3iacp5rz8j9pdkhqn52";}
-  {name="knetwalk";value="151cj33kfyjf5xxgw0q00l5jbvx5kb893y2mv9ydc9xmwgcd4szz";}
-  {name="kolf";value="1ibrf01vzpr5dyy2hjb6jq6i9hk7w4kw1iffkyh6w5z40nphs2dx";}
-  {name="kollision";value="1fgs793v36j27z76ik50wz466r3wrga5pq8ibqy3cinvh7blk7cb";}
-  {name="kolourpaint";value="1wxja4xd3jhxib2vpa5289f80hfcd2idpvzz4ap71ca0bzkvknq3";}
-  {name="konquest";value="0aga5yzv5jqbgzp6dp11mgjvfjzrs4csaa5pppwbld81573vldmp";}
-  {name="konsole";value="0kvv4ccc76swxzsw3z7dis8lbmnf6mbzj4b0n9l4zcmmw2iphvd4";}
-  {name="korundum";value="03djf01c6rm76dzswnlccwr81p5qyzccv2zxmbycclp8lp6w4vgg";}
-  {name="kpat";value="1vlyya0yiizrd9c1d4pl1dn6nw7g14rzvwhny12qls7ssrj40zzc";}
-  {name="kremotecontrol";value="0i6jz6m2a2ff97hkqpjy2qhdagx82jwcsnafl2cv0kddszxdabni";}
-  {name="kreversi";value="0ci6aampxq6l6sc8m8gxqrzhws56fbhp2xil0qzgab93xn7mmp1c";}
-  {name="kross-interpreters";value="1iypzm9rwszw1walylq6fa16s4hw84zqpyvmd7aik2dz59fmmvlx";}
-  {name="kruler";value="0841j4001v7497xa6nzdlprnhx8whp0rq24z2yblqnjf1wi5d07y";}
-  {name="ksaneplugin";value="10x1shs2cfa4331qymwafpm3hm45n3aqrhiriyl7vsnk1cc2agin";}
-  {name="kscd";value="0ih7zwyvrgsfd4sqj1g5m5hv71sqdzfhmfn6p3crdnnssbvnfhzd";}
-  {name="kshisen";value="1pxqz390mr066kni1gxa0jay00mgm1r0dmxydrg6mbfyw4qqw554";}
-  {name="ksirk";value="0rf5hj19bfc8mgm810rwvj1173nk93npgbsd17vsj1rqskdi57zy";}
-  {name="ksnakeduel";value="0q02nbcl71h6kqs3mdgq51g4y66p5p62mm70j55cfwjq70i8abbw";}
-  {name="ksnapshot";value="1rlq34j5ay3vyp1vpxxfpzyap26dcwg4ii10ql5bl28z2m1xv8ba";}
-  {name="kspaceduel";value="1nhxcmrn42gfkifxfikldha9045ffq5xzbb95wwvwp478jcqi4xk";}
-  {name="ksquares";value="06kxr8v70ygk2bwcvnfp4l4kjj3yhm5f5wgmzfww8h7kxg87lhg7";}
-  {name="kstars";value="0hhi2vfvv5dzr82gg2p34nsclis0hswkgvh9q21zg2nj2g4byblh";}
-  {name="ksudoku";value="1jglf83shv3p3kn71i0lbga9mil54cs2m4xr0dd113961c2fnylf";}
-  {name="ktimer";value="0kqavcxrxly15az0h0yn8cn6mksvka12yc8fywr029drnr70hs0i";}
-  {name="ktouch";value="1b8612a6pcsaamdq9hpkxr71vvmd0mxrnb0hl8iy05q61cv71i0b";}
-  {name="ktuberling";value="1zqzs86ricqwvj6ragxj4rxhddr92a34z8jwdp7qqqjdafzq57c8";}
-  {name="kturtle";value="0nslszpkacbdwsq8l2phzls5qbfm76r32yiynnd35qjfh94dpilf";}
-  {name="kubrick";value="1qlysx8kvz6r80rm0szq7pk007d57ddv77qy7d3gmpijwa9giybj";}
-  {name="kwallet";value="1pw7wgfjfa553kdc8z91amg18zhr5c51nhklr7kpqgp1yj0hwp6a";}
-  {name="kwordquiz";value="016l2yv461w6liqnkszprlr22nyyy7wi9f3fqblqq5xbps8wr6b4";}
-  {name="libkcddb";value="0qjdxxwj0hw6ykya6npfq2kp21sspwxf79pklz3w7q3gnl98rlbb";}
-  {name="libkcompactdisc";value="1jql8hqsb5jl73c22ssv0ddmhipjpgqxhwnyw362djdxifvrybhi";}
-  {name="libkdcraw";value="0w9h9a69wz7m0hg486jcw7vxkzrr3nfjkgqgr40i3cmxpnnjjvp9";}
-  {name="libkdeedu";value="0ai6vr33wcphimgbznmi8arh9fa9xpcpkjq8hq07svdgmbxjd44m";}
-  {name="libkdegames";value="0ifpxwpfh79gh5qs8wl0i951kab3ppmri0h99hi0idj96xhkznpf";}
-  {name="libkexiv2";value="1w9k4c38ziyfnh9byjszg6aw1mbjii06ladgiwx1q397layd7qhx";}
-  {name="libkipi";value="1a4kqhsvpcly6mlr9w8g8gb2wyyrfbi89pwb3i1ky3w9wxk87pi4";}
-  {name="libkmahjongg";value="1rr5z04af5kswcn6pjpd9ryp1zwp3znhwb97xgvppni88cwawyff";}
-  {name="libksane";value="1sv0ba5p0m8d621vykhayblk6lsys4c80474b7d7vgh9xbcxhhgc";}
-  {name="lskat";value="0bimy8wng95mpkssssmfm2779qyjsw5f1i9wh695k0jq6j25dscy";}
-  {name="marble";value="1z90p25fgvwg35pxap1yd3k2i2qrsv9d2057lixv03ymbj0l93aq";}
-  {name="mplayerthumbs";value="1m83pglqgi6dwbbnm4djybki11f2s6q2lhbqa6v1kq12133fhkc4";}
-  {name="nepomuk-core";value="14sfvizfwnarcidmj74v1rsix85sn9hvs6wm4xnyv7d4xw7mgqv3";}
-  {name="nepomuk-widgets";value="02wm1ghsf8mxv24y1d1b5j4nq8jwi6dwlbzlqdl2hhjqxfc60sxw";}
-  {name="okular";value="15aydihdfd5hzkgchxi2xpfy96bm90jcn07lmmp5xcdng3jj520h";}
-  {name="oxygen-icons";value="0rwdp44nkigs0v449l90mjw7ngs21a0jx17biascjhq1kxrh0vmp";}
-  {name="pairs";value="009qpwhy64xfad4ch4l4dh5dn5cj9g9jg0b3384k6wjvx6k61fqq";}
-  {name="palapeli";value="0g03r8f1z2jxyh2hl6l21s292240d2dbcqi0lndjyfsz322i55wc";}
-  {name="parley";value="1xn5na30xabzp8lhbmq5ajv08rl1s7zsn08ffwd2vq8ac1nwi0k6";}
-  {name="perlkde";value="0088hbqdjqdfyf1pqksppbq1xzpgc49rqsnpgjikgdh9nqssnipd";}
-  {name="perlqt";value="1jgiicjknkfiavnq9jw2mdmsqbqb4ch5caxfhx1v6azj4s95ldpj";}
-  {name="picmi";value="0ckfcmbivkbkl9akb20ih2k4sz221ygqi51wmir3p5ryvk2dlq2a";}
-  {name="print-manager";value="0wszjqf42c3mb8c9iq5ngjz21424zjl9j0g3pwgdfj0i8iv1lcd2";}
-  {name="pykde4";value="18j9fh1w3n9yrrzgsq3pqj2pi53wp58kbwkfwb3hn3a2ksw569qb";}
-  {name="qtruby";value="0zc0if1c8c0ddfm2f6w4zp6dizxqd3z6dnr1iwydw7mdac205j38";}
-  {name="qyoto";value="1cgkpr68wh5rq3kbkv0zjylmyfg1ld4qh8r5azrq25y4qiisxmax";}
-  {name="rocs";value="1ak19mjsniwqzybjawigqg8a04kpv6jhx53mkvlm3wjdnsxi1jis";}
-  {name="smokegen";value="09liqidf5a862l6a4cz4wghhmfsjay647q2q3h17s8iwwid7k373";}
-  {name="smokekde";value="1xl56ygpc0ca7smxiagm7ch45w6m415i9nbzin08i4p017vvx0df";}
-  {name="smokeqt";value="0rk31vd45xraihhb3nmx0mkynlq3wwvdsn0460jfi30m72zpmkyc";}
-  {name="step";value="00vxnybi6q7lw6w22gmd5jmai8ysgyh9sy1cnn6jj4difn1x8zcr";}
-  {name="superkaramba";value="1rkbrifkvhl2zajr96kk63lc3r5s43acfih6m499hgwxg8g9z0cf";}
-  {name="svgpart";value="0892krp78wq731wdr5ipsgx10w45xsrr8jx00qyjsci7qsmpfz4w";}
-  {name="sweeper";value="1i151jzqabfs72c8rl5hh401nmwp9abpa6nfq3m8qyh4d8gn0fig";}
-];
-modules=[
-{
-  module="kdemultimedia";
-  split=true;
-  pkgs=[
-    { name="audiocd-kio"; sane="audiocd_kio"; }
-    { name="dragon";  }
-    { name="ffmpegthumbs";  }
-    { name="juk";  }
-    { name="kmix";  }
-    { name="kscd";  }
-    { name="libkcddb";  }
-    { name="libkcompactdisc";  }
-    { name="mplayerthumbs";  }
-  ];
-}
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
-    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
-    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
-    { name="kgamma";  }
-    { name="kolourpaint";  }
-    { name="kruler";  }
-    { name="ksaneplugin";  }
-    { name="ksnapshot";  }
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="libkipi";  }
-    { name="libksane";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdelibs";
-  split=true;
-  pkgs=[
-    { name="kdelibs";  }
-    { name="nepomuk-core"; sane="nepomuk_core"; }
-    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
-  ];
-}
-{
-  module="kdeutils";
-  split=true;
-  pkgs=[
-    { name="ark";  }
-    { name="filelight";  }
-    { name="kcalc";  }
-    { name="kcharselect";  }
-    { name="kdf";  }
-    { name="kfloppy";  }
-    { name="kgpg";  }
-    { name="kremotecontrol";  }
-    { name="ktimer";  }
-    { name="kwallet";  }
-    { name="print-manager"; sane="print_manager"; }
-    { name="superkaramba";  }
-    { name="sweeper";  }
-  ];
-}
-{
-  module="applications";
-  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="konsole";  }
-  ];
-}
-{
-  module="kdegames";
-  split=true;
-  pkgs=[
-    { name="bomber";  }
-    { name="bovo";  }
-    { name="granatier";  }
-    { name="kajongg";  }
-    { name="kapman";  }
-    { name="katomic";  }
-    { name="kblackbox";  }
-    { name="kblocks";  }
-    { name="kbounce";  }
-    { name="kbreakout";  }
-    { name="kdiamond";  }
-    { name="kfourinline";  }
-    { name="kgoldrunner";  }
-    { name="kigo";  }
-    { name="killbots";  }
-    { name="kiriki";  }
-    { name="kjumpingcube";  }
-    { name="klickety";  }
-    { name="klines";  }
-    { name="kmahjongg";  }
-    { name="kmines";  }
-    { name="knavalbattle";  }
-    { name="knetwalk";  }
-    { name="kolf";  }
-    { name="kollision";  }
-    { name="konquest";  }
-    { name="kpat";  }
-    { name="kreversi";  }
-    { name="kshisen";  }
-    { name="ksirk";  }
-    { name="ksnakeduel";  }
-    { name="kspaceduel";  }
-    { name="ksquares";  }
-    { name="ksudoku";  }
-    { name="ktuberling";  }
-    { name="kubrick";  }
-    { name="libkdegames";  }
-    { name="libkmahjongg";  }
-    { name="lskat";  }
-    { name="palapeli";  }
-    { name="picmi";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="analitza";  }
-    { name="blinken";  }
-    { name="cantor";  }
-    { name="kalgebra";  }
-    { name="kalzium";  }
-    { name="kanagram";  }
-    { name="kbruch";  }
-    { name="kgeography";  }
-    { name="khangman";  }
-    { name="kig";  }
-    { name="kiten";  }
-    { name="klettres";  }
-    { name="kmplot";  }
-    { name="kstars";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
-    { name="marble";  }
-    { name="pairs";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="kimono";  }
-    { name="korundum";  }
-    { name="kross-interpreters"; sane="kross_interpreters"; }
-    { name="perlkde";  }
-    { name="perlqt";  }
-    { name="pykde4";  }
-    { name="qtruby";  }
-    { name="qyoto";  }
-    { name="smokegen";  }
-    { name="smokekde";  }
-    { name="smokeqt";  }
-  ];
-}
-{
-  module="kdeaccessibility";
-  split=true;
-  pkgs=[
-    { name="jovie";  }
-    { name="kaccessible";  }
-    { name="kmag";  }
-    { name="kmousetool";  }
-    { name="kmouth";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdeadmin";  split=false;
-  pkgs=[
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kuser"; }
-    { name="kcron"; }
-    { name="ksystemlog"; }
-  ];
-
-}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="sounds"; }
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-  ];
-
-}
-{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
-{ module="kdenetwork";  split=false;
-  pkgs=[
-    { name="kfile-plugins"; sane="kfile_plugins";}
-    { name="kget"; }
-    { name="kopete"; }
-    { name="krdc"; }
-    { name="kppp"; }
-    { name="krfb"; }
-    { name="kdnssd"; }
-    { name="filesharing"; }
-  ];
-
-}
-{ module="kdepim";  split=false;}
-{ module="kdepimlibs";  split=false;}
-{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
-{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
-{ module="kde-runtime"; sane="kde_runtime"; split=false;}
-#had to add fake pkgs to kdesdk to get it to be treated like a split module
-{ module="kdesdk";  split=false; pkgs = [{ name="fake"; }]; }
-{ module="kdetoys";  split=false;
-  pkgs=[
-    { name="kteatime"; }
-    { name="ktux"; }
-    { name="amor"; }
-  ];
-
-}
-{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
-{ module="kdewebdev";  split=false;
-  pkgs=[
-    { name="klinkstatus"; }
-    { name="kfilereplace"; }
-    { name="kimagemapeditor"; }
-    { name="kommander"; }
-  ];
-
-}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
-{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
-];
-}
diff --git a/pkgs/desktops/kde-4.10/kde-package/4.10.5.nix b/pkgs/desktops/kde-4.10/kde-package/4.10.5.nix
new file mode 100644
index 00000000000..b1abdb8afec
--- /dev/null
+++ b/pkgs/desktops/kde-4.10/kde-package/4.10.5.nix
@@ -0,0 +1,399 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="analitza";value="0lc83vmapd66ilph26hlf8shd4xv0v9y8jsjycw5nl4xpfm7l5nr";}
+  {name="ark";value="1fvb6phcfd17fxcbb5w4njmkj0vlnz6g5qa6wv5szn4fakb5db1v";}
+  {name="audiocd-kio";value="11ma2pvc7w6gdd98h806i163dsjhxxly4wv4xdcqq4yhdviq29qv";}
+  {name="blinken";value="1lfv15blwy3m88zylqsa7k1a5z01qmakjrb9wq9yxnjbhb12nyf8";}
+  {name="bomber";value="0z704hzpgl1s7jdcpicvixd2dnfsh7i4ainjd5zc1rcljgabmvmx";}
+  {name="bovo";value="10wp4spcdwsa4nbq9qhancvddv83q12qbi72ksnvds50md12h5xx";}
+  {name="cantor";value="070al4dx7x7kk568lpd1ajq0q5gws48w3n76g0wlf4dqqlijjfx6";}
+  {name="dragon";value="0wj89v1d34s595ky97zwph7rxb97h03qya3bi6y1npcp7kjlv2j9";}
+  {name="ffmpegthumbs";value="0ilc8k601g3m4x1slfcczah87f402a9143a70gvbjprffd7iyf9q";}
+  {name="filelight";value="1wfd498ir1ivcks1ys3h8whvi0l4xwfgz2j5c4m4b517dskrmaxf";}
+  {name="granatier";value="04i1zzqkv0da6ymqvdxlaxgws7z44521zj51nw4mvapf1jcck7bq";}
+  {name="gwenview";value="0rz3va3djm3qxqvchxa3549r1qf124sb4105bs6s42a05h4mzhqv";}
+  {name="jovie";value="05cc6qzn9hgdvqgi8a2k2i89ggx10fv970293z8d59r6wbh1skv6";}
+  {name="juk";value="00j9c3g1zsa9vbfwpg37jb4w8753sr28q9xbxp3kfablndwid3w9";}
+  {name="kaccessible";value="0rsdxzqamq2i3f59npsv6pir9bys3g6zd345sfnpbdkinvxyhrdn";}
+  {name="kactivities";value="0sfbc3w0cvjfp2zs6v28fv69pq5ikignily572jamm8nwaid5h2g";}
+  {name="kajongg";value="1yffsgbabnp4mckirl888bghpyrj71d8fbsb0rjk96av1kzl2yvx";}
+  {name="kalgebra";value="0slvk1c1n9g2b5nakfi53l7gh3c2y78pvcy2snj9f1z5c0sr05cn";}
+  {name="kalzium";value="12gp0k11zf3m5g2aabrbrd7kpi5k3z46w74kalzzk3s1babgnwxn";}
+  {name="kamera";value="13qka1nc0ibn3kb03l11v64r6w3k4g7ayq539ncp1syba5726xy1";}
+  {name="kanagram";value="11vd5abdsggzv4svj4wj6q7mcpbxnpjk4gv0m1zw82ya26aarjnk";}
+  {name="kapman";value="19r8a7k2ib2fijipajbj461b1sfvlfxrlpfmm52njg61xizdxy20";}
+  {name="kate";value="0wzvhywvkagshs1q8q1rmq3dxlc5h62y7mlfb2x9wzp945rshq6d";}
+  {name="katomic";value="0vqqjv1magpc7wgwj0cvbykl9qvphc3s03i30qndygi96mf36iwc";}
+  {name="kblackbox";value="197r2nfrpdynqix1c81y1y72jrbzzl3prjd6q9sca9qnd47xx9kb";}
+  {name="kblocks";value="0nnbaskl1s9gy6kn8qk3j9qr6vmsbnpmjj4ddn1fvr32kqjfzr3h";}
+  {name="kbounce";value="0i962rbbi41m8fd7x1vrbi6q46qnij3d8kdc3cwn7mmjp79gzwmq";}
+  {name="kbreakout";value="1mh7ki87y1jjk7g4n8flr0ym6qk9nh922xsca2ww1vv16mpxww9w";}
+  {name="kbruch";value="1632a7rjrmll42yazdab1hmgjv39mp16xhkj6mq61sqdd4pj316v";}
+  {name="kcalc";value="1gyp45f873q6v2y1l8k52x70b92893314h6ci5a07c0asm8ffrpa";}
+  {name="kcharselect";value="12w3mzh0gqgh6aaih69djv3f4b1z34cxwhnchqz75z2yb9lcdj1c";}
+  {name="kcolorchooser";value="19b0r8jjy3fkhhzp9hhxw7zyrkb7fafkxs22ik3lzlm6wri1dwpj";}
+  {name="kdeadmin";value="1fg49z2lgmsvkhhyvahasb5z0l9cad4xwq5ps3qv5f1yj0hfzic4";}
+  {name="kdeartwork";value="1z1xnljs5lzmahn3i5xs429bpyxzc6b8sw2m216cs06dwfk77if6";}
+  {name="kde-baseapps";value="1d08wqb3a9fi0gzkls4jmlnmqpfd5fmg4310d2ih78gflv1yk2gz";}
+  {name="kde-base-artwork";value="1hq35i8mw3akbg9m6wvp9fv6xpamv9na2bjqzqyph8sx0633dxrw";}
+  {name="kdegraphics-mobipocket";value="0jq1qrrax9w60w35qxvjrazl4c8qvninhgp9na7pgz6sk6ydb0jf";}
+  {name="kdegraphics-strigi-analyzer";value="07z3nzmfw5pxg97qx2jj54f3r6qc2x22yxhn3kmcpifzr3gyi555";}
+  {name="kdegraphics-thumbnailers";value="1iwmyn2r43i3bykrc4vx0785f3x5zrnvvfdhfpr88f6pxr95f7bq";}
+  {name="kdelibs";value="1lgjz90irrqwz8h6w7iwy8icvqyj4kb2sarnyrxna8dy1fah9m5n";}
+  {name="kdenetwork";value="1lra150av4ndq5s9msx1khwdwd8k0n756qg6d4fsjp2fy7scf26k";}
+  {name="kdepim";value="0qs1znrvfzrkhlh1d68pri9fnaq2nhxnih5fsjcn2m7d537havq1";}
+  {name="kdepimlibs";value="01hyi3r2an8g9ds59az39c8qdm8qiws6q16558jna7f6w4m0yq5r";}
+  {name="kdepim-runtime";value="1p293zqwdc0g77h996slc0qwa01a24nq5yh5a4q6ng92rfzzkrl3";}
+  {name="kdeplasma-addons";value="0hs9bmg4gcl9lks78pmb0n29jzzh56w5islyzhzccrrcbimsqvzp";}
+  {name="kde-runtime";value="0daw0sjyqrdhsah920fla05wvcf9zrck1lbkdcbvrk1qvvqwjhpx";}
+  {name="kdesdk";value="0h1il5dza8qcfz1fgz6qhsaccqkp0g5fdi4k3413vr6lhg67dh78";}
+  {name="kdetoys";value="1r2rh0hdipwfxwq29whicbvxa7dr5vswh9pqw60x1c634cgba49p";}
+  {name="kde-wallpapers";value="1d96asb1nn88rwzb2nis37d8qwliaswpzfc15zq6jkcbdyzaxfpv";}
+  {name="kdewebdev";value="18s79ah9j01mb3lpzpsi6wxbh3wjpkswx5snpv1fyphf760jzb3n";}
+  {name="kde-workspace";value="0xg8asnxq48x6zydh09bfga11363bya7hfkygas7ar7rb0144im3";}
+  {name="kdf";value="0d3i5jpikh285vwr93044lws34ihhbszb05gbyvibx7faqdllg2h";}
+  {name="kdiamond";value="1dca5h88lm2syhnk5bd8g83lx9422hyg972di4xj69vnnpl5nsp9";}
+  {name="kfloppy";value="02yq8p8ma1aghm9k442xznk1xwb4mcd36h040ix5rc7j3j02l79m";}
+  {name="kfourinline";value="0ljs9szk4r6iasn4qkclpq3nij5hb8xnyqj36w8nxbvsmka69d2p";}
+  {name="kgamma";value="0byvsk5j2g1ycfq5zskg9bkbmq9jddv0nzck2w4qayf072cqn8b3";}
+  {name="kgeography";value="0icf21sr6w920ga6as9yx1ja85gwk3h2bb1ra9k5bs32vw5r7nk9";}
+  {name="kgoldrunner";value="18i0mj3j6q1gycf33z416kcf9lsksrmk8fnp4j1jg9mlr6y1xc6c";}
+  {name="kgpg";value="1x04mj6ykmhmlr2074bn6kc88zz4y3lgbvnf4qkcj8q5wil1p3gv";}
+  {name="khangman";value="0yrqd17w78pl18ln8rqcb0cmqis8al9k3zvg0hvxyh3qp013xb9m";}
+  {name="kig";value="1wd8kk4gkvgxp83q6dqdqkqaznbrl8kk88ixk17qhlj03iykxfcj";}
+  {name="kigo";value="1g78wqsk72mki48inxam6337hpjd491325j3cmvvlz0196q3s4zn";}
+  {name="killbots";value="1kjmwsrqmj85yawbw6xr025bkv3kidwasiyrjr01mgsndlkn3y47";}
+  {name="kimono";value="0wswbykjq56rxf0rkkl97ipy36r5q8h9sws758fvwmd16nylhdg0";}
+  {name="kiriki";value="0iv3lak13szc93gqqjlqdmdbg3jy4xbxvnahzka0d3m2nkg9iv6h";}
+  {name="kiten";value="1112kl5vbz58v52nss4gd4plnrl3nkp57mnhdbs58dlxv1s1s7b9";}
+  {name="kjumpingcube";value="1y9pgqsq72v9mxw04dkg4x2m15jyl5iahqshxczzihh3pjllv7sr";}
+  {name="klettres";value="0kqjw7vrpzvrr4g6zhdsqppbr2viqr7jann4npnzh0bw48842zhp";}
+  {name="klickety";value="0d78nak6dzmkfsxq7cxndca51paw2giawk31s70fgr7kwa7s9g9f";}
+  {name="klines";value="0z8bp1xwy17k1nv7d8mrgsk7vgb5137icdy0d66jwaa9bzsv3khh";}
+  {name="kmag";value="1iamiy8ppyd4qkbdhqykxgh6c8w31glpjv1srk9s4gqyqj51mf24";}
+  {name="kmahjongg";value="02ai75zc5rfch3b7a2zz9kmw6r3kgkbzr9pi8c1zrdgif8awrl3x";}
+  {name="kmines";value="0hc838cd5h8gjm4alszi8z70r3jmjxqwmhni1silk16gsiy3kqvy";}
+  {name="kmix";value="08ls620ndrvszx36sy2xj32fvwm5b8aggp86cwvzqjvp47c46wjv";}
+  {name="kmousetool";value="02lg84gpnic2l84ay01adw2fynr0x7byklqdz3zphiqhddhfnb81";}
+  {name="kmouth";value="09jg2xar4p6rrcc41qfj0h57fapdgpdpjh6ackhyana0871q5cam";}
+  {name="kmplot";value="17s7n51x2nl5g4l0862gnzigkwa7qwipmvy7krn8b1z051n2jwfx";}
+  {name="knavalbattle";value="15qpgn5bjbk4smwzz5x0x9f1kd5mjhg6p4h4dalcay8k9zixxxvl";}
+  {name="knetwalk";value="0yqdxcah56z1q21xfrk33s4fx6l9q21na5dx1p12d114vzgr3gzq";}
+  {name="kolf";value="08ba3flnknzjgys73lhpy7b98j544wwv6vvbrd6p2675imwk168w";}
+  {name="kollision";value="1jahrgkb9j8shwrmm1486f3w1hd5snwfwv53gj7973z0mmm5468r";}
+  {name="kolourpaint";value="18ql77778zdc9149qd7mslkh780v6qkhdc1wfljrr1mj98p08av9";}
+  {name="konquest";value="1iyqgzyg004lyqssmvh4951m9v56ayw7ggza6awh6a805j0zz0sp";}
+  {name="konsole";value="1zqmmv4zpq59nm2r7ccmp1ij5q3qjclmbmcm667hxmq9dyrwv5an";}
+  {name="korundum";value="12cqg6ib06icadyslnqzqmkal6rmjhki02na09gacqdiwc7gf2p2";}
+  {name="kpat";value="1zdv4jvqg0xbbsf39d2n8d0ya2mqzva06s46m2hb66flyjz5pd3p";}
+  {name="kremotecontrol";value="0jw4jjlhy378f58wgqm5cikqj8i3bdz1s1qm4r24bb1677dqyd4x";}
+  {name="kreversi";value="1mxgb60zbq8qkjnamvlr072vii2px224mg03fjjds063321swx0z";}
+  {name="kross-interpreters";value="0r2y7lscsgk6jkzby7dqwd62yk2nyzwm6chihsvivl9frl38wqza";}
+  {name="kruler";value="0gwyy0k8h705bnp6q7jgzbk8i9d6csffhwlas7y0zwcl7n03664x";}
+  {name="ksaneplugin";value="187n3s19xdfl7bbcpgyappw1v2bgjki8kh1qh8dy8mscm2qn50j9";}
+  {name="kscd";value="0wqm2vhj593x4vps3205gfnl29yglr2szzpdiazi6rq80r8ifvbq";}
+  {name="kshisen";value="1n5131kckixwbllp8sxn5y93z9q2fdvjj77pcy4sadngx5slz718";}
+  {name="ksirk";value="0b2084h246jhphwpa5iwpxbib4z4h6cwvi8bp18l7yid77wz28f2";}
+  {name="ksnakeduel";value="0v74l5svmr21gahxzfz7sjnj5gzhnyir7l7cny1q7xnha7bnaw81";}
+  {name="ksnapshot";value="05l18i9mv9pghlf50qax9drlcrmdahgiljnvcq20vadrxw4qxghv";}
+  {name="kspaceduel";value="0q8iqg5n7w0v5llbgan7vnf41zbfagc0rd8ya7fp9gf5pmx422zf";}
+  {name="ksquares";value="0fnz1hy2n0i1gal9b8ij8bi5sql5iybbjpkyy55dapcbph2br8xc";}
+  {name="kstars";value="0nf3n9f6dmp8401d2jfcyh26xbwmwdav4maacp5dmhv6xvr2ivis";}
+  {name="ksudoku";value="07lxxaw6ykhlxzkbhzsz43ingfx0l1gb38v2z0ag8jd3iln7l79v";}
+  {name="ktimer";value="112449fn8zbgz3s22bswyc8fisa126j6xvmwxzb91c5vx0wj9qg8";}
+  {name="ktouch";value="0a9x6ym3gw3d6jqvlfaw5qyxzcn9vi4sa55ig0d9cdy8057y5pwz";}
+  {name="ktuberling";value="1ihvv3mais39yk84k1a76mpz5c9sbbnw80n536adh3y3fad4yw5a";}
+  {name="kturtle";value="07fxjiaq69x97w45z8r3g1iyi0vyk0wyqwjwn1qb7a1ziwva5jl9";}
+  {name="kubrick";value="0mqf52lp0s61qsv8q47h012m5k8mf6gqwjpb7swrs7hxsc58dspy";}
+  {name="kwallet";value="0mb8ph0wf761gpss7xmi4zngxfalm3sdngjxrpr8brczjp8v9wdm";}
+  {name="kwordquiz";value="0rbrfswf13pw4cam8fj9w7g12yhzvg82izzy79xsxb0dkk4ki42n";}
+  {name="libkcddb";value="033vmv8fin87m788qjyjaravf5gr9cj953yvcfg9438qpavd79qr";}
+  {name="libkcompactdisc";value="105w0bnw6gzjb8gnp2gmwcjgaz3gi4f16fninbl2658dnb24b1kq";}
+  {name="libkdcraw";value="0p1wbdrhpp6rg82kfrxhaz4lxqjix6mb1grj16zy1i24x89mxlya";}
+  {name="libkdeedu";value="1b6qpd3i59hfd7rwij255xyrxp5ylw5mpyr6k10py5pj7fn4zhc2";}
+  {name="libkdegames";value="1cc5011xm9rz9fz2dk3ibfr4cqq3rmw3i7vlcsrhfscsx0xm88sc";}
+  {name="libkexiv2";value="18ngfrz30q0prsrwy92hb7y0hxhcxlr4ic7lq7fv4l45434ry7pv";}
+  {name="libkipi";value="00nn96qwynfx2ajqllh8zkwccc1prigbcq75s1hnpm67nnfc98as";}
+  {name="libkmahjongg";value="06qpykgaxx5r7n3ymph1g2fy0dj2vclfqlnzbdc41ma3l66jci64";}
+  {name="libksane";value="0a0ipz9jmrw076mxsj2k3njaf7dwfrdqd5bqwcc4q8qqlhpp4ljy";}
+  {name="lskat";value="1sxmjhw61w1d19zidf96qkddx9r0h8z5kbjl8xgah8k25ji5qsr6";}
+  {name="marble";value="04cy00jsnahmigffjyqviizj5bvj2aldfgkyj2g5iadfsqflxvy4";}
+  {name="mplayerthumbs";value="0hmdvyillr779c1fmia3h6dcy7j7j0kvxvh4mdz1adfwaz4zgymy";}
+  {name="nepomuk-core";value="12grw88gc4b4i1h346ahpkv8493gyvhvkpcqxwc2dqpsqsfc7rpz";}
+  {name="nepomuk-widgets";value="1npmwv1vh5ci6c9a291vyps85c5cvdg5dn9r9h28dq58s2h274yh";}
+  {name="okular";value="05v23g4w6sw525w7qllcbyhk92k75hyqrvx9hncylig4blivjp9f";}
+  {name="oxygen-icons";value="1y7iq77fyiykmjf8xdyprnshlasazdv6fcjp6ayfx0jkixb2gqya";}
+  {name="pairs";value="1v4h0d04b7g59axkl69gyml02hzxjkfzcgg320mj05xx5q0kjyq5";}
+  {name="palapeli";value="13hvppav7yz9wvvly8f8kads9arqvl25spwa8awpl2f4a394c0sa";}
+  {name="parley";value="0wk6p4rw6063089iq758a0mcq10fh8c1pg0wq00dhs9d05gwk873";}
+  {name="perlkde";value="1hh5y4zmmb97py281i0jhzwg8r4ii3qmilzbwbrvk9j4ngcz37gg";}
+  {name="perlqt";value="09880varap78a44zifqx72wbx23wq0hqq540hf466fmmxk744877";}
+  {name="picmi";value="060a1n5lclsaz4zjq1dpm9y20fqgq3rjlkm54prp3kkj5hpi6kcl";}
+  {name="print-manager";value="0jmvfy376axdwi4a2fc78ldlny4jbk7kxvhi1mwf8piibwc10dvf";}
+  {name="pykde4";value="10aqvx6dfcbi9mrsr0sdhhxp2jqkw06rf55p2nxdadmcszad2k7k";}
+  {name="qtruby";value="042nya6n5sp2r9a9s3limbph8wv5z04fha7pkqznvrkr040qykvj";}
+  {name="qyoto";value="0nxhxvh4zpskvxv7mjz06vililg2wqlabaaaf61j0naxz4aynyrv";}
+  {name="rocs";value="10xb6qh29g4l369dyimwj0yk8s5yi6jg1byaf4z5jnr2w8ysbf7j";}
+  {name="smokegen";value="0myzqfqcl7i8kikcyj2vbip9y4al411jmjm02hv55baccygls8yr";}
+  {name="smokekde";value="0b1m9g1swj9r44zbg8lbqmxp9l342dz8b4wsnn6n9ih0b15p512h";}
+  {name="smokeqt";value="047am45yjkyyza281zfzvv84kvldvmbgch5q3fd89vcvl5sh399j";}
+  {name="step";value="05rjnb16mzz91q7473k2g83g792xqh77p4gc2xmw0a5j4qk6f6ga";}
+  {name="superkaramba";value="0vxb8656ag6hmy3nx9w3xa38j12rajkqsmv4kx6ylnpk6v71s7x2";}
+  {name="svgpart";value="17j59rwg483p7ip1zxq37jnzvkafrkj7yabwrbwk0vvxkqcbqpx3";}
+  {name="sweeper";value="0yhp6k2ai7wgn242932w10xwainq07bf9zjm2fvaavrg3gh38644";}
+];
+modules=[
+{
+  module="kdemultimedia";
+  split=true;
+  pkgs=[
+    { name="audiocd-kio"; sane="audiocd_kio"; }
+    { name="dragon";  }
+    { name="ffmpegthumbs";  }
+    { name="juk";  }
+    { name="kmix";  }
+    { name="kscd";  }
+    { name="libkcddb";  }
+    { name="libkcompactdisc";  }
+    { name="mplayerthumbs";  }
+  ];
+}
+{
+  module="kdegraphics";
+  split=true;
+  pkgs=[
+    { name="gwenview";  }
+    { name="kamera";  }
+    { name="kcolorchooser";  }
+    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
+    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
+    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
+    { name="kgamma";  }
+    { name="kolourpaint";  }
+    { name="kruler";  }
+    { name="ksaneplugin";  }
+    { name="ksnapshot";  }
+    { name="libkdcraw";  }
+    { name="libkexiv2";  }
+    { name="libkipi";  }
+    { name="libksane";  }
+    { name="okular";  }
+    { name="svgpart";  }
+  ];
+}
+{
+  module="kdelibs";
+  split=true;
+  pkgs=[
+    { name="kdelibs";  }
+    { name="nepomuk-core"; sane="nepomuk_core"; }
+    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
+  ];
+}
+{
+  module="kdeutils";
+  split=true;
+  pkgs=[
+    { name="ark";  }
+    { name="filelight";  }
+    { name="kcalc";  }
+    { name="kcharselect";  }
+    { name="kdf";  }
+    { name="kfloppy";  }
+    { name="kgpg";  }
+    { name="kremotecontrol";  }
+    { name="ktimer";  }
+    { name="kwallet";  }
+    { name="print-manager"; sane="print_manager"; }
+    { name="superkaramba";  }
+    { name="sweeper";  }
+  ];
+}
+{
+  module="applications";
+  split=true;
+  pkgs=[
+    { name="kate";  }
+    { name="konsole";  }
+  ];
+}
+{
+  module="kdegames";
+  split=true;
+  pkgs=[
+    { name="bomber";  }
+    { name="bovo";  }
+    { name="granatier";  }
+    { name="kajongg";  }
+    { name="kapman";  }
+    { name="katomic";  }
+    { name="kblackbox";  }
+    { name="kblocks";  }
+    { name="kbounce";  }
+    { name="kbreakout";  }
+    { name="kdiamond";  }
+    { name="kfourinline";  }
+    { name="kgoldrunner";  }
+    { name="kigo";  }
+    { name="killbots";  }
+    { name="kiriki";  }
+    { name="kjumpingcube";  }
+    { name="klickety";  }
+    { name="klines";  }
+    { name="kmahjongg";  }
+    { name="kmines";  }
+    { name="knavalbattle";  }
+    { name="knetwalk";  }
+    { name="kolf";  }
+    { name="kollision";  }
+    { name="konquest";  }
+    { name="kpat";  }
+    { name="kreversi";  }
+    { name="kshisen";  }
+    { name="ksirk";  }
+    { name="ksnakeduel";  }
+    { name="kspaceduel";  }
+    { name="ksquares";  }
+    { name="ksudoku";  }
+    { name="ktuberling";  }
+    { name="kubrick";  }
+    { name="libkdegames";  }
+    { name="libkmahjongg";  }
+    { name="lskat";  }
+    { name="palapeli";  }
+    { name="picmi";  }
+  ];
+}
+{
+  module="kdeedu";
+  split=true;
+  pkgs=[
+    { name="analitza";  }
+    { name="blinken";  }
+    { name="cantor";  }
+    { name="kalgebra";  }
+    { name="kalzium";  }
+    { name="kanagram";  }
+    { name="kbruch";  }
+    { name="kgeography";  }
+    { name="khangman";  }
+    { name="kig";  }
+    { name="kiten";  }
+    { name="klettres";  }
+    { name="kmplot";  }
+    { name="kstars";  }
+    { name="ktouch";  }
+    { name="kturtle";  }
+    { name="kwordquiz";  }
+    { name="libkdeedu";  }
+    { name="marble";  }
+    { name="pairs";  }
+    { name="parley";  }
+    { name="rocs";  }
+    { name="step";  }
+  ];
+}
+{
+  module="kdebindings";
+  split=true;
+  pkgs=[
+    { name="kimono";  }
+    { name="korundum";  }
+    { name="kross-interpreters"; sane="kross_interpreters"; }
+    { name="perlkde";  }
+    { name="perlqt";  }
+    { name="pykde4";  }
+    { name="qtruby";  }
+    { name="qyoto";  }
+    { name="smokegen";  }
+    { name="smokekde";  }
+    { name="smokeqt";  }
+  ];
+}
+{
+  module="kdeaccessibility";
+  split=true;
+  pkgs=[
+    { name="jovie";  }
+    { name="kaccessible";  }
+    { name="kmag";  }
+    { name="kmousetool";  }
+    { name="kmouth";  }
+  ];
+}
+{
+  module="kde-baseapps";
+sane="kde_baseapps";  split=true;
+  pkgs=[
+    { name="kde-baseapps"; sane="kde_baseapps"; }
+  ];
+}
+{ module="kactivities";  split=false;}
+{ module="kdeadmin";  split=false;
+  pkgs=[
+    { name="strigi-analyzer"; sane="strigi_analyzer";}
+    { name="kuser"; }
+    { name="ksystemlog"; }
+    { name="kcron"; }
+  ];
+
+}
+{ module="kdeartwork";  split=false;
+  pkgs=[
+    { name="ColorSchemes"; }
+    { name="IconThemes"; }
+    { name="emoticons"; }
+    { name="kscreensaver"; }
+    { name="kwin-styles"; sane="kwin_styles";}
+    { name="sounds"; }
+    { name="styles"; }
+    { name="wallpapers"; }
+    { name="HighResolutionWallpapers"; }
+    { name="WeatherWallpapers"; }
+    { name="desktopthemes"; }
+  ];
+
+}
+{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
+{ module="kdenetwork";  split=false;
+  pkgs=[
+    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers";}
+    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing";}
+    { name="kppp"; }
+    { name="kdnssd"; }
+    { name="krdc"; }
+    { name="krfb"; }
+    { name="kget"; }
+    { name="kopete"; }
+  ];
+
+}
+{ module="kdepim";  split=false;}
+{ module="kdepimlibs";  split=false;}
+{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
+{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
+{ module="kde-runtime"; sane="kde_runtime"; split=false;}
+#had to add fake pkgs to kdesdk to get it to be treated like a split module
+{ module="kdesdk";  split=false; pkgs = [{ name="fake"; }]; }
+{ module="kdetoys";  split=false;
+  pkgs=[
+    { name="kteatime"; }
+    { name="ktux"; }
+    { name="amor"; }
+  ];
+
+}
+{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
+{ module="kdewebdev";  split=false;
+  pkgs=[
+    { name="klinkstatus"; }
+    { name="kfilereplace"; }
+    { name="kimagemapeditor"; }
+    { name="kommander"; }
+  ];
+
+}
+{ module="kde-workspace"; sane="kde_workspace"; split=false;}
+{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
+];
+}
diff --git a/pkgs/desktops/kde-4.10/kde-runtime.nix b/pkgs/desktops/kde-4.10/kde-runtime.nix
index b562d8cadd5..a2fef65d75c 100644
--- a/pkgs/desktops/kde-4.10/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.10/kde-runtime.nix
@@ -1,12 +1,12 @@
 { kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
 , libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio
-, networkmanager, kactivities, kdepimlibs, openexr, ilmbase
+, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, config
 }:
 
 kde {
   buildInputs = [
     kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
-    qca2 samba (libcanberra.override { gtk = null; }) pulseaudio
+    qca2 samba libcanberra pulseaudio
     networkmanager kactivities kdepimlibs openexr
 #todo: add openslp
   ];
diff --git a/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix
index 611c6a70f6b..7c9846fbf9e 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/perlqt-include-smokeqt.patch b/pkgs/desktops/kde-4.10/kdebindings/perlqt-include-smokeqt.patch
deleted file mode 100644
index fd67860283b..00000000000
--- a/pkgs/desktops/kde-4.10/kdebindings/perlqt-include-smokeqt.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 48b92b74bc6fd270c33a726257e2879203cf5064
-Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
-Date:   Wed Mar 21 00:47:43 2012 +0400
-
-    Include SMOKE_QTCORE_INCLUDE_DIR
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 48020a1..2263a73 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,7 +14,7 @@ find_package(Smoke COMPONENTS QtCore QtGui QtNetwork Qt3Support QtDeclarative Qt
-                               QtOpenGl QtScript QtSql QtSvg QtTest QtUiTools QtWebKit QtXml QtXmlPatterns
-                               Phonon Qwt QSci QImageBlitz)
-                               
--include_directories(${SMOKE_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/src)
-+include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/src)
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${SMOKE_CMAKE_MODULE_DIR})
- include(MacroOptionalFindPackage)
- include(MacroOptionalAddBindings)
diff --git a/pkgs/desktops/kde-4.10/kdebindings/perlqt-rewrite-FindPerlMore.patch b/pkgs/desktops/kde-4.10/kdebindings/perlqt-rewrite-FindPerlMore.patch
deleted file mode 100644
index c7f73815f54..00000000000
--- a/pkgs/desktops/kde-4.10/kdebindings/perlqt-rewrite-FindPerlMore.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-commit e702abfd16f610e773fb0310d8c6512991794c63
-Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
-Date:   Wed Mar 21 00:50:02 2012 +0400
-
-    Rewrite FindPerlMore.cmake
-    
-    * Ask perl for expanded paths
-    * Move execute_process to a macro
-    * Add PERL_*_INSTALL_DIR variables that point to CMAKE_INSTALL_PREFIX
-    
-    The last change makes it easy to install a file into CMAKE_INSTALL_PREFIX
-    instead of perl install prefix.Add debug message
-
-diff --git a/cmake/FindPerlMore.cmake b/cmake/FindPerlMore.cmake
-index 6412a47..cc8faf8 100644
---- a/cmake/FindPerlMore.cmake
-+++ b/cmake/FindPerlMore.cmake
-@@ -5,54 +5,52 @@
- #
- #  PERL_INCLUDE_PATH = path to where perl.h can be found
- 
--if(PERL_INCLUDE_PATH)
--   # Already in cache, be silent
--   SET(PERL_HEADERS_FOUND TRUE)
--endif (PERL_INCLUDE_PATH)		
--
--IF(PERL_EXECUTABLE)
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{archlib}"
--   		OUTPUT_VARIABLE PERL_ARCH_LIB_DIR)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitearch}"
--   		OUTPUT_VARIABLE PERL_SITE_ARCH_DIR)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorarch}"
--   		OUTPUT_VARIABLE PERL_VENDOR_ARCH_DIR)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitelib}"
--   		OUTPUT_VARIABLE PERL_SITE_LIB_DIR)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorlib}"
--   		OUTPUT_VARIABLE PERL_VENDOR_LIB_DIR)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{version}"
--   		OUTPUT_VARIABLE PERL_VERSION)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccflags}"
--   		OUTPUT_VARIABLE PERL_CXX_FLAGS)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccdlflags}"
--   		OUTPUT_VARIABLE PERL_CCDL_FLAGS)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -MFile::Spec -e "print '-L' . File::Spec->catdir(\$Config{archlibexp}, 'CORE')"
--   		OUTPUT_VARIABLE PERL_EXTRA_LIB_PATHS)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{perllibs}"
--   		OUTPUT_VARIABLE PERL_LIBS)
--
--	FIND_PATH(PERL_INCLUDE_PATH 
--  		NAMES perl.h
--  		PATHS ${PERL_ARCH_LIB_DIR}/CORE
--  	)
--
--	if(PERL_INCLUDE_PATH)
--		SET(PERL_HEADERS_FOUND TRUE)
--	endif (PERL_INCLUDE_PATH)
--
--	MARK_AS_ADVANCED(
--	  PERL_INCLUDE_PATH
--	  )
-+if(FIND_PERLMORE_REQUIRED)
-+  find_package(Perl REQUIRED)
-+else()
-+ find_package(Perl)
-+endif()
-+
-+macro(_perl_get_config_var name output)
-+  execute_process(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{${name}}"
-+                  OUTPUT_VARIABLE PERL_${output})
-+endmacro()
-+
-+macro(_perl_get_config_dir name)
-+  string(TOLOWER ${name} _tmp)
-+  string(REPLACE "_" "" _tmp ${_tmp})
-+  _perl_get_config_var(${_tmp}exp ${name}_DIR)
-+  string(REPLACE "${PERL_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" PERL_${name}_INSTALL_DIR "${PERL_${name}_DIR}")
-+endmacro()
-+
-+if(PERL_EXECUTABLE)
-+  _perl_get_config_var(prefixexp ROOT_DIR)
-+
-+  _perl_get_config_dir(ARCH_LIB)
-+  _perl_get_config_dir(SITE_ARCH)
-+  _perl_get_config_dir(VENDOR_ARCH)
-+  _perl_get_config_dir(SITE_LIB)
-+  _perl_get_config_dir(VENDOR_LIB)
-+
-+  _perl_get_config_var(version VERSION)
-+  _perl_get_config_var(ccflags CXX_FLAGS)
-+  _perl_get_config_var(ccdlflags CCDL_FLAGS)
-+
-+  EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -MFile::Spec -e "print '-L' . File::Spec->catdir(\$Config{archlibexp}, 'CORE')"
-+                  OUTPUT_VARIABLE PERL_EXTRA_LIB_PATHS)
-+
-+  _perl_get_config_var(perllibs LIBS)
-+
-+  FIND_PATH(PERL_INCLUDE_PATH
-+            NAMES perl.h
-+            HINTS ${PERL_ARCH_LIB_DIR}/CORE
-+  )
-+
-+  if(PERL_INCLUDE_PATH)
-+    SET(PERL_HEADERS_FOUND TRUE)
-+  endif (PERL_INCLUDE_PATH)
-+
-+  MARK_AS_ADVANCED(PERL_INCLUDE_PATH)
- ENDIF(PERL_EXECUTABLE)
- 
- IF(PERL_HEADERS_FOUND)
diff --git a/pkgs/desktops/kde-4.10/kdebindings/perlqt-use-site-arch-install-dir.patch b/pkgs/desktops/kde-4.10/kdebindings/perlqt-use-site-arch-install-dir.patch
deleted file mode 100644
index 04f0c558677..00000000000
--- a/pkgs/desktops/kde-4.10/kdebindings/perlqt-use-site-arch-install-dir.patch
+++ /dev/null
@@ -1,454 +0,0 @@
-commit c78779fcaff587818ee37bec3ded5e0617625b95
-Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
-Date:   Wed Mar 21 01:01:27 2012 +0400
-
-    Install to PERL_SITE_ARCH_INSTALL_DIR
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 48020a1..16188df 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,7 +36,6 @@ macro_log_feature(Qwt5_Qt4_FOUND "Qwt5 for Qt4" "Qwt5 libraries for Qt4" "http:/
- add_definitions(-DDEBUG)
- 
- include (FindPerlMore)
--set(CUSTOM_PERL_SITE_ARCH_DIR ${PERL_SITE_ARCH_DIR} CACHE DIR "Custom installation directory for perl binary extension")
- 
- # the RPATH to be used when installing, but only if it's not a system directory
- GET_FILENAME_COMPONENT(SMOKE_LIB_DIR ${SMOKE_BASE_LIBRARY} PATH)
-diff --git a/INSTALL b/INSTALL
-index d19f97e..97cc9f1 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -36,7 +36,6 @@ ccmake step.
- The standard options are:
-     CMAKE_BUILD_TYPE = The type of build ('Debug', 'Release', etc)
-     CMAKE_INSTALL_PREFIX = The location for any executables ( e.g. puic4 )
--    CUSTOM_PERL_SITE_ARCH_DIR = The location for the perl modules themselves.
-     QT_QMAKE_EXECUTABLE = The path to your system's qmake.
- 
- cmake looks in your path for a qmake executable.  If it can't find it, it will
-diff --git a/Makefile.PL b/Makefile.PL
-index df9a13c..31dd912 100755
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -3,7 +3,7 @@
- use strict;
- use Config;
- 
--my ($prefix, $sitearch, $qmake) = ($Config{prefix}, $Config{sitearch});
-+my ($prefix, $qmake) = ($Config{prefix});
- my @cmakeArgs;
- foreach my $arg (@ARGV) {
-     my $key = $arg;
-@@ -12,7 +12,6 @@ foreach my $arg (@ARGV) {
-     $value =~ s/^[^=]*=//g;
-     if ($key eq 'PREFIX' or $key eq 'INSTALL_BASE') {
-         $prefix = $value;
--        $sitearch = "$prefix";
-     }
-     elsif ($key eq 'QMAKE') {
-         $qmake = $value;
-@@ -34,7 +33,6 @@ if($^O =~ /win/i){
- }
- push @args, "-DCMAKE_INSTALL_PREFIX=$prefix" if $prefix;
- push @args, "-DQT_QMAKE_EXECUTABLE=$qmake" if $qmake;
--push @args, "-DCUSTOM_PERL_SITE_ARCH_DIR=$sitearch" if $sitearch;
- push @args, @cmakeArgs;
- 
- if ( eval "require Alien::SmokeQt" ) {
-diff --git a/phonon/lib/CMakeLists.txt b/phonon/lib/CMakeLists.txt
-index f2857c3..78674ea 100644
---- a/phonon/lib/CMakeLists.txt
-+++ b/phonon/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(phononpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Phonon.pm ${CMAKE_BINARY_DIR}/blib/lib/Phonon.pm)
--install(FILES Phonon.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES Phonon.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/phonon/src/CMakeLists.txt b/phonon/src/CMakeLists.txt
-index a04db11..9933dfd 100644
---- a/phonon/src/CMakeLists.txt
-+++ b/phonon/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_phonon
- set_target_properties(perl_phonon PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_phonon PROPERTIES PREFIX "")
- 
--install(TARGETS perl_phonon DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_phonon DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qimageblitz/lib/CMakeLists.txt b/qimageblitz/lib/CMakeLists.txt
-index 0809ba8..22fc1c0 100644
---- a/qimageblitz/lib/CMakeLists.txt
-+++ b/qimageblitz/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qimageblitzpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QImageBlitz.pm ${CMAKE_BINARY_DIR}/blib/lib/QImageBlitz.pm)
--install(FILES QImageBlitz.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QImageBlitz.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qimageblitz/src/CMakeLists.txt b/qimageblitz/src/CMakeLists.txt
-index 02ef494..4f02c1b 100644
---- a/qimageblitz/src/CMakeLists.txt
-+++ b/qimageblitz/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qimageblitz
- set_target_properties(perl_qimageblitz PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qimageblitz PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qimageblitz DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qimageblitz DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qsci/lib/CMakeLists.txt b/qsci/lib/CMakeLists.txt
-index 63b451f..d22869f 100644
---- a/qsci/lib/CMakeLists.txt
-+++ b/qsci/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qscipm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qsci.pm ${CMAKE_BINARY_DIR}/blib/lib/Qsci.pm)
--install(FILES Qsci.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES Qsci.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qsci/src/CMakeLists.txt b/qsci/src/CMakeLists.txt
-index 8c1659b..bdcb5a8 100644
---- a/qsci/src/CMakeLists.txt
-+++ b/qsci/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qsci
- set_target_properties(perl_qsci PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qsci PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qsci DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qsci DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qt3support/lib/CMakeLists.txt b/qt3support/lib/CMakeLists.txt
-index 2f04cfa..dda5afa 100644
---- a/qt3support/lib/CMakeLists.txt
-+++ b/qt3support/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qt3support4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qt3Support4.pm ${CMAKE_BINARY_DIR}/blib/lib/Qt3Support4.pm)
--install(FILES Qt3Support4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES Qt3Support4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qt3support/src/CMakeLists.txt b/qt3support/src/CMakeLists.txt
-index b24532e..bed99aa 100644
---- a/qt3support/src/CMakeLists.txt
-+++ b/qt3support/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qt3support4
- set_target_properties(perl_qt3support4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qt3support4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qt3support4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qt3support4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtcore/lib/CMakeLists.txt b/qtcore/lib/CMakeLists.txt
-index ef07d10..1d78196 100644
---- a/qtcore/lib/CMakeLists.txt
-+++ b/qtcore/lib/CMakeLists.txt
-@@ -1,3 +1,3 @@
- add_subdirectory( QtCore4 )
- add_custom_target(perlqtcore4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtCore4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtCore4.pm)
--install( FILES QtCore4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR} )
-+install( FILES QtCore4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR} )
-diff --git a/qtcore/lib/QtCore4/CMakeLists.txt b/qtcore/lib/QtCore4/CMakeLists.txt
-index 44c7893..06aef20 100644
---- a/qtcore/lib/QtCore4/CMakeLists.txt
-+++ b/qtcore/lib/QtCore4/CMakeLists.txt
-@@ -1,3 +1,3 @@
--install( FILES signals.pm slots.pm isa.pm debug.pm classinfo.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/QtCore4 )
-+install( FILES signals.pm slots.pm isa.pm debug.pm classinfo.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/QtCore4 )
- add_custom_target(perlqt4pmlibmkdir ALL ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/blib/lib/QtCore4)
- add_custom_target(perlqt4pmlibsubdir ALL ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/blib/lib/QtCore4)
-diff --git a/qtcore/src/CMakeLists.txt b/qtcore/src/CMakeLists.txt
-index 3910636..b5e645c 100644
---- a/qtcore/src/CMakeLists.txt
-+++ b/qtcore/src/CMakeLists.txt
-@@ -53,10 +53,10 @@ target_link_libraries(perlqtcore4
- set_target_properties(perlqtcore4 PROPERTIES
-     OUTPUT_NAME ${libraryName}
-     PREFIX ""
--    INSTALL_NAME_DIR ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/
-+    INSTALL_NAME_DIR ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/
- )
- 
--install(TARGETS perlqtcore4 EXPORT PerlQtExport DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perlqtcore4 EXPORT PerlQtExport DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
- install(FILES binding.h handlers.h listclass_macros.h marshall_basetypes.h marshall_complex.h
-               marshall.h marshall_macros.h marshall_primitives.h marshall_types.h perlqt.h ppport.h
-               QtCore4.h smokehelp.h smokeperl.h util.h
-diff --git a/qtdbus/lib/CMakeLists.txt b/qtdbus/lib/CMakeLists.txt
-index d03a672..a60d603 100644
---- a/qtdbus/lib/CMakeLists.txt
-+++ b/qtdbus/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtdbus4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtDBus4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtDBus4.pm)
--install(FILES QtDBus4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtDBus4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtdbus/src/CMakeLists.txt b/qtdbus/src/CMakeLists.txt
-index 9aa05a0..5786ea2 100644
---- a/qtdbus/src/CMakeLists.txt
-+++ b/qtdbus/src/CMakeLists.txt
-@@ -31,4 +31,4 @@ target_link_libraries(perl_qtdbus4
- set_target_properties(perl_qtdbus4 PROPERTIES OUTPUT_NAME "QtDBus4")
- set_target_properties(perl_qtdbus4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtdbus4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/QtDBus4/)
-+install(TARGETS perl_qtdbus4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/QtDBus4/)
-diff --git a/qtdeclarative/lib/CMakeLists.txt b/qtdeclarative/lib/CMakeLists.txt
-index e8d2847..b458858 100644
---- a/qtdeclarative/lib/CMakeLists.txt
-+++ b/qtdeclarative/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtdeclarative4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtDeclarative4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtDeclarative4.pm)
--install(FILES QtDeclarative4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtDeclarative4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtdeclarative/src/CMakeLists.txt b/qtdeclarative/src/CMakeLists.txt
-index 1662167..ec2a8fc 100644
---- a/qtdeclarative/src/CMakeLists.txt
-+++ b/qtdeclarative/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtdeclarative4
- set_target_properties(perl_qtdeclarative4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtdeclarative4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtdeclarative4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtdeclarative4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtgui/lib/CMakeLists.txt b/qtgui/lib/CMakeLists.txt
-index 82626c8..e62a4ac 100644
---- a/qtgui/lib/CMakeLists.txt
-+++ b/qtgui/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtgui4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtGui4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtGui4.pm)
--install(FILES QtGui4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtGui4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtgui/src/CMakeLists.txt b/qtgui/src/CMakeLists.txt
-index 4cc8b36..44041b6 100644
---- a/qtgui/src/CMakeLists.txt
-+++ b/qtgui/src/CMakeLists.txt
-@@ -38,4 +38,4 @@ target_link_libraries(perl_qtgui4
- set_target_properties(perl_qtgui4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtgui4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtgui4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtgui4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qthelp/lib/CMakeLists.txt b/qthelp/lib/CMakeLists.txt
-index dcf5ebe..da817d4 100644
---- a/qthelp/lib/CMakeLists.txt
-+++ b/qthelp/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qthelp4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtHelp4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtHelp4.pm)
--install(FILES QtHelp4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtHelp4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qthelp/src/CMakeLists.txt b/qthelp/src/CMakeLists.txt
-index c00359d..689cb29 100644
---- a/qthelp/src/CMakeLists.txt
-+++ b/qthelp/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qthelp4
- set_target_properties(perl_qthelp4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qthelp4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qthelp4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qthelp4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtmultimedia/lib/CMakeLists.txt b/qtmultimedia/lib/CMakeLists.txt
-index e55f697..5384539 100644
---- a/qtmultimedia/lib/CMakeLists.txt
-+++ b/qtmultimedia/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtmultimedia4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtMultimedia4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtMultimedia4.pm)
--install(FILES QtMultimedia4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtMultimedia4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtmultimedia/src/CMakeLists.txt b/qtmultimedia/src/CMakeLists.txt
-index 0728aba..df8e552 100644
---- a/qtmultimedia/src/CMakeLists.txt
-+++ b/qtmultimedia/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtmultimedia4
- set_target_properties(perl_qtmultimedia4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtmultimedia4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtmultimedia4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtmultimedia4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtnetwork/lib/CMakeLists.txt b/qtnetwork/lib/CMakeLists.txt
-index 12cd5dd..d1fb0e6 100644
---- a/qtnetwork/lib/CMakeLists.txt
-+++ b/qtnetwork/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtnetwork4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtNetwork4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtNetwork4.pm)
--install(FILES QtNetwork4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtNetwork4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtnetwork/src/CMakeLists.txt b/qtnetwork/src/CMakeLists.txt
-index caf8327..0994d57 100644
---- a/qtnetwork/src/CMakeLists.txt
-+++ b/qtnetwork/src/CMakeLists.txt
-@@ -39,4 +39,4 @@ target_link_libraries(perl_qtnetwork4
- set_target_properties(perl_qtnetwork4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtnetwork4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtnetwork4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtnetwork4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtopengl/lib/CMakeLists.txt b/qtopengl/lib/CMakeLists.txt
-index f3b5640..d8dc9e4 100644
---- a/qtopengl/lib/CMakeLists.txt
-+++ b/qtopengl/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtopengl4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtOpenGL4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtOpenGL4.pm)
--install(FILES QtOpenGL4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtOpenGL4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtopengl/src/CMakeLists.txt b/qtopengl/src/CMakeLists.txt
-index 20493a9..777af89 100644
---- a/qtopengl/src/CMakeLists.txt
-+++ b/qtopengl/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtopengl4
- set_target_properties(perl_qtopengl4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtopengl4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtopengl4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtopengl4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtscript/lib/CMakeLists.txt b/qtscript/lib/CMakeLists.txt
-index d21dbe5..320ff93 100644
---- a/qtscript/lib/CMakeLists.txt
-+++ b/qtscript/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtscript4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtScript4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtScript4.pm)
--install(FILES QtScript4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtScript4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtscript/src/CMakeLists.txt b/qtscript/src/CMakeLists.txt
-index dd395be..6ff47d8 100644
---- a/qtscript/src/CMakeLists.txt
-+++ b/qtscript/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtscript4
- set_target_properties(perl_qtscript4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtscript4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtscript4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtscript4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtsql/lib/CMakeLists.txt b/qtsql/lib/CMakeLists.txt
-index 59336d3..d9dd4d5 100644
---- a/qtsql/lib/CMakeLists.txt
-+++ b/qtsql/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtsql4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtSql4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtSql4.pm)
--install(FILES QtSql4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtSql4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtsql/src/CMakeLists.txt b/qtsql/src/CMakeLists.txt
-index 3ec2028..59096ba 100644
---- a/qtsql/src/CMakeLists.txt
-+++ b/qtsql/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtsql4
- set_target_properties(perl_qtsql4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtsql4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtsql4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtsql4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtsvg/lib/CMakeLists.txt b/qtsvg/lib/CMakeLists.txt
-index 33f6deb..bf1dc1f 100644
---- a/qtsvg/lib/CMakeLists.txt
-+++ b/qtsvg/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtsvg4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtSvg4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtSvg4.pm)
--install(FILES QtSvg4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtSvg4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtsvg/src/CMakeLists.txt b/qtsvg/src/CMakeLists.txt
-index 11eccd2..449bf0f 100644
---- a/qtsvg/src/CMakeLists.txt
-+++ b/qtsvg/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtsvg4
- set_target_properties(perl_qtsvg4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtsvg4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtsvg4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtsvg4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qttest/lib/CMakeLists.txt b/qttest/lib/CMakeLists.txt
-index 3bfa78c..5a8d8da 100644
---- a/qttest/lib/CMakeLists.txt
-+++ b/qttest/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qttest4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtTest4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtTest4.pm)
--install(FILES QtTest4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtTest4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qttest/src/CMakeLists.txt b/qttest/src/CMakeLists.txt
-index 5492e55..d4662b1 100644
---- a/qttest/src/CMakeLists.txt
-+++ b/qttest/src/CMakeLists.txt
-@@ -38,4 +38,4 @@ target_link_libraries(perl_qttest4
- set_target_properties(perl_qttest4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qttest4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qttest4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qttest4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtuitools/lib/CMakeLists.txt b/qtuitools/lib/CMakeLists.txt
-index 119e40e..3a5f472 100644
---- a/qtuitools/lib/CMakeLists.txt
-+++ b/qtuitools/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtuitools4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtUiTools4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtUiTools4.pm)
--install(FILES QtUiTools4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtUiTools4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtuitools/src/CMakeLists.txt b/qtuitools/src/CMakeLists.txt
-index a8ae4a2..ecc079f 100644
---- a/qtuitools/src/CMakeLists.txt
-+++ b/qtuitools/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtuitools4
- set_target_properties(perl_qtuitools4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtuitools4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtuitools4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtuitools4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtwebkit/lib/CMakeLists.txt b/qtwebkit/lib/CMakeLists.txt
-index a02f7ee..3846227 100644
---- a/qtwebkit/lib/CMakeLists.txt
-+++ b/qtwebkit/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtwebkit4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtWebKit4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtWebKit4.pm)
--install(FILES QtWebKit4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtWebKit4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtwebkit/src/CMakeLists.txt b/qtwebkit/src/CMakeLists.txt
-index a6e00f8..dbebc44 100644
---- a/qtwebkit/src/CMakeLists.txt
-+++ b/qtwebkit/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtwebkit4
- set_target_properties(perl_qtwebkit4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtwebkit4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtwebkit4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtwebkit4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtxml/lib/CMakeLists.txt b/qtxml/lib/CMakeLists.txt
-index 5505bc4..7db743c 100644
---- a/qtxml/lib/CMakeLists.txt
-+++ b/qtxml/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtxml4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtXml4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtXml4.pm)
--install(FILES QtXml4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtXml4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtxml/src/CMakeLists.txt b/qtxml/src/CMakeLists.txt
-index 018508c..a351609 100644
---- a/qtxml/src/CMakeLists.txt
-+++ b/qtxml/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtxml4
- set_target_properties(perl_qtxml4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtxml4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtxml4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtxml4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtxmlpatterns/lib/CMakeLists.txt b/qtxmlpatterns/lib/CMakeLists.txt
-index a35f3df..3d86103 100644
---- a/qtxmlpatterns/lib/CMakeLists.txt
-+++ b/qtxmlpatterns/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtxmlpatterns4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtXmlPatterns4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtXmlPatterns4.pm)
--install(FILES QtXmlPatterns4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtXmlPatterns4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtxmlpatterns/src/CMakeLists.txt b/qtxmlpatterns/src/CMakeLists.txt
-index 9970a98..563e922 100644
---- a/qtxmlpatterns/src/CMakeLists.txt
-+++ b/qtxmlpatterns/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtxmlpatterns4
- set_target_properties(perl_qtxmlpatterns4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtxmlpatterns4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtxmlpatterns4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtxmlpatterns4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qwt/lib/CMakeLists.txt b/qwt/lib/CMakeLists.txt
-index 0013c4d..d67ffbf 100644
---- a/qwt/lib/CMakeLists.txt
-+++ b/qwt/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qwtpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qwt.pm ${CMAKE_BINARY_DIR}/blib/lib/Qwt.pm)
--install(FILES Qwt.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES Qwt.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qwt/src/CMakeLists.txt b/qwt/src/CMakeLists.txt
-index 869d818..b644e80 100644
---- a/qwt/src/CMakeLists.txt
-+++ b/qwt/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qwt
- set_target_properties(perl_qwt PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qwt PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qwt DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qwt DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/pkgs/desktops/kde-4.10/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.10/kdebindings/perlqt.nix
index 73d89155e28..689223e3148 100644
--- a/pkgs/desktops/kde-4.10/kdebindings/perlqt.nix
+++ b/pkgs/desktops/kde-4.10/kdebindings/perlqt.nix
@@ -5,12 +5,6 @@ kde {
   buildInputs = [ smokeqt perl ];
   nativeBuildInputs = [ cmake ];
 
-  patches =
-    # The order is important
-    [ ./perlqt-include-smokeqt.patch ./perlqt-rewrite-FindPerlMore.patch
-      ./perlqt-use-site-arch-install-dir.patch
-    ];
-
   meta = {
     description = "Perl bindings for Qt library";
   };
diff --git a/pkgs/desktops/kde-4.10/kdebindings/qtruby-include-smokeqt.patch b/pkgs/desktops/kde-4.10/kdebindings/qtruby-include-smokeqt.patch
deleted file mode 100644
index 7d20a3c1c0b..00000000000
--- a/pkgs/desktops/kde-4.10/kdebindings/qtruby-include-smokeqt.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 33078b4..1a6ad2e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,7 +5,7 @@ set(COMPILE_RUBY FALSE CACHE INTERNAL "")
- find_package(Ruby REQUIRED)
- find_package(Qt4 REQUIRED)
- find_package(Smoke COMPONENTS QtCore QtGui QtXml QtOpenGl QtSql QtNetwork QtDbus QtSvg Phonon QSci QtDeclarative QtScript QtWebkit QtUiTools QtTest Qwt)
--include_directories(${SMOKE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES})
-+include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES})
- 
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SMOKE_CMAKE_MODULE_DIR})
- include(MacroOptionalFindPackage)
diff --git a/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix
index 29faf2af15c..18a3703426c 100644
--- a/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix
+++ b/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix
@@ -5,9 +5,7 @@ kde {
   buildInputs = [ smokeqt ruby ];
   nativeBuildInputs = [ cmake ];
 
-  # The second patch is not ready for upstream submmission. I should add an
-  # option() instead.
-  patches = [ ./qtruby-include-smokeqt.patch ./qtruby-install-prefix.patch ];
+  patches = [ ./qtruby-install-prefix.patch ];
 
   cmakeFlags="-DRUBY_ROOT_DIR=${ruby}";
 
diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.10/kdebindings/smokegen-CMakeLists.txt-nix.patch
new file mode 100644
index 00000000000..33ec3df6452
--- /dev/null
+++ b/pkgs/desktops/kde-4.10/kdebindings/smokegen-CMakeLists.txt-nix.patch
@@ -0,0 +1,14 @@
+--- smokegen-4.10.5.orig/CMakeLists.txt 2013-06-28 17:14:50.000000000 +0000
++++ smokegen-4.10.5/CMakeLists.txt      2013-07-31 19:15:17.000000000 +0000
+@@ -36,6 +36,10 @@
+ set (CMAKE_SKIP_BUILD_RPATH FALSE)
+ set (CMAKE_SKIP_RPATH FALSE)
+
++# add the automatically determined parts of the RPATH
++# which point to directories outside the build tree to the install RPATH
++SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++
+ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
+
+ add_executable(smokegen ${generator_SRC})
+
diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen-SmokeConfig.cmake.in-nix.patch b/pkgs/desktops/kde-4.10/kdebindings/smokegen-SmokeConfig.cmake.in-nix.patch
new file mode 100644
index 00000000000..53257e836e0
--- /dev/null
+++ b/pkgs/desktops/kde-4.10/kdebindings/smokegen-SmokeConfig.cmake.in-nix.patch
@@ -0,0 +1,13 @@
+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@")
+ 
+ find_library(SMOKE_BASE_LIBRARY smokebase 
+-              PATHS "@SMOKE_LIBRARY_PREFIX@"
+-              NO_DEFAULT_PATH)
++              PATHS "@SMOKE_LIBRARY_PREFIX@")
+ 
+ if (NOT SMOKE_BASE_LIBRARY)
+     if (Smoke_FIND_REQUIRED)
diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch
deleted file mode 100644
index 03df484b63e..00000000000
--- a/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
- )
- 
--# 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 )
- 
- 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)
diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix
index 8b5da2a641d..0a3f2a85efa 100644
--- a/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix
+++ b/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix
@@ -4,7 +4,7 @@ kde {
   buildInputs = [ qt4 ];
   nativeBuildInputs = [ cmake ];
 
-  patches = [ ./smokegen-nix.patch ];
+  patches = [ ./smokegen-SmokeConfig.cmake.in-nix.patch ./smokegen-CMakeLists.txt-nix.patch ];
 
   meta = {
     description = "C++ parser used to generate language bindings for Qt/KDE";
diff --git a/pkgs/desktops/kde-4.10/kdeedu/cantor.nix b/pkgs/desktops/kde-4.10/kdeedu/cantor.nix
index d2a1b095b82..4563012ac67 100644
--- a/pkgs/desktops/kde-4.10/kdeedu/cantor.nix
+++ b/pkgs/desktops/kde-4.10/kdeedu/cantor.nix
@@ -1,7 +1,7 @@
-{ kde, kdelibs, libspectre, analitza, rLang, pkgconfig, gfortran, libqalculate }:
+{ kde, kdelibs, libspectre, analitza, R, pkgconfig, gfortran, libqalculate }:
 kde {
 
-  buildInputs = [ kdelibs libspectre analitza rLang gfortran libqalculate];
+  buildInputs = [ kdelibs libspectre analitza R gfortran libqalculate];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/filesharing.nix b/pkgs/desktops/kde-4.10/kdenetwork/filesharing.nix
deleted file mode 100644
index 2f32f4d6b2c..00000000000
--- a/pkgs/desktops/kde-4.10/kdenetwork/filesharing.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix
similarity index 100%
rename from pkgs/desktops/kde-4.7/kdeadmin/kcron.nix
rename to pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kfile-plugins.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix
similarity index 53%
rename from pkgs/desktops/kde-4.7/kdenetwork/kfile-plugins.nix
rename to pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix
index f90fd356079..ac28edb8dd9 100644
--- a/pkgs/desktops/kde-4.7/kdenetwork/kfile-plugins.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix
@@ -5,7 +5,5 @@ kde {
 
   buildInputs = [ kdelibs boost ];
 
-  preConfigure = "mv -v strigi-analyzer kfile-plugins";
-
-  patches = [ ./kdenetwork.patch ];
+  #preConfigure = "mv -v kdenetwork-strigi-analyzers kfile-plugins";
 }
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch
deleted file mode 100644
index ebadbfad9ba..00000000000
--- a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -r -u kdenetwork-4.7.1.orig/CMakeLists.txt kdenetwork-4.7.1/CMakeLists.txt
---- kdenetwork-4.7.1.orig/CMakeLists.txt	2011-03-29 15:25:42.174521812 +0400
-+++ kdenetwork-4.7.1/CMakeLists.txt	2011-03-29 15:27:43.268140322 +0400
-@@ -28,7 +28,8 @@
-    set(CMAKE_REQUIRED_INCLUDES  ${KDEWIN_INCLUDES} )
- endif (WIN32)
- 
--find_package(KdepimLibs REQUIRED)
-+macro_optional_find_package(KdepimLibs)
-+macro_log_feature(KDEPIMLIBS_FOUND "KDEPimLibs" "KDE pim-related libraries" "http://pim.kde.org.org/" FALSE "" "Required for Kopete")
- # find_package(X11VidMode) not used at this time
- 
- # NX support is not ready for KDE 4.2; disabled (uwolfer)
-@@ -79,7 +80,9 @@
- macro_optional_add_subdirectory(kfile-plugins)
- macro_optional_add_subdirectory(kget)
- 
--macro_optional_add_subdirectory(kopete)
-+if(KDEPIMLIBS_FOUND)
-+  macro_optional_add_subdirectory(kopete)
-+endif(KDEPIMLIBS_FOUND)
- 
- if(Q_WS_X11)
-   macro_optional_add_subdirectory(krdc)
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix
index 2f32f4d6b2c..bada0c1cb10 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix
@@ -2,6 +2,4 @@
 
 kde {
   buildInputs = [ kdelibs ];
-
-  patches = [ ./kdenetwork.patch ];
 }
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kfile-plugins.nix b/pkgs/desktops/kde-4.10/kdenetwork/kfile-plugins.nix
deleted file mode 100644
index f90fd356079..00000000000
--- a/pkgs/desktops/kde-4.10/kdenetwork/kfile-plugins.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, boost }:
-
-kde {
-  name = "strigi-analyzer-torrent";
-
-  buildInputs = [ kdelibs boost ];
-
-  preConfigure = "mv -v strigi-analyzer kfile-plugins";
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kget.nix b/pkgs/desktops/kde-4.10/kdenetwork/kget.nix
index 25028ef974e..d5f38096a42 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/kget.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kget.nix
@@ -4,14 +4,11 @@
 kde {
   buildInputs =
     [ kdelibs libktorrent
-#kde_workspace 
-shared_desktop_ontologies 
-#kdepimlibs
-#      kde_baseapps 
-gpgme boost libmms qca2 sqlite
+      kde_workspace
+      shared_desktop_ontologies
+      # kde_baseapps
+      gpgme boost libmms qca2 sqlite
     ];
 
   KDEDIRS = libktorrent;
-
-  patches = [ ./kdenetwork.patch ];
 }
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch
new file mode 100644
index 00000000000..ec003732344
--- /dev/null
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch
@@ -0,0 +1,22 @@
+diff --git a/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+index 88fdbd1..57c6c05 100644
+--- a/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
++++ b/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
+       LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
+       pt_ = i->id;
+       audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
+-      port2 = rtp_session_get_local_port(audio_stream_->session);
++      port2 = rtp_session_get_local_port(audio_stream_->ms.session);
+       first = false;
+     }
+   }
+@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
+     // working with a buggy client; let's try PCMU.
+     LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
+     audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
+-    port2 = rtp_session_get_local_port(audio_stream_->session);
++    port2 = rtp_session_get_local_port(audio_stream_->ms.session);
+   }
+ 
+   return true;
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch
new file mode 100644
index 00000000000..d6aa9515b76
--- /dev/null
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch
@@ -0,0 +1,47 @@
+diff --git a/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h b/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h
+--- a/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h
++++ b/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h
+@@ -25,16 +25,8 @@
+  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+-#ifndef __STUN_H__
+-#define __STUN_H__
+-
+-// This file contains classes for dealing with the STUN and TURN protocols.
+-// Both protocols use the same wire format.
+-
+-#include "talk/base/basictypes.h"
+-#include "talk/base/bytebuffer.h"
+-#include <string>
+-#include <vector>
++#ifndef STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX
++#define STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX
+ 
+ namespace cricket {
+ 
+@@ -55,6 +47,23 @@
+   STUN_DATA_INDICATION              = 0x0115
+ };
+ 
++}
++
++#endif // STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX
++
++#ifndef __STUN_H__
++#define __STUN_H__
++
++// This file contains classes for dealing with the STUN and TURN protocols.
++// Both protocols use the same wire format.
++
++#include "talk/base/basictypes.h"
++#include "talk/base/bytebuffer.h"
++#include <string>
++#include <vector>
++
++namespace cricket {
++
+ // These are the types of attributes defined in STUN & TURN.  Next to each is
+ // the name of the class (T is StunTAttribute) that implements that type.
+ enum StunAttributeType {
+
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
index 3907b67c42a..7139c62981c 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
@@ -18,6 +18,8 @@ kde {
   patchPhase =
     ''
       cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake
+      patch -p1 < ${./kopete-4.10.4-kopete-linphonemediaengine.patch}
+      patch -p1 < ${./kopete-4.10.4-kopete-stun.patch}
     '';
 
   cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix
index 2f32f4d6b2c..bada0c1cb10 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix
@@ -2,6 +2,4 @@
 
 kde {
   buildInputs = [ kdelibs ];
-
-  patches = [ ./kdenetwork.patch ];
 }
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix
index 1f3ba36aaa1..1b7405f1006 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix
@@ -1,8 +1,5 @@
 { kde, kdelibs, libvncserver, libjpeg }:
 
 kde {
-
   buildInputs = [ kdelibs libvncserver libjpeg ];
-
-  patches = [ ./kdenetwork.patch ];
 }
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix
index 80013f430d3..b6c36ea9c15 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix
@@ -1,7 +1,5 @@
-{ kde, kdelibs, libvncserver, libXdamage, libXtst }:
+{ kde, kdelibs, libvncserver, libXdamage, libXtst, libjpeg }:
 
 kde {
-  buildInputs = [ kdelibs libvncserver libXdamage libXtst];
-
-  patches = [ ./kdenetwork.patch ];
+  buildInputs = [ kdelibs libvncserver libXdamage libXtst libjpeg ];
 }
diff --git a/pkgs/desktops/kde-4.10/l10n/manifest-4.10.5.nix b/pkgs/desktops/kde-4.10/l10n/manifest-4.10.5.nix
new file mode 100644
index 00000000000..9862efe0b58
--- /dev/null
+++ b/pkgs/desktops/kde-4.10/l10n/manifest-4.10.5.nix
@@ -0,0 +1,282 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "0mxvp97sf1f6w2rfy966fdhpflqfmwv253zswaz3cv9b5m9yf5q8";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "0fk5r0bqnks1ygac6cs8f5gb16lr4qrh32jgdk50hnv6ad51agfv";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "10kc76l1fm56rhnc6wvm29ij15v2pvmsq1djvm6zxhsdm99af25k";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "0gn4ghvwwi09aibmx5940b159d7svnbcq25cg02lhvjvfrmyfp1j";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "175j2gn35vzjb17rbd0mvrxas180wq3v1x6q1caykm2qddqqmqgv";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "0zxa2cmcwdbdwgz5wm58v0gqzphcc1b1vzzgrrnpsmfjqb6h951c";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "0qab4gbilpb8fwyjqcvvmzms4hdbrii4xr5xgcl87v8va5gcdc8s";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "1vh9h185qa42q7gkyflp7g93hgvhxjd2cknwz0yq6dxsx8dg5iqd";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "1f8wsq9hh2d6wpd7v1bz5mchb1zjnc895mmpawy67rv6s45vx6y8";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "1nz7q6fq3242vjh2961r4v4kp1fywknnjrnfadgf3g0dvav2vkq8";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "1mazkh53vdvsz5zrx41fi49x44isibpwmrrqwcmpbcwdqx7iaf9v";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "0f7bi50gzrhnvif7c1h6mgscbbjvz0cqifdnaaqr9m7d9iafwwyz";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "0k0w849nqjsaxsi8rm4jd13fqcvk88v6j0yar36mvblh6x61qgq8";
+}
+{
+  lang = "fa";
+  saneName = "fa";
+  sha256 = "12fmd6zy14wsd2i1nszc4bl3q0asvf9wqsgwihxipw34fwa6irpv";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "0k76zlfjjz7vlvlz298713c27zbcybjip33wix76ldj7is9yb07v";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "03qxm8q3bvx4cqaxvfbdj07q2rpcwrqyp333x3jwmcc5xj731pww";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "09n5wpc4s2xxv1016dvg8zwbvx6lx6942lnyq3b4adl4yjcghs32";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "1w7hj6ma3d03wv2x651hwhxxc4ird23f0khc4z03ncpl9xvyikky";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "0jirch5cw99lcs9d83kzifb9wdqz1aqdjmi4wam0gi8nciws8hwr";
+}
+{
+  lang = "hi";
+  saneName = "hi";
+  sha256 = "02g0a4l1mlmx64acxfl6a1lqbivnwdfx98q8f9nyb3836i8i3sd7";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "087jww1daqqwrrxi1hz72kc39ipj6hj73cqzy4ds24hm112z58dc";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "1mwmbhnzvhxzcfk3j6f61jfprfwaan8mf9l4s7r8f3ddmsz66kha";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "0grmi972ndizf3gpjxjv79crc0si4b3dadayzmayrykndd5b30i6";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "13d8ikfhlswpaxrj9l6f0kf4dzbmgri5d3miz3r8h6lmmszq2phr";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "1m17wqak0alhkk81fhl32fcv0b2nnszjs7xia0df75z8c2js9vmm";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "1br0gipw4ra3bvzdal9dn8x8kldmmk4miw1z5hsimhkgc5y5amb3";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "0vmdfcy2dmxd6bjvz31xhjkxd2q55px70c9d6lj3fmf4bxiqlmc4";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "1snrn2yw7z2m0m3wqxgqrq1rxqnjb4ylngdnn0ym87yh7bh6kjsc";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "1dyymy3wdldmkxai47y25qzpcajsi18h4rl0m1izm90giwadrk85";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "1im120mlnvjdlh5gna9q0qfixg2zz2shhzbxih37ikzpjxr7v5zs";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "07303s04qkh7pa78ranvcvqs75wll427vdb0iv6sr07smd0fzf1d";
+}
+{
+  lang = "mr";
+  saneName = "mr";
+  sha256 = "1dzzzc3wkjhapmdlbp178w6rm00ibixmp4xhkbsavr7hy18a048c";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "039gi1ba8z9w80b6xsh3b51alq91d4phr6pmfnaqngwqmaksxidh";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "0bg55dl284y7wvcl40sgspnvpfiqkapvwwi02n4jyl3w4xsy3b8j";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "048pr21vfcwvfxpw56kil4awmx7samva4jd86g6rvrs6q85c0mxj";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "10xy5r3s79gh28zzy72dhs79ap616qnrqms3mgg9kdvmmi2n32nm";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "08ib4pbahgjww4d82vcgahc7jxky85riim1p0ck5dzhri0664zx8";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "0kqr4jvqsyasdacv0kxjcx5nfd6m0kd1vk7418mzbabjyb2nbvl1";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "0nfnwcq2n5dp721wi7arp3via0kvhf3rfq8h78k9dqs5afyhf4n1";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "1886fga94c7zp0g1hdijqj64mi8asgbmykic6n0mzin33c4rwyjs";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "0q51v23dviwrgy1zaq3823xh2vfm2zvkpqizgmi111m681s0n4kx";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "0mm8mfqlfbj0r2d4xyli2n8x8sgpw2bjxnlq8yy38pgi9pksgcsl";
+}
+{
+  lang = "si";
+  saneName = "si";
+  sha256 = "0qcvdil9gbgwf10v4j606d0vi4705vb77aq7p1kq3y57khldlhsa";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "1rmxh12r7i9cc7nkigxx6igvzjjq1rk3y5nm2mdjq7gcv067gp9i";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "0xdd5ini0b0fi5xfai533y8a5g8gyphfrz6qvivpgdd81rfckpk1";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "09rfcrw58f0bvqqkdcpiy56xv591yk6v0iinlabamza63h011rmk";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "1slznfn6ghqy5cy870apwgcygdhvbfvh1dy6rplhwnv0riwnx3ay";
+}
+{
+  lang = "tg";
+  saneName = "tg";
+  sha256 = "12ic6nd65l6w7vqymfr1djbkn8jfghc5vyyi783mdf3pwx3xjk8i";
+}
+{
+  lang = "th";
+  saneName = "th";
+  sha256 = "0v02h8gdwnabahb3invxvp2ap5x6b4a0pf0sl15phi8s2m1y9fad";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "10asd6ha7fjs4b11vp27xp1piycalvidv3l6z5sv9j5bs4hayp1g";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "11n6z1d2b2b93lj9vps4ry6k671m5lssrv4hi5nr0a1vbc1d6ix1";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "1lrghs0s3hmhmrqarsc29518ax95wz6gnhimxs8lyc88b4jil0p5";
+}
+{
+  lang = "vi";
+  saneName = "vi";
+  sha256 = "198rr7i673a77v3qlld1c0rm2vr86rr6nf97v4wckcvyz8b6s6i8";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "01glzj5vhhmv6zvrmwd4wwx0bq6b0p08ixx0rf3bh4pdbi42hiin";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "0cj8flr5c73crrwchfz3j60snzmvbr3bc1p4pnk4s3vajmwsdaas";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "0lc896x55ww3s5jz7ms0gmm22qq9yjpnbzbjfq64574pvr2m3s5y";
+}
+]
diff --git a/pkgs/desktops/kde-4.10/oxygen-icons.nix b/pkgs/desktops/kde-4.10/oxygen-icons.nix
index 373f2c7b5ac..adee87c8316 100644
--- a/pkgs/desktops/kde-4.10/oxygen-icons.nix
+++ b/pkgs/desktops/kde-4.10/oxygen-icons.nix
@@ -3,7 +3,7 @@
 kde {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "0nl3praln6kfdpr4diln850f29242496p5yrfcyq6xjkpsswq55w";
+  outputHash = "1aad2qb9zrjcild5s584q4zz6zc3wgkclv79gnfwkhmy0viqx9l6";
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
deleted file mode 100644
index 428e1370635..00000000000
--- a/pkgs/desktops/kde-4.7/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ callPackage, callPackageOrig, stdenv, qt48 }:
-
-let
-  release = "4.7.4";
-
-  # Need callPackageOrig to avoid infinite cycle
-  kde = callPackageOrig ./kde-package {
-    inherit release ignoreList extraSubpkgs callPackage;
-  };
-
-  # The list of igored individual modules
-  ignoreList = {
-    # kdeadmin/strigi-analyzer has no real code
-    kdeadmin = [ "strigi-analyzer" ];
-    # kdesdk/kioslave is splitted into kioslave-svn and kioslave-git
-    kdesdk = [ "kioslave" ];
-    # Most of kdebindings do not compile due to a bug in the buildsystem
-    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "perlqt"
-      "qtruby" "qyoto" "smokekde" ];
-  };
-
-  # Extra subpackages in the manifest format
-  extraSubpkgs = {
-    kdesdk =
-      [
-      {
-        name = "kioslave-svn";
-        sane = "kioslave_svn";
-        subdir = "kioslave";
-      }
-      {
-        name = "kioslave-perldoc";
-        sane = "kioslave_perldoc";
-        subdir = "kioslave";
-      }
-      ];
-  };
-
-in
-
-kde.modules // kde.individual //
-{
-  inherit (kde) manifest modules individual splittedModuleList;
-
-  akonadi = callPackage ./support/akonadi { };
-
-  qt4 = qt48;
-
-  kdebase_workspace = kde.modules.kde_workspace;
-
-  inherit release;
-
-  full = stdenv.lib.attrValues kde.modules;
-
-  l10n = callPackage ./l10n {
-    inherit release;
-    inherit (kde.manifest) stable;
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch
deleted file mode 100644
index 378cdb64694..00000000000
--- a/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3d3e247..f78db67 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,10 @@
--find_package(KDE4 REQUIRED)
--include(KDE4Defaults)
-+project(kde-wallpapers NONE)
-+if( WALLPAPER_INSTALL_DIR )
-+  message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}")
-+else()
-+  find_package(KDE4 REQUIRED)
-+  include(KDE4Defaults)
-+endif()
- 
- install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)
- 
diff --git a/pkgs/desktops/kde-4.7/files/polkit-install.patch b/pkgs/desktops/kde-4.7/files/polkit-install.patch
deleted file mode 100644
index d2ecac663ec..00000000000
--- a/pkgs/desktops/kde-4.7/files/polkit-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
-+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
-@@ -139,7 +139,7 @@
-         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
-         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- 
--    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
-+    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
-         "Where policy files generated by KAuth will be installed" FORCE)
- elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
-     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/desktops/kde-4.7/kde-baseapps/kate.nix b/pkgs/desktops/kde-4.7/kde-baseapps/kate.nix
deleted file mode 100644
index 1ffbcf9ebf9..00000000000
--- a/pkgs/desktops/kde-4.7/kde-baseapps/kate.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix
deleted file mode 100644
index 45192e0c460..00000000000
--- a/pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, shared_desktop_ontologies, glib, htmlTidy }:
-
-kde {
-  buildInputs = [ kdelibs shared_desktop_ontologies glib htmlTidy ];
-
-  meta = {
-    description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix b/pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix
deleted file mode 100644
index 87ac24972bd..00000000000
--- a/pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Konsole, the KDE terminal emulator";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kde-package/4.7.4.nix b/pkgs/desktops/kde-4.7/kde-package/4.7.4.nix
deleted file mode 100644
index 9a816b72cc6..00000000000
--- a/pkgs/desktops/kde-4.7/kde-package/4.7.4.nix
+++ /dev/null
@@ -1,273 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="blinken";value="16daqg0bbkci305qrcrvpv66cvshjfni5rf5gakblcn8qqlmwsi6";}
-  {name="cantor";value="0wgm0j9bl632bk94fi0hzp5s392xpyz0d524ahhi8q33bqkl06ra";}
-  {name="gwenview";value="1dhpb7q0myr9rl4bjsajq0kslvhxcddv1ddplqad63j619wk8gfj";}
-  {name="kalgebra";value="04g07syrk14kpr15f9kgfkkmkjgdvcwmrykmy56jwm8sfb6ncli9";}
-  {name="kalzium";value="0k25cinwp6yjp8q9irmwcb1ahf98ck3mw706jfpybpa7ds8ym5z1";}
-  {name="kamera";value="0airyhxzpnvpzag4w0q1h0pc1lwwplglki5max1mj5miaxg93r34";}
-  {name="kanagram";value="0271aq39dbs92rhc83m19pmm7rx5c573k27931sf3j3pw3x2q0nm";}
-  {name="kate";value="0pfddi7g99apqipnqv62i86ld11vl4igqv65xprqqf0a5a1413my";}
-  {name="kbruch";value="1dhhk55d3bs474l2w0xma89pq74gklq5faskrvd1lvvl853z3zib";}
-  {name="kcolorchooser";value="1gb861f1fy0fvmkg30l1gza998gyhjwj4gcyyv266wp5v7d01xda";}
-  {name="kdeaccessibility";value="12mvs1hy5ygnbbz14hg2fvs7mpvlamkfbz7g7kcvzp0fkjb524h3";}
-  {name="kdeadmin";value="16y73zpdgh72cf8yz8zn246i4d8nh4k6mbz9cbc4ggjblgjcn3pr";}
-  {name="kdeartwork";value="0vfz9mzpm8yy6fysmhcavd8l1fjcld36p0x9qymi4l072b7dkgyv";}
-  {name="kde-baseapps";value="075m3nn407di2mx8w5lv7va3ij0yd7yb575wmf05vfqr01xyhn8a";}
-  {name="kdegames";value="0c42wyk2mq3hz99zg4f9i2dbc9vyaa5l2301j0859pwvnp9zgafz";}
-  {name="kdegraphics-strigi-analyzer";value="1j7chf76mlwrq7z1dgm525f5srx1h30czm8dnw2f0yxfn18lvnl9";}
-  {name="kdegraphics-thumbnailers";value="1ny51jc8fm4gldrlmrfmslpfpn5pahlyws3jzaj6nkd3hdw3krnr";}
-  {name="kdelibs";value="0fdgl8qvpyb9pmb26b3yjfm9ib75mxayw75qm5kyzncmrvn427gy";}
-  {name="kdemultimedia";value="0a0vp1pq159lzgd0x817p9mf6al99w1dwnlyhs9zfpspgz8nw8y1";}
-  {name="kdenetwork";value="0zwqbyl5vw5nnzlilc4khlisjj1xjpziw9ahgvw8cbszscmv68b5";}
-  {name="kdepim";value="0s38qxks58dmwyi3fnvprpq5q9kr17v31n808j33d50rw62y398p";}
-  {name="kdepimlibs";value="0rpfkc0pxvfkaz8pb3yx21dm3ixw8gfrcdny1aqzbn3f7f8abhip";}
-  {name="kdepim-runtime";value="14p5bxrhqjnmz303hxlrdj4vxlmiv8j04qni33ljbgib0hnllva3";}
-  {name="kdeplasma-addons";value="068m2jpyprrscyk3f4nk9qix5smka5pq59sdwdan9996sh256py5";}
-  {name="kde-runtime";value="06nxv46s7ff5n3kmzq3mdc16b0ck0411lj0gf3scdyd85iqx06wd";}
-  {name="kdesdk";value="0v3gwml9rvqz96q8jk8myqvl6gjw3q37js2jn24yawli3sjjw552";}
-  {name="kdetoys";value="17fk1bmabgj9nz0m4j248f48m2xfscql43wmzkqnr7y6zghqfhfh";}
-  {name="kdeutils";value="0s1whgg59xnc6ny609s3vjzvpxak02f2y6v7zw72i808k03aal5v";}
-  {name="kde-wallpapers";value="133amrhhca4xi0gbmajcc6rw1c1ai5x29265fqp45588kyycbgvz";}
-  {name="kdewebdev";value="1nqp2j09nr3jhmfvjydwp86jz4nn5pxwcfi6ww9krfd1hyg4aqjc";}
-  {name="kde-workspace";value="1dj39nndpws9grinz287ypn5lj3zjh96gl4zhl7kp6z8f9mdqp0p";}
-  {name="kgamma";value="05vk5b40w0i75nx5lqn9qax10m604jkjxyxynm0i0b8gyksv78h9";}
-  {name="kgeography";value="1a49zqz8zb9kn7m4m5fsm5ibvn9m5pzq89isrd1yy9q7zlv3qfqc";}
-  {name="khangman";value="1bmzrc5jzbw9q9gxw9pzad37zj4h89rh3k4smycif6ky2jy72x6d";}
-  {name="kig";value="1s0mwnj2riam811l0nfk08ja43f0nibqaqchy2ff7627w22yr5m0";}
-  {name="kimono";value="1cbbchdj4x5sn6ldkmzrx5alhvgzgbprvyjpg1rcsfnyc6whp2p9";}
-  {name="kiten";value="13bcw1r39h0g75vwbyrsh8sb27vmqsbrmx2ay621ily4iy3jn5az";}
-  {name="klettres";value="1wczh41wq3w5ccy2yi4pqr3zk4v0wiy4slcn54a8bfi1b5s1267j";}
-  {name="kmplot";value="0dx5gnya008q7smf74fvygwfsa0hc2ajiznvdmf4qmm3s5bxpbrr";}
-  {name="kolourpaint";value="14zrh321av5f5i8a4bjj7xb1sqfcphzhc5qyg2w54cywaiswy8nx";}
-  {name="konsole";value="1wq2k8g6in86x72jzhz4ar8ba5lyjp0pia969wxa6b1vsj148ipy";}
-  {name="korundum";value="024daf05c9l83whcy0cfgxb3s24ci038kg1pnxlzz4z9sk39432r";}
-  {name="kross-interpreters";value="1kkg4w3id2g7nr89kjdgyy9hik75dnxlm6jmn3g8ilqdvw5ip1qx";}
-  {name="kruler";value="0wd805w2k1ask9l44z50jcd033zkbaxs3xd3w21qrwdvs52x8m41";}
-  {name="ksaneplugin";value="1rxpl6f5b0ld5ap6aag892rjd7r74szbzd6lqw8q8gzm6jmk34gq";}
-  {name="ksnapshot";value="0dn99b6qr4b4hc3c88m26axmb3jim836ig3mfgqpban9r7k15xci";}
-  {name="kstars";value="0zrw4rlfm5cwfbj884zn50sdp90zjg7inl9k2zj450dpvh7i6q3q";}
-  {name="ktouch";value="0vbzr69jbci058bcphf9i3fh40hwgrmcyj1n4gj90gwr4x2ha5hp";}
-  {name="kturtle";value="0mhg2b1jbywafnj93274yimvnaxivycqj98pvld3hppaq32f7vzp";}
-  {name="kwordquiz";value="0kfa83a91w8z39r55456i1vn85pb4dqrbav40sx5fhjb03iyrsdk";}
-  {name="libkdcraw";value="14y8ni9w441zx1k2fhcbnzpa1vcmpvk58mjdqrqvn8n630cy0hzn";}
-  {name="libkdeedu";value="1ga88g5s8mq1m8xwmhl09ylrnl8sw639cpah6wi8wwnqslj2zj0a";}
-  {name="libkexiv2";value="0w8mpjsiw2sr8ya7ffnvnprbsbi8ngpxrcxylgw617zcxpxky6ha";}
-  {name="libkipi";value="01fivyyg5jhnkn9r7bh96ygxvnh7a99h11wh228wk8nzx3i63lsc";}
-  {name="libksane";value="0bb26ajfmknxf4hdy513zx1q9j0hzrs0dr98vxmrwfxxbza67fbm";}
-  {name="marble";value="02yljp6lmqs753zkqpaz58zlrjjxydx9pizppzwjvjx8xk63b9z6";}
-  {name="mobipocket";value="0m08j4cdj2sr1xw3hi0zy651c2ap0q8y9s913r6ccm0f292n0856";}
-  {name="okular";value="03x1fgdnz0s17wj3pkdp77rqrbbb6ssgq0ly493pbi1x4lx768ib";}
-  {name="oxygen-icons";value="0ayx0y2swdcgz4wd1idkhm3gbixkn4mw89f1hrhrdvc6j7wdn2dj";}
-  {name="parley";value="0wgps4adiwaq3l471ig9j56vm7p2xf37779nlhfzavby622lyv8q";}
-  {name="perlkde";value="1psa8ca2ynmavhmbh5p8bgxiljiqj6figi3cmvkaa7ksnmg2p9a3";}
-  {name="perlqt";value="1v12vx46kmg9cgld7krphcqp97y0py1bc3s2gd6jbz5j48g1wznb";}
-  {name="pykde4";value="07c7rzi0rzafrh92m57ldz3v66v8996zqpgcqn351jfycwccg7pz";}
-  {name="qtruby";value="05j08dfqbqnj92k9n70x8yiiaxyk6p9sk3lwm8w8nhsxdciq8yny";}
-  {name="qyoto";value="1maq0c6qb618jiqrdfp4imq3x7x5rdgf80wbrsf8wmaz3iwg18jz";}
-  {name="rocs";value="0qqzfxas64jz95v8i0birbcp0azk01jx5ic6pny7szngwrms6k34";}
-  {name="smokegen";value="0rdaxss113l80gmzp71ngp1l07nn2ip5nhk0a3mmjkvd08i507i8";}
-  {name="smokekde";value="0cxd5y1i672wc295m2czvp5jry1lmvv88dkipd97368gxsqzd3q8";}
-  {name="smokeqt";value="0ll1q87y1sdmna4iac61cm6sn7imsfvcfq573cj7f5raqn08gbpf";}
-  {name="step";value="000a0hc45znshwrjsydrf05f5rwn7lmaiqbk65py827fgk67qkyb";}
-  {name="svgpart";value="056h2ynbl6ylfpf5a2l0qjasnicwx2yzizgd21pprzl9n7708zcw";}
-];
-modules=[
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
-    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
-    { name="kgamma";  }
-    { name="kolourpaint";  }
-    { name="kruler";  }
-    { name="ksaneplugin";  }
-    { name="ksnapshot";  }
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="libkipi";  }
-    { name="libksane";  }
-    { name="mobipocket";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="blinken";  }
-    { name="cantor";  }
-    { name="kalgebra";  }
-    { name="kalzium";  }
-    { name="kanagram";  }
-    { name="kbruch";  }
-    { name="kgeography";  }
-    { name="khangman";  }
-    { name="kig";  }
-    { name="kiten";  }
-    { name="klettres";  }
-    { name="kmplot";  }
-    { name="kstars";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
-    { name="marble";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="kimono";  }
-    { name="korundum";  }
-    { name="kross-interpreters"; sane="kross_interpreters"; }
-    { name="perlkde";  }
-    { name="perlqt";  }
-    { name="pykde4";  }
-    { name="qtruby";  }
-    { name="qyoto";  }
-    { name="smokegen";  }
-    { name="smokekde";  }
-    { name="smokeqt";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-    { name="konsole";  }
-  ];
-}
-{ module="kdeaccessibility";  split=false;
-  pkgs=[
-    { name="kaccessible"; }
-    { name="kmag"; }
-    { name="kmouth"; }
-    { name="kmousetool"; }
-    { name="jovie"; }
-  ];
-
-}
-{ module="kdeadmin";  split=false;
-  pkgs=[
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kuser"; }
-    { name="kcron"; }
-    { name="ksystemlog"; }
-    { name="system-config-printer-kde"; sane="system_config_printer_kde";}
-  ];
-
-}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="sounds"; }
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-    { name="aurorae"; }
-  ];
-
-}
-{ module="kdegames";  split=false;}
-{ module="kdelibs";  split=false;}
-{ module="kdemultimedia";  split=false;}
-{ module="kdenetwork";  split=false;
-  pkgs=[
-    { name="kfile-plugins"; sane="kfile_plugins";}
-    { name="kget"; }
-    { name="kopete"; }
-    { name="krdc"; }
-    { name="kppp"; }
-    { name="krfb"; }
-    { name="kdnssd"; }
-    { name="filesharing"; }
-  ];
-
-}
-{ module="kdepim";  split=false;}
-{ module="kdepimlibs";  split=false;}
-{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
-{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
-{ module="kde-runtime"; sane="kde_runtime"; split=false;}
-{ module="kdesdk";  split=false;
-  pkgs=[
-    { name="cervisia"; }
-    { name="lokalize"; }
-    { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";}
-    { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
-    { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
-    { name="kcachegrind"; }
-    { name="kapptemplate"; }
-    { name="kpartloader"; }
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kioslave"; }
-    { name="okteta"; }
-    { name="kmtrace"; }
-    { name="kompare"; }
-    { name="kprofilemethod"; }
-    { name="kstartperf"; }
-    { name="kuiviewer"; }
-    { name="poxml"; }
-    { name="scripts"; }
-    { name="umbrello"; }
-  ];
-
-}
-{ module="kdetoys";  split=false;
-  pkgs=[
-    { name="kteatime"; }
-    { name="ktux"; }
-    { name="amor"; }
-  ];
-
-}
-{ module="kdeutils";  split=false;
-  pkgs=[
-    { name="ark"; }
-    { name="kcalc"; }
-    { name="kremotecontrol"; }
-    { name="kdf"; }
-    { name="kfloppy"; }
-    { name="printer-applet"; sane="printer_applet";}
-    { name="filelight"; }
-    { name="kcharselect"; }
-    { name="kgpg"; }
-    { name="ktimer"; }
-    { name="kwallet"; }
-    { name="sweeper"; }
-    { name="superkaramba"; }
-  ];
-
-}
-{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
-{ module="kdewebdev";  split=false;
-  pkgs=[
-    { name="klinkstatus"; }
-    { name="kfilereplace"; }
-    { name="kimagemapeditor"; }
-    { name="kommander"; }
-  ];
-
-}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
-{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
-];
-}
diff --git a/pkgs/desktops/kde-4.7/kde-package/default.nix b/pkgs/desktops/kde-4.7/kde-package/default.nix
deleted file mode 100644
index 38713de5820..00000000000
--- a/pkgs/desktops/kde-4.7/kde-package/default.nix
+++ /dev/null
@@ -1,127 +0,0 @@
-{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
-, release, ignoreList, extraSubpkgs
-}:
-
-let
-  inherit (stdenv.lib) filter fold;
-  inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
-in
-rec {
-  manifest = import (./. + "/${release}.nix");
-
-  # src attribute for $name tarball
-  kdesrc = name: fetchurl {
-    url = "mirror://kde/" + (if manifest.stable then "" else "un")
-      + "stable/${release}/src/${name}-${release}.tar.bz2";
-    sha256 = getAttr name manifest.hashes;
-  };
-
-  # Default meta attribute
-  defMeta = {
-    homepage = http://www.kde.org;
-    inherit (qt4.meta) platforms maintainers;
-  };
-
-  # KDE package built from the whole tarball
-  # This function is used both for monolithic modules and modules which are
-  # released as individual tarballs
-  kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}:
-    stdenv.mkDerivation ({
-      name = "${name}-${release}";
-      src = kdesrc name;
-      meta = defMeta // meta;
-      enableParallelBuilding = true;
-    } // (removeAttrs a [ "meta" "name" ]));
-
-  # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
-  # API.
-  kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
-
-  # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.bz2
-  kdeSubdirPkg = module:
-    {name, subdir ? name, sane ? name}:
-    let name_ = name; in
-    a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}:
-    stdenv.mkDerivation ({
-      name = "${name}-${release}";
-      src = kdesrc module;
-      cmakeFlags =
-        [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
-          "-DBUILD_doc=TRUE"
-          "-DBUILD_${subdir}=TRUE"
-        ] ++ cmakeFlags;
-      meta = defMeta // meta;
-      enableParallelBuilding = true;
-    } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
-
-  # A KDE monolithic module
-  kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
-
-  # Combine packages in one module.
-  # Arguments:
-  #  * pkgFun --- a function of the following signature:
-  #               module: manifest_attrs: manual_attrs: derivation;
-  #  * module --- name of the module
-  #  * pkgs --- list of packages in manifest format
-  combinePkgs = pkgFun: module: pkgs:
-    let
-      f = p@{name, ...}:
-        callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; };
-      list = map f pkgs;
-      attrs = listToAttrs (map
-        ({name, sane ? name, ...}@p: { name = sane; value = f p; })
-        pkgs);
-    in
-      runCommand "${module}-${release}"
-      ({passthru = attrs // {
-         propagatedUserEnvPackages = list;
-         projects = attrs;
-       };})
-        ''
-          mkdir -pv $out/nix-support
-          echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
-        '';
-
-  # Given manifest module data, return the module
-  kdeModule = { module, sane ? module, split, pkgs ? [] }:
-    let
-      pkgs_ = filterPkgs module pkgs;
-    in
-    # Module is splitted by upstream
-    if split then combinePkgs kdeSplittedPkg module pkgs_
-    # Monolithic module
-    else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix")
-    # Module is splitted by us
-    else combinePkgs kdeSubdirPkg module pkgs_;
-
-  # The same, as nameValuePair with sane name
-  kdeModuleNV = a@{ module, sane ? module, ... }:
-    { name = sane; value = kdeModule a; };
-
-  filterPkgs = module: (p:
-      removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p
-      ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs));
-
-  # Remove attrsets with x.name in subst. Optimized for empty subst.
-  removeNames = subst: big:
-    fold (s: out: filter (x: x.name != s) out) big subst;
-
-  modules = listToAttrs (map kdeModuleNV manifest.modules);
-
-  splittedModuleList =
-    let
-      splitted = filter (a: a ? pkgs) manifest.modules;
-      names = map ({module, sane ? module, ...}: sane) splitted;
-    in
-    map (m: m.projects) (stdenv.lib.attrVals names modules);
-
-  individual =
-    stdenv.lib.zipAttrsWith
-    (
-      name: list:
-      if tail list == []
-      then head list
-      else abort "Multiple modules define ${name}"
-    )
-    splittedModuleList;
-}
diff --git a/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
deleted file mode 100755
index 910394fb6a3..00000000000
--- a/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh
+++ /dev/null
@@ -1,145 +0,0 @@
-#! /bin/sh
-
-# Usage: download kde release to $dir, then run
-# $0 $dir
-
-dir="$1"
-
-# Detect release number & whether it is a stable release
-if [[ ! -d "${dir}" ]]; then
-  echo "${dir} is not a directory (or doesn't exist)!" >&2
-  exit 1
-fi
-
-release=$(ls "${dir}"/kdelibs-*.tar.bz2 | \
-  sed -e 's/.*kdelibs-//' -e 's/\.tar\.bz2//')
-
-if [[ ${release##*.} -gt 50 ]]; then
-  stable="false"
-else
-  stable="true"
-fi
-
-echo "Detected release ${release}" >&2
-
-declare -A hash
-declare -A modules
-declare -a packages
-declare -a top_level
-
-# xsltproc output declares -A module
-if [[ ! -f kde_projects.xml ]]; then
-  curl -O -J http://projects.kde.org/kde_projects.xml
-fi
-eval `xsltproc kde-submodules.xslt kde_projects.xml`
-
-module[kde-baseapps]=kde-baseapps
-
-print_sane() {
-  echo "Called print_sane $1" >&2
-  sane="${1//[^a-z0-9_]/_}"
-  if [[ "$sane" != "$1" ]]; then
-    echo "Sane version is $sane" >&2
-    echo -n "sane=\"$sane\";"
-  fi
-}
-
-for i in `cd "${dir}"; ls *-${release}.tar.bz2`; do
-  package=${i%-${release}.tar.bz2}
-  packages+=( "$package" )
-  echo -n "${package}.. " >&2
-  hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo -n ${hash[$package]} >&2
-
-  if [ -n "${module[$package]}" ]; then
-    m="${module[$package]}"
-    echo " (${m})" >&2
-    modules[$m]=1
-  else
-    top_level+=( "$package" )
-    echo " (top-level)" >&2
-  fi
-  #nix-store --add-fixed sha256 "${dir}/${i}" >&2
-done
-
-
-print_pkg_hash() {
-  echo "  {name=\"${1}\";value=\"${hash[$1]}\";}"
-}
-
-print_hashes(){
-  echo "hashes=builtins.listToAttrs["
-  for p in "${packages[@]}"; do print_pkg_hash "$p"; done
-  echo "];"
-}
-
-print_split_module(){
-  echo -n "$1:" >&2
-  echo -e "{\n  module=\"$1\";"
-  print_sane "$1"
-  echo "  split=true;"
-  echo "  pkgs=["
-  for p in "${packages[@]}"; do
-    if [[ "${module[$p]}" == "$1" ]]; then
-      echo -n "    { name=\"$p\"; "
-      print_sane "$p"
-      echo " }"
-      echo -n " $p" >&2
-    fi
-  done
-  echo "  ];"
-  echo "}"
-  echo >&2
-}
-
-print_mono_module(){
-  echo -en "{ module=\"$1\"; "
-  print_sane "$1"
-  echo -n "$1 ... " >&2
-  echo -n " split=false;"
-  cml="$1-$release/CMakeLists.txt"
-  tar -xf "${dir}/$1-${release}.tar.bz2" "$cml"
-  if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
-    if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then
-      echo " is monolithic (has unconditionally added subdirs)" >&2
-    else
-      subdirs=( `grep '^[^#]*add_subdirectory' $cml |
-        sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
-        grep -v '\(doc\|cmake\)'` )
-      echo " seems splittable, subdirs: ${subdirs[*]}" >&2
-      echo -e "\n  pkgs=["
-      for s in "${subdirs[@]}"; do
-        echo -en "    {"
-		echo -n " name=\"${s//\//-}\"; "
-        print_sane "$s"
-        if [[ $s != "${s//\//-}" ]]; then
-          echo -n "subdir=\"$s\"; "
-        fi
-        echo "}"
-      done
-      echo -e "  ];\n"
-    fi
-  else
-    echo " is monolithic (has no subdirs)" >&2
-  fi
-  rm $cml
-  rmdir $1-$release
-  echo "}"
-}
-
-print_modules(){
-  echo "modules=["
-  echo "Printing modules splitted by upstream" >&2
-  for m in "${!modules[@]}"; do print_split_module "$m"; done
-  echo >&2
-  echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
-  for m in "${top_level[@]}"; do print_mono_module "$m"; done
-  echo "];"
-}
-
-echo "Writing ${release}.nix" >&2
-exec > "${release}.nix"
-echo "{stable=${stable};"
-print_hashes
-print_modules
-echo "}"
diff --git a/pkgs/desktops/kde-4.7/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.7/kde-package/kde-submodules.xslt
deleted file mode 100644
index 952a05a9d27..00000000000
--- a/pkgs/desktops/kde-4.7/kde-package/kde-submodules.xslt
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- xslt file for http://projects.kde.org/kde_projects.xml -->
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:output method="text" />
-	<xsl:template match="/">
-		<xsl:for-each select="kdeprojects/component[@identifier='kde']">
-			<xsl:text>declare -A module
</xsl:text>
-			<xsl:for-each select="module">
-				<xsl:variable name="module" select='@identifier' />
-				<xsl:for-each select=".//project[repo]">
-					<xsl:text>module["</xsl:text>
-					<xsl:value-of select='@identifier' />
-					<xsl:text>"]="</xsl:text>
-					<xsl:value-of select="$module" />
-					<xsl:text>"
</xsl:text>
-				</xsl:for-each>
-			</xsl:for-each>
-		</xsl:for-each>
-	</xsl:template>
-</xsl:stylesheet>
diff --git a/pkgs/desktops/kde-4.7/kde-runtime.nix b/pkgs/desktops/kde-4.7/kde-runtime.nix
deleted file mode 100644
index 9b25e77b083..00000000000
--- a/pkgs/desktops/kde-4.7/kde-runtime.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
-, libcanberra, virtuoso, samba, ntrack, libjpeg
-}:
-
-kde {
-  buildInputs =
-    [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica
-      samba (libcanberra.override { gtk = null; }) ntrack libjpeg
-    ];
-
-  passthru.propagatedUserEnvPackages = [ virtuoso ];
-
-  meta = {
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kde-wallpapers.nix b/pkgs/desktops/kde-4.7/kde-wallpapers.nix
deleted file mode 100644
index 57f2b643aa4..00000000000
--- a/pkgs/desktops/kde-4.7/kde-wallpapers.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake }:
-
-kde {
-  nativeBuildInputs = [ cmake ];
-
-  patches = [ ./files/kde-wallpapers-buildsystem.patch ];
-
-  cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
-
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "29f4e8b24435ee8c64affdc6250f59ed9f78445118fe0a4e216d89969dd2006b";
-
-  meta = {
-    description = "Wallpapers for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix
deleted file mode 100644
index 82730702989..00000000000
--- a/pkgs/desktops/kde-4.7/kde-workspace.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies
-, lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate
-, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi
-, pykde4, libjpeg, pkgconfig, libXft, libXxf86misc
-}:
-
-kde {
-
-  buildInputs =
-    [ kdelibs qimageblitz libdbusmenu_qt pykde4 libjpeg libXft libXxf86misc
-      xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
-      xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
-      xorg.libpthreadstubs
-      boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394
-      libusb python libqalculate kdepimlibs pam prison akonadi
-    ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  preConfigure =
-   ''
-     # Fix incorrect path to kde4-config.
-     substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
-
-     # Fix the path to the keyboard configuration files.
-     substituteInPlace kcontrol/keyboard/xkb_rules.cpp \
-       --replace /usr/share/X11 ${xkeyboard_config}/etc/X11
-   '';
-
-  enableParallelBuilding = false;
-  
-  meta = {
-    description = "KDE workspace components such as Plasma, Kwin and System Settings";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/jovie.nix
deleted file mode 100644
index d38c80c4c36..00000000000
--- a/pkgs/desktops/kde-4.7/kdeaccessibility/jovie.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
-  buildInputs = [ kdelibs speechd ];
-
-  meta = {
-    description = "Text-to-speech synthesis daemon";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/kaccessible.nix
deleted file mode 100644
index 98fae7c983f..00000000000
--- a/pkgs/desktops/kde-4.7/kdeaccessibility/kaccessible.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
-  buildInputs = [ kdelibs speechd ];
-
-  meta = {
-    description = "Bridge that provides accessibility services to applications";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/kmag.nix
deleted file mode 100644
index f3b27dacf67..00000000000
--- a/pkgs/desktops/kde-4.7/kdeaccessibility/kmag.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Screen magnifier for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix
deleted file mode 100644
index 8e0caa76ed9..00000000000
--- a/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libXtst, libXt }:
-
-kde {
-  buildInputs = [ kdelibs libXtst libXt ];
-
-  meta = {
-    description = "A program that clicks the mouse for you";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/kmouth.nix
deleted file mode 100644
index 4159501967c..00000000000
--- a/pkgs/desktops/kde-4.7/kdeaccessibility/kmouth.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A type-and-say front end for speech synthesizers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.7/kdeadmin/ksystemlog.nix
deleted file mode 100644
index bada0c1cb10..00000000000
--- a/pkgs/desktops/kde-4.7/kdeadmin/ksystemlog.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.7/kdeadmin/kuser.nix
deleted file mode 100644
index 571674a461a..00000000000
--- a/pkgs/desktops/kde-4.7/kdeadmin/kuser.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ kde, kdelibs, kdepimlibs }:
-
-kde {
-  buildInputs = [ kdelibs kdepimlibs ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdeadmin/system-config-printer-kde.nix b/pkgs/desktops/kde-4.7/kdeadmin/system-config-printer-kde.nix
deleted file mode 100644
index 2c462f67c15..00000000000
--- a/pkgs/desktops/kde-4.7/kdeadmin/system-config-printer-kde.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ kde, pkgconfig, pythonPackages, sip, pycups, pygobject, system_config_printer,
-  kdelibs, kdepimlibs, pykde4, cups, nettools }:
-
-let s_c_p = system_config_printer.override { withGUI = false; }; in
-kde {
-  buildInputs = [ kdelibs kdepimlibs pythonPackages.python pycups pykde4 sip
-    pygobject s_c_p ];
-
-  passthru = { system_config_printer = s_c_p; };
-
-  preConfigure =
-    ''
-      for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py; do
-        substituteInPlace $i \
-          --replace /usr/share/system-config-printer ${s_c_p}/share/system-config-printer \
-          --replace /usr/bin/cupstestppd ${cups}/bin/cupstestppd \
-          --replace /bin/hostname ${nettools}/bin/hostname
-      done
-    '';
-
-  postInstall =
-    ''
-      # Bake the required Python path into the printer configuration program.
-      res=
-      for i in $(IFS=:; echo $PYTHONPATH); do res="$res''${res:+,} '$i'"; done
-
-      sed -i $out/share/apps/system-config-printer-kde/system-config-printer-kde.py \
-          -e "1 a import sys\nsys.path = [$res] + sys.path"
-
-      mkdir -p $out/nix-support
-      echo ${pykde4} > $out/nix-support/propagated-user-env-packages
-    '';
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.7/kdeartwork/ColorSchemes.nix
deleted file mode 100644
index acccf66976f..00000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/ColorSchemes.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-color-schemes";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE color schemes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.7/kdeartwork/FindXscreensaver.cmake
deleted file mode 100644
index 499ed75268e..00000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/FindXscreensaver.cmake
+++ /dev/null
@@ -1,73 +0,0 @@
-#Macro to find xscreensaver directory
-
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT XSCREENSAVER_FOUND)
-  FIND_PATH(XSCREENSAVER_DIR deco
-    HINTS
-      ${KDE4_INCLUDE_DIR}
-    PATHS
-      /usr
-      /usr/local
-      /opt/local
-      /usr/X11R6
-      /opt/kde
-      /opt/kde3
-      /usr/kde
-      /usr/local/kde
-      /usr/local/xscreensaver
-      /usr/openwin/lib/xscreensaver
-      /etc
-    PATH_SUFFIXES
-      lib${LIB_SUFFIX}/xscreensaver
-      lib${LIB_SUFFIX}/misc/xscreensaver
-      lib/xscreensaver
-      lib64/xscreensaver
-      lib/misc/xscreensaver
-      libexec/xscreensaver
-      bin/xscreensaver-hacks
-      hacks)
-  message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
-
-  FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
-    PATHS
-    ${KDE4_INCLUDE_DIR}
-    /usr/
-    /usr/local/
-    /opt/local/
-    /usr/X11R6/
-    /opt/kde/
-    /opt/kde3/
-    /usr/kde/
-    /usr/local/kde/
-    /usr/openwin/lib/xscreensaver/
-    /etc/
-    PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
-  )
-  MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
-
-endif(NOT XSCREENSAVER_FOUND)
-
-#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
-#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
-
-# Need to fix hack
-if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-    set(XSCREENSAVER_FOUND TRUE)
-endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-
-if (XSCREENSAVER_FOUND)
-  if (NOT Xscreensaver_FIND_QUIETLY)
-    message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
-  endif (NOT Xscreensaver_FIND_QUIETLY)
-else (XSCREENSAVER_FOUND)
-  if (Xscreensaver_FIND_REQUIRED)
-    message(FATAL_ERROR "XScreenSaver not found")
-  endif (Xscreensaver_FIND_REQUIRED)
-endif (XSCREENSAVER_FOUND)
-
-
-MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.7/kdeartwork/HighResolutionWallpapers.nix
deleted file mode 100644
index edffca1562e..00000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/HighResolutionWallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-wallpapers-high-resolution";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE wallpapers in high resolution";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.7/kdeartwork/IconThemes.nix
deleted file mode 100644
index 43071e8bd14..00000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/IconThemes.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kdeartwork-icon-themes";
-
-  # Sources contain primary and kdeclassic as well but they're not installed
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE nuvola and mono icon themes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.7/kdeartwork/WeatherWallpapers.nix
deleted file mode 100644
index 947e5e17ab0..00000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/WeatherWallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-weather-wallpapers";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE wallpapers (weather)";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/aurorae.nix b/pkgs/desktops/kde-4.7/kdeartwork/aurorae.nix
deleted file mode 100644
index 4bce95217cc..00000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/aurorae.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "aurorae-themes";
-
-  buildInputs = [ kdelibs ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.7/kdeartwork/desktopthemes.nix
deleted file mode 100644
index 93dd361af73..00000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/desktopthemes.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-desktop-themes";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE desktop themes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.7/kdeartwork/emoticons.nix
deleted file mode 100644
index 5ef9f78a719..00000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/emoticons.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-emotion-icons";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE emotion icons (smiles)";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix
deleted file mode 100644
index 7028b9db228..00000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }:
-
-kde {
-  buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
-
-  cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ];
-
-  meta = {
-    description = "KDE screensavers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.7/kdeartwork/kwin-styles.nix
deleted file mode 100644
index b5d769b216d..00000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/kwin-styles.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace ];
-
-  meta = {
-    description = "Styles for KWin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/sounds.nix b/pkgs/desktops/kde-4.7/kdeartwork/sounds.nix
deleted file mode 100644
index e98705da889..00000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/sounds.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-sounds";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "New login/logout sounds";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/styles.nix b/pkgs/desktops/kde-4.7/kdeartwork/styles.nix
deleted file mode 100644
index 6a1306c3710..00000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/styles.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-style-phase";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Phase, a widget style for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.7/kdeartwork/wallpapers.nix
deleted file mode 100644
index 611c6a70f6b..00000000000
--- a/pkgs/desktops/kde-4.7/kdeartwork/wallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-wallpapers";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE wallpapers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdebindings/pykde-purity.patch b/pkgs/desktops/kde-4.7/kdebindings/pykde-purity.patch
deleted file mode 100644
index dfc2c886bba..00000000000
--- a/pkgs/desktops/kde-4.7/kdebindings/pykde-purity.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c853e38..5df3253 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -73,7 +73,7 @@ INCLUDE_DIRECTORIES(
-     ${QT_QTWEBKIT_INCLUDE_DIR}
-     ${KDE4_INCLUDE_DIR}
-     ${KDE4_INCLUDE_DIR}/solid
--    ${KDE4_INCLUDE_DIR}/phonon
-+	${PHONON_INCLUDE_DIR}/phonon
-     ${KDE4_INCLUDE_DIR}/kio
-     ${KDE4_INCLUDE_DIR}/kdeprint
-     ${KDE4_INCLUDE_DIR}/kdeprint/lpr
-@@ -232,7 +232,7 @@ _pkg_config = {
-     'pykde_kde_sip_flags':  '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}',
-     'pykde_mod_dir':        '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4',
-     'pykde_modules':        '${PYKDE_MODULES}',
--    'pykde_sip_dir':        '${SIP_DEFAULT_SIP_DIR}/PyKDE4',
-+    'pykde_sip_dir':        '${CMAKE_INSTALL_PREFIX}/share/sip/PyKDE4',
-     'pykde_version':        kde_version_hex,
-     'pykde_version_str':    '${KDE_VERSION}'
- }
-@@ -244,7 +244,7 @@ PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES
- 
- # Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
- # (Don't forget the / at the end of sip/.)
--INSTALL(DIRECTORY sip/ DESTINATION ${SIP_DEFAULT_SIP_DIR}/PyKDE4
-+INSTALL(DIRECTORY sip/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/sip/PyKDE4
-     PATTERN "*~" EXCLUDE    # This sucks, why can't I just whitelist what I _do_ want?
-     PATTERN ".svn" EXCLUDE
-     PATTERN "*.in" EXCLUDE)
-diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt
-index 41fa0fe..642d867 100644
---- a/kpythonpluginfactory/CMakeLists.txt
-+++ b/kpythonpluginfactory/CMakeLists.txt
-@@ -3,7 +3,12 @@
- set(kpythonpluginfactory_SRCS
-     kpythonpluginfactory.cpp)
- 
--GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
-+option(HARDCODE_LIB_PYTHON_PATH "Whether the path to libpython.so should be hardcoded" OFF)
-+if(HARDCODE_LIB_PYTHON_PATH)
-+	get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} REALPATH)
-+else(HARDCODE_LIB_PYTHON_PATH)
-+    get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
-+endif(HARDCODE_LIB_PYTHON_PATH)
- ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\")
- ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000)
- 
diff --git a/pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch b/pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch
deleted file mode 100644
index 96b3b887a8d..00000000000
--- a/pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-commit 017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
-Author: Luca Beltrame <lbeltrame@kde.org>
-Date:   Mon Oct 1 20:47:56 2012 +0200
-
-    Remove duplicated QVector<int> definition, since it's in PyQt now.
-    Simon, if you have time, please review if everything is OK.
-    
-    CCMAIL: simon@simonzone.com
-
-diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip
-index 5a0a080..73dad01 100644
---- a/sip/kdecore/typedefs.sip
-+++ b/sip/kdecore/typedefs.sip
-@@ -951,77 +951,3 @@ template <TYPE1>
- %End
- };
- 
--%MappedType QVector<int>
--{
--%TypeHeaderCode
--#include <qvector.h>
--%End
--
--%ConvertFromTypeCode
--    // Create the list.
--    PyObject *l;
--
--    if ((l = PyList_New(sipCpp->size())) == NULL)
--        return NULL;
--
--    // Set the list elements.
--    for (int i = 0; i < sipCpp->size(); ++i)
--    {
--        int t = (sipCpp->at(i));
--
--#if PY_MAJOR_VERSION >= 3        
--        PyObject *tobj = PyLong_FromLong(t);
--#else
--        PyObject *tobj = PyInt_FromLong(t);
--#endif
--
--        PyList_SET_ITEM(l, i, tobj);
--    }
--
--    return l;
--%End
--
--%ConvertToTypeCode
--    // Check the type if that is all that is required.
--    if (sipIsErr == NULL)
--    {
--        if (!PyList_Check(sipPy))
--            return 0;
--
--        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
--            PyObject *tobj = PyList_GET_ITEM(sipPy, i);
--#if PY_MAJOR_VERSION >= 3
--            if (!PyNumber_Check(tobj))
--#else
--            if (!PyInt_Check(tobj))
--#endif
--                return 0;
--        }
--        return 1;
--    }
--
--    QVector<int> *qv = new QVector<int>;
-- 
--    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--    {
--        PyObject *tobj = PyList_GET_ITEM(sipPy, i);
-- #if PY_MAJOR_VERSION >= 3
--        int t = PyLong_AsLong (tobj);
--#else
--        int t = PyInt_AS_LONG (tobj);
--#endif
--
--        if (*sipIsErr)
--        {
--            delete qv;
--            return 0;
--        }
--
--        qv->append(t);
--    }
-- 
--    *sipCppPtr = qv;
-- 
--    return sipGetState(sipTransferObj);
--%End
--};
diff --git a/pkgs/desktops/kde-4.7/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.7/kdebindings/pykde4.nix
deleted file mode 100644
index 030f2fb430a..00000000000
--- a/pkgs/desktops/kde-4.7/kdebindings/pykde4.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies,
-  boost, lndir }:
-
-let pydir = "lib/python${python.majorVersion}"; in
-
-kde {
-  buildInputs = [ python kdepimlibs shared_desktop_ontologies boost ];
-
-  propagatedBuildInputs = [ pyqt4 sip ];
-
-#NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon";
-
-  patches = [ ./pykde-purity.patch ./pykde4-new-sip.patch ];
-
-  cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON";
-
-  preConfigure =
-    ''
-      # Symlink PyQt into PyKDE.  This is necessary because PyQt looks
-      # in its PyQt4/uic/widget-plugins directory for plugins, and KDE
-      # needs to install a plugin.
-      mkdir -pv $out/${pydir}
-      ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
-    '';
-
-  meta = {
-    description = "Python bindings for KDE";
-    kde.name = "pykde4";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.7/kdebindings/smokegen.nix
deleted file mode 100644
index 43f54b552e5..00000000000
--- a/pkgs/desktops/kde-4.7/kdebindings/smokegen.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, qt4, cmake }:
-
-kde {
-  buildInputs = [ qt4 ];
-  nativeBuildInputs = [ cmake ];
-
-  patchPhase = "sed -e /RPATH/d -i CMakeLists.txt";
-
-  meta = {
-    description = "C++ parser used to generate language bindings for Qt/KDE";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix
deleted file mode 100644
index 29e25093d11..00000000000
--- a/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, qt4, cmake, phonon, qimageblitz, smokegen }:
-
-kde {
-  propagatedBuildInputs = [ qt4 phonon qimageblitz ];
-  nativeBuildInputs = [ cmake ];
-  propagatedNativeBuildInputs = [ smokegen ];
-
-  meta = {
-    description = "C++ parser used to generate language bindings for Qt/KDE";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/FindLibfacile.cmake b/pkgs/desktops/kde-4.7/kdeedu/FindLibfacile.cmake
deleted file mode 100644
index 617eb4b2467..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/FindLibfacile.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-# - Try to find Libfacile
-# Once done this will define
-#
-#  LIBFACILE_FOUND - system has Libfacile
-#  LIBFACILE_INCLUDE_DIR - the Libfacile include directory
-#  LIBFACILE_LIBRARIES - Link these to use Libfacile
-#
-# Copyright (c) 2006, Carsten Niehaus, <cniehaus@gmx.de>
-# Copyright (c) 2006, Montel Laurent, <montel@kde.org>
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-find_package(OCaml)
-
-if( OCAML_FOUND )
-   find_library(LIBFACILE_LIBRARIES NAMES facile.a
-       HINTS ${OCAMLC_DIR}
-       PATH_SUFFIXES facile ocaml/facile
-   )
-   find_path(LIBFACILE_INCLUDE_DIR NAMES facile.cmi
-       HINTS ${OCAMLC_DIR}
-       PATH_SUFFIXES facile lib/ocaml/facile
-   )
-endif(OCAML_FOUND)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Libfacile DEFAULT_MSG LIBFACILE_INCLUDE_DIR
-	LIBFACILE_LIBRARIES OCAML_FOUND)
-
-# show the LIBFACILE_INCLUDE_DIR and LIBFACILE_LIBRARIES variables only in the advanced view
-mark_as_advanced(LIBFACILE_INCLUDE_DIR LIBFACILE_LIBRARIES )
diff --git a/pkgs/desktops/kde-4.7/kdeedu/blinken.nix b/pkgs/desktops/kde-4.7/kdeedu/blinken.nix
deleted file mode 100644
index cdf9728833c..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/blinken.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Memory Enhancement Game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/cantor.nix b/pkgs/desktops/kde-4.7/kdeedu/cantor.nix
deleted file mode 100644
index 8b8bbc210c7..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/cantor.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libspectre }:
-kde {
-  buildInputs = [ kdelibs libspectre ];
-
-  meta = {
-    description = "KDE Frontend to Mathematical Software";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.7/kdeedu/kalgebra.nix
deleted file mode 100644
index f1a190332cd..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kalgebra.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu, readline }:
-kde {
-  buildInputs = [ kdelibs libkdeedu readline ];
-
-  meta = {
-    description = "2D and 3D Graph Calculator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kalzium-feature-log.patch b/pkgs/desktops/kde-4.7/kdeedu/kalzium-feature-log.patch
deleted file mode 100644
index 3c054e8d60a..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kalzium-feature-log.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-commit d96c6e70400dcd4e3514065e607388b80f96d6a1
-Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
-Date:   Mon Aug 15 00:53:16 2011 +0400
-
-    Display feature log
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 132934c..eec6942 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -47,3 +47,4 @@ add_subdirectory(src)
- add_subdirectory(data)
- add_subdirectory(plasmoid)
- add_subdirectory(libscience)
-+macro_display_feature_log()
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.7/kdeedu/kalzium.nix
deleted file mode 100644
index d7d9b403b1a..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kalzium.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro }:
-kde {
-  buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ];
-
-  prePatch = ''
-    cp -v ${./FindLibfacile.cmake} cmake/modules/FindLibfacile.cmake
-    sed -e 's/\+facile/''${LIBFACILE_INCLUDE_DIR}/' -i src/CMakeOCamlInstructions.cmake
-    '';
-
-  patches = [ ./kalzium-feature-log.patch ];
-
-  meta = {
-    description = "Periodic Table of Elements";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.7/kdeedu/kanagram.nix
deleted file mode 100644
index 8759c96d78c..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kanagram.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "Letter Order Game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.7/kdeedu/kbruch.nix
deleted file mode 100644
index dc50f1e85a3..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kbruch.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Practice Fractions";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.7/kdeedu/kgeography.nix
deleted file mode 100644
index bd8d27c8d6e..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kgeography.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Geography Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/khangman.nix b/pkgs/desktops/kde-4.7/kdeedu/khangman.nix
deleted file mode 100644
index 997b50e906a..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/khangman.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "KDE hangman game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kig.nix b/pkgs/desktops/kde-4.7/kdeedu/kig.nix
deleted file mode 100644
index bd5ef67529c..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kig.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, boost, python}:
-kde {
-  buildInputs = [ kdelibs boost python ];
-
-  cmakeFlags = ''
-    -DBOOST_PYTHON_INCLUDES:PATH=${boost}/include;${python}/include/${python.libPrefix}
-    -DBOOST_PYTHON_LIBS=boost_python;${python.libPrefix} -DKIG_ENABLE_PYTHON_SCRIPTING=1
-    '';
-  meta = {
-    description = "KDE Interactive Geometry";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kiten.nix b/pkgs/desktops/kde-4.7/kdeedu/kiten.nix
deleted file mode 100644
index 939b7a9f77a..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kiten.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Japanese Reference/Study Tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/klettres.nix b/pkgs/desktops/kde-4.7/kdeedu/klettres.nix
deleted file mode 100644
index 7a0fa83078e..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/klettres.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE alphabet tutorial";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.7/kdeedu/kmplot.nix
deleted file mode 100644
index 18458cf6f0b..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kmplot.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE mathematical function plotter";
-    kde = {
-      name = "kmplot";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kstars.nix b/pkgs/desktops/kde-4.7/kdeedu/kstars.nix
deleted file mode 100644
index 5b5a2d621de..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kstars.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, eigen, xplanet, indilib }:
-
-kde {
-  buildInputs = [ kdelibs eigen xplanet indilib ];
-
-  meta = {
-    description = "A KDE graphical desktop planetarium";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.7/kdeedu/ktouch.nix
deleted file mode 100644
index 768be6f4367..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/ktouch.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Touch Typing Tutor";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.7/kdeedu/kturtle.nix
deleted file mode 100644
index 1e1922b1410..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kturtle.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Educational Programming Environment";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.7/kdeedu/kwordquiz.nix
deleted file mode 100644
index 1b33ba2e469..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/kwordquiz.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "Flash Card Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.7/kdeedu/libkdeedu.nix
deleted file mode 100644
index def6c85fefe..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/libkdeedu.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Libraries used by KDE Education applications";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/marble.nix b/pkgs/desktops/kde-4.7/kdeedu/marble.nix
deleted file mode 100644
index 8bd86c91094..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/marble.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, gpsd }:
-
-kde {
-  buildInputs = [ kdelibs gpsd ];
-
-  meta = {
-    description = "Marble Virtual Globe";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/parley.nix b/pkgs/desktops/kde-4.7/kdeedu/parley.nix
deleted file mode 100644
index eccd40a598f..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/parley.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkdeedu, libxml2, attica }:
-
-kde {
-  buildInputs = [ kdelibs libkdeedu libxml2 attica ];
-
-  meta = {
-    description = "Vocabulary Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/rocs.nix b/pkgs/desktops/kde-4.7/kdeedu/rocs.nix
deleted file mode 100644
index 91976b84001..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/rocs.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, kdelibs, boost }:
-
-kde {
-  buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) ];
-
-  NIX_CFLAGS_COMPILE = "-fexceptions";
-
-  meta = {
-    description = "A KDE graph theory viewer";
-    kde = {
-      name = "rocs";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeedu/step.nix b/pkgs/desktops/kde-4.7/kdeedu/step.nix
deleted file mode 100644
index fac9974baf1..00000000000
--- a/pkgs/desktops/kde-4.7/kdeedu/step.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, gsl, libqalculate, eigen }:
-
-kde {
-  buildInputs = [ kdelibs gsl libqalculate eigen ];
-
-  meta = {
-    description = "A KDE interactive physical simulator";
-    kde = {
-      name = "step";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegames.nix b/pkgs/desktops/kde-4.7/kdegames.nix
deleted file mode 100644
index dfca49be12f..00000000000
--- a/pkgs/desktops/kde-4.7/kdegames.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, pykde4,
-  openal, libsndfile, qhull, sqlite, pkgconfig }:
-
-kde rec {
-  buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython
-    openal libsndfile qhull sqlite ] ++ pythonPath;
-
-  pythonPath = [ pythonPackages.twisted pykde4 ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  # TODO: ggz
-
-  postInstall = "wrapPythonPrograms";
-
-  meta = {
-    description = "KDE Games";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix
deleted file mode 100644
index c03c82469e6..00000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi
-, libjpeg, pkgconfig }:
-
-kde {
-
-  buildInputs =
-    [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi libjpeg ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Gwenview, the KDE image viewer";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.7/kdegraphics/kamera.nix
deleted file mode 100644
index 70904b17c23..00000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/kamera.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libgphoto2 }:
-
-kde {
-  buildInputs = [ kdelibs libgphoto2 ];
-
-  meta = {
-    description = "KDE camera interface library";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.7/kdegraphics/kcolorchooser.nix
deleted file mode 100644
index 58528cb186b..00000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/kcolorchooser.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A small utility to select a color";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-strigi-analyzer.nix
deleted file mode 100644
index 6001a5f363d..00000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-strigi-analyzer.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Strigi analyzers for various graphics file formats";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-thumbnailers.nix
deleted file mode 100644
index 55bf8309b2a..00000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-thumbnailers.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libkexiv2, libkdcraw }:
-
-kde {
-  buildInputs = [ kdelibs libkexiv2 libkdcraw ];
-
-  meta = {
-    description = "Thumbnailers for various graphics file formats";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.7/kdegraphics/kgamma.nix
deleted file mode 100644
index 28d9252187e..00000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/kgamma.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libXxf86vm }:
-
-kde {
-  buildInputs = [ kdelibs libXxf86vm ];
-
-  meta = {
-    description = "KDE monitor calibration tool";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.7/kdegraphics/kolourpaint.nix
deleted file mode 100644
index 5276ec09f46..00000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/kolourpaint.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, qimageblitz }:
-
-kde {
-  buildInputs = [ kdelibs qimageblitz ];
-
-  meta = {
-    description = "KDE paint program";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.7/kdegraphics/kruler.nix
deleted file mode 100644
index c5c2c6e05d7..00000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/kruler.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE screen ruler";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.7/kdegraphics/ksaneplugin.nix
deleted file mode 100644
index 1381ed7dd26..00000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/ksaneplugin.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libksane }:
-
-kde {
-  buildInputs = [ kdelibs libksane ];
-
-  meta = {
-    description = "A KScan plugin that implements the scanning through libksane";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.7/kdegraphics/ksnapshot.nix
deleted file mode 100644
index f01a609e20d..00000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/ksnapshot.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libkipi }:
-
-kde {
-  buildInputs = [ kdelibs libkipi ];
-
-  meta = {
-    description = "KDE screenshot utility";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix
deleted file mode 100644
index 9810a98551e..00000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libjpeg, lcms1 }:
-
-kde {
-  buildInputs = [ kdelibs libjpeg lcms1 ];
-
-  meta = {
-    description = "Library for decoding RAW images";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.7/kdegraphics/libkexiv2.nix
deleted file mode 100644
index 096b0a6e957..00000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/libkexiv2.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, exiv2 }:
-
-kde {
-  buildInputs = [ kdelibs exiv2 ];
-
-  meta = {
-    description = "Exiv2 support library";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.7/kdegraphics/libkipi.nix
deleted file mode 100644
index 6b16265e7a3..00000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/libkipi.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Interface library to kipi-plugins";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.7/kdegraphics/libksane.nix
deleted file mode 100644
index b539eab3899..00000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/libksane.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, saneBackends }:
-
-kde {
-  buildInputs = [ kdelibs saneBackends ];
-
-  meta = {
-    description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix b/pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix
deleted file mode 100644
index 2c2ba3796a2..00000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, okular }:
-
-kde {
-  buildInputs = [ kdelibs okular ];
-
-  meta = {
-    description = "A collection of plugins to handle mobipocket files";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/okular.nix b/pkgs/desktops/kde-4.7/kdegraphics/okular.nix
deleted file mode 100644
index 0c5c7b49b17..00000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/okular.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
-, qimageblitz, pkgconfig }:
-
-kde {
-  buildInputs =
-    [ chmlib djvulibre ebook_tools kdelibs libspectre popplerQt4 qca2 qimageblitz pkgconfig ];
-
-  meta = {
-    description = "Okular, the KDE document viewer";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.7/kdegraphics/svgpart.nix
deleted file mode 100644
index a344cc4b4b4..00000000000
--- a/pkgs/desktops/kde-4.7/kdegraphics/svgpart.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "SVG KPart";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdelibs.nix b/pkgs/desktops/kde-4.7/kdelibs.nix
deleted file mode 100644
index 41a648d1056..00000000000
--- a/pkgs/desktops/kde-4.7/kdelibs.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ kde, gcc, cmake, perl, aspell
-, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
-, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
-, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
-, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
-, getopt, udev, herqq, phonon, libjpeg, xz
-}:
-
-kde {
-  buildInputs =
-    [ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper
-      libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2
-      shared_desktop_ontologies xz udev libxml2 libjpeg kerberos aspell
-    ];
-
-  propagatedBuildInputs = [ qt4 soprano strigi phonon ];
-
-  propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ];
-
-  # TODO: make sonnet plugins (dictionaries) really work.
-  # There are a few hardcoded paths.
-  # Let kdelibs find openexr
-  # Split plugins from libs?
-
-  patches = [ ./files/polkit-install.patch ];
-
-  # cmake fails to find acl.h because of C++-style comment
-  # TODO: OpenEXR
-  cmakeFlags = [
-    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
-    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
-  ];
-
-  meta = {
-    description = "KDE libraries";
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdemultimedia.nix b/pkgs/desktops/kde-4.7/kdemultimedia.nix
deleted file mode 100644
index 4c3182dd9fe..00000000000
--- a/pkgs/desktops/kde-4.7/kdemultimedia.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, alsaLib, libvorbis, taglib, flac, cdparanoia, lame, kdelibs, ffmpeg,
-  libmusicbrainz3, libtunepimp, pulseaudio }:
-
-kde {
-
-  buildInputs =
-    # Note: kdemultimedia can use xine-lib, but it doesn't seem useful
-    # without the Phonon Xine backend.
-    [ kdelibs cdparanoia taglib libvorbis libmusicbrainz3 libtunepimp ffmpeg
-      flac lame pulseaudio
-    ];
-
-  meta = {
-    description = "KDE multimedia programs such as a movie player and volume utility";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/FindmsiLBC.cmake b/pkgs/desktops/kde-4.7/kdenetwork/FindmsiLBC.cmake
deleted file mode 100644
index c40b0bed310..00000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/FindmsiLBC.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# cmake macro to test msiLBC
-
-# Copyright (c) 2009-2010 Pali Rohár <pali.rohar@gmail.com>
-#
-# MSILBC_FOUND
-# MSILBC_LIBRARY
-
-include ( FindPackageHandleStandardArgs )
-
-if ( MSILBC_LIBRARY )
-	set ( MSILBC_FOUND true )
-	set ( msiLBC_FIND_QUIETLY true )
-else ( MSILBC_LIBRARY )
-	find_library ( MSILBC_LIBRARY NAMES msilbc
-		PATH_SUFFIXES mediastreamer/plugins)
-endif ( MSILBC_LIBRARY )
-
-find_package_handle_standard_args ( msiLBC DEFAULT_MSG MSILBC_LIBRARY )
-mark_as_advanced ( MSILBC_LIBRARY )
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/filesharing.nix b/pkgs/desktops/kde-4.7/kdenetwork/filesharing.nix
deleted file mode 100644
index 2f32f4d6b2c..00000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/filesharing.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kdenetwork.patch b/pkgs/desktops/kde-4.7/kdenetwork/kdenetwork.patch
deleted file mode 100644
index ebadbfad9ba..00000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/kdenetwork.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -r -u kdenetwork-4.7.1.orig/CMakeLists.txt kdenetwork-4.7.1/CMakeLists.txt
---- kdenetwork-4.7.1.orig/CMakeLists.txt	2011-03-29 15:25:42.174521812 +0400
-+++ kdenetwork-4.7.1/CMakeLists.txt	2011-03-29 15:27:43.268140322 +0400
-@@ -28,7 +28,8 @@
-    set(CMAKE_REQUIRED_INCLUDES  ${KDEWIN_INCLUDES} )
- endif (WIN32)
- 
--find_package(KdepimLibs REQUIRED)
-+macro_optional_find_package(KdepimLibs)
-+macro_log_feature(KDEPIMLIBS_FOUND "KDEPimLibs" "KDE pim-related libraries" "http://pim.kde.org.org/" FALSE "" "Required for Kopete")
- # find_package(X11VidMode) not used at this time
- 
- # NX support is not ready for KDE 4.2; disabled (uwolfer)
-@@ -79,7 +80,9 @@
- macro_optional_add_subdirectory(kfile-plugins)
- macro_optional_add_subdirectory(kget)
- 
--macro_optional_add_subdirectory(kopete)
-+if(KDEPIMLIBS_FOUND)
-+  macro_optional_add_subdirectory(kopete)
-+endif(KDEPIMLIBS_FOUND)
- 
- if(Q_WS_X11)
-   macro_optional_add_subdirectory(krdc)
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kdnssd.nix b/pkgs/desktops/kde-4.7/kdenetwork/kdnssd.nix
deleted file mode 100644
index 2f32f4d6b2c..00000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/kdnssd.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kget.nix b/pkgs/desktops/kde-4.7/kdenetwork/kget.nix
deleted file mode 100644
index 2381a2459e6..00000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/kget.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, sqlite
-, shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }:
-
-kde {
-  buildInputs =
-    [ kdelibs libktorrent kde_workspace shared_desktop_ontologies kdepimlibs
-      kde_baseapps gpgme boost libmms qca2 sqlite
-    ];
-
-  KDEDIRS = libktorrent;
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix
deleted file mode 100644
index 440e8595704..00000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
-  jasper, libidn, mediastreamer, msilbc, pkgconfig, libxml2, libxslt, giflib,
-  libgadu, boost, qca2, gpgme, sqlite }:
-
-kde {
-  buildInputs = [ kdelibs speex libmsn libotr kdepimlibs qimageblitz libktorrent
-    jasper libidn mediastreamer msilbc libxml2 libxslt giflib libgadu boost qca2
-    gpgme sqlite ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  KDEDIRS = libktorrent;
-
-  patchPhase = "cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake";
-
-  cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];
-
-  meta = {
-    description = "A KDE multi-protocol IM client";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.7/kdenetwork/kppp.nix
deleted file mode 100644
index 2f32f4d6b2c..00000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/kppp.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix
deleted file mode 100644
index 40ef91d5433..00000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libvncserver, libjpeg }:
-
-kde {
-  buildInputs = [ kdelibs libvncserver libjpeg ];
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.7/kdenetwork/krfb.nix
deleted file mode 100644
index 80013f430d3..00000000000
--- a/pkgs/desktops/kde-4.7/kdenetwork/krfb.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libvncserver, libXdamage, libXtst }:
-
-kde {
-  buildInputs = [ kdelibs libvncserver libXdamage libXtst];
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.7/kdepim-runtime.nix b/pkgs/desktops/kde-4.7/kdepim-runtime.nix
deleted file mode 100644
index ef637f3f075..00000000000
--- a/pkgs/desktops/kde-4.7/kdepim-runtime.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, fetchurl, cmake, kdelibs, libxml2, libxslt, boost, kdepimlibs, akonadi
-, shared_desktop_ontologies }:
-
-kde {
-  buildInputs = [ kdepimlibs akonadi boost shared_desktop_ontologies libxml2
-    libxslt ];
-
-  meta = {
-    description = "KDE PIM runtime";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdepim.nix b/pkgs/desktops/kde-4.7/kdepim.nix
deleted file mode 100644
index 9b95d491a44..00000000000
--- a/pkgs/desktops/kde-4.7/kdepim.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kde, boost, gpgme, libassuan, libxml2, libxslt, kdepimlibs, kdepim_runtime
-, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee }:
-
-kde {
-
-  buildInputs =
-    [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2
-      libxslt cyrus_sasl gpgme libassuan grantlee
-    ];
-
-  passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ];
-
-  meta = {
-    description = "KDE PIM tools";
-    longDescription = ''
-      Contains various personal information management tools for KDE, such as an organizer.
-    '';
-    license = "GPL";
-    homepage = http://pim.kde.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdepimlibs.nix b/pkgs/desktops/kde-4.7/kdepimlibs.nix
deleted file mode 100644
index 736508eaf0f..00000000000
--- a/pkgs/desktops/kde-4.7/kdepimlibs.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
-, kdelibs, akonadi, shared_desktop_ontologies, libxml2, libxslt, prison }:
-
-kde {
-  buildInputs =
-    [ boost gpgme shared_desktop_ontologies libical libxml2 libxslt
-      openldap cyrus_sasl akonadi prison
-    ];
-
-  propagatedBuildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE PIM libraries";
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeplasma-addons.nix b/pkgs/desktops/kde-4.7/kdeplasma-addons.nix
deleted file mode 100644
index 30a32b465b6..00000000000
--- a/pkgs/desktops/kde-4.7/kdeplasma-addons.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
-, boost, eigen, kde_workspace, attica, python, qca2, qimageblitz
-, kdepimlibs, libkexiv2, libqalculate, libXtst }:
-# TODO: qwt, scim
-
-kde {
-
-  KDEDIRS=marble;
-
-  buildInputs = [ kdelibs boost eigen kde_workspace
-    attica python qca2 qimageblitz kdepimlibs
-    libqalculate libXtst shared_desktop_ontologies marble libkexiv2];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "KDE Plasma Addons";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.7/kdesdk/cervisia.nix
deleted file mode 100644
index 1dabe46cd42..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/cervisia.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE CVS frontend";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-git.nix b/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-git.nix
deleted file mode 100644
index df4a0856c6b..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-git.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-  # Needs kdebase for libkonq
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  meta = {
-    description = "Git plugin for dolphin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-svn.nix b/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-svn.nix
deleted file mode 100644
index 8032b89ff54..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-svn.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-  # Needs kdebase for libkonq
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  meta = {
-    description = "Svn plugin for dolphin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/find-svn.patch b/pkgs/desktops/kde-4.7/kdesdk/find-svn.patch
deleted file mode 100644
index 61cb49b308f..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/find-svn.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/cmake/modules/FindSVN.cmake b/cmake/modules/FindSVN.cmake
-index 59bcb96..2eac05d 100644
---- a/cmake/modules/FindSVN.cmake
-+++ b/cmake/modules/FindSVN.cmake
-@@ -17,6 +17,9 @@ FIND_PROGRAM(SVNCONFIG_EXECUTABLE NAMES svn-config PATHS
- FIND_PROGRAM(APRCONFIG_EXECUTABLE NAMES apr-1-config apr-config PATHS
-    /usr/local/apr/bin
- )
-+find_program(APUCONFIG_EXECUTABLE NAMES apu-1-config apu-config PATHS
-+   /usr/local/apr/bin
-+)
- 
- if(SVNCONFIG_EXECUTABLE)
- 
-@@ -56,15 +59,9 @@ else(SVNCONFIG_EXECUTABLE)
-       set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-    else(APRCONFIG_EXECUTABLE)
-       FIND_PATH(_INCLUDES apr_pools.h
--         ${SVN_INCLUDES}/apr-0/
--         ${SVN_INCLUDES}/apr-1/
--         ${SVN_INCLUDES}/apr-1.0/
--         /usr/include/apr-0/
--         /usr/include/apr-1/
--         /usr/include/apr-1.0/
--         /usr/local/include/apr-0/
--         /usr/local/include/apr-1/
--         /usr/local/include/apr-1.0/
-+         HINTS ${SVN_INCLUDES}
-+         PATHS /usr /usr/local
-+         SUFFIXES apr-0 apr-1 apr-1.0
-       )
-       if(_INCLUDES)
-          set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-@@ -72,6 +69,25 @@ else(SVNCONFIG_EXECUTABLE)
-          set(SVN_FOUND FALSE) # no apr == can't compile!
-       endif(_INCLUDES)
-    endif(APRCONFIG_EXECUTABLE)
-+
-+   # Use apu-config if it exists
-+   if(APUCONFIG_EXECUTABLE)
-+      EXEC_PROGRAM(${APUCONFIG_EXECUTABLE} ARGS --includes RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _INCLUDES)
-+      string(REPLACE "-I" "" _INCLUDES ${_INCLUDES})
-+      string(REPLACE " " ";" _INCLUDES ${_INCLUDES})
-+      set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-+   else(APUCONFIG_EXECUTABLE)
-+      FIND_PATH(_INCLUDES apu.h
-+         HINTS ${SVN_INCLUDES}
-+         PATHS /usr /usr/local
-+         SUFFIXES apr-0 apr-1 apr-1.0
-+      )
-+      if(_INCLUDES)
-+         set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-+      else(_INCLUDES)
-+         set(SVN_FOUND FALSE) # no apr == can't compile!
-+      endif(_INCLUDES)
-+   endif(APUCONFIG_EXECUTABLE)
-    FIND_LIBRARY(SVN_LIBRARIES NAMES svn_client-1)
-    if(SVN_LIBRARIES)
-       FIND_LIBRARY(_LIBRARIES NAMES svn_subr-1)
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.7/kdesdk/kapptemplate.nix
deleted file mode 100644
index 391536248dd..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kapptemplate.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE 4 project template generator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.7/kdesdk/kcachegrind.nix
deleted file mode 100644
index 65d410cca48..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kcachegrind.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Frontend for Callgrind/Cachegrind";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kdeaccounts-plugin.nix b/pkgs/desktops/kde-4.7/kdesdk/kdeaccounts-plugin.nix
deleted file mode 100644
index 7e170ca2a2c..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kdeaccounts-plugin.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kdepimlibs }:
-
-kde {
-  buildInputs = [ kdelibs kdepimlibs ];
-
-  meta = {
-    description = "KDE accounts akonadi agent";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.7/kdesdk/kioslave-perldoc.nix
deleted file mode 100644
index 6a10bdf7c4b..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kioslave-perldoc.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, perl }:
-
-kde {
-  buildInputs = [ kdelibs perl ];
-
-  cmakeFlags = [ "-DBUILD_perldoc=ON" ];
-
-  meta = {
-    description = "perldoc: kioslave";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix b/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix
deleted file mode 100644
index db0bd27094b..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, subversionClient, apr, aprutil }:
-
-kde {
-  buildInputs = [ kdelibs subversionClient apr aprutil ];
-
-  patches = [ ./find-svn.patch ];
-
-  meta = {
-    description = "Subversion kioslave";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kmtrace.nix b/pkgs/desktops/kde-4.7/kdesdk/kmtrace.nix
deleted file mode 100644
index d580f7fb691..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kmtrace.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, gcc }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
-
-  meta = {
-    description = "KDE mtrace-based malloc debugger";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kompare.nix b/pkgs/desktops/kde-4.7/kdesdk/kompare.nix
deleted file mode 100644
index 1ddb4b8ea5b..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kompare.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A program to view the differences between files and optionally generate a diff";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kpartloader.nix b/pkgs/desktops/kde-4.7/kdesdk/kpartloader.nix
deleted file mode 100644
index e7790d33c90..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kpartloader.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A test application for KParts";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kprofilemethod.nix b/pkgs/desktops/kde-4.7/kdesdk/kprofilemethod.nix
deleted file mode 100644
index 5a6693f2f5d..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kprofilemethod.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A macro for profiling using QTime";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kstartperf.nix b/pkgs/desktops/kde-4.7/kdesdk/kstartperf.nix
deleted file mode 100644
index 0c8259cd31f..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kstartperf.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libtool }:
-
-kde {
-  buildInputs = [ kdelibs libtool ];
-
-  meta = {
-    description = "Measures start up time of a KDE application";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/kuiviewer.nix b/pkgs/desktops/kde-4.7/kdesdk/kuiviewer.nix
deleted file mode 100644
index 7c5089dcd37..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/kuiviewer.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Displays Qt Designer's UI files";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.7/kdesdk/lokalize.nix
deleted file mode 100644
index 1565426eb1f..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/lokalize.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, hunspell }:
-
-kde {
-  buildInputs = [ kdelibs hunspell ];
-
-  meta = {
-    description = "KDE 4 Computer-aided translation system";
-    longDescription = ''
-      Computer-aided translation system.
-      Do not translate what had already been translated.
-    '';
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/okteta.nix b/pkgs/desktops/kde-4.7/kdesdk/okteta.nix
deleted file mode 100644
index 1b53a0e03dc..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/okteta.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, qca2 }:
-
-kde {
-  buildInputs = [ kdelibs qca2 ];
-
-# TODO: Look what does -DBUILD_mobile add
-
-  meta = {
-    description = "KDE byte editor";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/poxml.nix b/pkgs/desktops/kde-4.7/kdesdk/poxml.nix
deleted file mode 100644
index 1ab9ed49df5..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/poxml.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, antlr }:
-
-kde {
-  buildInputs = [ kdelibs antlr ];
-
-  meta = {
-    description = "Po<->xml tools";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/scripts.nix b/pkgs/desktops/kde-4.7/kdesdk/scripts.nix
deleted file mode 100644
index df81145e5d6..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/scripts.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Various scripts to ease KDE development";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/strigi-analyzer.nix b/pkgs/desktops/kde-4.7/kdesdk/strigi-analyzer.nix
deleted file mode 100644
index 0ad48c8cfde..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/strigi-analyzer.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Strigi analyzers for diff, po and ts";
-    kde = {
-      name = "strigi-analyzer";
-      module = "kdesdk";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.7/kdesdk/umbrello.nix
deleted file mode 100644
index e83a2d9a901..00000000000
--- a/pkgs/desktops/kde-4.7/kdesdk/umbrello.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt, boost }:
-
-kde {
-  buildInputs = [ kdelibs libxml2 libxslt boost ];
-
-  meta = {
-    description = "Umbrello UML modeller";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdetoys/amor.nix b/pkgs/desktops/kde-4.7/kdetoys/amor.nix
deleted file mode 100644
index 936d63d544a..00000000000
--- a/pkgs/desktops/kde-4.7/kdetoys/amor.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE creature for your desktop";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.7/kdetoys/kteatime.nix
deleted file mode 100644
index dacf54def4b..00000000000
--- a/pkgs/desktops/kde-4.7/kdetoys/kteatime.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE utility for making a fine cup of tea";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdetoys/ktux.nix b/pkgs/desktops/kde-4.7/kdetoys/ktux.nix
deleted file mode 100644
index 108f9be7c72..00000000000
--- a/pkgs/desktops/kde-4.7/kdetoys/ktux.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace ];
-
-  meta = {
-    description = "Tux Screen Saver";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/ark.nix b/pkgs/desktops/kde-4.7/kdeutils/ark.nix
deleted file mode 100644
index 7fbdaf586d6..00000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/ark.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libarchive, bzip2, kde_baseapps }:
-
-kde {
-  buildInputs = [ kdelibs kde_baseapps libarchive bzip2 ];
-
-  meta = {
-    description = "KDE Archiving Tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/filelight.nix b/pkgs/desktops/kde-4.7/kdeutils/filelight.nix
deleted file mode 100644
index 25ecabed27c..00000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/filelight.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Tool to visualise file and directory sizes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.7/kdeutils/kcalc.nix
deleted file mode 100644
index 08b202e8f0e..00000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/kcalc.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, gmp }:
-
-kde {
-  buildInputs = [ kdelibs gmp ];
-
-  meta = {
-    description = "KDE Calculator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.7/kdeutils/kcharselect.nix
deleted file mode 100644
index d4c9c06f483..00000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/kcharselect.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE character selection utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/kdf.nix b/pkgs/desktops/kde-4.7/kdeutils/kdf.nix
deleted file mode 100644
index 3f9da58d0a6..00000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/kdf.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE free disk space utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.7/kdeutils/kfloppy.nix
deleted file mode 100644
index 2434a4fa671..00000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/kfloppy.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Floppy disk formatting utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.7/kdeutils/kgpg.nix
deleted file mode 100644
index f3b00a5b968..00000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/kgpg.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kdepimlibs }:
-
-kde {
-  buildInputs = [ kdelibs kdepimlibs ];
-
-  meta = {
-    description = "Simple KDE GUI for GPG";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix
deleted file mode 100644
index fef516e478d..00000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace, libXtst }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace libXtst ];
-
-  meta = {
-    description = "KDE remote control";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.7/kdeutils/ktimer.nix
deleted file mode 100644
index 5700977349e..00000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/ktimer.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Timer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/kwallet.nix b/pkgs/desktops/kde-4.7/kdeutils/kwallet.nix
deleted file mode 100644
index 9ec0e6c0396..00000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/kwallet.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Wallet (password storage) management tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/printer-applet.nix b/pkgs/desktops/kde-4.7/kdeutils/printer-applet.nix
deleted file mode 100644
index 2d937b3a4db..00000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/printer-applet.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ kde, kdelibs
-, pythonPackages, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer
-, pythonDBus, makeWrapper }:
-
-let s_c_p = system_config_printer.override { withGUI = false; }; in
-
-kde rec {
-  buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython
-    ] ++ pythonPath;
-
-  pythonPath = [ pyqt4 pykde4 pycups s_c_p ];
-
-  passthru.propagatedUserEnvPackages = [ s_c_p ];
-
-  postInstall =
-    ''
-      wrapPythonPrograms
-
-      # ‘system-config-printer’ supplies some D-Bus policy that we need.
-      mkdir -p $out/nix-support
-      echo ${s_c_p} > $out/nix-support/propagated-user-env-packages
-    '';
-
-  meta = {
-    description = "KDE printer applet";
-    longDescription = "Applet to view current print jobs and configure new printers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.7/kdeutils/superkaramba.nix
deleted file mode 100644
index 4dce768078b..00000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/superkaramba.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, qimageblitz }:
-
-kde {
-  buildInputs = [ kdelibs qimageblitz ];
-
-  cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ];
-
-  meta = {
-    description = "A KDE Eye-candy Application";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.7/kdeutils/sweeper.nix
deleted file mode 100644
index 78d56c7df30..00000000000
--- a/pkgs/desktops/kde-4.7/kdeutils/sweeper.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Helps clean unwanted traces the user leaves on the system";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.7/kdewebdev/kfilereplace.nix
deleted file mode 100644
index c3f6129d7e5..00000000000
--- a/pkgs/desktops/kde-4.7/kdewebdev/kfilereplace.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt }:
-
-kde {
-  buildInputs = [ kdelibs libxml2 libxslt ];
-
-  meta = {
-    description = "Batch search and replace tool";
-    homepage = http://www.kdewebdev.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.7/kdewebdev/kimagemapeditor.nix
deleted file mode 100644
index bececea7797..00000000000
--- a/pkgs/desktops/kde-4.7/kdewebdev/kimagemapeditor.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt }:
-
-kde {
-  buildInputs = [ kdelibs libxml2 libxslt ];
-
-  meta = {
-    description = "An HTML imagemap editor";
-    homepage = http://www.nongnu.org/kimagemap/;
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.7/kdewebdev/klinkstatus.nix
deleted file mode 100644
index 94adbb7fd6e..00000000000
--- a/pkgs/desktops/kde-4.7/kdewebdev/klinkstatus.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt, kdepimlibs
-, boost, htmlTidy }:
-
-kde {
-  buildInputs =
-    [ kdelibs libxml2 libxslt kdepimlibs boost htmlTidy ];
-
-  meta = {
-    description = "A KDE link checker";
-    homepage = http://klinkstatus.kdewebdev.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.7/kdewebdev/kommander.nix
deleted file mode 100644
index 6a870e56303..00000000000
--- a/pkgs/desktops/kde-4.7/kdewebdev/kommander.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt }:
-
-kde {
-  buildInputs = [ kdelibs libxml2 libxslt ];
-
-  meta = {
-    description = "A graphical editor of scripted dialogs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/l10n/default.nix b/pkgs/desktops/kde-4.7/l10n/default.nix
deleted file mode 100644
index 69cfdcf8ab2..00000000000
--- a/pkgs/desktops/kde-4.7/l10n/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
-
-let
-
-  inherit (stdenv.lib) attrByPath singleton;
-
-  kdeL10nDerivation =
-    { lang, saneName, sha256 }:
-
-    stdenv.mkDerivation rec {
-      name = "kde-l10n-${saneName}-${release}";
-
-      src = fetchurl {
-        url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
-        name = "${name}.tar.bz2";
-        inherit sha256;
-      };
-
-      buildInputs = [ gettext kdelibs ];
-
-      cmakeFlags = "-Wno-dev";
-
-      meta = {
-        description = "KDE translation for ${lang}";
-        license = "GPL";
-        inherit (kdelibs.meta) maintainers platforms homepage;
-      };
-    };
-
-  kdeL10nRelease =
-    builtins.listToAttrs (
-      map ({lang, saneName, sha256}:
-        {
-          name = saneName;
-          value = kdeL10nDerivation { inherit lang saneName sha256; };
-        }
-      ) (import (./manifest + "-${release}.nix"))
-    );
-
-in
-{
-  inherit kdeL10nDerivation;
-  recurseForDerivations = true;
-} // kdeL10nRelease
diff --git a/pkgs/desktops/kde-4.7/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.7/l10n/l10n-manifest.sh
deleted file mode 100755
index cc0eec20aaa..00000000000
--- a/pkgs/desktops/kde-4.7/l10n/l10n-manifest.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# Usage: download kde-l10n to $dir, then run
-# $0 $dir
-
-dir=$1
-
-if [[ ! -d "${dir}" ]]; then
-  echo "${dir} is not a directory (or doesn't exist)!" >&2
-  exit 1
-fi
-
-release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.bz2 | \
-	sed -e 's/.*en_GB-//' -e 's/\.tar\.bz2//')
-
-echo "Detected release ${release}" >&2
-
-exec > "manifest-${release}.nix"
-echo "["
-for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.bz2`; do
-  lang=${i%-${release}.tar.bz2}
-  lang=${lang#kde-l10n-}
-  echo -n "${lang}.. " >&2
-  hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo "{"
-  echo "  lang = \"${lang}\";"
-  echo "  saneName = \"$(echo $lang | sed s^@^_^g)\";"
-  echo "  sha256 = \"${hash}\";"
-  echo "}"
-  echo $hash >&2
-done
-echo "]"
diff --git a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix
deleted file mode 100644
index a128ff8dc62..00000000000
--- a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix
+++ /dev/null
@@ -1,267 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "1iw8x8k31jrgqc8nq276iwca1dgicz9vcx58rfbnk924dvqrflpv";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "07i4s6jkfkw59mr5n4256rzwy64y1c5wy957jbvnidqcrpzh1azf";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "080svc26zqf45wra6d6ljxzgs8f6gzl567wm73yp5qrgqnvyvxir";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "04fz56hsrpl6mxsbw5ja7armf8zbib542d7iv4p4c87xncib13qj";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "01mi1d6yz5w122bcjzp3r8g70pzil6216sv2y2dxaqjlxpdllklp";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "0l1rwx1k0vpkfc52divm5cnwxr05mwcl1sr84mi24s2ygs6rk8ib";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "1r2pzkvs1rc8hfzi5q0p6drvkl1ykq89bzi3k73i3fghx42qdxv6";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "100589wkw5rdcihk1nwl4i0bc30bq3b289n03q9lgf8zadflrrg9";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "0q41lpkf8srjxrrcnw9c7rkc83m4jw3r7z6s8x9rn0d5h2l36gv8";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "0mmvr3fh51r958myc18nxvl7d8hsm4wl70vmac3a3w47mr9aayqi";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "11k8svvnph9431maxdhzr334h7h11jk681fb2z1hb7i6cprmac9f";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "0pvjfkh93avkg9dii5byjh3kiqcgax9dfw97jmy6qccicgq6frvd";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "0gnnr7nyxjrzf632zs1k3j4bss3gm5qadfm2jki41y9q1f82vy99";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "0mfrmqn1yiqrgq79bgbb8799myv5h30g1gr83xja9g9y0lb645bs";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "03d6xbc7h9gslzvx1q7lcb8bfr5w8809jfb6cn4zv36in593wq85";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "13m7rdz2gd1cag2x6hfzyv8xj5777fly5f9pyhr28hrafyqc44l5";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "1ryimhlddxwaa40si3j0id37xm845ybsfkck0i7x2kmg87a55wcz";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "01v4vkbyhbsv64z7mnj129ss1rnr00n19iiza0ivjzsbzryhh3p2";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "0s2a4nc3z03xj8za426arwr1cjqqcd6pq82lc9q0kiv2fpxgagxw";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "0sv4fsnnnnpnf14s7fv83g9kzqq31gl0647cy523xkyxpdwhj9hp";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "0k9gzxiyplvk78nqk3kmqh74lani6iqciyighii1m0cvylq5sljz";
-}
-{
-  lang = "id";
-  saneName = "id";
-  sha256 = "16l4wif0qsmvpikagkhfyh98wdss4w0imixnzawadx0jq5mac6ga";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "1g5pan1iy2mx43z5gxvp07n3a9yrc56y4pya2r9g6wjnzcp0ynbj";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "0p0grhjx04khqmih8gmlpgjazr8asv7ql1gj965sjaf8a6z1h5ar";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "1f6ig8x3siqww4bwldpgncpyhlmkf6hbd6ahlvd5dqn6hqpknygx";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "0kyhr0b5g842dds59l3rcvyq3n12xx11svcqbqhiqqm3a8qki9vi";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "02ss6rxqf71n06a769l0xky30nhyqdhhsad9lmxs0dbbnxdcnixr";
-}
-{
-  lang = "kn";
-  saneName = "kn";
-  sha256 = "0rk193a27hvh63lfb7yy8g0wxb05kymyqnhdxcmai3wk2n53bi9y";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "0wyplpkkq6mdm5k7jxxppwgrm4rrb5mbhagszg1y460rcx7d5vcm";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "08767csx7sq02jkkrdl16jj7jprqc3qbsz7vdcwli3274qjkdk9s";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "0f4mxjsg2ipsj57ki26n870zxnk28z9ayblzgmv821xiawjaa4gc";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "1myb1b4p849nvb4q2n5hcy5fsfb4zdvhc5vkwa2giiy0pv230cmm";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "1vm6fjac0aaxls0rlgz4s804kbarj1rzyli50dzfcfqwngzkckxk";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "02v0cscngl7wfsl7yc2xr1a593qq064spgk1ynzad1rz1g98z212";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "01s1kfp5x036hcpyl87qzqjlmjwp8hda3qplnj3inihias2cnvb7";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "0al2lwvj23rp1plg2ykakbgw6qzxkkd5pd2nqdfnaif9xq9fp9db";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "08fffsaay01dnbs7bg3w325bknjcfbp3f1ryrdy2g7w2achyakls";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "03klc7q1h0xxc43vqw2m87n4wzxg140ql7mlzrjsrdnqgx2pvch4";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "1g4nd48fzfxam8zsi0imw57lhjm7i7qifqmy53s7pfr4cmq4fbw5";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "112pj6bi1bagafh89322mdj8ynmljv0ry7z2zss4ljfhqxxndc6b";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "1i4fx5mrz9910wkfgi885gjafcspnk8nyx7cimkvnp6y2xwpl733";
-}
-{
-  lang = "si";
-  saneName = "si";
-  sha256 = "0h77cqi9cmzni4mn7k91ar56b9ph8dlyagn29wd958hpkxwbdqiw";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "1q8bxlaah7afs12ni8xpjj6nlxjmxfpzabavm7ixqwnn4l732vyn";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "0508w2k4g7f9dm0ds28h5hhxd5qc4w16zxqskygrs6144567hb0c";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "0bvbzah338bh8vnn2ppakd8zb49vcc7d95ahyahrkqc4ls5z60sv";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "1glgb7shn3qlszayyc11wjhbc5g29agq2rlwf45drk2b5fi2m8bn";
-}
-{
-  lang = "th";
-  saneName = "th";
-  sha256 = "0g3pgrsb3d33295nw45y0a318yb4bvld46xvjsd3ay8hxpxrf4yy";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "02k1jakxwj5zp0z7x8yrjrl17syzv6rfyscal6af5bavjsx99kxp";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "0wq1jlxwz2avqzb9yqnck69qkfy3q7cq76i2jadbfdvwk06w44bi";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "0813bmgi9k3kx2k8rl8h1l9p6zcnabk36p7nm8v9vb4v7d52cyds";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "14slp0ybjbsm62misrp9qni5pzw4pzz3zznzc49z0a7yfni9i6av";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "18jfbz2h8jjby48hwjyrd9yn3k7xbp58g28psmlhsg2m3f8mr669";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "09mfspiy3ihg0n6paqhp0g1srl60sxrkxgha536624kbrbwp1jpq";
-}
-]
diff --git a/pkgs/desktops/kde-4.7/oxygen-icons.nix b/pkgs/desktops/kde-4.7/oxygen-icons.nix
deleted file mode 100644
index 1f7572b4d8e..00000000000
--- a/pkgs/desktops/kde-4.7/oxygen-icons.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake }:
-
-kde {
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "0c12c72bcf41cfaf03f85fc1ae27e44d8cecac3deb504ab1de4c30f4fc9e3cd0";
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    description = "KDE Oxygen theme icons";
-    longDescription = "Icons for KDE's default theme";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/support/akonadi/default.nix b/pkgs/desktops/kde-4.7/support/akonadi/default.nix
deleted file mode 100644
index cf515509602..00000000000
--- a/pkgs/desktops/kde-4.7/support/akonadi/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano }:
-
-stdenv.mkDerivation rec {
-  name = "akonadi-1.6.1";
-  
-  src = fetchurl {
-    url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
-    sha256 = "0r8sw7m1pwqc7qkaczm0r8adqi1wvlhdp32gy3q5p5plq50xhgra";
-  };
-
-  buildInputs = [ qt4 soprano libxslt boost ];
-
-  nativeBuildInputs = [ cmake automoc4 shared_mime_info ];
-
-  enableParallelBuilding = true;
-  
-  meta = with stdenv.lib; {
-    description = "KDE PIM Storage Service";
-    license = "LGPL";
-    homepage = http://pim.kde.org/akonadi;
-    maintainers = [ maintainers.sander maintainers.urkud ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix
index f8246190462..b8f9afff7b3 100644
--- a/pkgs/desktops/kde-4.8/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.8/kde-runtime.nix
@@ -6,7 +6,7 @@
 kde {
   buildInputs =
     [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica xz networkmanager
-      samba (libcanberra.override { gtk = null; }) ntrack libjpeg qca2 pulseaudio
+      samba libcanberra ntrack libjpeg qca2 pulseaudio
     ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix
index 9bc9634469c..5248d6567d2 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 8be4ac09e14..a7e64707f91 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 00000000000..62b04caaa34
--- /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 00000000000..51ac265dcb1
--- /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 d597237e32b..2e76b22510f 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 e5daaca9d52..a6107d0a870 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 100b3aa87f1..e77c2251b36 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/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix
new file mode 100644
index 00000000000..fcd0c9fd453
--- /dev/null
+++ b/pkgs/development/compilers/aldor/default.nix
@@ -0,0 +1,51 @@
+{ fetchgit, stdenv, gmp, which, flex, bison, makeWrapper
+, autoconf, automake, libtool, openjdk, perl }:
+
+stdenv.mkDerivation {
+  name = "aldor-1.1.0";
+
+  src = fetchgit {
+    url = "https://github.com/pippijn/aldor";
+    sha256 = "14xv3jl15ib2knsdz0bd7jx64zg1qrr33q5zcr8gli860ps8gkg3";
+    rev = "f7b95835cf709654744441ddb1c515bfc2bec998";
+  };
+
+  buildInputs = [ gmp which flex bison makeWrapper autoconf automake libtool
+                  openjdk perl ];
+
+  preConfigure = ''
+    cd aldor ;
+    ./autogen.sh ;
+  '';
+
+  postInstall = ''
+    for prog in aldor unicl javagen ;
+    do
+      wrapProgram $out/bin/$prog --set ALDORROOT $out \
+        --prefix PATH : ${openjdk}/bin \
+        --prefix PATH : ${stdenv.gcc}/bin ;
+    done
+  '';
+
+  meta = {
+    homepage = "http://www.aldor.org/";
+    description = "Aldor is a programming language with an expressive type system";
+    license = stdenv.lib.licenses.asl20;
+
+    longDescription = ''
+      Aldor is a programming language with an expressive type system well-suited
+      for mathematical computing and which has been used to develop a number of
+      computer algebra libraries. Originally known as A#, Aldor was conceived as
+      an extension language for the Axiom system, but is now used more in other settings.
+      In Aldor, types and functions are first class values that can be constructed
+      and manipulated within programs. Pervasive support for dependent types allows
+      static checking of dynamic objects. What does this mean for a normal user? Aldor
+      solves many difficulties encountered in widely-used object-oriented programming
+      languages. It allows programs to use a natural style, combining the more attractive
+      and powerful properties of functional, object-oriented and aspect-oriented styles.
+    '';
+
+    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/development/compilers/avra/default.nix
new file mode 100644
index 00000000000..db9fafa42f1
--- /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/closure/default.nix b/pkgs/development/compilers/closure/default.nix
new file mode 100644
index 00000000000..13c9f1c0350
--- /dev/null
+++ b/pkgs/development/compilers/closure/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, jre, gnutar, bash }:
+
+stdenv.mkDerivation rec {
+  name = "closure-compiler-${version}";
+  version = "20130603";
+
+  src = fetchurl {
+    url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
+    sha256 = "0bk0s8p9r9an5m0l8y23wjlx490k15i4zah0a384a2akzji8y095";
+  };
+
+  phases = [ "installPhase" ];
+
+  buildInputs = [ gnutar ];
+
+  installPhase = ''
+    mkdir -p $out/lib/java $out/bin
+    tar -xzf $src
+    cp -r compiler.jar $out/lib/java/
+    echo "#!${bash}/bin/bash" > $out/bin/closure-compiler
+    echo "${jre}/bin/java -jar $out/lib/java/compiler.jar \"\$@\"" >> $out/bin/closure-compiler
+    chmod +x $out/bin/closure-compiler
+  '';
+
+  meta = {
+    description = "A tool for making JavaScript download and run faster";
+    homepage = https://developers.google.com/closure/compiler/;
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix
new file mode 100644
index 00000000000..56924d589f4
--- /dev/null
+++ b/pkgs/development/compilers/elm/elm-server.nix
@@ -0,0 +1,22 @@
+{ cabal, blazeHtml, deepseq, Elm, filepath, happstackServer, HTTP
+, mtl, parsec, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "elm-server";
+  version = "0.9.0.2";
+  sha256 = "0g362llb7jkwz8xhyhhsc8hz0vj7s7bgfz1az5qfh1cm4h8nynwr";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    blazeHtml deepseq Elm filepath happstackServer HTTP mtl parsec
+    transformers
+  ];
+  jailbreak = true;
+  meta = {
+    homepage = "http://elm-lang.org";
+    description = "The Elm language server";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix
new file mode 100644
index 00000000000..2c851ebbf3f
--- /dev/null
+++ b/pkgs/development/compilers/elm/elm.nix
@@ -0,0 +1,22 @@
+{ cabal, binary, blazeHtml, blazeMarkup, cmdargs, filepath, hjsmin
+, indents, mtl, pandoc, parsec, transformers, unionFind, uniplate
+}:
+
+cabal.mkDerivation (self: {
+  pname = "Elm";
+  version = "0.9.0.2";
+  sha256 = "0yr395wsj0spi6h9d6lm5hvdryybpf8i1qpv4gz9dk0bwlyc8iwh";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    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";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index e87dd88bf0d..6be976783bc 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "fpc-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/sourceforge/freepascal/Source/${version}/fpcbuild-${version}.tar.gz";
+    url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz";
     sha256 = "1vxy2y8pm0ribhpdhqlwwz696ncnz4rk2dafbn1mjgipm97qb26p";
   };
 
diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix
index d17f9f19515..7dd5be78185 100644
--- a/pkgs/development/compilers/gcc/4.3/default.nix
+++ b/pkgs/development/compilers/gcc/4.3/default.nix
@@ -135,7 +135,7 @@ stdenv.mkDerivation ({
     homepage = "http://gcc.gnu.org/";
     license = "GPL/LGPL";
     description = "GNU Compiler Collection, 4.3.x";
-    maintainers = with stdenv.lib.maintainers; [viric ludo];
+    maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };
 
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 035ebc8b268..c9cd71fc2b5 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.20130816";
   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 = "0w636gfjn3xigrlj31z4hy9kv44svyifsqcshrq95qxijx396j5m";
   };
 
   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/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix
index 99e91901d00..e3cc71bbccf 100644
--- a/pkgs/development/compilers/ghc/with-packages.nix
+++ b/pkgs/development/compilers/ghc/with-packages.nix
@@ -76,6 +76,11 @@ stdenv.mkDerivation rec {
           ln -s $f $out/share/emacs/site-lisp/
           echo -n .
         done
+        for f in "$currentPath/share/ghci/"*; do
+          mkdir -p $out/share/ghci
+          ln -s $f $out/share/ghci/
+          echo -n .
+        done
         for f in "$currentPkgDir/"*.conf; do
           ln -s $f $linkedPkgDir
           echo -n .
diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix
index 39c79e9a3de..01a8f1b6b18 100644
--- a/pkgs/development/compilers/go/1.1.nix
+++ b/pkgs/development/compilers/go/1.1.nix
@@ -7,11 +7,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "go-1.1";
+  name = "go-1.1.1";
 
   src = fetchurl {
-    url = http://go.googlecode.com/files/go1.1.src.tar.gz;
-    sha1 = "a464704ebbbdd552a39b5f9429b059c117d165b3";
+    url = http://go.googlecode.com/files/go1.1.1.src.tar.gz;
+    sha1 = "f365aed8183e487a48a66ace7bf36e5974dffbb3";
   };
 
   buildInputs = [ bison glibc bash makeWrapper ];
diff --git a/pkgs/development/compilers/lessc/default.nix b/pkgs/development/compilers/lessc/default.nix
new file mode 100644
index 00000000000..1d2bd5e7d0b
--- /dev/null
+++ b/pkgs/development/compilers/lessc/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, nodejs }:
+
+stdenv.mkDerivation rec {
+  name = "lessc-${version}";
+  version = "1.4.0";
+
+  src = fetchgit {
+    url = https://github.com/less/less.js.git;
+    rev = "refs/tags/v${version}";
+    sha256 = "12nzaz7v1bnqzylh4zm1srrj7w7f45fqj4sihxyg0bknfvfwdc56";
+  };
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/lib
+    cp -r $src/bin/* $out/bin/
+    cp -r $src/lib/* $out/lib/
+    substituteInPlace $out/bin/lessc --replace "/usr/bin/env node" ${nodejs}/bin/node
+  '';
+
+  meta = {
+    description = "LESS to CSS compiler";
+    homepage = http://lesscss.org/;
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 59e2bdc5509..1e53256a240 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -18,19 +18,23 @@ stdenv.mkDerivation {
   propagatedBuildInputs = [ libffi ];
   buildInputs = [ perl groff cmake python ]; # ToDo: polly, libc++; enable cxx11?
 
-  # created binaries need to be run before installation... I coudn't find a better way
-  preBuild = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/lib'';
+  # created binaries need to be run before installation... I coudn't find a
+  # better way
+  preBuild = ( if stdenv.isDarwin
+               then "export DYLD_LIBRARY_PATH='$DYLD_LIBRARY_PATH:'`pwd`/lib"
+               else "export LD_LIBRARY_PATH='$LD_LIBRARY_PATH:'`pwd`/lib" );
 
-  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_SHARED_LIBS=ON" ];
+  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]
+    ++ stdenv.lib.optional (!stdenv.isDarwin) [ "-DBUILD_SHARED_LIBS=ON" ];
 
   enableParallelBuilding = true;
-  #doCheck = true; # tests are broken, don't know why
+  # doCheck = true; # tests are broken, don't know why
 
-  meta = {
-    homepage = http://llvm.org/;
+  meta = with stdenv.lib; {
     description = "Collection of modular and reusable compiler and toolchain technologies";
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric shlevy raskin];
-    platforms = with stdenv.lib.platforms; all;
+    homepage    = http://llvm.org/;
+    license     = licenses.bsd3;
+    maintainers = with maintainers; [ lovek323 raskin shlevy viric ];
+    platforms   = platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
new file mode 100644
index 00000000000..10945934d00
--- /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/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix
index a45217a331a..b488308f5c4 100644
--- a/pkgs/development/compilers/stalin/default.nix
+++ b/pkgs/development/compilers/stalin/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     license = "GPLv2+";
     description = "Stalin, an optimizing Scheme compiler";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/compilers/strategoxt/0.17.nix b/pkgs/development/compilers/strategoxt/0.17.nix
index c84734d7ac7..d621cbf5f0c 100644
--- a/pkgs/development/compilers/strategoxt/0.17.nix
+++ b/pkgs/development/compilers/strategoxt/0.17.nix
@@ -82,7 +82,7 @@ rec {
 
 
   dryad = stdenv.mkDerivation rec {
-    name = "dryad-0.2pre1835518355";
+    name = "dryad-0.2pre18355";
 
     src = fetchurl {
       url = "http://releases.strategoxt.org/dryad/${name}-zbqfh1rm/dryad-0.2pre18355.tar.gz";
diff --git a/pkgs/development/compilers/strategoxt/0.18.nix b/pkgs/development/compilers/strategoxt/0.18.nix
index 85d373afa0d..7e58c561739 100644
--- a/pkgs/development/compilers/strategoxt/0.18.nix
+++ b/pkgs/development/compilers/strategoxt/0.18.nix
@@ -59,7 +59,7 @@ rec {
   };
 
   javafront = stdenv.mkDerivation (rec {
-    name = "java-front-0.9.1";
+    name = "java-front-0.9.1pre20122";
 
     src = fetchurl {
       url = "http://hydra.nixos.org/build/766286/download/1/java-front-0.9.1pre20122.tar.gz";
@@ -92,7 +92,7 @@ rec {
   } // ( if stdenv.system == "i686-cygwin" then { CFLAGS = "-O2"; } else {} ) ) ;
 
   dryad = stdenv.mkDerivation rec {
-    name = "dryad-0.2pre1835518355";
+    name = "dryad-0.2pre18355";
 
     src = fetchurl {
       url = "http://releases.strategoxt.org/dryad/${name}-zbqfh1rm/dryad-0.2pre18355.tar.gz";
diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index 11b0b2ea7b2..7ad7348925b 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
     license = "LGPLv2+";
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix
index 753c0f8ee77..f9a48468df3 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/pkgs/development/compilers/yap/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "yap-5.1.1";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/yap/Yap-5.1.1.tar.gz";
+    url = "mirror://sourceforge/yap/Yap-5.1.1.tar.gz";
     sha256 = "0bajxmlla9gay4m4l7y7x6qldxzi0jcq2ykgpjk9liky7g5kbnya";
   };
 
diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix
index 8d083126e4c..ba3e643a4fe 100644
--- a/pkgs/development/eclipse/ecj/default.nix
+++ b/pkgs/development/eclipse/ecj/default.nix
@@ -54,6 +54,6 @@ EOF
       # http://www.eclipse.org/legal/epl-v10.html (free software, copyleft)
       license = "EPLv1.0";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
     };
   }
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
new file mode 100644
index 00000000000..ffa4402a72a
--- /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 00000000000..902af75d494
--- /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 00000000000..63cf85bc506
--- /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 00000000000..6a3b3a8357c
--- /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/php-xdebug/default.nix b/pkgs/development/interpreters/php-xdebug/default.nix
index 5a242f3c85a..99c5ad663af 100644
--- a/pkgs/development/interpreters/php-xdebug/default.nix
+++ b/pkgs/development/interpreters/php-xdebug/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, php, autoconf, automake }:
 
-stdenv.mkDerivation {
-  name = "php-xdebug-2.0.5";
+stdenv.mkDerivation rec {
+  version = "2.2.3";
+  name = "php-xdebug-${version}";
 
   src = fetchurl {
-    url = "http://xdebug.org/files/xdebug-2.0.5.tgz";
-    sha256 = "1cmq7c36gj8n41mfq1wba5rij8j77yqhydpcsbcysk1zchg68f26";
+    url = "http://xdebug.org/files/xdebug-2.2.3.tgz";
+    sha256 = "076px4ax3qcqr3mmhi9jjkfhn7pcymrpda4hzy6kgn3flhnqfldk";
   };
 
   buildInputs = [ php autoconf automake ];
@@ -13,6 +14,9 @@ stdenv.mkDerivation {
   configurePhase = ''
     phpize
     ./configure --prefix=$out
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    # looks for this file for some reason -- isn't needed
+    touch unix.h
   '';
 
   buildPhase = ''
diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index 576c1dac7ed..caa673b31a9 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
 , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext
-, openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype
-, libxslt, libmcrypt, bzip2, icu }:
+, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype, libxslt
+, libmcrypt, bzip2, icu, libssh2, makeWrapper, libiconvOrEmpty, libiconv, uwimap
+, pam }:
 
 let
   libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
@@ -9,13 +10,21 @@ in
 
 composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.3.25";
+  version = "5.3.27";
 
   name = "php-${version}";
 
   enableParallelBuilding = true;
 
-  buildInputs = ["flex" "bison" "pkgconfig"];
+  buildInputs
+    = [ flex bison pkgconfig ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ libssh2 makeWrapper ];
+
+  # need to include the C++ standard library when compiling on darwin
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lstdc++";
+
+  # need to specify where the dylib for icu is stored
+  DYLD_LIBRARY_PATH = stdenv.lib.optionalString stdenv.isDarwin "${icu}/lib";
 
   flags = {
 
@@ -35,17 +44,21 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
         buildInputs = [curl openssl];
       };
 
+      pcntl = {
+        configureFlags = [ "--enable-pcntl" ];
+      };
+
       zlib = {
         configureFlags = ["--with-zlib=${zlib}"];
         buildInputs = [zlib];
       };
 
       libxml2 = {
-        configureFlags = [
-          "--with-libxml-dir=${libxml2}"
-          #"--with-iconv-dir=${libiconv}"
-          ];
-        buildInputs = [ libxml2 ];
+        configureFlags
+          = [ "--with-libxml-dir=${libxml2}" ]
+            ++ stdenv.lib.optional (libiconvOrEmpty != [])
+              [ "--with-iconv=${libiconv}" ];
+        buildInputs = [ libxml2 ] ++ libiconvOrEmpty;
       };
 
       readline = {
@@ -120,6 +133,14 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
         buildInputs = [gettext];
       };
 
+      imap = {
+        configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ]
+          # uwimap builds with kerberos on darwin
+          ++ stdenv.lib.optional (stdenv.isDarwin) "--with-kerberos";
+        buildInputs = [ uwimap openssl ]
+          ++ stdenv.lib.optional (!stdenv.isDarwin) pam;
+      };
+
       intl = {
         configureFlags = ["--enable-intl"];
         buildInputs = [icu];
@@ -151,45 +172,35 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
       ftp = {
         configureFlags = ["--enable-ftp"];
       };
-
-      /*
-         php is build within this derivation in order to add the xdebug lines to the php.ini.
-         So both Apache and command line php both use xdebug without having to configure anything.
-         Xdebug could be put in its own derivation.
-      * /
-        meta = {
-                description = "debugging support for PHP";
-                homepage = http://xdebug.org;
-                license = "based on the PHP license - as is";
-                };
-      */
     };
 
   cfg = {
-    mysqlSupport = config.php.mysql or true;
-    mysqliSupport = config.php.mysqli or true;
-    pdo_mysqlSupport = config.php.pdo_mysql or true;
-    libxml2Support = config.php.libxml2 or true;
     apxs2Support = config.php.apxs2 or true;
     bcmathSupport = config.php.bcmath or true;
-    socketsSupport = config.php.sockets or true;
+    bz2Support = config.php.bz2 or false;
     curlSupport = config.php.curl or true;
+    exifSupport = config.php.exif or true;
+    ftpSupport = config.php.ftp or true;
+    gdSupport = config.php.gd or true;
     gettextSupport = config.php.gettext or true;
+    imapSupport = config.php.imap or false;
+    intlSupport = config.php.intl or true;
+    libxml2Support = config.php.libxml2 or true;
+    mbstringSupport = config.php.mbstring or true;
+    mcryptSupport = config.php.mcrypt or false;
+    mysqlSupport = config.php.mysql or true;
+    mysqliSupport = config.php.mysqli or true;
+    opensslSupport = config.php.openssl or true;
+    pcntlSupport = config.php.pcntl or true;
+    pdo_mysqlSupport = config.php.pdo_mysql or true;
     postgresqlSupport = config.php.postgresql or true;
     readlineSupport = config.php.readline or true;
-    sqliteSupport = config.php.sqlite or true;
     soapSupport = config.php.soap or true;
-    zlibSupport = config.php.zlib or true;
-    opensslSupport = config.php.openssl or true;
-    mbstringSupport = config.php.mbstring or true;
-    gdSupport = config.php.gd or true;
-    intlSupport = config.php.intl or true;
-    exifSupport = config.php.exif or true;
+    socketsSupport = config.php.sockets or true;
+    sqliteSupport = config.php.sqlite or true;
     xslSupport = config.php.xsl or false;
-    mcryptSupport = config.php.mcrypt or false;
-    bz2Support = config.php.bz2 or false;
     zipSupport = config.php.zip or true;
-    ftpSupport = config.php.ftp or true;
+    zlibSupport = config.php.zlib or true;
   };
 
   configurePhase = ''
@@ -197,23 +208,32 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
     ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
     echo configurePhase end
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    # don't build php.dSYM as the php binary
+    sed -i 's/EXEEXT = \.dSYM/EXEEXT =/' Makefile
   '';
 
   installPhase = ''
     unset installPhase; installPhase;
     cp php.ini-production $iniFile
-  '';
+  '' + ( stdenv.lib.optionalString stdenv.isDarwin ''
+    for prog in $out/bin/*; do
+      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "$DYLD_LIBRARY_PATH"
+    done
+  '' );
 
   src = fetchurl {
-    url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
-    sha256 = "15dwks0823m0vc3qv58yxfvchwx9ydg5gjvjy8kpc5w3syras76m";
+    url = "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror";
+    sha256 = "11xj6v65m6l2lq2s2j5pq5l0iwjsnxmv1nad9hja50ivc8fb4bg1";
     name = "php-${version}.tar.bz2";
   };
 
   meta = {
     description = "The PHP language runtime engine";
-    homepage = http://www.php.net/;
-    license = "PHP-3";
+    homepage    = http://www.php.net/;
+    license     = "PHP-3";
+    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
+    platforms   = stdenv.lib.platforms.unix;
   };
 
   patches = [./fix.patch];
diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index 35b1f82c246..394278dea74 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
 , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext
 , openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype
-, libxslt, libmcrypt, bzip2, icu }:
+, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash }:
 
 let
   libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
@@ -9,7 +9,7 @@ in
 
 composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.4.15";
+  version = "5.4.18";
 
   name = "php-${version}";
 
@@ -30,6 +30,16 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
 
       # Extensions
 
+      ldap = {
+        configureFlags = ["--with-ldap=${openldap}"];
+        buildInputs = [openldap cyrus_sasl openssl];
+      };
+
+      mhash = {
+        configureFlags = ["--with-mhash"];
+        buildInputs = [libmhash];
+      };
+
       curl = {
         configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"];
         buildInputs = [curl openssl];
@@ -167,6 +177,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     };
 
   cfg = {
+    ldapSupport = config.php.ldap or true;
+    mhashSupport = config.php.mhash or true;
     mysqlSupport = config.php.mysql or true;
     mysqliSupport = config.php.mysqli or true;
     pdo_mysqlSupport = config.php.pdo_mysql or true;
@@ -214,8 +226,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
   '';
 
   src = fetchurl {
-    url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
-    sha256 = "0dh159svdrakvm9nsyg3yyln7cqqzpxgs2163cqxplnc93d8a8id";
+    urls = [
+      "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror"
+      "http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror"
+    ];
+    sha256 = "1ncizy992nfy3i3lzns7qcinj5376d840hchaqs5jlfn2nz0k50x";
     name = "php-${version}.tar.bz2";
   };
 
diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix
new file mode 100644
index 00000000000..2dd681239a6
--- /dev/null
+++ b/pkgs/development/interpreters/pypy/2.0/default.nix
@@ -0,0 +1,91 @@
+{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
+, sqlite, openssl, ncurses, pythonFull, expat }:
+
+assert zlibSupport -> zlib != null;
+
+let
+
+  majorVersion = "2.0";
+  version = "${majorVersion}.2";
+  pythonVersion = "2.7";
+  libPrefix = "pypy${majorVersion}";
+
+  pypy = stdenv.mkDerivation rec {
+    name = "pypy-${version}";
+
+    inherit majorVersion version;
+
+    src = fetchurl {
+      url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2";
+      sha256 = "0g2cajs6m3yf0lak5f18ccs6j77cf5xvbm4h6y5l1qlqdc6wk48r";
+    };
+
+    buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ]
+      ++ stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc
+      ++ stdenv.lib.optional zlibSupport zlib;
+
+    C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/include") buildInputs);
+    LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
+    LD_LIBRARY_PATH = LIBRARY_PATH;
+
+    preConfigure = ''
+      substituteInPlace Makefile \
+        --replace "-Ojit" "-Ojit --batch" \
+        --replace "pypy/goal/targetpypystandalone.py" "pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2 --withmod-_multiprocessing"
+
+      # we are using cpython and not pypy to do translation
+      substituteInPlace rpython/bin/rpython \
+        --replace "/usr/bin/env pypy" "${pythonFull}/bin/python"
+      substituteInPlace pypy/goal/targetpypystandalone.py \
+        --replace "/usr/bin/env pypy" "${pythonFull}/bin/python"
+
+      # convince pypy to find nix ncurses
+      substituteInPlace pypy/module/_minimal_curses/fficurses.py \
+        --replace "/usr/include/ncurses/curses.h" "${ncurses}/include/curses.h" \
+        --replace "ncurses/curses.h" "${ncurses}/include/curses.h" \
+        --replace "ncurses/term.h" "${ncurses}/include/term.h" \
+        --replace "libraries = ['curses']" "libraries = ['ncurses']"
+    '';
+
+
+    doCheck = true;
+    checkPhase = ''
+       export TERMINFO="${ncurses}/share/terminfo/";
+       export TERM="xterm";
+       export HOME="$TMPDIR";
+       # disable shutils because it assumes gid 0 exists
+       # disable socket because it has two actual network tests that fail
+      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_socket -test_shutil' lib-python
+    '';
+
+    installPhase = ''
+       mkdir -p $out/{bin,include,lib,pypy-c}
+
+       cp -R {include,lib_pypy,lib-python,pypy-c} $out/pypy-c
+       ln -s $out/pypy-c/pypy-c $out/bin/pypy
+       chmod +x $out/bin/pypy
+
+       # other packages expect to find stuff according to libPrefix
+       ln -s $out/pypy-c/include $out/include/${libPrefix}
+       ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix}
+
+       # TODO: compile python files?
+    '';
+
+    passthru = {
+      inherit zlibSupport libPrefix;
+      executable = "pypy";
+    };
+
+    enableParallelBuilding = true;
+
+    meta = with stdenv.lib; {
+      homepage = "http://pypy.org/";
+      description = "PyPy is a fast, compliant alternative implementation of the Python language (2.7.3)";
+      license = licenses.mit;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ iElectric ];
+    };
+  };
+
+in pypy
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index f264e4179e7..4b55f7150d3 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -75,6 +75,7 @@ let
     passthru = {
       inherit zlibSupport;
       libPrefix = "python${majorVersion}";
+      executable = "python2.6";
     };
 
     enableParallelBuilding = true;
@@ -148,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 ccb423ef32e..aea2d21fd8d 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
-, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm
-}:
+, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm, libX11 }:
 
 assert zlibSupport -> zlib != null;
 
@@ -86,6 +85,7 @@ let
     passthru = {
       inherit zlibSupport;
       libPrefix = "python${majorVersion}";
+      executable = "python2.7";
     };
 
     enableParallelBuilding = true;
@@ -164,6 +164,12 @@ let
       deps = [ ncurses ];
     };
 
+    crypt = buildInternalPythonModule {
+      moduleName = "crypt";
+      internalName = "crypt";
+      deps = [ ];
+    };
+
     gdbm = buildInternalPythonModule {
       moduleName = "gdbm";
       internalName = "gdbm";
@@ -179,7 +185,7 @@ let
 
     tkinter = buildInternalPythonModule {
       moduleName = "tkinter";
-      deps = [ tcl tk x11 ];
+      deps = [ tcl tk x11 libX11 ];
     };
 
     readline = buildInternalPythonModule {
diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
new file mode 100644
index 00000000000..e09602e7381
--- /dev/null
+++ b/pkgs/development/interpreters/python/3.2/default.nix
@@ -0,0 +1,87 @@
+{ stdenv, fetchurl
+, bzip2
+, db4
+, gdbm
+, libX11, xproto
+, ncurses
+, openssl
+, readline
+, sqlite
+, tcl, tk
+, zlib
+}:
+
+assert readline != null -> ncurses != null;
+
+with stdenv.lib;
+
+let
+  majorVersion = "3.2";
+  version = "${majorVersion}.5";
+
+  buildInputs = filter (p: p != null) [
+    zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
+  ];
+in
+stdenv.mkDerivation {
+  name = "python3-${version}";
+  inherit majorVersion version;
+
+  src = fetchurl {
+    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
+    sha256 = "0pxs234g08v3lar09lvzxw4vqdpwkbqmvkv894j2w7aklskcjd6v";
+  };
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+
+  preConfigure = ''
+    for i in /usr /sw /opt /pkg; do	# improve purity
+      substituteInPlace ./setup.py --replace $i /no-such-path
+    done
+    ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
+
+    configureFlagsArray=( --enable-shared --with-threads
+                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
+                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
+                          LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}"
+                        )
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  postInstall = ''
+    rm -rf "$out/lib/python${majorVersion}/test"
+    ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
+  '';
+
+  passthru = {
+    zlibSupport = zlib != null;
+    sqliteSupport = sqlite != null;
+    db4Support = db4 != null;
+    readlineSupport = readline != null;
+    opensslSupport = openssl != null;
+    tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
+    libPrefix = "python${majorVersion}";
+    executable = "python3.2m";
+    is_py3k = true;
+  };
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = "http://python.org";
+    description = "a high-level dynamically-typed programming language";
+    longDescription = ''
+      Python is a remarkably powerful dynamic programming language that
+      is used in a wide variety of application domains. Some of its key
+      distinguishing features include: clear, readable syntax; strong
+      introspection capabilities; intuitive object orientation; natural
+      expression of procedural code; full modularity, supporting
+      hierarchical packages; exception-based error handling; and very
+      high level dynamic data types.
+    '';
+    license = stdenv.lib.licenses.psfl;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
+  };
+}
diff --git a/pkgs/development/interpreters/python/3.2/setup-hook.sh b/pkgs/development/interpreters/python/3.2/setup-hook.sh
new file mode 100644
index 00000000000..e6fa34bf54b
--- /dev/null
+++ b/pkgs/development/interpreters/python/3.2/setup-hook.sh
@@ -0,0 +1,15 @@
+addPythonPath() {
+    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.2/site-packages
+}
+
+toPythonPath() {
+    local paths="$1"
+    local result=
+    for i in $paths; do
+        p="$i/lib/python3.2/site-packages"
+        result="${result}${result:+:}$p"
+    done
+    echo $result
+}
+
+envHooks=(${envHooks[@]} addPythonPath)
diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index 16973c6226e..509249b7f24 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -17,7 +17,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.3";
-  version = "${majorVersion}.1";
+  version = "${majorVersion}.2";
 
   buildInputs = filter (p: p != null) [
     zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
@@ -28,10 +28,12 @@ stdenv.mkDerivation {
   inherit majorVersion version;
 
   src = fetchurl {
-    url = "http://www.python.org/ftp/python/3.3.1/Python-${version}.tar.bz2";
-    sha256 = "0mm7nvdd85p6b26jwshy2dhicf0b06mb5lrl564i3c5q7jgs1vll";
+    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
+    sha256 = "16myvina7nakyyg7r5gnjyydk8bzar988vmxsw2k485w5gz04wpp";
   };
 
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+
   preConfigure = ''
     for i in /usr /sw /opt /pkg; do	# improve purity
       substituteInPlace ./setup.py --replace $i /no-such-path
@@ -49,6 +51,7 @@ stdenv.mkDerivation {
 
   postInstall = ''
     rm -rf "$out/lib/python${majorVersion}/test"
+    ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
   '';
 
   passthru = {
@@ -58,7 +61,9 @@ stdenv.mkDerivation {
     readlineSupport = readline != null;
     opensslSupport = openssl != null;
     tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
-    libPrefix = "python${majorVersion}m";
+    libPrefix = "python${majorVersion}";
+    executable = "python3.3m";
+    is_py3k = true;
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/interpreters/python/3.3/setup-hook.sh b/pkgs/development/interpreters/python/3.3/setup-hook.sh
index e6fa34bf54b..c272c87daf1 100644
--- a/pkgs/development/interpreters/python/3.3/setup-hook.sh
+++ b/pkgs/development/interpreters/python/3.3/setup-hook.sh
@@ -1,12 +1,12 @@
 addPythonPath() {
-    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.2/site-packages
+    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.3/site-packages
 }
 
 toPythonPath() {
     local paths="$1"
     local result=
     for i in $paths; do
-        p="$i/lib/python3.2/site-packages"
+        p="$i/lib/python3.3/site-packages"
         result="${result}${result:+:}$p"
     done
     echo $result
diff --git a/pkgs/development/interpreters/r-lang/default.nix b/pkgs/development/interpreters/r-lang/default.nix
deleted file mode 100644
index 43219899380..00000000000
--- a/pkgs/development/interpreters/r-lang/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, readline, perl, gfortran, libX11, libpng, libXt, zlib
-, withBioconductor ? false
-}:
-
-stdenv.mkDerivation {
-  name = "r-lang";
-  version = "2.12.0";
-  src = fetchurl {
-    url = http://cran.r-project.org/src/base/R-2/R-2.12.0.tar.gz;
-    sha256 = "93d72d845b01c6cd00e58f04b5e78fd6c83de96a8620505ad2a016772af02179";
-  };
-
-  bioconductor = if withBioconductor then import ../development/libraries/science/biology/bioconductor { inherit fetchurl stdenv readline; } else null;
-
-  postUnpack = ''
-    gunzip R-2.12.0/src/library/Recommended/Matrix_0.999375-44.tar.gz
-    tar --file=R-2.12.0/src/library/Recommended/Matrix_0.999375-44.tar --delete Matrix/src/dummy.cpp
-    gzip R-2.12.0/src/library/Recommended/Matrix_0.999375-44.tar
-  '';
-
-  buildInputs = [readline perl gfortran libpng libX11 libXt zlib];
-  configureFlags = ["--enable-R-shlib"] ;
-
-  meta = {
-    description = "R is a language and environment for statistical computing and graphics";
-    license     = "GPL2";
-    homepage    = http://www.r-project.org/;
-    longDescription = ''
-      R is a language and environment for statistical computing and
-      graphics. It is a GNU project which is similar to the S language.
-      R provides a wide variety of statistical (linear and nonlinear
-      modelling, classical statistical tests, time-series analysis,
-      classification, clustering, ...) and graphical techniques, and is
-      highly extensible.
-    '';
-  };
-}
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 347647fd87e..ddcf2634039 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.4";
+  version = "5.3.6";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz";
-    sha256 = "0yrdmpdvzf092869y6zjjjxl6j2kypgiv7qrfkv7lj8w01pbh7sd";
+    sha256 = "12pvgidaym1rwyyi69bd2gfmfwi1y0lf8xgih7a8r20z4g0zzq3z";
   };
 
   # Various racket executables do run-time searches for these.
diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 9b34f9a1fef..f7d8b93f966 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Ren'Py Visual Novel Engine";
     homepage = "http://renpy.org/";
-    licence = "MIT";
+    license = "MIT";
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index 2e899128252..da0de976824 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -3,81 +3,86 @@
 g: # Get dependencies from patched gems
 {
   aliases = {
-    ZenTest = g.ZenTest_4_9_0;
-    actionmailer = g.actionmailer_3_2_13;
-    actionpack = g.actionpack_3_2_13;
-    activemodel = g.activemodel_3_2_13;
-    activerecord = g.activerecord_3_2_13;
-    activeresource = g.activeresource_3_2_13;
-    activesupport = g.activesupport_3_2_13;
-    addressable = g.addressable_2_3_3;
-    arel = g.arel_3_0_2;
+    ZenTest = g.ZenTest_4_9_3;
+    actionmailer = g.actionmailer_4_0_0;
+    actionpack = g.actionpack_4_0_0;
+    activemodel = g.activemodel_4_0_0;
+    activerecord = g.activerecord_4_0_0;
+    activerecord_deprecated_finders = g.activerecord_deprecated_finders_1_0_3;
+    activesupport = g.activesupport_4_0_0;
+    addressable = g.addressable_2_3_5;
+    arel = g.arel_4_0_0;
+    atomic = g.atomic_1_1_13;
     atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
     autotest_rails = g.autotest_rails_4_1_2;
-    aws_sdk = g.aws_sdk_1_8_5;
+    aws_sdk = g.aws_sdk_1_15_0;
     bitbucket_backup = g.bitbucket_backup_0_2_2;
-    builder = g.builder_3_2_0;
-    buildr = g.buildr_1_4_11;
-    bundler = g.bundler_1_3_4;
+    builder = g.builder_3_2_2;
+    buildr = g.buildr_1_4_12;
+    bundler = g.bundler_1_3_5;
     childprocess = g.childprocess_0_3_9;
     chronic = g.chronic_0_9_1;
     daemons = g.daemons_1_1_9;
     diff_lcs = g.diff_lcs_1_1_3;
     dimensions = g.dimensions_1_2_0;
+    domain_name = g.domain_name_0_5_13;
+    dotenv = g.dotenv_0_8_0;
     em_resolv_replace = g.em_resolv_replace_1_1_3;
     erubis = g.erubis_2_7_0;
     eventmachine = g.eventmachine_1_0_3;
     eventmachine_tail = g.eventmachine_tail_0_6_4;
-    execjs = g.execjs_1_4_0;
     fakes3 = g.fakes3_0_1_5;
-    faraday = g.faraday_0_8_7;
+    faraday = g.faraday_0_8_8;
     faraday_middleware = g.faraday_middleware_0_8_8;
-    ffi = g.ffi_1_6_0;
+    ffi = g.ffi_1_9_0;
     file_tail = g.file_tail_1_0_12;
-    foreman = g.foreman_0_62_0;
+    foreman = g.foreman_0_63_0;
     gettext = g.gettext_2_3_9;
-    highline = g.highline_1_6_16;
-    hike = g.hike_1_2_1;
+    highline = g.highline_1_6_19;
+    hike = g.hike_1_2_3;
     hoe = g.hoe_3_1_0;
-    i18n = g.i18n_0_6_4;
+    http_cookie = g.http_cookie_1_0_1;
+    i18n = g.i18n_0_6_5;
     iconv = g.iconv_1_0_3;
-    journey = g.journey_1_0_4;
     jruby_pageant = g.jruby_pageant_1_1_1;
-    jsduck = g.jsduck_4_7_1;
-    json = g.json_1_7_7;
-    json_pure = g.json_pure_1_7_7;
-    libv8 = g.libv8_3_3_10_4;
+    jsduck = g.jsduck_5_1_0;
+    json = g.json_1_8_0;
+    json_pure = g.json_pure_1_8_0;
     locale = g.locale_2_0_8;
     lockfile = g.lockfile_2_1_0;
     macaddr = g.macaddr_1_6_1;
-    mail = g.mail_2_5_3;
-    mime_types = g.mime_types_1_21;
+    mail = g.mail_2_5_4;
+    mechanize = g.mechanize_2_7_2;
+    mime_types = g.mime_types_1_24;
+    mini_portile = g.mini_portile_0_5_1;
     minitar = g.minitar_0_5_3;
-    multi_json = g.multi_json_1_7_2;
+    minitest = g.minitest_4_7_5;
+    multi_json = g.multi_json_1_7_9;
     multipart_post = g.multipart_post_1_2_0;
+    net_http_digest_auth = g.net_http_digest_auth_1_4;
+    net_http_persistent = g.net_http_persistent_2_9;
     net_sftp = g.net_sftp_2_0_5;
-    net_ssh = g.net_ssh_2_6_6;
+    net_ssh = g.net_ssh_2_6_8;
     nix = g.nix_0_1_1;
-    nokogiri = g.nokogiri_1_5_9;
+    nokogiri = g.nokogiri_1_6_0;
+    ntlm_http = g.ntlm_http_0_1_1;
     papertrail = g.papertrail_0_9_7;
     papertrail_cli = g.papertrail_cli_0_9_3;
-    parallel = g.parallel_0_6_3;
+    parallel = g.parallel_0_7_1;
     polyglot = g.polyglot_0_3_3;
     rack = g.rack_1_5_2;
-    rack_cache = g.rack_cache_1_2;
     rack_protection = g.rack_protection_1_5_0;
-    rack_ssl = g.rack_ssl_1_3_3;
     rack_test = g.rack_test_0_6_2;
-    rails = g.rails_3_2_13;
-    railties = g.railties_3_2_13;
-    rake = g.rake_10_0_4;
+    rails = g.rails_4_0_0;
+    railties = g.railties_4_0_0;
+    rake = g.rake_10_1_0;
     rb_fsevent = g.rb_fsevent_0_9_3;
-    rdiscount = g.rdiscount_2_0_7_1;
-    rdoc = g.rdoc_3_12_2;
-    remote_syslog = g.remote_syslog_1_6_13;
-    right_aws = g.right_aws_3_0_5;
-    right_http_connection = g.right_http_connection_1_3_0;
-    rjb = g.rjb_1_4_6;
+    rdiscount = g.rdiscount_2_1_6;
+    remote_syslog = g.remote_syslog_1_6_14;
+    right_aws = g.right_aws_3_1_0;
+    right_http_connection = g.right_http_connection_1_4_0;
+    rjb = g.rjb_1_4_8;
+    rkelly_remix = g.rkelly_remix_0_0_4;
     rmail = g.rmail_1_0_0;
     rspec = g.rspec_2_11_0;
     rspec_core = g.rspec_core_2_11_1;
@@ -85,33 +90,39 @@ g: # Get dependencies from patched gems
     rspec_mocks = g.rspec_mocks_2_11_3;
     rubyforge = g.rubyforge_2_0_4;
     rubyzip = g.rubyzip_0_9_9;
-    sass = g.sass_3_2_7;
-    selenium_webdriver = g.selenium_webdriver_2_31_0;
+    sass = g.sass_3_2_10;
+    selenium_webdriver = g.selenium_webdriver_2_35_0;
     servolux = g.servolux_0_10_0;
     sinatra = g.sinatra_1_3_2;
-    sprockets = g.sprockets_2_2_2;
+    sprockets = g.sprockets_2_10_0;
+    sprockets_rails = g.sprockets_rails_2_0_0;
     syslog_protocol = g.syslog_protocol_0_9_2;
     systemu = g.systemu_2_5_2;
+    taskjuggler = g.taskjuggler_3_5_0;
+    term_ansicolor = g.term_ansicolor_1_2_2;
     text = g.text_1_2_1;
-    therubyracer = g.therubyracer_0_10_2;
     thin = g.thin_1_5_1;
-    thor = g.thor_0_18_0;
-    tilt = g.tilt_1_3_6;
-    tins = g.tins_0_7_2;
-    treetop = g.treetop_1_4_12;
+    thor = g.thor_0_18_1;
+    thread_safe = g.thread_safe_0_1_2;
+    tilt = g.tilt_1_4_1;
+    tins = g.tins_0_8_4;
+    treetop = g.treetop_1_4_15;
     trollop = g.trollop_2_0;
     tzinfo = g.tzinfo_0_3_37;
+    unf = g.unf_0_1_2;
+    unf_ext = g.unf_ext_0_0_6;
     uuid = g.uuid_2_3_7;
-    uuidtools = g.uuidtools_2_1_3;
+    uuidtools = g.uuidtools_2_1_4;
+    webrobots = g.webrobots_0_1_1;
     websocket = g.websocket_1_0_7;
-    xapian_full_alaveteli = g.xapian_full_alaveteli_1_2_9_5;
+    xapian_full = g.xapian_full_1_2_3;
     xapian_ruby = g.xapian_ruby_1_2_15_1;
     xml_simple = g.xml_simple_1_1_1;
     yajl_ruby = g.yajl_ruby_1_1_0;
   };
-  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
+  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''thin'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ];
   gems = {
-    ZenTest_4_9_0 = {
+    ZenTest_4_9_3 = {
       basename = ''ZenTest'';
       meta = {
         description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby'';
@@ -138,77 +149,77 @@ multiruby runs anything you want on multiple versions of ruby. Great
 for compatibility checking! Use multiruby_setup to manage your
 installed versions.'';
       };
-      name = ''ZenTest-4.9.0'';
+      name = ''ZenTest-4.9.3'';
       requiredGems = [  ];
-      sha256 = ''16bp7rwl463m0d213rmwp4rjfwiw1bm529c518v91l18h7hcnb96'';
+      sha256 = ''0rd07scqhdy9sfygbgbdick895pk4pbamcl70hr78cylhqpk6m38'';
     };
-    actionmailer_3_2_13 = {
+    actionmailer_4_0_0 = {
       basename = ''actionmailer'';
       meta = {
         description = ''Email composition, delivery, and receiving framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'';
       };
-      name = ''actionmailer-3.2.13'';
-      requiredGems = [ g.actionpack_3_2_13 g.mail_2_5_3 ];
-      sha256 = ''0ksw1b5rba8l6400qgc6zjdn14q68n6crjmm76ggg32r4wv3xn06'';
+      name = ''actionmailer-4.0.0'';
+      requiredGems = [ g.actionpack_4_0_0 g.mail_2_5_4 ];
+      sha256 = ''0d63hmddll0vdbzzxj4zl6njv1pm7j2njvqfccvvyypwsynfjkgk'';
     };
-    actionpack_3_2_13 = {
+    actionpack_4_0_0 = {
       basename = ''actionpack'';
       meta = {
         description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
       };
-      name = ''actionpack-3.2.13'';
-      requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ];
-      sha256 = ''1m3kd3rwa4z0yik68xi0l9q71lyzq4gdciqaw5w2w9pal1cj8y5w'';
+      name = ''actionpack-4.0.0'';
+      requiredGems = [ g.activesupport_4_0_0 g.builder_3_1_4 g.rack_1_5_2 g.rack_test_0_6_2 g.erubis_2_7_0 ];
+      sha256 = ''0hx9hdbqqm73l81p5r520zdk218739414yhw9yrys905ks2f5j4d'';
     };
-    activemodel_3_2_13 = {
+    activemodel_4_0_0 = {
       basename = ''activemodel'';
       meta = {
         description = ''A toolkit for building modeling frameworks (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
-        longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'';
+        longDescription = ''A toolkit for building modeling frameworks like Active Record. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'';
       };
-      name = ''activemodel-3.2.13'';
-      requiredGems = [ g.activesupport_3_2_13 g.builder_3_0_4 ];
-      sha256 = ''0lpc9ylwm00g66hmgj06iq51m2l234ii7k6qsjiywf9x5fq6khn5'';
+      name = ''activemodel-4.0.0'';
+      requiredGems = [ g.activesupport_4_0_0 g.builder_3_1_4 ];
+      sha256 = ''0vsq5bzsyfrzgnhizlipivmh7m9p0ky29avx47wnaqwjlpkir5m2'';
     };
-    activerecord_3_2_13 = {
+    activerecord_4_0_0 = {
       basename = ''activerecord'';
       meta = {
         description = ''Object-relational mapper framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
       };
-      name = ''activerecord-3.2.13'';
-      requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 g.arel_3_0_2 g.tzinfo_0_3_37 ];
-      sha256 = ''1z5rrjy2v27xldr24sd4sxi6k6f5anyg20kwj3qyc0jjn8c0gv85'';
+      name = ''activerecord-4.0.0'';
+      requiredGems = [ g.activesupport_4_0_0 g.activemodel_4_0_0 g.arel_4_0_0 g.activerecord_deprecated_finders_1_0_3 ];
+      sha256 = ''0lhksb0172kz23yhibr1rxihyp01h2ajqxd0l4nahs2qc9jlr722'';
     };
-    activeresource_3_2_13 = {
-      basename = ''activeresource'';
+    activerecord_deprecated_finders_1_0_3 = {
+      basename = ''activerecord_deprecated_finders'';
       meta = {
-        description = ''REST modeling framework (part of Rails).'';
-        homepage = ''http://www.rubyonrails.org'';
-        longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.'';
+        description = ''This gem contains deprecated finder APIs extracted from Active Record.'';
+        homepage = ''https://github.com/rails/activerecord-deprecated_finders'';
+        longDescription = ''Deprecated finder APIs extracted from Active Record.'';
       };
-      name = ''activeresource-3.2.13'';
-      requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 ];
-      sha256 = ''1r4ph4cqd32d4lq9bfyv1dpfxc4qndcqhqx7h7xg4p0va7dz251l'';
+      name = ''activerecord-deprecated_finders-1.0.3'';
+      requiredGems = [  ];
+      sha256 = ''1z2g7h2ywhplrsjrsh8961agf17s9rj8ypdwjj482mw86if3dslp'';
     };
-    activesupport_3_2_13 = {
+    activesupport_4_0_0 = {
       basename = ''activesupport'';
       meta = {
         description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
       };
-      name = ''activesupport-3.2.13'';
-      requiredGems = [ g.i18n_0_6_1 g.multi_json_1_7_2 ];
-      sha256 = ''1vailj8ja9g3s029p5qbvqdpxcis5gcpkl2d6j7a6d36hxlwlf8y'';
+      name = ''activesupport-4.0.0'';
+      requiredGems = [ g.i18n_0_6_5 g.multi_json_1_7_9 g.tzinfo_0_3_37 g.minitest_4_7_5 g.thread_safe_0_1_2 ];
+      sha256 = ''0agxkvjhhv6r9rpm0lcgjny4sn1ihhvhlgs46rgi3fz0y1d93ids'';
     };
-    addressable_2_3_3 = {
+    addressable_2_3_5 = {
       basename = ''addressable'';
       meta = {
         description = ''URI Implementation'';
@@ -218,11 +229,11 @@ Ruby's standard library. It more closely conforms to the relevant RFCs and
 adds support for IRIs and URI templates.
 '';
       };
-      name = ''addressable-2.3.3'';
+      name = ''addressable-2.3.5'';
       requiredGems = [  ];
-      sha256 = ''0nn583ba8kq4hhpr4lr2zzpm4r0mga0zfalxxpa6a4v27q71v5hh'';
+      sha256 = ''11hv69v6h39j7m4v51a4p7my7xwjbhxbsg3y7ja156z7by10wkg7'';
     };
-    arel_3_0_2 = {
+    arel_4_0_0 = {
       basename = ''arel'';
       meta = {
         description = ''Arel is a SQL AST manager for Ruby'';
@@ -236,9 +247,20 @@ It is intended to be a framework framework; that is, you can build your own ORM
 with it, focusing on innovative object and collection modeling as opposed to
 database compatibility and query generation.'';
       };
-      name = ''arel-3.0.2'';
+      name = ''arel-4.0.0'';
       requiredGems = [  ];
-      sha256 = ''158bvrhammpblky9z9dgimjr55bdypfx6w5s1dm4vyj42h49qpkx'';
+      sha256 = ''19xzg8jhp4p18xlf6sp4yhf6vdpc3hl8lm23n6glikclm7rvgick'';
+    };
+    atomic_1_1_13 = {
+      basename = ''atomic'';
+      meta = {
+        description = ''An atomic reference implementation for JRuby, Rubinius, and MRI'';
+        homepage = ''http://github.com/headius/ruby-atomic'';
+        longDescription = ''An atomic reference implementation for JRuby, Rubinius, and MRI'';
+      };
+      name = ''atomic-1.1.13'';
+      requiredGems = [  ];
+      sha256 = ''0sdy8fcncm6p2cba3p8v7dnbsa4z41f4cs1dd0myf4fq7axrrh0s'';
     };
     atoulme_Antwrap_0_7_4 = {
       basename = ''atoulme_Antwrap'';
@@ -259,7 +281,7 @@ database compatibility and query generation.'';
 	check out Buildr!'';
       };
       name = ''atoulme-Antwrap-0.7.4'';
-      requiredGems = [ g.rjb_1_4_6 ];
+      requiredGems = [ g.rjb_1_4_8 ];
       sha256 = ''0sh9capkya88qm9mvixwly32fwb2c4nzif9j9vv0f73rqw8kz4j4'';
     };
     autotest_rails_4_1_2 = {
@@ -271,19 +293,19 @@ database compatibility and query generation.'';
 rails support and extra plugins for migrations and fixtures.'';
       };
       name = ''autotest-rails-4.1.2'';
-      requiredGems = [ g.ZenTest_4_9_0 ];
+      requiredGems = [ g.ZenTest_4_9_3 ];
       sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
     };
-    aws_sdk_1_8_5 = {
+    aws_sdk_1_15_0 = {
       basename = ''aws_sdk'';
       meta = {
         description = ''AWS SDK for Ruby'';
         homepage = ''http://aws.amazon.com/sdkforruby'';
         longDescription = ''AWS SDK for Ruby'';
       };
-      name = ''aws-sdk-1.8.5'';
-      requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_9 g.json_1_7_7 ];
-      sha256 = ''0rhkkkfsw0qzckn99mnvpbnl7b1kysma3x8bbqwah2x438kwygpb'';
+      name = ''aws-sdk-1.15.0'';
+      requiredGems = [ g.uuidtools_2_1_4 g.nokogiri_1_5_10 g.json_1_8_0 ];
+      sha256 = ''1lan7sgp7n5r2x2amcqswckdmkymrp89pj92arxdalis9jamma7q'';
     };
     bitbucket_backup_0_2_2 = {
       basename = ''bitbucket_backup'';
@@ -293,25 +315,9 @@ rails support and extra plugins for migrations and fixtures.'';
         longDescription = ''A tool to backup Bitbucket repos.'';
       };
       name = ''bitbucket-backup-0.2.2'';
-      requiredGems = [ g.highline_1_6_16 g.json_1_7_7 ];
+      requiredGems = [ g.highline_1_6_19 g.json_1_8_0 ];
       sha256 = ''1kzg6pkzw04n96i6mhb74gpg4c899wly5fc2m1y6m2xvn71qksys'';
     };
-    builder_3_0_4 = {
-      basename = ''builder'';
-      meta = {
-        description = ''Builders for MarkUp.'';
-        homepage = ''http://onestepback.org'';
-        longDescription = ''Builder provides a number of builder objects that make creating structured data
-simple to do.  Currently the following builder objects are supported:
-
-* XML Markup
-* XML Events
-'';
-      };
-      name = ''builder-3.0.4'';
-      requiredGems = [  ];
-      sha256 = ''0hn41h249v82wj7d9vji2lm568jxv8pzq2czh2v0603hjv21r8x1'';
-    };
     builder_3_1_3 = {
       basename = ''builder'';
       meta = {
@@ -328,7 +334,7 @@ simple to do.  Currently the following builder objects are supported:
       requiredGems = [  ];
       sha256 = ''0w6xsq9vyvzdy0xb52sajgipr9ml2bbpivk6dxm69c6987dk7him'';
     };
-    builder_3_2_0 = {
+    builder_3_1_4 = {
       basename = ''builder'';
       meta = {
         description = ''Builders for MarkUp.'';
@@ -340,11 +346,27 @@ simple to do.  Currently the following builder objects are supported:
 * XML Events
 '';
       };
-      name = ''builder-3.2.0'';
+      name = ''builder-3.1.4'';
       requiredGems = [  ];
-      sha256 = ''0f2cpfx6lpazb1wrz3lf06qp6f0qf0gdq5z8xnhkplc3fz3kslb0'';
+      sha256 = ''1p0bjy1vb0zbswd6bsh5qda0f0br53p8vak8cm7hls62094r405p'';
     };
-    buildr_1_4_11 = {
+    builder_3_2_2 = {
+      basename = ''builder'';
+      meta = {
+        description = ''Builders for MarkUp.'';
+        homepage = ''http://onestepback.org'';
+        longDescription = ''Builder provides a number of builder objects that make creating structured data
+simple to do.  Currently the following builder objects are supported:
+
+* XML Markup
+* XML Events
+'';
+      };
+      name = ''builder-3.2.2'';
+      requiredGems = [  ];
+      sha256 = ''14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2'';
+    };
+    buildr_1_4_12 = {
       basename = ''buildr'';
       meta = {
         description = ''Build like you code'';
@@ -356,20 +378,20 @@ to do, and it takes care of the rest.  But also something we can easily extend
 for those one-off tasks, with a language that's a joy to use.
 '';
       };
-      name = ''buildr-1.4.11'';
-      requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_4 ];
-      sha256 = ''0bdrwl9jvxc5h2wqsyacr688hxvzcqan1bhqyryb5bg9a5gpscb4'';
+      name = ''buildr-1.4.12'';
+      requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_5 ];
+      sha256 = ''0hsy9bkfp1pq5f3jx8i6fsk0r309nmq778ykk6w103rkrdb3l6s6'';
     };
-    bundler_1_3_4 = {
+    bundler_1_3_5 = {
       basename = ''bundler'';
       meta = {
         description = ''The best way to manage your application's dependencies'';
         homepage = ''http://gembundler.com'';
         longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
       };
-      name = ''bundler-1.3.4'';
+      name = ''bundler-1.3.5'';
       requiredGems = [  ];
-      sha256 = ''1vgrc71nhnqlrg08zvs63afa1z9kzn2vvn95b14dvy14k2br3qhj'';
+      sha256 = ''1r7zx8qfwzr3pbgrjbsml7z5qgscwyyv33x2jzhz6adqyx3r1f08'';
     };
     childprocess_0_3_9 = {
       basename = ''childprocess'';
@@ -379,7 +401,7 @@ for those one-off tasks, with a language that's a joy to use.
         longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
       };
       name = ''childprocess-0.3.9'';
-      requiredGems = [ g.ffi_1_6_0 ];
+      requiredGems = [ g.ffi_1_9_0 ];
       sha256 = ''0jbz2ix7ff9ry8717lhcq9w8j8yd45akw48giwgdqccay5mlph7d'';
     };
     chronic_0_9_1 = {
@@ -440,6 +462,32 @@ is the MIT license.'';
       requiredGems = [  ];
       sha256 = ''1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0'';
     };
+    domain_name_0_5_13 = {
+      basename = ''domain_name'';
+      meta = {
+        description = ''Domain Name manipulation library for Ruby'';
+        homepage = ''https://github.com/knu/ruby-domain_name'';
+        longDescription = ''This is a Domain Name manipulation library for Ruby.
+
+It can also be used for cookie domain validation based on the Public
+Suffix List.
+'';
+      };
+      name = ''domain_name-0.5.13'';
+      requiredGems = [ g.unf_0_1_2 ];
+      sha256 = ''0m57vacj2bmdfp094gjylfzz5gqdpn95pcypk5friab3svrambxv'';
+    };
+    dotenv_0_8_0 = {
+      basename = ''dotenv'';
+      meta = {
+        description = ''Loads environment variables from `.env`.'';
+        homepage = ''https://github.com/bkeepers/dotenv'';
+        longDescription = ''Loads environment variables from `.env`.'';
+      };
+      name = ''dotenv-0.8.0'';
+      requiredGems = [  ];
+      sha256 = ''1l93ksw6szh77yzrsl4pzsg0ryry3j5n9k0xf8614gyl07p9rh51'';
+    };
     em_resolv_replace_1_1_3 = {
       basename = ''em_resolv_replace'';
       meta = {
@@ -504,17 +552,6 @@ using TCP/IP, especially if custom protocols are required.'';
       requiredGems = [ g.eventmachine_1_0_3 ];
       sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61'';
     };
-    execjs_1_4_0 = {
-      basename = ''execjs'';
-      meta = {
-        description = ''Run JavaScript code from Ruby'';
-        homepage = ''https://github.com/sstephenson/execjs'';
-        longDescription = ''ExecJS lets you run JavaScript code from Ruby.'';
-      };
-      name = ''execjs-1.4.0'';
-      requiredGems = [ g.multi_json_1_7_2 ];
-      sha256 = ''0b69ci2afbcdqsri3i89a7s7j7palxsxdb65x6h2wx79kzlc5xcs'';
-    };
     fakes3_0_1_5 = {
       basename = ''fakes3'';
       meta = {
@@ -522,18 +559,18 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Use FakeS3 to test basic S3 functionality without actually connecting to S3'';
       };
       name = ''fakes3-0.1.5'';
-      requiredGems = [ g.thor_0_18_0 g.builder_3_2_0 ];
+      requiredGems = [ g.thor_0_18_1 g.builder_3_2_2 ];
       sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib'';
     };
-    faraday_0_8_7 = {
+    faraday_0_8_8 = {
       basename = ''faraday'';
       meta = {
         description = ''HTTP/REST API client library.'';
         homepage = ''https://github.com/lostisland/faraday'';
       };
-      name = ''faraday-0.8.7'';
+      name = ''faraday-0.8.8'';
       requiredGems = [ g.multipart_post_1_2_0 ];
-      sha256 = ''186a9md3ixanl2crdlw37kspw5wiyw16z9mj3aw8rd1yd5q56ddi'';
+      sha256 = ''1cnyj5japrnv6wvl01la5amf7hikckfznh8234ad21n730b2wci4'';
     };
     faraday_middleware_0_8_8 = {
       basename = ''faraday_middleware'';
@@ -543,19 +580,19 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Various middleware for Faraday'';
       };
       name = ''faraday_middleware-0.8.8'';
-      requiredGems = [ g.faraday_0_8_7 ];
+      requiredGems = [ g.faraday_0_8_8 ];
       sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz'';
     };
-    ffi_1_6_0 = {
+    ffi_1_9_0 = {
       basename = ''ffi'';
       meta = {
         description = ''Ruby FFI'';
         homepage = ''http://wiki.github.com/ffi/ffi'';
         longDescription = ''Ruby FFI library'';
       };
-      name = ''ffi-1.6.0'';
+      name = ''ffi-1.9.0'';
       requiredGems = [  ];
-      sha256 = ''0jhjzj8gb6cakv32a6czgrx8krb0hx8mmkwh5yv2lhdcv3ak013v'';
+      sha256 = ''0rnh9yyfzcpdmi8m7giyd21lgqj00afgxvgbx41hsi2ls1ghfwvy'';
     };
     file_tail_1_0_12 = {
       basename = ''file_tail'';
@@ -565,19 +602,19 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Library to tail files in Ruby'';
       };
       name = ''file-tail-1.0.12'';
-      requiredGems = [ g.tins_0_7_2 ];
+      requiredGems = [ g.tins_0_8_4 ];
       sha256 = ''0mzxxnwj7k5pwxs0rdbmb3b41zgvzw7x40sf3qlkch4zdfx91i1j'';
     };
-    foreman_0_62_0 = {
+    foreman_0_63_0 = {
       basename = ''foreman'';
       meta = {
         description = ''Process manager for applications with multiple components'';
         homepage = ''http://github.com/ddollar/foreman'';
         longDescription = ''Process manager for applications with multiple components'';
       };
-      name = ''foreman-0.62.0'';
-      requiredGems = [ g.thor_0_18_0 ];
-      sha256 = ''08i34rgs3bydk52zwpps4p0y2fvcnibp9lvfdhr75ppin7wv7lmr'';
+      name = ''foreman-0.63.0'';
+      requiredGems = [ g.thor_0_18_1 g.dotenv_0_8_0 ];
+      sha256 = ''0yqyjix9jm4iwyc4f3wc32vxr28rpjcw1c9ni5brs4s2a24inzlk'';
     };
     gettext_2_3_9 = {
       basename = ''gettext'';
@@ -593,7 +630,7 @@ So you can use GNU gettext tools for maintaining.
       requiredGems = [ g.locale_2_0_8 g.text_1_2_1 ];
       sha256 = ''1i4kzkan7mnyr1ihphx0sqs3k4qj9i1ldg4a1cwf5h2fz657wvjj'';
     };
-    highline_1_6_16 = {
+    highline_1_6_19 = {
       basename = ''highline'';
       meta = {
         description = ''HighLine is a high-level command-line IO library.'';
@@ -604,9 +641,9 @@ crank out anything from simple list selection to complete shells with just
 minutes of work.
 '';
       };
-      name = ''highline-1.6.16'';
+      name = ''highline-1.6.19'';
       requiredGems = [  ];
-      sha256 = ''1v9dps96hryg7c8hqw41vbm1q02d7wpq7fj1c3bkzsd5518idgzi'';
+      sha256 = ''0gylnz2cdaswgszgl8x2qx0c87md4246r1i0blgm3nqvgd4hlsxd'';
     };
     highline_1_6_2 = {
       basename = ''highline'';
@@ -623,16 +660,16 @@ minutes of work.
       requiredGems = [  ];
       sha256 = ''0azmahb70f1nlg6lq5wljbzcijhfb9lz8skwb4k2977kdml07mcn'';
     };
-    hike_1_2_1 = {
+    hike_1_2_3 = {
       basename = ''hike'';
       meta = {
         description = ''Find files in a set of paths'';
         homepage = ''http://github.com/sstephenson/hike'';
         longDescription = ''A Ruby library for finding files in a set of paths.'';
       };
-      name = ''hike-1.2.1'';
+      name = ''hike-1.2.3'';
       requiredGems = [  ];
-      sha256 = ''1c78gja9i9nj76gdj65czhvwam6550l0w9ilnn8vysj9cwv0rg7b'';
+      sha256 = ''0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm'';
     };
     hoe_3_1_0 = {
       basename = ''hoe'';
@@ -654,27 +691,27 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [ g.rake_0_9_6 ];
       sha256 = ''0i961x0hrd6fs1nsfham87dhn64gqpnai27l14jag7qbnp3a79yp'';
     };
-    i18n_0_6_1 = {
-      basename = ''i18n'';
+    http_cookie_1_0_1 = {
+      basename = ''http_cookie'';
       meta = {
-        description = ''New wave Internationalization support for Ruby'';
-        homepage = ''http://github.com/svenfuchs/i18n'';
-        longDescription = ''New wave Internationalization support for Ruby.'';
+        description = ''A Ruby library to handle HTTP Cookies based on RFC 6265'';
+        homepage = ''https://github.com/sparklemotion/http-cookie'';
+        longDescription = ''HTTP::Cookie is a Ruby library to handle HTTP Cookies based on RFC 6265.  It has with security, standards compliance and compatibility in mind, to behave just the same as today's major web browsers.  It has builtin support for the legacy cookies.txt and the latest cookies.sqlite formats of Mozilla Firefox, and its modular API makes it easy to add support for a new backend store.'';
       };
-      name = ''i18n-0.6.1'';
-      requiredGems = [  ];
-      sha256 = ''0x3lhp1vl1k4dfqx6k93hhxcpjkz57y8cf007ws7p845ywk6ibfl'';
+      name = ''http-cookie-1.0.1'';
+      requiredGems = [ g.domain_name_0_5_13 ];
+      sha256 = ''0gzghirmim217g7gf1rq3xiav8gfg32r38mcz0w9vznk30psy7d9'';
     };
-    i18n_0_6_4 = {
+    i18n_0_6_5 = {
       basename = ''i18n'';
       meta = {
         description = ''New wave Internationalization support for Ruby'';
         homepage = ''http://github.com/svenfuchs/i18n'';
         longDescription = ''New wave Internationalization support for Ruby.'';
       };
-      name = ''i18n-0.6.4'';
+      name = ''i18n-0.6.5'';
       requiredGems = [  ];
-      sha256 = ''0wz1rnrs4n21j1rw9a120j2pfdkbikp1yvxaqi3mk30iw6mx4p0f'';
+      sha256 = ''0cv15pi9f530fx9q3b83im7afy947dd86jf5ffqs9bvw8iykmil1'';
     };
     iconv_1_0_3 = {
       basename = ''iconv'';
@@ -687,17 +724,6 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''1nhjn07h2fqivdj6xqzi2x2kzh28vigx8z3q5fv2cqn9aqmbdacl'';
     };
-    journey_1_0_4 = {
-      basename = ''journey'';
-      meta = {
-        description = ''Journey is a router'';
-        homepage = ''http://github.com/rails/journey'';
-        longDescription = ''Journey is a router.  It routes requests.'';
-      };
-      name = ''journey-1.0.4'';
-      requiredGems = [  ];
-      sha256 = ''03y1xidg1rx1yjz8xb50083vfwcsfkgs4zmizc040y1h4mhvhm3l'';
-    };
     jruby_pageant_1_1_1 = {
       basename = ''jruby_pageant'';
       meta = {
@@ -709,27 +735,27 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl'';
     };
-    jsduck_4_7_1 = {
+    jsduck_5_1_0 = {
       basename = ''jsduck'';
       meta = {
         description = ''Simple JavaScript Duckumentation generator'';
         homepage = ''https://github.com/senchalabs/jsduck'';
         longDescription = ''Documentation generator for Sencha JS frameworks'';
       };
-      name = ''jsduck-4.7.1'';
-      requiredGems = [ g.rdiscount_2_0_7_1 g.json_1_7_7 g.parallel_0_6_3 g.execjs_1_4_0 g.therubyracer_0_10_2 g.dimensions_1_2_0 ];
-      sha256 = ''0yn568ix4j4xpyrsk07cp5c3migsl7ymlg07fsyn5a65yrwyaiyv'';
+      name = ''jsduck-5.1.0'';
+      requiredGems = [ g.rdiscount_2_1_6 g.json_1_8_0 g.parallel_0_7_1 g.rkelly_remix_0_0_4 g.dimensions_1_2_0 ];
+      sha256 = ''05l2729524w6i1jywyb2kgbp8w04za8wbvx5w914f7mcsry98rn4'';
     };
-    json_1_7_7 = {
+    json_1_8_0 = {
       basename = ''json'';
       meta = {
         description = ''JSON Implementation for Ruby'';
         homepage = ''http://flori.github.com/json'';
         longDescription = ''This is a JSON implementation as a Ruby extension in C.'';
       };
-      name = ''json-1.7.7'';
+      name = ''json-1.8.0'';
       requiredGems = [  ];
-      sha256 = ''1v5pn3g9ignbgrfl72dbf7bzvxsm90ybp24fa3bm9cv5cpa2ww7x'';
+      sha256 = ''0a8prb853nwz9xqjhcd4rm9a5ng8arcn06hlacf0kcizzz69rr47'';
     };
     json_pure_1_7_5 = {
       basename = ''json_pure'';
@@ -742,27 +768,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''14nwwf001mh70qnynpb3h8c0kgcfi666yrg2frib4p6lr57jx8ap'';
     };
-    json_pure_1_7_7 = {
+    json_pure_1_8_0 = {
       basename = ''json_pure'';
       meta = {
         description = ''JSON Implementation for Ruby'';
         homepage = ''http://flori.github.com/json'';
         longDescription = ''This is a JSON implementation in pure Ruby.'';
       };
-      name = ''json_pure-1.7.7'';
+      name = ''json_pure-1.8.0'';
       requiredGems = [  ];
-      sha256 = ''0jxp0amx9xhka0ixnhvfgwc5ydr82hkxp81pvw32z31arx7jrwl6'';
-    };
-    libv8_3_3_10_4 = {
-      basename = ''libv8'';
-      meta = {
-        description = ''Distribution of the V8 JavaScript engine'';
-        homepage = ''http://github.com/fractaloop/libv8'';
-        longDescription = ''Distributes the V8 JavaScript engine in binary and source forms in order to support fast builds of The Ruby Racer'';
-      };
-      name = ''libv8-3.3.10.4'';
-      requiredGems = [  ];
-      sha256 = ''0zy585rs1ihm8nsw525wgmbkcq7aqy1k9dbkk8s6953adl0bpz42'';
+      sha256 = ''0kkn5zhiffav2cffj43wwvzj07825r4j463ilfjgik034vnbjs83'';
     };
     locale_2_0_8 = {
       basename = ''locale'';
@@ -798,48 +813,73 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [ g.systemu_2_5_2 ];
       sha256 = ''1vd9l1d0lc0sq3rn1ya816wrzgxxqdzq6pgq0y0435qm6ikwy7ch'';
     };
-    mail_2_5_3 = {
+    mail_2_5_4 = {
       basename = ''mail'';
       meta = {
         description = ''Mail provides a nice Ruby DSL for making, sending and reading emails.'';
         homepage = ''http://github.com/mikel/mail'';
         longDescription = ''A really Ruby Mail handler.'';
       };
-      name = ''mail-2.5.3'';
-      requiredGems = [ g.mime_types_1_21 g.treetop_1_4_12 g.i18n_0_6_4 ];
-      sha256 = ''1afr3acz7vsvr4gp6wnrkw1iwbjhf14mh8g8mlm40r86wcwzr39k'';
+      name = ''mail-2.5.4'';
+      requiredGems = [ g.mime_types_1_24 g.treetop_1_4_15 ];
+      sha256 = ''0z15ksb8blcppchv03g34844f7xgf36ckp484qjj2886ig1qara4'';
     };
-    mime_types_1_21 = {
+    mechanize_2_7_2 = {
+      basename = ''mechanize'';
+      meta = {
+        description = ''The Mechanize library is used for automating interaction with websites'';
+        homepage = ''http://mechanize.rubyforge.org'';
+        longDescription = ''The Mechanize library is used for automating interaction with websites.
+Mechanize automatically stores and sends cookies, follows redirects,
+and can follow links and submit forms.  Form fields can be populated and
+submitted.  Mechanize also keeps track of the sites that you have visited as
+a history.'';
+      };
+      name = ''mechanize-2.7.2'';
+      requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9 g.mime_types_1_24 g.http_cookie_1_0_1 g.nokogiri_1_6_0 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_13 ];
+      sha256 = ''1w1rnn6jps1393gywi38saw5iqrvyai3vmvbv2kbc9j0zj5csyrl'';
+    };
+    mime_types_1_24 = {
       basename = ''mime_types'';
       meta = {
         description = ''This library allows for the identification of a file's likely MIME content type'';
         homepage = ''http://mime-types.rubyforge.org/'';
         longDescription = ''This library allows for the identification of a file's likely MIME content
-type. This is release 1.21 with new MIME types. The identification of MIME
-content type is based on a file's filename extensions.
+type. This is release 1.24, adding and updating a few MIME types and fixing
+some issues with documentation.
 
-MIME types are used in MIME-compliant communications, as in e-mail or
-HTTP traffic, to indicate the type of content which is transmitted.
-MIME::Types provides the ability for detailed information about MIME
-entities (provided as a set of MIME::Type objects) to be determined and
-used programmatically. There are many types defined by RFCs and vendors,
-so the list is long but not complete; don't hesitate to ask to add
-additional information. This library follows the IANA collection of MIME
-types (see below for reference).
+MIME types are used in MIME-compliant communications, as in e-mail or HTTP
+traffic, to indicate the type of content which is transmitted. MIME::Types
+provides the ability for detailed information about MIME entities (provided as
+a set of MIME::Type objects) to be determined and used programmatically. There
+are many types defined by RFCs and vendors, so the list is long but not
+complete; don't hesitate to ask to add additional information. This library
+follows the IANA collection of MIME types (see below for reference).
 
-MIME::Types for Ruby was originally based on and synchronized with MIME::Types
-for Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data
-format for the MIME::Type list has changed and the synchronization will no
-longer happen.
+MIME::Types for Ruby was originally based on MIME::Types for Perl by Mark
+Overmeer, copyright 2001 - 2009. As of version 1.15, the data format for the
+MIME::Type list has changed and the synchronization will no longer happen.
 
 MIME::Types is built to conform to the MIME types of RFCs 2045 and 2231. It
-follows the official {IANA registry}[http://www.iana.org/assignments/media-types/]
+tracks the {IANA registry}[http://www.iana.org/assignments/media-types/]
 ({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types
-added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp].'';
+added from the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp]
+and added by the users of MIME::Types.'';
       };
-      name = ''mime-types-1.21'';
+      name = ''mime-types-1.24'';
       requiredGems = [  ];
-      sha256 = ''1qmx53a2kqk0nnhjbfvbc213wsxiprl0wqm7f2xvcsh253ld91iw'';
+      sha256 = ''1g9wmcimvighiyc2pq1qyl3v9420aai86qplyndvvkh7qw78xl9a'';
+    };
+    mini_portile_0_5_1 = {
+      basename = ''mini_portile'';
+      meta = {
+        description = ''Simplistic port-like solution for developers'';
+        homepage = ''http://github.com/luislavena/mini_portile'';
+        longDescription = ''Simplistic port-like solution for developers. It provides a standard and simplified way to compile against dependency libraries without messing up your system.'';
+      };
+      name = ''mini_portile-0.5.1'';
+      requiredGems = [  ];
+      sha256 = ''0cafnlhdzakzl5vqcm9b97kchj9bvhlcf4ylkyr85lz1263hbagg'';
     };
     minitar_0_5_3 = {
       basename = ''minitar'';
@@ -852,16 +892,79 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [  ];
       sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53'';
     };
-    multi_json_1_7_2 = {
+    minitest_4_7_5 = {
+      basename = ''minitest'';
+      meta = {
+        description = ''minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking'';
+        homepage = ''https://github.com/seattlerb/minitest'';
+        longDescription = ''minitest provides a complete suite of testing facilities supporting
+TDD, BDD, mocking, and benchmarking.
+
+    "I had a class with Jim Weirich on testing last week and we were
+     allowed to choose our testing frameworks. Kirk Haines and I were
+     paired up and we cracked open the code for a few test
+     frameworks...
+
+     I MUST say that minitest is *very* readable / understandable
+     compared to the 'other two' options we looked at. Nicely done and
+     thank you for helping us keep our mental sanity."
+
+    -- Wayne E. Seguin
+
+minitest/unit is a small and incredibly fast unit testing framework.
+It provides a rich set of assertions to make your tests clean and
+readable.
+
+minitest/spec is a functionally complete spec engine. It hooks onto
+minitest/unit and seamlessly bridges test assertions over to spec
+expectations.
+
+minitest/benchmark is an awesome way to assert the performance of your
+algorithms in a repeatable manner. Now you can assert that your newb
+co-worker doesn't replace your linear algorithm with an exponential
+one!
+
+minitest/mock by Steven Baker, is a beautifully tiny mock (and stub)
+object framework.
+
+minitest/pride shows pride in testing and adds coloring to your test
+output. I guess it is an example of how to write IO pipes too. :P
+
+minitest/unit is meant to have a clean implementation for language
+implementors that need a minimal set of methods to bootstrap a working
+test suite. For example, there is no magic involved for test-case
+discovery.
+
+    "Again, I can't praise enough the idea of a testing/specing
+     framework that I can actually read in full in one sitting!"
+
+    -- Piotr Szotkowski
+
+Comparing to rspec:
+
+    rspec is a testing DSL. minitest is ruby.
+
+    -- Adam Hawkins, "Bow Before MiniTest"
+
+minitest doesn't reinvent anything that ruby already provides, like:
+classes, modules, inheritance, methods. This means you only have to
+learn ruby to use minitest and all of your regular OO practices like
+extract-method refactorings still apply.'';
+      };
+      name = ''minitest-4.7.5'';
+      requiredGems = [  ];
+      sha256 = ''03p6iban9gcpcflzp4z901s1hgj9369p6515h967ny6hlqhcf2iy'';
+    };
+    multi_json_1_7_9 = {
       basename = ''multi_json'';
       meta = {
-        description = ''A gem to provide swappable JSON backends.'';
+        description = ''A common interface to multiple JSON libraries.'';
         homepage = ''http://github.com/intridea/multi_json'';
-        longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.'';
+        longDescription = ''A common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.'';
       };
-      name = ''multi_json-1.7.2'';
+      name = ''multi_json-1.7.9'';
       requiredGems = [  ];
-      sha256 = ''17mfs58bilkn2b9g3ggh6pz1w4c2a72mqsr6zf0qd8vahw5h158q'';
+      sha256 = ''1q13ldcc8shlfisy90k19zrar87208gs3za6jmr78p11ip21picx'';
     };
     multipart_post_1_2_0 = {
       basename = ''multipart_post'';
@@ -874,6 +977,43 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [  ];
       sha256 = ''12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc'';
     };
+    net_http_digest_auth_1_4 = {
+      basename = ''net_http_digest_auth'';
+      meta = {
+        description = ''An implementation of RFC 2617 - Digest Access Authentication'';
+        homepage = ''http://github.com/drbrain/net-http-digest_auth'';
+        longDescription = ''An implementation of RFC 2617 - Digest Access Authentication.  At this time
+the gem does not drop in to Net::HTTP and can be used for with other HTTP
+clients.
+
+In order to use net-http-digest_auth you'll need to perform some request
+wrangling on your own.  See the class documentation at Net::HTTP::DigestAuth
+for an example.'';
+      };
+      name = ''net-http-digest_auth-1.4'';
+      requiredGems = [  ];
+      sha256 = ''14801gr34g0rmqz9pv4rkfa3crfdbyfk6r48vpg5a5407v0sixqi'';
+    };
+    net_http_persistent_2_9 = {
+      basename = ''net_http_persistent'';
+      meta = {
+        description = ''Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8'';
+        homepage = ''http://docs.seattlerb.org/net-http-persistent'';
+        longDescription = ''Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8.
+It's thread-safe too!
+
+Using persistent HTTP connections can dramatically increase the speed of HTTP.
+Creating a new HTTP connection for every request involves an extra TCP
+round-trip and causes TCP congestion avoidance negotiation to start over.
+
+Net::HTTP supports persistent connections with some API methods but does not
+handle reconnection gracefully.  Net::HTTP::Persistent supports reconnection
+and retry according to RFC 2616.'';
+      };
+      name = ''net-http-persistent-2.9'';
+      requiredGems = [  ];
+      sha256 = ''0k9bp7q5fsh908jnkwfj71ky04i4ih0ky6sqi5vl6zcpjsczgfcb'';
+    };
     net_sftp_2_0_5 = {
       basename = ''net_sftp'';
       meta = {
@@ -882,7 +1022,7 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
         longDescription = ''A pure Ruby implementation of the SFTP client protocol'';
       };
       name = ''net-sftp-2.0.5'';
-      requiredGems = [ g.net_ssh_2_6_6 ];
+      requiredGems = [ g.net_ssh_2_6_8 ];
       sha256 = ''0lqk735wspm8rbiyxpbil8ikrqcyg00ss1df7fny0761c3as6m0v'';
     };
     net_ssh_2_6_0 = {
@@ -896,16 +1036,16 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [ g.jruby_pageant_1_1_1 ];
       sha256 = ''18fsgps4a9dfrjszkl3py8j7vw0xwi70bcp59ccj2rlr6i1jv5gw'';
     };
-    net_ssh_2_6_6 = {
+    net_ssh_2_6_8 = {
       basename = ''net_ssh'';
       meta = {
         description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
         homepage = ''https://github.com/net-ssh/net-ssh'';
         longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.'';
       };
-      name = ''net-ssh-2.6.6'';
+      name = ''net-ssh-2.6.8'';
       requiredGems = [  ];
-      sha256 = ''00fdnwv3jf311jjcc51lq8w26r62vzma91i79h5hj8i1ylrilx51'';
+      sha256 = ''0vf9w8b9f5ha94nwhvwxyqk4lfpy42ihl1g0qib8dfvswlkqw3mx'';
     };
     nix_0_1_1 = {
       basename = ''nix'';
@@ -918,7 +1058,7 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [  ];
       sha256 = ''0kwrbkkg0gxibhsz9dpd5zabcf2wqsicg28yiazyb3dc9dslk26k'';
     };
-    nokogiri_1_5_9 = {
+    nokogiri_1_5_10 = {
       basename = ''nokogiri'';
       meta = {
         description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser'';
@@ -929,9 +1069,35 @@ many features is the ability to search documents via XPath or CSS3 selectors.
 XML is like violence - if it doesn’t solve your problems, you are not using
 enough of it.'';
       };
-      name = ''nokogiri-1.5.9'';
+      name = ''nokogiri-1.5.10'';
       requiredGems = [  ];
-      sha256 = ''08qx4p3p6dd1yh58c4waz5rjmkzv3v315fr0l6n0dgkg71dczbi9'';
+      sha256 = ''0dblphzwzl705xmlqcflz8s60xzbcgi4xqzx7984l4kcssbkn71b'';
+    };
+    nokogiri_1_6_0 = {
+      basename = ''nokogiri'';
+      meta = {
+        description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser'';
+        homepage = ''http://nokogiri.org'';
+        longDescription = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  Among Nokogiri's
+many features is the ability to search documents via XPath or CSS3 selectors.
+
+XML is like violence - if it doesn’t solve your problems, you are not using
+enough of it.'';
+      };
+      name = ''nokogiri-1.6.0'';
+      requiredGems = [ g.mini_portile_0_5_1 ];
+      sha256 = ''1icrny9w2hd0pm7cyq5wqdkbzr57dkma1lbyrr0x14lsnangkidb'';
+    };
+    ntlm_http_0_1_1 = {
+      basename = ''ntlm_http'';
+      meta = {
+        description = ''Ruby/NTLM HTTP library.'';
+        homepage = ''http://www.mindflowsolutions.net'';
+        longDescription = ''Ruby/NTLM HTTP provides NTLM authentication over http.'';
+      };
+      name = ''ntlm-http-0.1.1'';
+      requiredGems = [  ];
+      sha256 = ''0yx01ffrw87wya1syivqzf8hz02axk7jdpw6aw221xwvib767d36'';
     };
     papertrail_0_9_7 = {
       basename = ''papertrail'';
@@ -941,7 +1107,7 @@ enough of it.'';
         longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).'';
       };
       name = ''papertrail-0.9.7'';
-      requiredGems = [ g.addressable_2_3_3 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_7 g.faraday_middleware_0_8_8 ];
+      requiredGems = [ g.addressable_2_3_5 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_8 g.faraday_middleware_0_8_8 ];
       sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr'';
     };
     papertrail_cli_0_9_3 = {
@@ -955,15 +1121,15 @@ enough of it.'';
       requiredGems = [ g.papertrail_0_9_7 ];
       sha256 = ''1914dcfqsmw5rl4xd1zwjrfbgwglyncxm8km06bgxaqn4wnaq5iv'';
     };
-    parallel_0_6_3 = {
+    parallel_0_7_1 = {
       basename = ''parallel'';
       meta = {
         description = ''Run any kind of code in parallel processes'';
         homepage = ''https://github.com/grosser/parallel'';
       };
-      name = ''parallel-0.6.3'';
+      name = ''parallel-0.7.1'';
       requiredGems = [  ];
-      sha256 = ''17mg4vfx1c4z7399azf982a3cn522m43kavdqfhfs6i89m7z0l9n'';
+      sha256 = ''1kzz6ydg7r23ks2b7zbpx4vz3h186n19vhgnjcwi7xwd6h2f1fsq'';
     };
     polyglot_0_3_3 = {
       basename = ''polyglot'';
@@ -979,24 +1145,6 @@ augments 'require' to find and load matching files.'';
       requiredGems = [  ];
       sha256 = ''082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v'';
     };
-    rack_1_4_5 = {
-      basename = ''rack'';
-      meta = {
-        description = ''a modular Ruby webserver interface'';
-        homepage = ''http://rack.github.com/'';
-        longDescription = ''Rack provides a minimal, modular and adaptable interface for developing
-web applications in Ruby.  By wrapping HTTP requests and responses in
-the simplest way possible, it unifies and distills the API for web
-servers, web frameworks, and software in between (the so-called
-middleware) into a single method call.
-
-Also see http://rack.github.com/.
-'';
-      };
-      name = ''rack-1.4.5'';
-      requiredGems = [  ];
-      sha256 = ''027k0nbb8d7cl24x2cywdc6lgrr4lwvdwwjk8wkgz8h9ism3zgzp'';
-    };
     rack_1_5_2 = {
       basename = ''rack'';
       meta = {
@@ -1015,17 +1163,6 @@ Also see http://rack.github.com/.
       requiredGems = [  ];
       sha256 = ''19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6'';
     };
-    rack_cache_1_2 = {
-      basename = ''rack_cache'';
-      meta = {
-        description = ''HTTP Caching for Rack'';
-        homepage = ''http://tomayko.com/src/rack-cache/'';
-        longDescription = ''Rack::Cache is suitable as a quick drop-in component to enable HTTP caching for Rack-based applications that produce freshness (Expires, Cache-Control) and/or validation (Last-Modified, ETag) information.'';
-      };
-      name = ''rack-cache-1.2'';
-      requiredGems = [ g.rack_1_5_2 ];
-      sha256 = ''073ffpsqmy4nqxz178qisb3a4v3305c49ypj0jw6s9mkz02yvgq2'';
-    };
     rack_protection_1_5_0 = {
       basename = ''rack_protection'';
       meta = {
@@ -1037,18 +1174,6 @@ Also see http://rack.github.com/.
       requiredGems = [ g.rack_1_5_2 ];
       sha256 = ''10wm67f2mp9pryg0s8qapbyxd2lcrpb8ywsbicg29cv2xprhbl4j'';
     };
-    rack_ssl_1_3_3 = {
-      basename = ''rack_ssl'';
-      meta = {
-        description = ''Force SSL/TLS in your app.'';
-        homepage = ''https://github.com/josh/rack-ssl'';
-        longDescription = ''    Rack middleware to force SSL/TLS.
-'';
-      };
-      name = ''rack-ssl-1.3.3'';
-      requiredGems = [ g.rack_1_5_2 ];
-      sha256 = ''0rkmj71s87prswa8sqal42kdllgpfd35ir5m9ahhnlmrrpqd0hr5'';
-    };
     rack_test_0_6_2 = {
       basename = ''rack_test'';
       meta = {
@@ -1063,27 +1188,27 @@ request helpers feature.'';
       requiredGems = [ g.rack_1_5_2 ];
       sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky'';
     };
-    rails_3_2_13 = {
+    rails_4_0_0 = {
       basename = ''rails'';
       meta = {
         description = ''Full-stack web application framework.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
       };
-      name = ''rails-3.2.13'';
-      requiredGems = [ g.activesupport_3_2_13 g.actionpack_3_2_13 g.activerecord_3_2_13 g.activeresource_3_2_13 g.actionmailer_3_2_13 g.railties_3_2_13 g.bundler_1_3_4 ];
-      sha256 = ''1f5w4ivy0jxpjf1gkav064i0gd5x9xqnznwrkbc3slc9savprifz'';
+      name = ''rails-4.0.0'';
+      requiredGems = [ g.activesupport_4_0_0 g.actionpack_4_0_0 g.activerecord_4_0_0 g.actionmailer_4_0_0 g.railties_4_0_0 g.bundler_1_3_5 g.sprockets_rails_2_0_0 ];
+      sha256 = ''12q2z2zpqpr61rqdx8can2ay6y1xxi6ghmlkyvfvxnnwwzxypavf'';
     };
-    railties_3_2_13 = {
+    railties_4_0_0 = {
       basename = ''railties'';
       meta = {
         description = ''Tools for creating, working with, and running Rails applications.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
       };
-      name = ''railties-3.2.13'';
-      requiredGems = [ g.rake_10_0_4 g.rack_ssl_1_3_3 g.thor_0_18_0 g.rdoc_3_12_2 g.activesupport_3_2_13 g.actionpack_3_2_13 ];
-      sha256 = ''01wbqfnlrs9nbs0b97dbxh7aap2bma7my530pcggxdf8ckms8kr9'';
+      name = ''railties-4.0.0'';
+      requiredGems = [ g.activesupport_4_0_0 g.actionpack_4_0_0 g.rake_10_1_0 g.thor_0_18_1 ];
+      sha256 = ''063yyp75b87z0nr1mayzyq462nnhfm834mn97fcyg2mf3zr8qbly'';
     };
     rake_0_9_2_2 = {
       basename = ''rake'';
@@ -1107,16 +1232,16 @@ request helpers feature.'';
       requiredGems = [  ];
       sha256 = ''09kyh351gddn6gjz255hbaza1cw235xvfz9dc15rhyq9phvqdphc'';
     };
-    rake_10_0_4 = {
+    rake_10_1_0 = {
       basename = ''rake'';
       meta = {
         description = ''Ruby based make-like utility.'';
         homepage = ''http://rake.rubyforge.org'';
         longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.'';
       };
-      name = ''rake-10.0.4'';
+      name = ''rake-10.1.0'';
       requiredGems = [  ];
-      sha256 = ''032z0csyi5bjfgzq3winvqvi9fpf3bfx518hzzapkfy90y702ds1'';
+      sha256 = ''1frsqpihi39x3yqaa7m9vbls1kd24wckbj5cpiwqix8xmcwnic7q'';
     };
     rb_fsevent_0_9_3 = {
       basename = ''rb_fsevent'';
@@ -1129,43 +1254,28 @@ request helpers feature.'';
       requiredGems = [  ];
       sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1'';
     };
-    rdiscount_2_0_7_1 = {
+    rdiscount_2_1_6 = {
       basename = ''rdiscount'';
       meta = {
         description = ''Fast Implementation of Gruber's Markdown in C'';
-        homepage = ''http://github.com/rtomayko/rdiscount'';
+        homepage = ''http://dafoster.net/projects/rdiscount/'';
       };
-      name = ''rdiscount-2.0.7.1'';
+      name = ''rdiscount-2.1.6'';
       requiredGems = [  ];
-      sha256 = ''1xjwi99wfyjhn72h8k709kbq2npqmw2zvikszxfg6in83yb8vmxn'';
+      sha256 = ''180ln9gwxn0cyflg0i1viv7jyalmjqvqr34cb65xsmmsz1nz55q2'';
     };
-    rdoc_3_12_2 = {
-      basename = ''rdoc'';
-      meta = {
-        description = ''RDoc produces HTML and command-line documentation for Ruby projects'';
-        homepage = ''http://docs.seattlerb.org/rdoc'';
-        longDescription = ''RDoc produces HTML and command-line documentation for Ruby projects.  RDoc
-includes the +rdoc+ and +ri+ tools for generating and displaying online
-documentation.
-
-See RDoc for a description of RDoc's markup and basic use.'';
-      };
-      name = ''rdoc-3.12.2'';
-      requiredGems = [ g.json_1_7_7 ];
-      sha256 = ''1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8'';
-    };
-    remote_syslog_1_6_13 = {
+    remote_syslog_1_6_14 = {
       basename = ''remote_syslog'';
       meta = {
         description = ''Monitor plain text log file(s) for new entries and send to remote syslog collector'';
         homepage = ''http://github.com/papertrail/remote_syslog'';
         longDescription = ''Lightweight daemon to tail one or more log files and transmit UDP syslog messages to a remote syslog host (centralized log aggregation). Generates UDP packets itself instead of depending on a system syslog daemon, so it doesn't affect system-wide logging configuration.'';
       };
-      name = ''remote_syslog-1.6.13'';
+      name = ''remote_syslog-1.6.14'';
       requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ];
-      sha256 = ''0q35j02k2l3fw3fdzq0i3rd6chsqr982gj13f3m3lsxm7kms03nw'';
+      sha256 = ''1f2yjyqhbdc4vlx52zli1b33f6yn8qc1kd4n0dpv27zswj9qfdkr'';
     };
-    right_aws_3_0_5 = {
+    right_aws_3_1_0 = {
       basename = ''right_aws'';
       meta = {
         description = ''The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.'';
@@ -1209,11 +1319,11 @@ The RightScale AWS gems comprise:
 - Test suite (requires AWS account to do "live" testing).
 '';
       };
-      name = ''right_aws-3.0.5'';
-      requiredGems = [ g.right_http_connection_1_3_0 ];
-      sha256 = ''0pxdmxmqiidy3dpxsp4l0b1l6nq9b1sh4p1gkzalqm4l24646h4k'';
+      name = ''right_aws-3.1.0'';
+      requiredGems = [ g.right_http_connection_1_4_0 ];
+      sha256 = ''1a3l5vyvq078nq976rzkrd6fbj522sbgrxpdq3p9z373h0awha09'';
     };
-    right_http_connection_1_3_0 = {
+    right_http_connection_1_4_0 = {
       basename = ''right_http_connection'';
       meta = {
         description = ''RightScale's robust HTTP/S connection module'';
@@ -1228,9 +1338,9 @@ algorithm for low-level network errors.
 - HTTPS certificate checking
 '';
       };
-      name = ''right_http_connection-1.3.0'';
+      name = ''right_http_connection-1.4.0'';
       requiredGems = [  ];
-      sha256 = ''0900zy2ya57vhxdkdm2gj7xmvzj4gwm5l7ad0lh68ka3vxhdi7ap'';
+      sha256 = ''0m4phly7srnwyvfqp01lpaxrgrybhszar0p23zl8b12r6bdjl84g'';
     };
     rjb_1_4_2 = {
       basename = ''rjb'';
@@ -1244,7 +1354,7 @@ algorithm for low-level network errors.
       requiredGems = [  ];
       sha256 = ''1cgbwpc45djs0mw05ydxf5apmb9ibj61n240ylqwzrajf13banzh'';
     };
-    rjb_1_4_6 = {
+    rjb_1_4_8 = {
       basename = ''rjb'';
       meta = {
         description = ''Ruby Java bridge'';
@@ -1252,9 +1362,22 @@ algorithm for low-level network errors.
         longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
 '';
       };
-      name = ''rjb-1.4.6'';
+      name = ''rjb-1.4.8'';
       requiredGems = [  ];
-      sha256 = ''0q2czc3ghk32hnxf76xsf0jqcfrnx60aqarvdjhgsfdc9a5pmk20'';
+      sha256 = ''06ps4ssaxb8jwja53h7v7kb31hsdr997b8na89d1yasm5zyraliw'';
+    };
+    rkelly_remix_0_0_4 = {
+      basename = ''rkelly_remix'';
+      meta = {
+        description = ''Fork of the RKelly library to make it suitable as the JavaScript parser in JSDuck'';
+        longDescription = ''Fork of the RKelly library to make it suitable as the JavaScript parser
+in JSDuck.
+
+* http://rkelly.rubyforge.org/'';
+      };
+      name = ''rkelly-remix-0.0.4'';
+      requiredGems = [  ];
+      sha256 = ''1w6yr5n3b8yd0rsba9q3zyxr0n2hbpkz4v2k1qx6j1ywvl9rc2c1'';
     };
     rmail_1_0_0 = {
       basename = ''rmail'';
@@ -1326,7 +1449,7 @@ algorithm for low-level network errors.
 * For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.'';
       };
       name = ''rubyforge-2.0.4'';
-      requiredGems = [ g.json_pure_1_7_7 ];
+      requiredGems = [ g.json_pure_1_8_0 ];
       sha256 = ''1wdaa4nzy39yzy848fa1rybi72qlyf9vhi1ra9wpx9rpi810fwh1'';
     };
     rubyzip_0_9_9 = {
@@ -1339,7 +1462,7 @@ algorithm for low-level network errors.
       requiredGems = [  ];
       sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2'';
     };
-    sass_3_2_7 = {
+    sass_3_2_10 = {
       basename = ''sass'';
       meta = {
         description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
@@ -1350,20 +1473,20 @@ algorithm for low-level network errors.
       command line tool or a web-framework plugin.
 '';
       };
-      name = ''sass-3.2.7'';
+      name = ''sass-3.2.10'';
       requiredGems = [  ];
-      sha256 = ''0c494gh1i4llk4lbi35vidsgclf3cgxind1a7nm499ac9sdz084s'';
+      sha256 = ''0anfff4hz8fz1wbimmp9vv4mjfl1swg7ww74j549788x41l4x283'';
     };
-    selenium_webdriver_2_31_0 = {
+    selenium_webdriver_2_35_0 = {
       basename = ''selenium_webdriver'';
       meta = {
         description = ''The next generation developer focused tool for automated testing of webapps'';
         homepage = ''http://selenium.googlecode.com'';
         longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
       };
-      name = ''selenium-webdriver-2.31.0'';
-      requiredGems = [ g.multi_json_1_7_2 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
-      sha256 = ''1nv3ff31g183kdb97jjz0y7ny3vdnccd09pgblpj87bzhrrdfv3r'';
+      name = ''selenium-webdriver-2.35.0'';
+      requiredGems = [ g.multi_json_1_7_9 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
+      sha256 = ''1y9p7njw26j571mhnvqrh0hvszx78kfci4d7qps38l32zid5qa7m'';
     };
     servolux_0_10_0 = {
       basename = ''servolux'';
@@ -1387,19 +1510,29 @@ interpreters.'';
         longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.'';
       };
       name = ''sinatra-1.3.2'';
-      requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_3_6 ];
+      requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_4_1 ];
       sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc'';
     };
-    sprockets_2_2_2 = {
+    sprockets_2_10_0 = {
       basename = ''sprockets'';
       meta = {
         description = ''Rack-based asset packaging system'';
         homepage = ''http://getsprockets.org/'';
         longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
       };
-      name = ''sprockets-2.2.2'';
-      requiredGems = [ g.hike_1_2_1 g.multi_json_1_7_2 g.rack_1_5_2 g.tilt_1_3_6 ];
-      sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s'';
+      name = ''sprockets-2.10.0'';
+      requiredGems = [ g.hike_1_2_3 g.multi_json_1_7_9 g.rack_1_5_2 g.tilt_1_4_1 ];
+      sha256 = ''1z0kiaymvqm07wqqy479vd8a60ggr3f3520b4splljbn2055fn3s'';
+    };
+    sprockets_rails_2_0_0 = {
+      basename = ''sprockets_rails'';
+      meta = {
+        description = ''Sprockets Rails integration'';
+        homepage = ''https://github.com/rails/sprockets-rails'';
+      };
+      name = ''sprockets-rails-2.0.0'';
+      requiredGems = [ g.sprockets_2_10_0 g.actionpack_4_0_0 g.activesupport_4_0_0 ];
+      sha256 = ''068w0ly7x1vciy4j6mwgsnz6a983pld4rzk1fpvfsmkdqcizb20x'';
     };
     syslog_protocol_0_9_2 = {
       basename = ''syslog_protocol'';
@@ -1423,6 +1556,37 @@ interpreters.'';
       requiredGems = [  ];
       sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr'';
     };
+    taskjuggler_3_5_0 = {
+      basename = ''taskjuggler'';
+      meta = {
+        description = ''A Project Management Software'';
+        homepage = ''http://www.taskjuggler.org'';
+        longDescription = ''TaskJuggler is a modern and powerful, Free and Open Source Software project
+management tool. Its new approach to project planing and tracking is more
+flexible and superior to the commonly used Gantt chart editing tools.
+
+TaskJuggler is project management software for serious project managers. It
+covers the complete spectrum of project management tasks from the first idea
+to the completion of the project. It assists you during project scoping,
+resource assignment, cost and revenue planing, risk and communication
+management.
+'';
+      };
+      name = ''taskjuggler-3.5.0'';
+      requiredGems = [ g.mail_2_5_4 g.term_ansicolor_1_2_2 ];
+      sha256 = ''0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2'';
+    };
+    term_ansicolor_1_2_2 = {
+      basename = ''term_ansicolor'';
+      meta = {
+        description = ''Ruby library that colors strings using ANSI escape sequences'';
+        homepage = ''http://flori.github.com/term-ansicolor'';
+        longDescription = ''This library uses ANSI escape sequences to control the attributes of terminal output'';
+      };
+      name = ''term-ansicolor-1.2.2'';
+      requiredGems = [ g.tins_0_8_4 ];
+      sha256 = ''1b41q1q6mqcgzq9fhzhmjvfg5sfs5v7gkb8z57r4hajcp89lflxr'';
+    };
     text_1_2_1 = {
       basename = ''text'';
       meta = {
@@ -1434,17 +1598,6 @@ interpreters.'';
       requiredGems = [  ];
       sha256 = ''0s186kh125imdr7dahr10payc1gmxgk6wjy1v3agdyvl53yn5z3z'';
     };
-    therubyracer_0_10_2 = {
-      basename = ''therubyracer'';
-      meta = {
-        description = ''Embed the V8 Javascript interpreter into Ruby'';
-        homepage = ''http://github.com/cowboyd/therubyracer'';
-        longDescription = ''Call javascript code and manipulate javascript objects from ruby. Call ruby code and manipulate ruby objects from javascript.'';
-      };
-      name = ''therubyracer-0.10.2'';
-      requiredGems = [ g.libv8_3_3_10_4 ];
-      sha256 = ''111hm2l613v06sy7pzjzmnyi4x11rg3c2syhnpv8fn0wnn9rdiyb'';
-    };
     thin_1_5_1 = {
       basename = ''thin'';
       meta = {
@@ -1456,48 +1609,59 @@ interpreters.'';
       requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_3 g.daemons_1_1_9 ];
       sha256 = ''0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga'';
     };
-    thor_0_18_0 = {
+    thor_0_18_1 = {
       basename = ''thor'';
       meta = {
         description = ''A scripting framework that replaces rake, sake and rubigen'';
         homepage = ''http://whatisthor.com/'';
         longDescription = ''A scripting framework that replaces rake, sake and rubigen'';
       };
-      name = ''thor-0.18.0'';
+      name = ''thor-0.18.1'';
       requiredGems = [  ];
-      sha256 = ''0m7pl518j5q1ymgxmsi6xfjp6k40mwbmzk33s760v53azwxkfxan'';
+      sha256 = ''0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3'';
     };
-    tilt_1_3_6 = {
+    thread_safe_0_1_2 = {
+      basename = ''thread_safe'';
+      meta = {
+        description = ''A collection of data structures and utilities to make thread-safe programming in Ruby easier'';
+        homepage = ''https://github.com/headius/thread_safe'';
+        longDescription = ''Thread-safe collections and utilities for Ruby'';
+      };
+      name = ''thread_safe-0.1.2'';
+      requiredGems = [ g.atomic_1_1_13 ];
+      sha256 = ''1bxyh5l11inadbk7pjyz5s98g24qj8xavh55bc56nrzj51y9aavy'';
+    };
+    tilt_1_4_1 = {
       basename = ''tilt'';
       meta = {
         description = ''Generic interface to multiple Ruby template engines'';
         homepage = ''http://github.com/rtomayko/tilt/'';
         longDescription = ''Generic interface to multiple Ruby template engines'';
       };
-      name = ''tilt-1.3.6'';
+      name = ''tilt-1.4.1'';
       requiredGems = [  ];
-      sha256 = ''1yz6zfnwq0qyjn71115vd63ly8zm1jss0b2v7fbcbzzj9lrnq9y6'';
+      sha256 = ''00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir'';
     };
-    tins_0_7_2 = {
+    tins_0_8_4 = {
       basename = ''tins'';
       meta = {
         description = ''Useful stuff.'';
         homepage = ''http://flori.github.com/tins'';
         longDescription = ''All the stuff that isn't good/big enough for a real library.'';
       };
-      name = ''tins-0.7.2'';
+      name = ''tins-0.8.4'';
       requiredGems = [  ];
-      sha256 = ''142mvgn8218wikwdvd5gq4g6k3p24f273wlqvczzfhz02livrz90'';
+      sha256 = ''1j1mkxh9m4qkhgyl9naxd2gxv03c6svbwcm7vl8c2s9p4gfg0x7s'';
     };
-    treetop_1_4_12 = {
+    treetop_1_4_15 = {
       basename = ''treetop'';
       meta = {
         description = ''A Ruby-based text parsing and interpretation DSL'';
         homepage = ''https://github.com/cjheath/treetop'';
       };
-      name = ''treetop-1.4.12'';
+      name = ''treetop-1.4.15'';
       requiredGems = [ g.polyglot_0_3_3 g.polyglot_0_3_3 ];
-      sha256 = ''1jlfjq67n933sm0px0s2j965v1kl1rj8fbx6xk8y4yppkv6ygxc8'';
+      sha256 = ''1zqj5y0mvfvyz11nhsb4d5ch0i0rfcyj64qx19mw4qhg3hh8z9pz'';
     };
     trollop_2_0 = {
       basename = ''trollop'';
@@ -1525,6 +1689,30 @@ specify.'';
       requiredGems = [  ];
       sha256 = ''0pi2vabsg73h6z4wfwyd27k63issp2qp1nh0vd74rdk740gmb3kc'';
     };
+    unf_0_1_2 = {
+      basename = ''unf'';
+      meta = {
+        description = ''A wrapper library to bring Unicode Normalization Form support to Ruby/JRuby'';
+        homepage = ''https://github.com/knu/ruby-unf'';
+        longDescription = ''This is a wrapper library to bring Unicode Normalization Form support
+to Ruby/JRuby.
+'';
+      };
+      name = ''unf-0.1.2'';
+      requiredGems = [ g.unf_ext_0_0_6 ];
+      sha256 = ''1g6agdd14yylawwd9ifgcpxwfyiydqj9l7cq6ipypj70v1l46i1s'';
+    };
+    unf_ext_0_0_6 = {
+      basename = ''unf_ext'';
+      meta = {
+        description = ''Unicode Normalization Form support library for CRuby'';
+        homepage = ''https://github.com/knu/ruby-unf_ext'';
+        longDescription = ''Unicode Normalization Form support library for CRuby'';
+      };
+      name = ''unf_ext-0.0.6'';
+      requiredGems = [  ];
+      sha256 = ''07zbmkzcid6pzdqgla3456ipfdka7j1v4hsx1iaa8rbnllqbmkdg'';
+    };
     uuid_2_3_7 = {
       basename = ''uuid'';
       meta = {
@@ -1538,7 +1726,7 @@ specify.'';
       requiredGems = [ g.macaddr_1_6_1 ];
       sha256 = ''04q10an3v40zwjihvdwm23fw6vl39fbkhdiwfw78a51ym9airnlp'';
     };
-    uuidtools_2_1_3 = {
+    uuidtools_2_1_4 = {
       basename = ''uuidtools'';
       meta = {
         description = ''UUID generator'';
@@ -1546,9 +1734,21 @@ specify.'';
         longDescription = ''A simple universally unique ID generation library.
 '';
       };
-      name = ''uuidtools-2.1.3'';
+      name = ''uuidtools-2.1.4'';
       requiredGems = [  ];
-      sha256 = ''0v8scs7760334kkwca7n8kah6nk4hyw7izgk014zg1l1yv7kzpi9'';
+      sha256 = ''1w0bhnkp5515f3yx5fakfrfkawxjpb4fjm1r2c6lk691xlr696s3'';
+    };
+    webrobots_0_1_1 = {
+      basename = ''webrobots'';
+      meta = {
+        description = ''A Ruby library to help write robots.txt compliant web robots'';
+        homepage = ''https://github.com/knu/webrobots'';
+        longDescription = ''This library helps write robots.txt compliant web robots in Ruby.
+'';
+      };
+      name = ''webrobots-0.1.1'';
+      requiredGems = [  ];
+      sha256 = ''1jlnhhpa1mkrgsmihs2qx13z3n6xhswjnlk5a2ypyplw2id5x32n'';
     };
     websocket_1_0_7 = {
       basename = ''websocket'';
@@ -1561,15 +1761,15 @@ specify.'';
       requiredGems = [  ];
       sha256 = ''1jrfz4295qbnjaxv37fw9jzxyxz61izp7c0683mnscacpx262zw0'';
     };
-    xapian_full_alaveteli_1_2_9_5 = {
-      basename = ''xapian_full_alaveteli'';
+    xapian_full_1_2_3 = {
+      basename = ''xapian_full'';
       meta = {
         description = ''xapian-core + Ruby xapian-bindings'';
         longDescription = ''Xapian bindings for Ruby without dependency on system Xapian library'';
       };
-      name = ''xapian-full-alaveteli-1.2.9.5'';
+      name = ''xapian-full-1.2.3'';
       requiredGems = [  ];
-      sha256 = ''0qg1jkx5lr4a5v7l3f9gq7f07al6qaxxzma230zrzs48bz3qnhxm'';
+      sha256 = ''02z0wsir38jsp5d6sqrkgv5prk8s6sdf6g2h718j2374kpnkyrxv'';
     };
     xapian_ruby_1_2_15_1 = {
       basename = ''xapian_ruby'';
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index de5c64a06a1..dcb30df04c8 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 0a83741635e..050ea96869f 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -5,11 +5,11 @@ 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 ];
@@ -22,11 +22,9 @@ stdenv.mkDerivation rec {
     '';
 
   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";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index cac5ec483fe..dd8b68717aa 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "aspell-0.60.6.1";
 
   src = fetchurl {
-    url = "ftp://ftp.gnu.org/gnu/aspell/${name}.tar.gz";
+    url = "mirror://gnu/aspell/${name}.tar.gz";
     sha256 = "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm";
   };
 
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     description = "GNU Aspell, A spell checker for many languages";
     homepage = http://aspell.net/;
     license = "LGPLv2+";
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index c2aefd64c79..131da4112e8 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -29,70 +29,70 @@ let
 in {
 
   de = buildDict {
-    shortName = "de-20030222_1";
+    shortName = "de-20030222-1";
     fullName = "German";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2;
       sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s";
     };
   };
-    
+
   en = buildDict {
-    shortName = "en-6.0_0";
+    shortName = "en-7.1-0";
     fullName = "English";
     src = fetchurl {
-      url = mirror://gnu/aspell/dict/en/aspell6-en-6.0-0.tar.bz2;
-      sha256 = "1628rrx1yq9jmnd86sr24vih101smb818vf10vx97f6j263niw14";
+      url = mirror://gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2;
+      sha256 = "02ldfiny4iakgfgy4sdrzjqdzi7l1rmb6y30lv31kfy5x31g77gz";
     };
   };
-    
+
   es = buildDict {
-    shortName = "es-0.50_2";
+    shortName = "es-1.11-2";
     fullName = "Spanish";
     src = fetchurl {
-      url = mirror://gnu/aspell/dict/es/aspell-es-0.50-2.tar.bz2;
-      sha256 = "0i96xswcng35n5zhgpiswmi5sdpx63kl8bg7fl1zp5j1shr2l3jw";
+      url = mirror://gnu/aspell/dict/es/aspell6-es-1.11-2.tar.bz2;
+      sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd";
     };
   };
-    
+
   eo = buildDict {
-    shortName = "eo-0.50_2";
+    shortName = "eo-2.1.20000225a-2";
     fullName = "Esperanto";
     src = fetchurl {
-      url = mirror://gnu/aspell/dict/eo/aspell-eo-0.50-2.tar.bz2;
-      sha256 = "19vhdm599ng98nq8jxspgvanv5hwryp0qri1vx6zsjl0jx1acqbc";
+      url = mirror://gnu/aspell/dict/eo/aspell6-eo-2.1.20000225a-2.tar.bz2;
+      sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1";
     };
   };
 
   fr = buildDict {
-    shortName = "fr-0.50_3";
+    shortName = "fr-0.50-3";
     fullName = "French";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/fr/aspell-fr-0.50-3.tar.bz2;
       sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr";
     };
   };
-    
+
   it = buildDict {
-    shortName = "it-0.53_0";
+    shortName = "it-2.2_20050523-0";
     fullName = "Italian";
     src = fetchurl {
-      url = mirror://gnu/aspell/dict/it/aspell-it-0.53-0.tar.bz2;
-      sha256 = "0vzs2mk0h2znx0jjs5lqiwdrc4nf6v3f8xbrsni8pfnxhh5ik1rv";
+      url = mirror://gnu/aspell/dict/it/aspell6-it-2.2_20050523-0.tar.bz2;
+      sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v";
     };
   };
-    
+
   la = buildDict {
-    shortName = "la-20020503_0";
+    shortName = "la-20020503-0";
     fullName = "Latin";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2;
       sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl";
     };
   };
-    
+
   nl = buildDict {
-    shortName = "nl-0.50_2";
+    shortName = "nl-0.50-2";
     fullName = "Dutch";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/nl/aspell-nl-0.50-2.tar.bz2;
@@ -103,23 +103,23 @@ in {
       echo "add nl.rws" > $out/lib/aspell/nederlands.multi
     '';
   };
-    
+
   pl = buildDict {
-    shortName = "pl-6.0_20061121_0";
+    shortName = "pl-6.0_20061121-0";
     fullName = "Polish";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/pl/aspell6-pl-6.0_20061121-0.tar.bz2;
       sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1";
     };
   };
-     
+
   ru = buildDict {
-    shortName = "ru-0.99f7_1";
+    shortName = "ru-0.99f7-1";
     fullName = "Russian";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2;
       sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw";
     };
   };
-    
+
 }
diff --git a/pkgs/development/libraries/attica/default.nix b/pkgs/development/libraries/attica/default.nix
index 99fe36faa4b..87f6c019fb7 100644
--- a/pkgs/development/libraries/attica/default.nix
+++ b/pkgs/development/libraries/attica/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "attica-0.4.1";
+  name = "attica-0.4.2";
   
   src = fetchurl {
     url = "mirror://kde/stable/attica/${name}.tar.bz2";
-    sha256 = "1rnd861vy6waf25b1ilsr3rwb06dmmlnd8zq3l8y6r0lq5i2bl9n";
+    sha256 = "1y74gsyzi70dfr9d1f1b08k130rm3jaibsppg8dv5h3211vm771v";
   };
   
   buildInputs = [ qt4 ];
diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index 8ea6470cde8..2f4de88c94c 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -3,17 +3,18 @@
 stdenv.mkDerivation rec {
   name = "audiofile-0.3.3";
 
-  buildInputs = [ alsaLib ];
+  buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
 
   src = fetchurl {
     url = "http://audiofile.68k.org/${name}.tar.gz";
     sha256 = "1qm7z0g1d9rcxi1m87slgdi0rhl94g13dx3d2b05dilghwpgjjgq";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A library for reading and writing audio files in various formats";
-    homepage = http://www.68k.org/~michael/audiofile/; 
-    license = "lgpl";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    homepage    = http://www.68k.org/~michael/audiofile/; 
+    license     = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ lovek323 shlevy ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 39a03e0b002..f62dc200447 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -1,5 +1,6 @@
 { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
-, expat, gettext, intltool, glib, qt4 ? null, libiconvOrEmpty
+, expat, gettext, intltool, glib, libiconvOrEmpty
+, qt4 ? null
 , qt4Support ? false
 , withLibdnssdCompat ? false }:
 
@@ -25,23 +26,29 @@ stdenv.mkDerivation rec {
     [ "--disable-qt3" "--disable-gdbm" "--disable-mono"
       "--disable-gtk" "--disable-gtk3"
       "--${if qt4Support then "enable" else "disable"}-qt4"
-      "--disable-python"
-      "--with-distro=none" "--localstatedir=/var"
-    ] ++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd";
+      "--disable-python" "--localstatedir=/var" "--with-distro=none" ]
+    ++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd"
+    # autoipd won't build on darwin
+    ++ stdenv.lib.optional stdenv.isDarwin "--disable-autoipd";
 
-  meta = {
+  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i '20 i\
+    #define __APPLE_USE_RFC_2292' \
+    avahi-core/socket.c
+  '';
+
+  meta = with stdenv.lib; {
     description = "Avahi, an mDNS/DNS-SD implementation";
+    homepage    = http://avahi.org;
+    license     = licenses.lgpl2Plus;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ lovek323 ];
+
     longDescription = ''
       Avahi is a system which facilitates service discovery on a local
       network.  It is an implementation of the mDNS (for "Multicast
       DNS") and DNS-SD (for "DNS-Based Service Discovery")
       protocols.
     '';
-
-    homepage = http://avahi.org;
-    license = "LGPLv2+";
-
-    platforms = stdenv.lib.platforms.linux;  # arbitrary choice
-    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
diff --git a/pkgs/development/libraries/boost/1.54.nix b/pkgs/development/libraries/boost/1.54.nix
new file mode 100644
index 00000000000..ba4252feaa5
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.54.nix
@@ -0,0 +1,91 @@
+{ stdenv, fetchurl, icu, expat, zlib, bzip2, python
+, enableRelease ? true
+, enableDebug ? false
+, enableSingleThreaded ? false
+, enableMultiThreaded ? true
+, enableShared ? true
+, enableStatic ? false
+, enablePIC ? false
+, enableExceptions ? false
+, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
+}:
+
+let
+
+  variant = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableRelease "release" ++
+     stdenv.lib.optional enableDebug "debug");
+
+  threading = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableSingleThreaded "single" ++
+     stdenv.lib.optional enableMultiThreaded "multi");
+
+  link = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableShared "shared" ++
+     stdenv.lib.optional enableStatic "static");
+
+  # To avoid library name collisions
+  layout = if taggedLayout then "tagged" else "system";
+
+  cflags = if enablePIC && enableExceptions then
+             "cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC"
+           else if enablePIC then
+             "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
+           else if enableExceptions then
+             "cflags=-fexceptions"
+           else
+             "";
+in
+
+stdenv.mkDerivation {
+  name = "boost-1.54.0";
+
+  meta = {
+    homepage = "http://boost.org/";
+    description = "Boost C++ Library Collection";
+    license = "boost-license";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_54_0.tar.bz2";
+    sha256 = "07df925k56pbz3gvhxpx54aij34qd40a7sxw4im11brnwdyr4zh4";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [icu expat zlib bzip2 python];
+
+  configureScript = "./bootstrap.sh";
+  configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
+
+  buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
+
+  # normal install does not install bjam, this is a separate step
+  installPhase = ''
+    cd tools/build/v2
+    sh bootstrap.sh
+    ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install
+  '';
+
+  crossAttrs = rec {
+    buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ];
+    # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
+    # override them.
+    propagatedBuildInputs = buildInputs;
+    # We want to substitute the contents of configureFlags, removing thus the
+    # usual --build and --host added on cross building.
+    preConfigure = ''
+      export configureFlags="--prefix=$out --without-icu"
+    '';
+    buildPhase = ''
+      set -x
+      cat << EOF > user-config.jam
+      using gcc : cross : $crossConfig-g++ ;
+      EOF
+      ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
+    '';
+  };
+}
diff --git a/pkgs/development/libraries/boost/1.53-headers.nix b/pkgs/development/libraries/boost/header-only-wrapper.nix
similarity index 50%
rename from pkgs/development/libraries/boost/1.53-headers.nix
rename to pkgs/development/libraries/boost/header-only-wrapper.nix
index 04bad16bd70..d32462d3720 100644
--- a/pkgs/development/libraries/boost/1.53-headers.nix
+++ b/pkgs/development/libraries/boost/header-only-wrapper.nix
@@ -1,18 +1,23 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, boost }:
+
+let
+  version = stdenv.lib.removePrefix "boost-" boost.name;
+  pkgid = stdenv.lib.replaceChars ["-" "."] ["_" "_"] boost.name;
+in
 
 stdenv.mkDerivation {
-  name = "boost-headers-1.53.0";
+  name = "boost-headers-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_1_53_0.tar.bz2";
-    sha256 = "15livg6y1l3gdsg6ybvp3y4gp0w3xh1rdcq5bjf0qaw804dh92pq";
+    url = "mirror://sourceforge/boost/${pkgid}.tar.bz2";
+    sha256 = "07df925k56pbz3gvhxpx54aij34qd40a7sxw4im11brnwdyr4zh4";
   };
 
   phases = [ "installPhase" ];
 
   installPhase = ''
     mkdir -p $out/include
-    tar xf $src -C $out/include --strip-components=1 boost_1_53_0/boost
+    tar xf $src -C $out/include --strip-components=1 ${pkgid}/boost
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix
index a6e426b164a..73ea5254182 100644
--- a/pkgs/development/libraries/ccrtp/default.nix
+++ b/pkgs/development/libraries/ccrtp/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation {
     sha256 = "1p4zzqn02zvnyjy84khiq8v65pl422fb6ni946h9sxh4yw2lgn01";
   };
 
-  buildInputs = [ openssl pkgconfig libgcrypt ucommon ];
+  buildInputs = [ openssl pkgconfig libgcrypt ];
+  propagatedBuildInputs = [ ucommon ];
 
   doCheck = true;
 
@@ -16,7 +17,7 @@ stdenv.mkDerivation {
     description = "GNU ccRTP, an implementation of the IETF real-time transport protocol (RTP)";
     homepage = http://www.gnu.org/software/ccrtp/;
     license = "GPLv2";
-    maintainers = with stdenv.lib.maintainers; [ marcweber ludo ];
+    maintainers = with stdenv.lib.maintainers; [ marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix
new file mode 100644
index 00000000000..2c712c5c20e
--- /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/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix
index aa594a8e2bc..2c723e2c8b2 100644
--- a/pkgs/development/libraries/cloog-ppl/default.nix
+++ b/pkgs/development/libraries/cloog-ppl/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
 
     /* Leads to an ICE on Cygwin:
 
diff --git a/pkgs/development/libraries/clutter-gtk/0.10.8.nix b/pkgs/development/libraries/clutter-gtk/0.10.8.nix
index 182040f5c41..a8433fb5fea 100644
--- a/pkgs/development/libraries/clutter-gtk/0.10.8.nix
+++ b/pkgs/development/libraries/clutter-gtk/0.10.8.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index 3e13ff2da7e..8fe087cbfbc 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    maintainers = with stdenv.lib.maintainers; [ urkud ludo ];
+    maintainers = with stdenv.lib.maintainers; [ urkud ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 6c6891fb279..36eb93532d9 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
     license = "LGPLv2+";
     homepage = http://www.clutter-project.org/;
 
-    maintainers = with stdenv.lib.maintainers; [ urkud ludo ];
+    maintainers = with stdenv.lib.maintainers; [ urkud ];
     platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/development/libraries/confuse/default.nix b/pkgs/development/libraries/confuse/default.nix
index 7291aa5eb38..67fe669a037 100644
--- a/pkgs/development/libraries/confuse/default.nix
+++ b/pkgs/development/libraries/confuse/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "confuse-2.7";
   src = fetchurl {
-    url = "http://savannah.nongnu.org/download/confuse/${name}.tar.gz";
+    url = "mirror://savannah/confuse/${name}.tar.gz";
     sha256 = "0y47r2ashz44wvnxdb18ivpmj8nxhw3y9bf7v9w0g5byhgyp89g3";
   };
 
diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix
index 32d1c478a49..7fb9089420d 100644
--- a/pkgs/development/libraries/cracklib/default.nix
+++ b/pkgs/development/libraries/cracklib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
   name = "cracklib-2.8.16";
@@ -8,8 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "1g3mchdvra9nihxlkl3rdz96as3xnfw5m59hmr5k17l7qa9a8fpw";
   };
 
-  meta = {
-    homepage = http://sourceforge.net/projects/cracklib;
+  buildInputs = libintlOrEmpty;
+
+  meta = with stdenv.lib; {
+    homepage    = http://sourceforge.net/projects/cracklib;
     description = "A library for checking the strength of passwords";
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index f80d5813c3e..3b517d60b27 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
     description = "Crypto++, a free C++ class library of cryptographic schemes";
     homepage = http://cryptopp.com/;
     license = "Boost 1.0";
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix
index 950fe1baf08..a802f571674 100644
--- a/pkgs/development/libraries/ctl/default.nix
+++ b/pkgs/development/libraries/ctl/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ctl-1.4.1";
 
   src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/ampasctl/ctl-1.4.1.tar.gz;
+    url = mirror://sourceforge/ampasctl/ctl-1.4.1.tar.gz;
     sha256 = "16lzgbpxdyhykdwndj1i9vx3h4bfkxqqcrvasvgg70gb5raxj0mj";
   };
 
diff --git a/pkgs/development/libraries/exosip/3.x.nix b/pkgs/development/libraries/exosip/3.x.nix
new file mode 100644
index 00000000000..123b53783a6
--- /dev/null
+++ b/pkgs/development/libraries/exosip/3.x.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, libosip, openssl, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "3.6.0";
+  src = fetchurl {
+    url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz";
+    sha256 = "0r1mj8x5991bgwf03bx1ajn5kbbmw1136jabw2pn7dls9h41mnli";
+  };
+  name = "libexosip2-${version}";
+
+  buildInputs = [ libosip openssl pkgconfig ];
+      
+  meta = {
+    license = "GPLv2+";
+    description = "Library that hides the complexity of using the SIP protocol";
+  };
+}
diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix
index d850618ecdf..fb13e0b8c6f 100644
--- a/pkgs/development/libraries/exosip/default.nix
+++ b/pkgs/development/libraries/exosip/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, libosip, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "3.6.0";
+  version = "4.0.0";
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/exosip/libeXosip2-${version}.tar.gz";
-    sha256 = "0r1mj8x5991bgwf03bx1ajn5kbbmw1136jabw2pn7dls9h41mnli";
+    url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz";
+    sha256 = "1rdjr3x7s992w004cqf4xji1522an9rpzsr9wvyhp685khmahrsj";
   };
   name = "libexosip2-${version}";
 
diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix
index 732b591353c..8e79afb5f9e 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "faac-1.28";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/faac/${name}.tar.gz";
+    url = "mirror://sourceforge/faac/${name}.tar.gz";
     sha256 = "1pqr7nf6p2r283n0yby2czd3iy159gz8rfinkis7vcfgyjci2565";
   };
 
diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix
index 119e785ea4f..9f731d118bc 100644
--- a/pkgs/development/libraries/ffmpeg/1.x.nix
+++ b/pkgs/development/libraries/ffmpeg/1.x.nix
@@ -30,12 +30,12 @@ assert playSupport -> SDL != null;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-1.2";
-  
+
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
     sha256 = "1bssxbn4p813xlgb8whg4b60j90yzfy92x70b4q8j35fgp0gnfcs";
   };
-  
+
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
   # the resulting library is GPL'ed, so it can only be used in GPL'ed
   # applications.
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional playSupport SDL;
 
   enableParallelBuilding = true;
-    
+
   crossAttrs = {
     dontSetConfigureCross = true;
     configureFlags = configureFlags ++ [
@@ -89,6 +89,10 @@ stdenv.mkDerivation rec {
       ];
   };
 
+  passthru = {
+    inherit vdpauSupport;
+  };
+
   meta = {
     homepage = http://www.ffmpeg.org/;
     description = "A complete, cross-platform solution to record, convert and stream audio and video";
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index b37fcdf4436..98a6c35c8b8 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -78,8 +78,10 @@ stdenv.mkDerivation rec {
     inherit vdpauSupport;
   };
 
-  meta = {
-    homepage = http://www.ffmpeg.org/;
+  meta = with stdenv.lib; {
+    homepage    = http://www.ffmpeg.org/;
     description = "A complete, cross-platform solution to record, convert and stream audio and video";
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
index f716700d98e..68c91596ac5 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
@@ -22,19 +22,19 @@
     <fontconfig>
       <xsl:copy-of select="child::node()[name() != 'dir' and name() != 'cachedir' and name() != 'include']" />
 
-      <include xml:space="preserve"><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
       <include ignore_missing="yes" xml:space="preserve">/etc/fonts/conf.d</include>
-      
+      <include xml:space="preserve"><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
+
       <cachedir xml:space="preserve">/var/cache/fontconfig</cachedir>
       <cachedir xml:space="preserve">~/.fontconfig</cachedir>
-      
+
       <xsl:for-each select="str:tokenize($fontDirectories)">
         <dir><xsl:value-of select="." /></dir>
         <xsl:text>&#0010;</xsl:text>
       </xsl:for-each>
-      
+
     </fontconfig>
 
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/pkgs/development/libraries/gegl/0_0_22.nix b/pkgs/development/libraries/gegl/0_0_22.nix
index 150ba1ac961..b2f2e85a1ea 100644
--- a/pkgs/development/libraries/gegl/0_0_22.nix
+++ b/pkgs/development/libraries/gegl/0_0_22.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng12, cairo, libjpeg
+{ stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng, cairo, libjpeg
 , librsvg, pango, gtk }:
-        
+
 stdenv.mkDerivation {
   name = "gegl-0.0.22";
 
@@ -11,9 +11,9 @@ stdenv.mkDerivation {
 
   configureFlags = "--disable-docs"; # needs fonts otherwise  don't know how to pass them
 
-  buildInputs = [ pkgconfig glib babl_0_0_22 libpng12 cairo libjpeg librsvg pango gtk ];
+  buildInputs = [ pkgconfig glib babl_0_0_22 libpng cairo libjpeg librsvg pango gtk ];
 
-  meta = { 
+  meta = {
     description = "Graph-based image processing framework";
     homepage = http://www.gegl.org;
     license = "GPL3";
diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index 734bde71338..56c3c3e7a2b 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -2,7 +2,7 @@
 
 let inherit (composableDerivation) edf; in
 
-composableDerivation.composableDerivation {} {
+composableDerivation.composableDerivation {} rec {
 
   flags =
   # python and ruby untested 
@@ -10,20 +10,14 @@ composableDerivation.composableDerivation {} {
     # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else [])
     # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };}
 
-  name = "geos-3.2.2";
+  name = "geos-3.3.8";
 
   src = fetchurl {
-    url = http://download.osgeo.org/geos/geos-3.2.2.tar.bz2;
-    sha256 = "0711wcq46h7zgvp0bk4m60vmx1wal9db1q36mayf0vwk34hprpr4";
+    url = "http://download.osgeo.org/geos/${name}.tar.bz2";
+    sha256 = "0fshz8s9g610ycl4grrmcdcxb01aqpc6qac3x3jjik0vlz8x9v7b";
   };
 
-  # for development version. can be removed ?
-  #configurePhase = "
-  #  [ -f configure ] || \\
-  #  LIBTOOLIZE=libtoolize ./autogen.sh
-  #  [>{ automake --add-missing; autoconf; }
-  #  unset configurePhase; configurePhase
-  #";
+  enableParallelBuilding = true;
 
   meta = {
     description = "C++ port of the Java Topology Suite (JTS)";
diff --git a/pkgs/development/libraries/gettext/0.17.nix b/pkgs/development/libraries/gettext/0.17.nix
index bee2042f116..ef0a1d41bd6 100644
--- a/pkgs/development/libraries/gettext/0.17.nix
+++ b/pkgs/development/libraries/gettext/0.17.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/gettext/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index f9229793165..1c08bef1413 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrEmpty, zlib, libffi
-, python, pcre, libelf }:
+, python, pcre, libelf, libintlOrEmpty }:
 
 # TODO:
 # * Add gio-module-fam
@@ -24,7 +24,7 @@ let
   '';
 in
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "glib-2.36.1";
 
   src = fetchurl {
@@ -35,7 +35,7 @@ stdenv.mkDerivation (rec {
   outputs = [ "dev" "out" "bin" "doc" ];
 
   # configure script looks for d-bus but it is only needed for tests
-  buildInputs = [ libelf ];
+  buildInputs = [ libelf ] ++ libintlOrEmpty;
 
   nativeBuildInputs = [ perl pkgconfig gettext python ];
 
@@ -43,10 +43,9 @@ stdenv.mkDerivation (rec {
 
   configureFlags = "--with-pcre=system --disable-fam";
 
-  postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h" # https://bugzilla.gnome.org/show_bug.cgi?id=698716 :-)
-    + stdenv.lib.optionalString stdenv.isDarwin ''
-      sed '24 i #include <Foundation/Foundation.h>'
-    '';
+  postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h";
+
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
   enableParallelBuilding = true;
 
@@ -55,12 +54,12 @@ stdenv.mkDerivation (rec {
      inherit flattenInclude;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "GLib, a C library of programming buildings blocks";
     homepage    = http://www.gtk.org/;
-    license     = "LGPLv2+";
-    maintainers = with stdenv.lib.maintainers; [ raskin urkud lovek323 ];
-    platforms   = stdenv.lib.platforms.unix;
+    license     = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ lovek323 raskin urkud ];
+    platforms   = platforms.unix;
 
     longDescription = ''
       GLib provides the core application building blocks for libraries
@@ -71,12 +70,3 @@ stdenv.mkDerivation (rec {
   };
 }
 
-//
-
-(stdenv.lib.optionalAttrs stdenv.isDarwin {
-  # XXX: Disable the NeXTstep back-end because stdenv.gcc doesn't support
-  # Objective-C.
-  postConfigure =
-    '' sed -i configure -e's/glib_have_cocoa=yes/glib_have_cocoa=no/g'
-    '';
-}))
diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix
index 8be076f335c..eca215c3131 100644
--- a/pkgs/development/libraries/glibc/2.13/common.nix
+++ b/pkgs/development/libraries/glibc/2.13/common.nix
@@ -219,7 +219,7 @@ stdenv.mkDerivation ({
 
     license = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     #platforms = stdenv.lib.platforms.linux;
   } // meta;
 }
diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix
index e0588a6275d..66251e0fc49 100644
--- a/pkgs/development/libraries/glibc/2.17/common.nix
+++ b/pkgs/development/libraries/glibc/2.17/common.nix
@@ -8,6 +8,7 @@ cross:
 , machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null
 , mig ? null
 , profilingLibraries ? false, meta
+, withGd ? false, gd ? null, libpng ? null
 , preConfigure ? "", ... }@args:
 
 let
@@ -103,12 +104,13 @@ stdenv.mkDerivation ({
       # To avoid linking with -lgcc_s (dynamic link)
       # so the glibc does not depend on its compiler store path
       "libc_cv_as_needed=no"
-    ];
+    ] ++ stdenv.lib.optional withGd "--with-gd";
 
   installFlags = [ "sysconfdir=$(out)/etc" ];
 
   buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ]
-    ++ stdenv.lib.optional (mig != null) mig;
+    ++ stdenv.lib.optional (mig != null) mig
+    ++ stdenv.lib.optionals withGd [ gd libpng ];
 
   # Needed to install share/zoneinfo/zone.tab.  Set to impure /bin/sh to
   # prevent a retained dependency on the bootstrap tools in the stdenv-linux
@@ -125,7 +127,7 @@ stdenv.mkDerivation ({
 
 # Remove the `gccCross' attribute so that the *native* glibc store path
 # doesn't depend on whether `gccCross' is null or not.
-// (removeAttrs args [ "gccCross" "fetchurl" "fetchgit" ]) //
+// (removeAttrs args [ "gccCross" "fetchurl" "fetchgit" "withGd" "gd" "libpng" ]) //
 
 {
   name = name + "-${version}" +
@@ -188,6 +190,10 @@ stdenv.mkDerivation ({
   } // meta;
 }
 
+// stdenv.lib.optionalAttrs withGd {
+  preBuild = "unset NIX_DONT_SET_RPATH";
+}
+
 // stdenv.lib.optionalAttrs (hurdHeaders != null) {
   # Work around the fact that the configure snippet that looks for
   # <hurd/version.h> does not honor `--with-headers=$sysheaders' and that
diff --git a/pkgs/development/libraries/glibc/2.17/default.nix b/pkgs/development/libraries/glibc/2.17/default.nix
index da2ddc7a797..ace043a250c 100644
--- a/pkgs/development/libraries/glibc/2.17/default.nix
+++ b/pkgs/development/libraries/glibc/2.17/default.nix
@@ -5,6 +5,7 @@
 , profilingLibraries ? false
 , gccCross ? null
 , debugSymbols ? false
+, withGd ? false, gd ? null, libpng ? null
 }:
 
 assert stdenv.gcc.gcc != null;
@@ -16,10 +17,11 @@ in
   build cross ({
     name = "glibc"
       + stdenv.lib.optionalString (hurdHeaders != null) "-hurd"
-      + stdenv.lib.optionalString debugSymbols "-debug";
+      + stdenv.lib.optionalString debugSymbols "-debug"
+      + stdenv.lib.optionalString withGd "-gd";
 
     inherit fetchurl fetchgit stdenv kernelHeaders installLocales
-      profilingLibraries gccCross;
+      profilingLibraries gccCross withGd gd libpng;
 
     builder = ./builder.sh;
 
diff --git a/pkgs/development/libraries/gmp/5.1.1.nix b/pkgs/development/libraries/gmp/5.1.1.nix
index 0261f833962..1f43e07e58d 100644
--- a/pkgs/development/libraries/gmp/5.1.1.nix
+++ b/pkgs/development/libraries/gmp/5.1.1.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
       '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/development/libraries/gnutls/2.12.nix b/pkgs/development/libraries/gnutls/2.12.nix
index 85a676a05b1..86829a3a44b 100644
--- a/pkgs/development/libraries/gnutls/2.12.nix
+++ b/pkgs/development/libraries/gnutls/2.12.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/gnutls/;
     license = "LGPLv2.1+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index df6a67b9731..0a98a2698fd 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (rec {
 
     homepage = http://www.gnu.org/software/gnutls/;
     license = "LGPLv2.1+";
-    maintainers = [ maintainers.ludo ];
+    maintainers = [ ];
   };
 }
 
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index b96d5b25bb1..99a80640bb8 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -1,14 +1,17 @@
-{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python, gdk_pixbuf }:
+{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python, gdk_pixbuf
+, libintlOrEmpty, autoconf, automake, otool }:
 
 stdenv.mkDerivation rec {
   name = "gobject-introspection-1.34.2";
 
-  buildInputs = [ flex bison glib pkgconfig python gdk_pixbuf ];
+  buildInputs = [ flex bison glib pkgconfig python gdk_pixbuf ]
+    ++ libintlOrEmpty
+    ++ stdenv.lib.optional stdenv.isDarwin otool;
   propagatedBuildInputs = [ libffi ];
 
   # Tests depend on cairo, which is undesirable (it pulls in lots of
   # other dependencies).
-  configureFlags = "--disable-tests";
+  configureFlags = [ "--disable-tests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gobject-introspection/1.34/${name}.tar.xz";
@@ -18,8 +21,17 @@ stdenv.mkDerivation rec {
   postInstall = "rm -rf $out/share/gtk-doc";
 
   meta = with stdenv.lib; {
-    maintainers = [ maintainers.urkud ];
-    platforms = platforms.linux;
-    homepage = http://live.gnome.org/GObjectIntrospection;
+    description = "A middleware layer between C libraries and language bindings";
+    homepage    = http://live.gnome.org/GObjectIntrospection;
+    maintainers = with maintainers; [ lovek323 urkud ];
+    platforms   = platforms.unix;
+
+    longDescription = ''
+      GObject introspection is a middleware layer between C libraries (using
+      GObject) and language bindings. The C library can be scanned at compile
+      time and generate a metadata file, in addition to the actual native C
+      library. Then at runtime, language bindings can read this metadata and
+      automatically provide bindings to call into the C library.
+    '';
   };
 }
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index 14da5f3468b..016b340c51f 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv2";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;
   };
 }
diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix
index 3b52133058f..a4a3a01299c 100644
--- a/pkgs/development/libraries/gsasl/default.nix
+++ b/pkgs/development/libraries/gsasl/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/gsasl/;
     license = "GPLv3+";
 
-    maintainers = with stdenv.lib.maintainers; [ bjg ludo ];
+    maintainers = with stdenv.lib.maintainers; [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index 474d2f97dd0..49364f88242 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/gsl/;
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
index 2ac325dc282..d6717d799f1 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
@@ -1,7 +1,6 @@
-{ fetchurl, stdenv, pkgconfig, python, gstreamer
-, xlibs, alsaLib, cdparanoia, libogg
-, libtheora, libvorbis, freetype, pango
-, liboil, glib
+{ fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia
+, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo
+, libintlOrEmpty
 , # Whether to build no plugins that have external dependencies
   # (except the ALSA plugin).
   minimalDeps ? false
@@ -25,22 +24,28 @@ stdenv.mkDerivation rec {
 
   # TODO : v4l, libvisual
   buildInputs =
-    [ pkgconfig glib alsaLib ]
+    [ pkgconfig glib cairo ]
+    # can't build alsaLib on darwin
+    ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib
     ++ stdenv.lib.optionals (!minimalDeps)
-      [ xlibs.xlibs xlibs.libXv cdparanoia libogg libtheora libvorbis
-        freetype pango liboil
-      ];
+      [ xlibs.xlibs xlibs.libXv libogg libtheora libvorbis freetype pango
+        liboil ]
+    # can't build cdparanoia on darwin
+    ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia
+    ++ libintlOrEmpty;
+
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
   propagatedBuildInputs = [ gstreamer ];
  
   postInstall = "rm -rf $out/share/gtk-doc";
   
-  meta = {
-    homepage = http://gstreamer.freedesktop.org;
-
+  meta = with stdenv.lib; {
+    homepage    = http://gstreamer.freedesktop.org;
     description = "Base plug-ins for GStreamer";
-
-    license = "LGPLv2+";
+    license     = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 }
 
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index e5aadea9507..1ed01400c50 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -19,7 +19,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
+  NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"
+    + stdenv.lib.optionalString (libintlOrEmpty != []) " -lintl";
+
+  buildInputs = stdenv.lib.optional stdenv.isDarwin xlibs.libXi;
 
   nativeBuildInputs = [ perl pkgconfig gettext ];
 
@@ -34,8 +37,12 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-xinput=yes";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A multi-platform toolkit for creating graphical user interfaces";
+    homepage    = http://www.gtk.org/;
+    license     = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ lovek323 raskin ];
+    platforms   = platforms.all;
 
     longDescription = ''
       GTK+ is a highly usable, feature rich toolkit for creating
@@ -47,12 +54,5 @@ stdenv.mkDerivation rec {
       proprietary software with GTK+ without any license fees or
       royalties.
     '';
-
-    homepage = http://www.gtk.org/;
-
-    license = "LGPLv2+";
-
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/gtk-sharp-2/default.nix b/pkgs/development/libraries/gtk-sharp-2/default.nix
index 9baac518ff7..0e659fb074b 100644
--- a/pkgs/development/libraries/gtk-sharp-2/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-2/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.gz;
+    url = mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.gz;
     sha256 = "1y55vc2cp4lggmbil2lb28d0gn71iq6wfyja1l9mya5xll8svzwc";
   };
 
diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix
index eb2335dac43..17dc5469910 100644
--- a/pkgs/development/libraries/gtkimageview/default.nix
+++ b/pkgs/development/libraries/gtkimageview/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix
index 46e1bba488a..030375938a6 100644
--- a/pkgs/development/libraries/gtkspell/default.nix
+++ b/pkgs/development/libraries/gtkspell/default.nix
@@ -1,12 +1,12 @@
-{stdenv, fetchurl, gtk, aspell, pkgconfig}:
+{stdenv, fetchurl, gtk, aspell, pkgconfig, enchant, intltool}:
 
 stdenv.mkDerivation {
-  name = "gtkspell-2.0.11";
+  name = "gtkspell-2.0.16";
   
   src = fetchurl {
-    url = http://gtkspell.sourceforge.net/download/gtkspell-2.0.11.tar.gz;
-    md5 = "494869f67146a12a3f17a958f51aeb05";
+    url = mirror://sourceforge/gtkspell/gtkspell-2.0.16.tar.gz;
+    sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg";
   };
   
-  buildInputs = [aspell pkgconfig gtk];
+  buildInputs = [aspell pkgconfig gtk enchant intltool];
 }
diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix
index 64943d5e1c1..bbb145fd8bf 100644
--- a/pkgs/development/libraries/haskell/HFuse/default.nix
+++ b/pkgs/development/libraries/haskell/HFuse/default.nix
@@ -5,18 +5,19 @@ cabal.mkDerivation (self: {
   version = "0.2.4.1";
   sha256 = "12k04dvh92kk2i68bcb70xnk378qxmh46f241k06di5rkcgwyg1k";
   extraLibraries = [ fuse ];
-
   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 = {
     homepage = "https://github.com/toothbrush/hfuse";
     description = "HFuse is a binding for the Linux FUSE library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix
index c07060cf197..7ee64f4254e 100644
--- a/pkgs/development/libraries/haskell/Hipmunk/default.nix
+++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix
@@ -2,12 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "Hipmunk";
-  version = "5.2.0.10";
-  sha256 = "0kq6dlx1g7dra7nsfmrc13yvnl7wh00fadmgln9v2vyf0ww82x95";
+  version = "5.2.0.11";
+  sha256 = "0pcbwlq0njgj6dzh8h94gml63wv52f6l9hdas378lm7v8gbizxl7";
   buildDepends = [ StateVar transformers ];
-  patchPhase = ''
-    sed -i -e 's|containers.*,|containers,|' Hipmunk.cabal
-  '';
   meta = {
     homepage = "http://patch-tag.com/r/felipe/hipmunk/home";
     description = "A Haskell binding for Chipmunk";
diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix
index 659a1158d0f..b87c47f04be 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 738b69f2832..9018bc603cf 100644
--- a/pkgs/development/libraries/haskell/MonadRandom/default.nix
+++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "MonadRandom";
-  version = "0.1.9";
-  sha256 = "1n947650xlz47rj6y6ik2mknyr9smwragjr5akccinmfm1krg6lz";
+  version = "0.1.11";
+  sha256 = "107f3ch84riagxa9x6yk4gxq2vq5dsk63rd0780g1fdplnf1sky3";
   buildDepends = [ mtl random transformers ];
   meta = {
     description = "Random-number generation monad";
diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix
index 62731657e82..2fd9c3e0fb6 100644
--- a/pkgs/development/libraries/haskell/SDL/default.nix
+++ b/pkgs/development/libraries/haskell/SDL/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "SDL";
-  version = "0.6.4";
-  sha256 = "1zrfx2nw0k8lfkr6vnwsp5wr3yz62v0bq60p4sdzj7gm01bz92g0";
+  version = "0.6.5";
+  sha256 = "1vlf1bvp4cbgr31qk6aqikhgn9jbgj7lrvnjzv3ibykm1hhd6vdb";
   extraLibraries = [ SDL ];
   meta = {
     description = "Binding to libSDL";
diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix
index 475abb0b3a9..263cd049a3d 100644
--- a/pkgs/development/libraries/haskell/abstract-deque/default.nix
+++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix
@@ -2,10 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "abstract-deque";
-  version = "0.2";
-  sha256 = "0cq1k74b854flfvh7qhfnpngn4vyzp1az1rkaara23wlylydgs89";
-  buildDepends = [ HUnit random ];
+  version = "0.2.2";
+  sha256 = "12g4y3j59nkjw9ja247m8ydhj6a033lzfbqkp4a5slrqdxfdlvyb";
+  buildDepends = [ HUnit random testFramework testFrameworkHunit ];
   testDepends = [ HUnit random testFramework testFrameworkHunit ];
+  doCheck = false;
   meta = {
     homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
     description = "Abstract, parameterized interface to mutable Deques";
diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix
index dcd6698a5a2..28d8def56cf 100644
--- a/pkgs/development/libraries/haskell/acid-state/default.nix
+++ b/pkgs/development/libraries/haskell/acid-state/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "acid-state";
-  version = "0.10.0";
-  sha256 = "0jjjh8l6ka8kawgp1gm75is4ajavl7nd6b2l717wjs8sy93qnzsc";
+  version = "0.11.4";
+  sha256 = "1z9jswg5c2wp9k2lfp0yx7mvw6iiyizm72s552lgjn8i3slq8481";
   buildDepends = [
     cereal extensibleExceptions filepath mtl network safecopy stm
   ];
diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix
index 209341e22e7..c51663a9d09 100644
--- a/pkgs/development/libraries/haskell/active/default.nix
+++ b/pkgs/development/libraries/haskell/active/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "active";
-  version = "0.1.0.4";
-  sha256 = "0f4bgx7l9vx2kywl87zpxpjbfix79lp8chf6xzfpmh4wrbmfgi1s";
+  version = "0.1.0.6";
+  sha256 = "0hh52hkmma4lxfv3gj7x23cwx8v6wd1cm9hblvhzhylxk8dyl5m7";
   buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
   testDepends = [
     newtype QuickCheck semigroupoids semigroups vectorSpace
diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix
index 4b37ea84d58..b542816f05b 100644
--- a/pkgs/development/libraries/haskell/atomic-primops/default.nix
+++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix
@@ -1,10 +1,10 @@
-{ cabal, Cabal, primitive }:
+{ cabal, bitsAtomic, Cabal, primitive }:
 
 cabal.mkDerivation (self: {
   pname = "atomic-primops";
-  version = "0.1.0.2";
-  sha256 = "1qjm97hi2wr658yk7f5cfppizaawmrkvs2q7qzq00h14fr71xxca";
-  buildDepends = [ Cabal primitive ];
+  version = "0.4";
+  sha256 = "01sg0yn25fs0z7dmrvhyp3amay9l028xs570xhy6vvplrji1mxf0";
+  buildDepends = [ bitsAtomic Cabal primitive ];
   meta = {
     homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
     description = "A safe approach to CAS and other atomic ops in Haskell";
diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
index 663a91b0c30..68b08e50686 100644
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@@ -3,14 +3,14 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec-conduit";
-  version = "1.0.1";
-  sha256 = "14b6ym5sjvg1x82ijydhrjk5445kg0fvwqzqwqld59akbqb6fpg5";
+  version = "1.0.1.2";
+  sha256 = "1j05r7mvm83wgnka7asmwd1dj4ajkg548mryyhpr7dd53vn5lbx0";
   buildDepends = [ attoparsec conduit text transformers ];
   testDepends = [ attoparsec conduit hspec resourcet text ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Consume attoparsec parsers via conduit";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
index c21d6eddbee..2ddd7c05ee9 100644
--- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "authenticate-oauth";
-  version = "1.4.0.6";
-  sha256 = "1ylfvc744wqyn5xbv6fivfys5kk9k9r2b9xf63zfzj5l5yqmv91a";
+  version = "1.4.0.7";
+  sha256 = "1pmkj35rpbhgyjrfdg8j51xn9a420aawkwfg28fpxz7kid0cqw8g";
   buildDepends = [
     base64Bytestring blazeBuilder blazeBuilderConduit conduit
     cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl
diff --git a/pkgs/development/libraries/haskell/bindings-DSL/default.nix b/pkgs/development/libraries/haskell/bindings-DSL/default.nix
new file mode 100644
index 00000000000..9d6e8d1a04d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bindings-DSL/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "bindings-DSL";
+  version = "1.0.16";
+  sha256 = "1sly88585f94dsnhyw6nagnr4jfjixnn61my85x05987flf325px";
+  meta = {
+    homepage = "http://bitbucket.org/mauricio/bindings-dsl";
+    description = "FFI domain specific language, on top of hsc2hs";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/bindings-posix/default.nix b/pkgs/development/libraries/haskell/bindings-posix/default.nix
new file mode 100644
index 00000000000..8bdf30e36d1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bindings-posix/default.nix
@@ -0,0 +1,13 @@
+{ cabal, bindingsDSL }:
+
+cabal.mkDerivation (self: {
+  pname = "bindings-posix";
+  version = "1.2.6";
+  sha256 = "1yza3qbf0f5gfpg79pb6xfpw37zg191nmxa4r6h9x4xb5na0rzff";
+  buildDepends = [ bindingsDSL ];
+  meta = {
+    description = "Low level bindings to posix";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/byteable/default.nix b/pkgs/development/libraries/haskell/byteable/default.nix
new file mode 100644
index 00000000000..6e527cc9958
--- /dev/null
+++ b/pkgs/development/libraries/haskell/byteable/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "byteable";
+  version = "0.1.1";
+  sha256 = "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4";
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-byteable";
+    description = "Type class for sequence of bytes";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix
index 6ad4db61cfd..90fb53051e2 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/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix
index 14695fd08f5..69acb897220 100644
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix
@@ -1,15 +1,15 @@
-{ cabal, basicPrelude, hashable, hspec, liftedBase, monadControl
-, QuickCheck, systemFilepath, text, transformers
+{ cabal, async, basicPrelude, deepseq, hashable, hspec, liftedBase
+, monadControl, QuickCheck, systemFilepath, text, transformers
 , unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude";
-  version = "0.5.8";
-  sha256 = "1yq2x3mfkasprmsx1gracjhih9l9x0dsq6pdf90khlcl11qh57ir";
+  version = "0.5.9";
+  sha256 = "1qqmip3ynqdxlwynm60wsn82dcyymcfql79k039iablanj4mic61";
   buildDepends = [
-    basicPrelude hashable liftedBase monadControl systemFilepath text
-    transformers unorderedContainers vector
+    async basicPrelude deepseq hashable liftedBase monadControl
+    systemFilepath text transformers unorderedContainers vector
   ];
   testDepends = [ hspec QuickCheck transformers ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index e670ff1a3d1..6cb8d26bd39 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 dfaed86b9af..1814ab99784 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.3";
-  sha256 = "1cglfbkmgbsv3k32vdfg4xk6b5g5c2z8pm0xgbmdb4bbg765lrh6";
+  version = "0.10.5";
+  sha256 = "013095w6xzkaj6c09vrkmf24gl07kc995c39yby5jdngpggdxc9h";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath transformers ];
diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
index 99c4016947d..45b218a40f7 100644
--- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "comonad-transformers";
-  version = "3.0.2";
-  sha256 = "1910hqp7f03p44alxm4dm8i4wikf0b60hmm85yrhbq02kcr3379d";
+  version = "3.0.4";
+  sha256 = "1jvg08vmi47p8ji1llci02lk675q93pm6dd8imqj6xjrq34g4x9a";
   buildDepends = [
     comonad contravariant distributive semigroupoids semigroups
     transformers
diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix
index 7e11886fc58..472e4e315c1 100644
--- a/pkgs/development/libraries/haskell/comonad/default.nix
+++ b/pkgs/development/libraries/haskell/comonad/default.nix
@@ -1,10 +1,10 @@
-{ cabal, doctest, filepath, semigroups, transformers }:
+{ cabal, doctest, filepath, semigroups, tagged, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "comonad";
-  version = "3.0.2";
-  sha256 = "0ryyifcxc5rmjrf9323zzj357709mah1hdsrnrbakd5ck7grjfay";
-  buildDepends = [ semigroups transformers ];
+  version = "3.1";
+  sha256 = "0sl9b3f1vwpjdvnrxv7b8n512w05pv4in6qx3l4sbksdp1zjvcyv";
+  buildDepends = [ semigroups tagged transformers ];
   testDepends = [ doctest filepath ];
   meta = {
     homepage = "http://github.com/ekmett/comonad/";
diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix
index 5921d8b07d3..aac28ff0871 100644
--- a/pkgs/development/libraries/haskell/comonads-fd/default.nix
+++ b/pkgs/development/libraries/haskell/comonads-fd/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "comonads-fd";
-  version = "3.0.1";
-  sha256 = "0ap9sw7h130bza43091mbl9a5bsin6342zawgycdcsag49wm3dyy";
+  version = "3.0.3";
+  sha256 = "06x545yq5xc3kphjipkgjrgrfvvkjpy0wji9d5fw44ca91nzglww";
   buildDepends = [
     comonad comonadTransformers mtl semigroups transformers
   ];
diff --git a/pkgs/development/libraries/haskell/concatenative/default.nix b/pkgs/development/libraries/haskell/concatenative/default.nix
new file mode 100644
index 00000000000..34344c1566b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/concatenative/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "concatenative";
+  version = "1.0.1";
+  sha256 = "05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd";
+  meta = {
+    homepage = "https://patch-tag.com/r/salazar/concatenative/snapshot/current/content/pretty";
+    description = "A library for postfix control flow";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 6a12708ea33..8c550065deb 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -1,22 +1,22 @@
-{ cabal, doctest, hspec, liftedBase, mmorph, monadControl
+{ cabal, doctest, hspec, liftedBase, mmorph, monadControl, mtl
 , QuickCheck, resourcet, text, transformers, transformersBase, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.6";
-  sha256 = "0da5wxhsfjgcn850iimcp15vhg5lw0fa8i7c3hdw4yvrpza14dcn";
+  version = "1.0.7.3";
+  sha256 = "0ih3ymv5m3c66wr9xydc1dxgpvh5b92dyyc7v67li6n3w7dzi6fp";
   buildDepends = [
-    liftedBase mmorph monadControl resourcet text transformers
+    liftedBase mmorph monadControl mtl resourcet text transformers
     transformersBase void
   ];
   testDepends = [
-    doctest hspec QuickCheck resourcet text transformers void
+    doctest hspec mtl QuickCheck resourcet text transformers void
   ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Streaming data processing library";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/constraints/default.nix b/pkgs/development/libraries/haskell/constraints/default.nix
index 0fe2cb8864a..87ec5d82724 100644
--- a/pkgs/development/libraries/haskell/constraints/default.nix
+++ b/pkgs/development/libraries/haskell/constraints/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "constraints";
-  version = "0.3.2";
-  sha256 = "1fmjl6dh2iswvmq8r3izplp6zg9m8yq1c4rj0zpqjbv2iqsi4kl1";
+  version = "0.3.3";
+  sha256 = "0mglqd6l6bc333i7gymbm8q037hj5fny6jzyg1zmw5kg6r3xcwdi";
   buildDepends = [ newtype ];
   meta = {
     homepage = "http://github.com/ekmett/constraints/";
diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix
index e1f5e2ae567..7978a4185af 100644
--- a/pkgs/development/libraries/haskell/contravariant/default.nix
+++ b/pkgs/development/libraries/haskell/contravariant/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "contravariant";
-  version = "0.4.1";
-  sha256 = "0alzl47lqzw9fqjqxdfy40f1aynd8mc00b2h7fj2ch0zq82hm85q";
+  version = "0.4.3";
+  sha256 = "1hhcsy5bshi2yx8618wxa40gax5wfapnbgdmv1acgjyxb6vbmsp6";
   buildDepends = [ tagged transformers transformersCompat ];
   meta = {
     homepage = "http://github.com/ekmett/contravariant/";
diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix
index 23fdd553f9e..aa786fa9784 100644
--- a/pkgs/development/libraries/haskell/crypto-api/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-api/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-api";
-  version = "0.12.2.1";
-  sha256 = "03hbjjrwnpa4ji2ig458s0c4g13r566sl6fs3hciwyf6cfq597wk";
+  version = "0.12.2.2";
+  sha256 = "0qmv8vizrbjs3k2f78r6ykyilps4zp7xxpzdxw7rngh154wqgv1k";
   buildDepends = [ cereal entropy tagged transformers ];
   meta = {
     homepage = "https://github.com/TomMD/crypto-api";
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 00000000000..3e93912b3a7
--- /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 00000000000..378ccf3dbcc
--- /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 50935a77a64..6efca94a651 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/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index 97f74e80530..03fee5bac92 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -1,12 +1,12 @@
-{ cabal, cereal, cryptoApi, HUnit, QuickCheck, tagged
+{ cabal, byteable, cereal, cryptoApi, HUnit, QuickCheck, tagged
 , testFramework, testFrameworkHunit, testFrameworkQuickcheck2
 }:
 
 cabal.mkDerivation (self: {
   pname = "cryptohash";
-  version = "0.9.0";
-  sha256 = "0ipzrp83pz33qc7gmn9bmhbmc1f0hfvagyfr5bnmhgrh6lgy9s7l";
-  buildDepends = [ cereal cryptoApi tagged ];
+  version = "0.9.1";
+  sha256 = "164j43dja91k2cssh0s2dw9riibijl02bap9mn8jn1h6vjb6w9z0";
+  buildDepends = [ byteable cereal cryptoApi tagged ];
   testDepends = [
     HUnit QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2
diff --git a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
index 5066a83c5f6..db9b90574e4 100644
--- a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
+++ b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-binary-ieee754";
-  version = "0.4.3";
-  sha256 = "0aba7qvjvhfp9cpr65j8zs62niv9yccrardk10aaqpkz3ihc86pm";
+  version = "0.4.4";
+  sha256 = "02nzg1barhqhpf4x26mpzvk7jd29nali033qy01adjplv2z5m5sr";
   buildDepends = [ binary ];
   meta = {
     homepage = "https://john-millikin.com/software/data-binary-ieee754/";
diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index bc2abf5c16d..a73b6d9fba8 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 141a820b5d1..023ac090681 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 ed23b092b02..c2dbb27aebd 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 6f201e7cd85..84d3d9bbf48 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 73c7ff8f8c4..50afb16f282 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 561f32118c2..644037e946e 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/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
index 70995ecb3ce..d28de6c67a0 100644
--- a/pkgs/development/libraries/haskell/dimensional-tf/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dimensional-tf";
-  version = "0.1.1";
-  sha256 = "0hhp2nx8xyk5ms3mzg1d3jhzm1b0bxz7aijxqasrxjq9p04jr2ci";
+  version = "0.2";
+  sha256 = "0j23iamgcm7wy6y7i7diq5nnaimpsz0vvb1yrmyh0qz792d60fw1";
   buildDepends = [ numtypeTf time ];
   meta = {
     homepage = "http://dimensional.googlecode.com/";
diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix
index 329722abe8e..154b7ea0628 100644
--- a/pkgs/development/libraries/haskell/dimensional/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dimensional";
-  version = "0.10.2";
-  sha256 = "14idyacd38a2kc97hp773j8iiim2lxh9czr8gp12m66w4n603znn";
+  version = "0.12.1";
+  sha256 = "176mvnd570xskjs6ky1wax9adzzrm9j6ai0fc4hy2z4097ydcgwm";
   buildDepends = [ numtype time ];
   meta = {
     homepage = "http://dimensional.googlecode.com/";
diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix
index 0854f39efce..e80f4379aa7 100644
--- a/pkgs/development/libraries/haskell/dns/default.nix
+++ b/pkgs/development/libraries/haskell/dns/default.nix
@@ -1,15 +1,20 @@
 { cabal, attoparsec, attoparsecConduit, binary, blazeBuilder
-, conduit, iproute, mtl, network, networkConduit, random
+, conduit, hspec, iproute, mtl, network, networkConduit, random
 }:
 
 cabal.mkDerivation (self: {
   pname = "dns";
-  version = "0.3.6";
-  sha256 = "0dpwy94id9rxxjpji47nazinm8i1ihm0606dmi5iqqhbl5h2jara";
+  version = "0.3.8";
+  sha256 = "1x2rfm89qpx7dpxr457i2wqmjry8r28f42j194131mfx4gc4mwdq";
   buildDepends = [
     attoparsec attoparsecConduit binary blazeBuilder conduit iproute
     mtl network networkConduit random
   ];
+  testDepends = [
+    attoparsec attoparsecConduit binary blazeBuilder conduit hspec
+    iproute mtl network networkConduit random
+  ];
+  doCheck = false;
   meta = {
     description = "DNS library in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix
index 841fae96791..8500de5fcfb 100644
--- a/pkgs/development/libraries/haskell/dual-tree/default.nix
+++ b/pkgs/development/libraries/haskell/dual-tree/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dual-tree";
-  version = "0.1.0.2";
-  sha256 = "0ys50m8yjksxi33qyk6ql4ldpdzb0fvxqvywi3y46xi16w5yrkb0";
+  version = "0.1.0.3";
+  sha256 = "0k3p1lqhynlqvkbnrs5vn478c76qcn754n5pb17p5i4jcw94bm0n";
   buildDepends = [ monoidExtras newtype semigroups ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
index 4730af58569..67c1962cbe9 100644
--- a/pkgs/development/libraries/haskell/either/default.nix
+++ b/pkgs/development/libraries/haskell/either/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "either";
-  version = "3.4";
-  sha256 = "05nbp8gp50wq592k6dsrpzp6wmqjn9pz6mkizqfb65z1wvd1xiz2";
+  version = "3.4.1";
+  sha256 = "1cq4glqhxz9k8fxf0dc8b6hcxxfn4yci6h7wmfkmkfq5ca61ax1b";
   buildDepends = [
     MonadRandom mtl semigroupoids semigroups transformers
   ];
diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix
index 797ce1711b2..17409f05eed 100644
--- a/pkgs/development/libraries/haskell/entropy/default.nix
+++ b/pkgs/development/libraries/haskell/entropy/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "entropy";
-  version = "0.2.2.1";
-  sha256 = "1yl1gmkmbalm27pjlpm9nhsbxpvxl8w7p8psq5apyrbdqnv9yhbg";
+  version = "0.2.2.2";
+  sha256 = "1xkpfi6njj5iqwn5wa6npyzxksj9hr0xqbxrslg646whxrkd8718";
   meta = {
     homepage = "https://github.com/TomMD/entropy";
     description = "A platform independent entropy source";
diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix
index 7ed890c513c..d15ac59feba 100644
--- a/pkgs/development/libraries/haskell/errors/default.nix
+++ b/pkgs/development/libraries/haskell/errors/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "errors";
-  version = "1.4.1";
-  sha256 = "18npfwr6byh0aib9qxpynr2gf0v92c0xbxky4a733jbdrwli5c40";
+  version = "1.4.2";
+  sha256 = "1csry8bbz7r4gc7x3lf1ih10rvnig2i91nfij227p9744yndl2xw";
   buildDepends = [ either safe transformers ];
   meta = {
     description = "Simplified error-handling";
diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix
index c9544b2c1f6..fb8714f3e85 100644
--- a/pkgs/development/libraries/haskell/fast-logger/default.nix
+++ b/pkgs/development/libraries/haskell/fast-logger/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fast-logger";
-  version = "0.3.1";
-  sha256 = "0sjn3vad0fbchv1fhap71wfnihlwnfhk6p9h9hpnbr0i4b32f1ks";
+  version = "0.3.3";
+  sha256 = "0ya9dn9j2nddpclj00w6jgmiq2xx500sws056fa2s4bdsl8vn5rh";
   buildDepends = [ blazeBuilder dateCache filepath text unixTime ];
   testDepends = [ hspec ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index 0064a7f425a..71a3fe8d0c2 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fclabels";
-  version = "1.1.6";
-  sha256 = "0f5zqbqsm89lp1f7wrmcs8pn7hzbbl8id7xa6ny114bgxrfbrwpk";
+  version = "1.1.7.1";
+  sha256 = "1f34r3bzn1cbba8d5d1j3wxrlrrj5vf09hpgd6ppina91wyj4dyn";
   buildDepends = [ mtl transformers ];
   meta = {
     homepage = "https://github.com/sebastiaanvisser/fclabels";
diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix
index d15906e0be5..a2c1ccde86b 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/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix
index ccb0f8bac82..2eb9ac94d8c 100644
--- a/pkgs/development/libraries/haskell/file-embed/default.nix
+++ b/pkgs/development/libraries/haskell/file-embed/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "file-embed";
-  version = "0.0.4.8";
-  sha256 = "1jq4jdrxw822gzz7mc07nx4yj233mwmykp6xk371pf3hnq8rly0h";
+  version = "0.0.4.9";
+  sha256 = "128z3jwxn6d13dkrfjx7maxgmax8bfgr8n2jfhqg3rvv4ryjnqv2";
   buildDepends = [ filepath ];
   testDepends = [ filepath HUnit ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
index 46ae27fc090..f1a0554e380 100644
--- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "filesystem-conduit";
-  version = "1.0.0";
-  sha256 = "1fz3iihcqpg6m3svjqdg8lvkpza955qn8cbs9b3w333vxkglhi6v";
+  version = "1.0.0.1";
+  sha256 = "04l8i97mr0jzkc7vc77j885n45qd2qyn5kmzxyckp3za96sjsqqw";
   buildDepends = [
     conduit systemFileio systemFilepath text transformers
   ];
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Use system-filepath data types with conduits";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
 })
diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix
index 043156ab5e1..f1a1ec837fd 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 62b07030a46..679ced622d9 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-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index fe0602bf888..93230af4411 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -19,13 +19,13 @@ cabal.mkDerivation (self: {
   buildTools = [ emacs ];
   doCheck = false;
   postInstall = ''
-      cd $out/share/$pname-$version
-      make
-      rm Makefile
-      cd ..
-      ensureDir "$out/share/emacs"
-      mv $pname-$version emacs/site-lisp
-    '';
+    cd $out/share/$pname-$version
+    make
+    rm Makefile
+    cd ..
+    ensureDir "$out/share/emacs"
+    mv $pname-$version emacs/site-lisp
+  '';
   meta = {
     homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
     description = "Happy Haskell Programming";
diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix
index 856ec810463..04af52f2679 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 78711cc7c44..511b1b70f28 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/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 9213c534fa3..45c96e64012 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -18,6 +18,7 @@ cabal.mkDerivation (self: {
     safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize
     zlib
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://gitit.net";
     description = "Wiki using happstack, git or darcs, and pandoc";
diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index 003207e77ae..f397a60017f 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.3";
-  sha256 = "0wbp8bz5c3hzix6r7nbg6dmakb77i3lq4hgjk3gd8mvksd3n97jr";
+  version = "1.8.0.1";
+  sha256 = "17nnmv84pjls1my58yzifbin3pxcnlbpkprglad707rr4lrkkjvv";
   buildDepends = [ bmp GLUT OpenGL ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix
index f3d029a5ea7..46e2913572e 100644
--- a/pkgs/development/libraries/haskell/hackage-db/default.nix
+++ b/pkgs/development/libraries/haskell/hackage-db/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hackage-db";
-  version = "1.5";
-  sha256 = "1m7f6vwgjzibk8rd14y6m62xv5969ns94a57sansi9d83q6rj9iv";
+  version = "1.7";
+  sha256 = "0mf22xxbcbjb7l4jahknp6s7lsfn43ib7z9m2jsg9py92vkacfp1";
   buildDepends = [ Cabal filepath tar utf8String ];
   meta = {
     homepage = "http://github.com/peti/hackage-db";
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 766f56ee8e3..f3f2562a073 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/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
index fad611798e9..c191c428780 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-hamlet";
-  version = "7.0.2";
-  sha256 = "0hsmvv5rggyl7sa4sp30zyr43k6zj7dlpd0mb916wzcqrnyxa34a";
+  version = "7.0.3";
+  sha256 = "0z4phykm2wxpdga47sdg76v7vmy32kav4nscizlkl648qjrx9k3r";
   buildDepends = [ hamlet happstackServer text ];
   meta = {
     homepage = "http://www.happstack.com/";
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix
new file mode 100644
index 00000000000..46edfb8946a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix
@@ -0,0 +1,14 @@
+{ cabal, happstackServer, mtl, text }:
+
+cabal.mkDerivation (self: {
+  pname = "happstack-lite";
+  version = "7.3.1";
+  sha256 = "0y8d0xv26szfjmkfqzak19zqjgv0w6rkc1rzrd2jkvsbchnwacjy";
+  buildDepends = [ happstackServer mtl text ];
+  meta = {
+    homepage = "http://www.happstack.com/";
+    description = "Happstack minus the useless stuff";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index b679ba453fd..f58e4ba2d3d 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "7.1.7.1";
-  sha256 = "1q897av0ynfh6jn4jhmmamkwda7zg36p4ncn9yic69calzvjpz72";
+  version = "7.3.0";
+  sha256 = "094q6m6a4cxwmmw9hin2pphiq8gi0y4ma4vkvqv7rwqnn3mf9n0q";
   buildDepends = [
     base64Bytestring blazeHtml extensibleExceptions filepath hslogger
     html monadControl mtl network parsec sendfile syb systemFilepath
diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
index 7b6ccb69633..7c9e7694046 100644
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@@ -2,9 +2,10 @@
 
 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 = {
     description = "Parse source to template-haskell abstract syntax";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix
index 15d32de346d..c864c7e0a5f 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/hflags/default.nix b/pkgs/development/libraries/haskell/hflags/default.nix
index 17c01f9a659..89d2f2d518e 100644
--- a/pkgs/development/libraries/haskell/hflags/default.nix
+++ b/pkgs/development/libraries/haskell/hflags/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hflags";
-  version = "0.1.3";
-  sha256 = "0nn08xqn0hvdlblnaad3nsdfkc0ssab6kvhi4qbrcq9jmjmspld3";
+  version = "0.2";
+  sha256 = "1bz8w1vxqlc2c9iygr2dhy2ck1sd56zjwqzz707nqcmsqqsfmyhb";
   buildDepends = [ text ];
   meta = {
     homepage = "http://github.com/errge/hflags";
diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index fb7d0d4a00a..e0cab385286 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "highlighting-kate";
-  version = "0.5.3.9";
-  sha256 = "158k38snqhgfjyzq82f8k1fkrpw0ld023wndzyzwwc6s933ap8hc";
+  version = "0.5.5";
+  sha256 = "0ypxlsfh9xdpnxp6j7wy7q7ymhmxfgwrqi4c08zwf8xy5sfvahs9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];
diff --git a/pkgs/development/libraries/haskell/hinotify/default.nix b/pkgs/development/libraries/haskell/hinotify/default.nix
index de1c0e12759..bd706339c02 100644
--- a/pkgs/development/libraries/haskell/hinotify/default.nix
+++ b/pkgs/development/libraries/haskell/hinotify/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hinotify";
-  version = "0.3.5";
-  sha256 = "00pzvqw2w3gbz8j4hiz8zxm7rki07g1iamjlbazz3kmpwcgjxi0l";
+  version = "0.3.6";
+  sha256 = "0vzn9z90z9zk7g9pvbrgm6xyb4b5x2dai1c70fvmdi3w4h2x17zw";
   meta = {
     homepage = "https://github.com/kolmodin/hinotify.git";
     description = "Haskell binding to inotify";
diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
index 57cb8dc8710..87d5181fa7d 100644
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-lib";
-  version = "0.21.2";
-  sha256 = "07li348kmwz9j4bfgmkq7zs9nyqxi5hhydij2fg4jwj0hbfxvmy9";
+  version = "0.21.3";
+  sha256 = "1vvki1dg98f8r9w6gmblazkbin7g2hzifwqd1frb0a3kp869i870";
   buildDepends = [
     cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat
     regexpr safe split time transformers utf8String
diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index acffb0e55ff..e4dd6ef1faa 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -2,14 +2,14 @@
 , dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib, hspec
 , httpConduit, HUnit, json, networkConduit, parsec, regexpr, safe
 , shakespeareText, text, time, transformers, wai, waiExtra
-, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodPlatform
-, yesodStatic, yesodTest
+, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodStatic
+, yesodTest
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.21.2";
-  sha256 = "1z8nyvqzyjh36g50w4gmh8mzvydanfn1s3gx4nliwk4mjfj4bbkl";
+  version = "0.21.3";
+  sha256 = "18gil6qwlzfk0y0f9q1la5np5phi0h3nqlb8rwn9qjjgvs134jgy";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -17,7 +17,7 @@ cabal.mkDerivation (self: {
     hamlet hjsmin hledger hledgerLib httpConduit HUnit json
     networkConduit parsec regexpr safe shakespeareText text time
     transformers wai waiExtra waiHandlerLaunch warp yaml yesod
-    yesodCore yesodPlatform yesodStatic
+    yesodCore yesodStatic
   ];
   testDepends = [ hspec yesod yesodTest ];
   doCheck = false;
diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
index 5d81a49f10b..36012251e07 100644
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger";
-  version = "0.21.2";
-  sha256 = "04n9bm97zqh8am83fr2aflw3gv5nwm9jm7bp9vzd4986f1c43ig3";
+  version = "0.21.3";
+  sha256 = "14j0axlq6xfaih7m6lqpis26ya0yl4v6g6xrqbihmjddvx7j32f2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index 2542e200586..0ccdb3c529e 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -1,12 +1,12 @@
-{ cabal, binary, blas, gsl, liblapack, random, storableComplex
-, vector
+{ cabal, binary, blas, deepseq, gsl, liblapack, random
+, storableComplex, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "hmatrix";
-  version = "0.14.1.0";
-  sha256 = "10fvbk3k2fgac46a86mc8g0s5gsw1p1bz4k57gn6dzgwh73mxjx7";
-  buildDepends = [ binary random storableComplex vector ];
+  version = "0.15.0.1";
+  sha256 = "0hm3jnh7lds74zyk2m8i3zcdmsv1jlvplrzlxxr68j1cqwfdxilg";
+  buildDepends = [ binary deepseq random storableComplex vector ];
   extraLibraries = [ blas gsl liblapack ];
   meta = {
     homepage = "https://github.com/albertoruiz/hmatrix";
diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index 93162ff8cdf..374dd9eaf67 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.5.4";
-  sha256 = "07m7wxannk9rr8q2bdxhkjjlvwlzp7lq2c41y6cgjkjcm2x9qcc8";
+  version = "1.7.0";
+  sha256 = "0a1s7pkymn41kk8gp5i7v141vq5yx857rma1l2xffs9lh4qalnq8";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -14,9 +14,9 @@ cabal.mkDerivation (self: {
   ];
   doCheck = false;
   meta = {
-    homepage = "http://hspec.github.com/";
+    homepage = "http://hspec.github.io/";
     description = "A version of Hspec which is used to test Hspec itself";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
 })
diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 354cd286de0..d7925b41816 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.5.4";
-  sha256 = "18c7mj2qh0q7ksb9sa7jhpfzsbbsfbv3gpkjpz1fx17bd3h8vkld";
+  version = "1.7.0";
+  sha256 = "0cw24vmns06z5308wva9bb5czs9i5wm6qdhymgiyl2i47ibxp5bj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -20,9 +20,9 @@ cabal.mkDerivation (self: {
   ];
   doCheck = false;
   meta = {
-    homepage = "http://hspec.github.com/";
+    homepage = "http://hspec.github.io/";
     description = "Behavior-Driven Development for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
 })
diff --git a/pkgs/development/libraries/haskell/http-attoparsec/default.nix b/pkgs/development/libraries/haskell/http-attoparsec/default.nix
new file mode 100644
index 00000000000..9a7ad41de57
--- /dev/null
+++ b/pkgs/development/libraries/haskell/http-attoparsec/default.nix
@@ -0,0 +1,14 @@
+{ cabal, attoparsec, httpTypes }:
+
+cabal.mkDerivation (self: {
+  pname = "http-attoparsec";
+  version = "0.1.0";
+  sha256 = "1ncdjzgb5kv20y9kps4nawvbwaqnfil9g552if638vv8hag8cwq9";
+  buildDepends = [ attoparsec httpTypes ];
+  meta = {
+    homepage = "https://github.com/tlaitinen/http-attoparsec";
+    description = "Attoparsec parsers for http-types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index cea5708c269..f6a06e33515 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";
-  sha256 = "0zm8m3nvxyc9z3b8d47ggx56raqpz1aa8r268k6gidpc5zpad2yl";
+  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/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
index 6d1c34556f7..9be23188db4 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -1,17 +1,17 @@
 { cabal, blazeBuilder, caseInsensitive, classyPrelude, conduit
 , dataDefault, hspec, httpConduit, httpTypes, liftedBase
 , monadControl, network, networkConduit, text, transformers, wai
-, warp, word8
+, waiLogger, warp, word8
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.1.1.6";
-  sha256 = "0fh61rm3k00shzis2dkgifnkfn78vx124dzmmdzlf550kjmhxb9l";
+  version = "0.2.0";
+  sha256 = "01kqf9c2yr3x5jwzyn44gs76fbffpacxs2j89aa902l0rz6l8ral";
   buildDepends = [
     blazeBuilder caseInsensitive classyPrelude conduit dataDefault
     httpConduit httpTypes liftedBase monadControl network
-    networkConduit text wai warp word8
+    networkConduit text wai waiLogger warp word8
   ];
   testDepends = [
     blazeBuilder conduit hspec httpConduit httpTypes liftedBase network
diff --git a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
index 86605ae55a5..500ed430783 100644
--- a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt-charproperties";
-  version = "9.1.1";
-  sha256 = "14xv0q1hh0k8lgispc4fa49cvyg9s7936kp42vr9b0pyd1q4zid8";
+  version = "9.1.1.1";
+  sha256 = "1a8cmswqysd0fpq6bpszav5cqpibnad49mbcswvrwipk28x3j078";
   meta = {
     homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
     description = "Character properties and classes for XML and Unicode";
-    license = "unknown";
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/hxt-unicode/default.nix b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
index 731c63b5378..fbe402cea5f 100644
--- a/pkgs/development/libraries/haskell/hxt-unicode/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt-unicode";
-  version = "9.0.2";
-  sha256 = "1ri3198j0bavgam861yiiisl43rh4pbkmji7g6v3jnnch7834hdd";
+  version = "9.0.2.1";
+  sha256 = "1ng3qaiwkaav1kmf0yxkm44887xphbx6slva3fskzx0sgkd1v0vp";
   buildDepends = [ hxtCharproperties ];
   meta = {
     homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
     description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings";
-    license = "unknown";
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
diff --git a/pkgs/development/libraries/haskell/indents/default.nix b/pkgs/development/libraries/haskell/indents/default.nix
new file mode 100644
index 00000000000..84a19f541ee
--- /dev/null
+++ b/pkgs/development/libraries/haskell/indents/default.nix
@@ -0,0 +1,14 @@
+{ cabal, concatenative, mtl, parsec }:
+
+cabal.mkDerivation (self: {
+  pname = "indents";
+  version = "0.3.3";
+  sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn";
+  buildDepends = [ concatenative mtl parsec ];
+  meta = {
+    homepage = "http://patch-tag.com/r/salazar/indents";
+    description = "indentation sensitive parser-combinators for parsec";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix
new file mode 100644
index 00000000000..3cc44b05dbb
--- /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/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix
index bec6431b42b..4cceb87c97e 100644
--- a/pkgs/development/libraries/haskell/io-choice/default.nix
+++ b/pkgs/development/libraries/haskell/io-choice/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "io-choice";
-  version = "0.0.4";
-  sha256 = "1b6jvk37jkpd4m3r6ip70xwzrz67a30yam831nqpljsbgk2f9arq";
+  version = "0.0.5";
+  sha256 = "19nr8kxcg98510cqgjn4c9sd8i9yz8fv4ryqg6lzzgpwqzkvx5ph";
   buildDepends = [
     liftedBase monadControl transformers transformersBase
   ];
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 154bc68c3c5..00000000000
--- 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/language-java/default.nix b/pkgs/development/libraries/haskell/language-java/default.nix
index 5464826788b..13054c0714d 100644
--- a/pkgs/development/libraries/haskell/language-java/default.nix
+++ b/pkgs/development/libraries/haskell/language-java/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-java";
-  version = "0.2.4";
-  sha256 = "1fb36xq75mzmbsh25s0pscazvz6nvfy2mn1270653m7s3gdgcs5f";
+  version = "0.2.5";
+  sha256 = "1l3q156m3l3fawsrgj3fr16qxr0apwg2si410j0f5hsgfmkhdrm6";
   buildDepends = [ cpphs parsec syb ];
   testDepends = [
     filepath HUnit mtl QuickCheck testFramework testFrameworkHunit
diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 4531603214e..8bc221f1493 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/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix
index 4e98aa82bc2..83f87f7c8b5 100644
--- a/pkgs/development/libraries/haskell/liblastfm/default.nix
+++ b/pkgs/development/libraries/haskell/liblastfm/default.nix
@@ -1,18 +1,14 @@
-{ cabal, aeson, attoparsec, cereal, contravariant, cryptoApi
-, httpConduit, httpTypes, HUnit, network, pureMD5, testFramework
-, testFrameworkHunit, text, void
+{ cabal, aeson, cereal, contravariant, cryptoApi, httpConduit
+, httpTypes, network, pureMD5, semigroups, text, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "liblastfm";
-  version = "0.2.0.0";
-  sha256 = "1x147mry8pq8qzrhrsbxm4b7sb80c9900kq2igwvcskwszd5h56n";
+  version = "0.3.0.0";
+  sha256 = "131p51yi17qfgk8h5b0rx2jyl37w4spafxmlcws1s5pk6bwy75jf";
   buildDepends = [
     aeson cereal contravariant cryptoApi httpConduit httpTypes network
-    pureMD5 text void
-  ];
-  testDepends = [
-    aeson attoparsec HUnit testFramework testFrameworkHunit text
+    pureMD5 semigroups text void
   ];
   meta = {
     description = "Lastfm API interface";
diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix
index 0a03ed45fee..9dc4b58797f 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 d24bf5719bd..691029ac5de 100644
--- a/pkgs/development/libraries/haskell/mime-mail/default.nix
+++ b/pkgs/development/libraries/haskell/mime-mail/default.nix
@@ -1,12 +1,15 @@
-{ cabal, base64Bytestring, blazeBuilder, filepath, random, text }:
+{ cabal, base64Bytestring, blazeBuilder, filepath, hspec, random
+, text
+}:
 
 cabal.mkDerivation (self: {
   pname = "mime-mail";
-  version = "0.4.1.2";
-  sha256 = "01dw9zvgxmwg0jslw14a9kjrmyjvwla8bw40w2426ifdwwxb3ywy";
+  version = "0.4.2.1";
+  sha256 = "1rpxx90k4dgz1b5ss6vqqgd9n1hjrv09q20myy16zzlj1gmn8k3g";
   buildDepends = [
     base64Bytestring blazeBuilder filepath random text
   ];
+  testDepends = [ blazeBuilder hspec text ];
   meta = {
     homepage = "http://github.com/snoyberg/mime-mail";
     description = "Compose MIME email messages";
diff --git a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix
new file mode 100644
index 00000000000..c4a77630e6a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "modular-arithmetic";
+  version = "1.0.1.1";
+  sha256 = "14n83kjmz8mqjivjhwxk1zckms5z3gn77yq2hsw2yybzff2vkdkd";
+  meta = {
+    description = "A type for integers modulo some constant";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/monad-par-extras/default.nix b/pkgs/development/libraries/haskell/monad-par-extras/default.nix
index fb877337221..6b9ca0e7553 100644
--- a/pkgs/development/libraries/haskell/monad-par-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monad-par-extras/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-par-extras";
-  version = "0.3.2";
-  sha256 = "1k0j3n803z4lv5impz6xd1nzav35dl5f68nlw2ppgg1bbfpvdv6b";
+  version = "0.3.3";
+  sha256 = "0bl4bd6jzdc5zm20q1g67ppkfh6j6yn8fwj6msjayj621cck67p2";
   buildDepends = [
     abstractPar cereal deepseq mtl random transformers
   ];
diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.2.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.2.nix
rename to pkgs/development/libraries/haskell/monad-par/0.3.4.4.nix
index ab875b34c36..d682908dcf1 100644
--- a/pkgs/development/libraries/haskell/monad-par/0.3.4.2.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.2";
-  sha256 = "1k10m4w2g92psahsvcyi98sc31wg5anijp46lbsipi2r2gxxc7bs";
+  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 e955bb14a72..60236eaad35 100644
--- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
+++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monadcryptorandom";
-  version = "0.5.2";
-  sha256 = "0a0qx331c1kvhmwwam7pbbrnq8ky3spfnw6zsz6rz7g1lk1hfawn";
+  version = "0.5.3";
+  sha256 = "1nmkya9mf9y6lhmbhamq2g09pfvfpmicrwab09mcy3ggljdnnfyg";
   buildDepends = [ cryptoApi mtl tagged transformers ];
   meta = {
     homepage = "https://github.com/TomMD/monadcryptorandom";
diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix
index a0ba1fd9856..969ab8bd0b8 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/mueval/default.nix b/pkgs/development/libraries/haskell/mueval/default.nix
index f965caf2c1e..f4b3b4a78ed 100644
--- a/pkgs/development/libraries/haskell/mueval/default.nix
+++ b/pkgs/development/libraries/haskell/mueval/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mueval";
-  version = "0.9";
-  sha256 = "1y6n3zvdlzxl5hi1raz7ac6fgy9321ilka3g2pk7p1ss9d10k8pb";
+  version = "0.9.1";
+  sha256 = "1f668z7rpdj2m239f5i54v7kd7wsvx3qvvhwyiavf28cmk32mxpq";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix
index d636ea7b542..77c81362d24 100644
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ b/pkgs/development/libraries/haskell/multiarg/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "multiarg";
-  version = "0.16.0.0";
-  sha256 = "086mnhbp1d3n0xdn4cdlyrkkgrykg4bwhi7sbfdmn688qhpl3g9m";
+  version = "0.18.0.0";
+  sha256 = "1wgnpsnzjsspjvg5srjrzr4mqxhyisidkjj26cangxlhmb88rlwi";
   buildDepends = [ explicitException utf8String ];
   meta = {
     homepage = "https://github.com/massysett/multiarg";
diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
index 483271fe959..2b1a5694044 100644
--- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-conduit-tls";
-  version = "1.0.0.2";
-  sha256 = "1vzhalz6hxal73rxm6f2l9m7j34mldamz16wrb6ay67wg6giq55z";
+  version = "1.0.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 00000000000..76783dceb49
--- /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 f6f4d420e2a..9fb5d334a4d 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/numtype-tf/default.nix b/pkgs/development/libraries/haskell/numtype-tf/default.nix
index 76f57daca38..ad7f2d98660 100644
--- a/pkgs/development/libraries/haskell/numtype-tf/default.nix
+++ b/pkgs/development/libraries/haskell/numtype-tf/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "numtype-tf";
-  version = "0.1";
-  sha256 = "1hvnqgjg7yifxdsji9v0wqwbp4syhdc97pa3nrn4p96g7kmvw25v";
+  version = "0.1.1";
+  sha256 = "0aj24jlfcv4rsa0zfglsfgq9f0kxln32drypp66652ycffz3ip9a";
   meta = {
     homepage = "http://dimensional.googlecode.com/";
     description = "Type-level (low cardinality) integers, implemented using type families";
diff --git a/pkgs/development/libraries/haskell/numtype/default.nix b/pkgs/development/libraries/haskell/numtype/default.nix
index be90f003f7f..d35f763d32e 100644
--- a/pkgs/development/libraries/haskell/numtype/default.nix
+++ b/pkgs/development/libraries/haskell/numtype/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "numtype";
-  version = "1.0";
-  sha256 = "2606e81d7bcef0ba76b1e6ffc8d513c36fef5fefaab3bdd02da18761ec504e1f";
+  version = "1.0.1";
+  sha256 = "130qchi9dplpg7pxf4pz7nz4mnprngw16mizqycp5pdlawbcp5js";
   meta = {
     homepage = "http://dimensional.googlecode.com/";
     description = "Type-level (low cardinality) integers";
diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix
index c8b9e984eb1..d5ec97b6f6a 100644
--- a/pkgs/development/libraries/haskell/oeis/default.nix
+++ b/pkgs/development/libraries/haskell/oeis/default.nix
@@ -1,12 +1,13 @@
-{ cabal, HTTP, network }:
+{ cabal, HTTP, HUnit, network, testFramework, testFrameworkHunit }:
 
 cabal.mkDerivation (self: {
   pname = "oeis";
-  version = "0.3.1";
-  sha256 = "0kxs25b1z0b807vhrn8v7chsdsw8civqiym8767fy2rk5si0i4w2";
+  version = "0.3.5";
+  sha256 = "0r23mqbfvvvx6shzdclzfrqi8r95gxl93cih7ny7w7px3w5yc5x6";
   buildDepends = [ HTTP network ];
+  testDepends = [ HUnit testFramework testFrameworkHunit ];
   meta = {
-    description = "Interface to the Online Encyclopedia of Integer Sequences";
+    description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
diff --git a/pkgs/development/libraries/haskell/pcap-enumerator/default.nix b/pkgs/development/libraries/haskell/pcap-enumerator/default.nix
new file mode 100644
index 00000000000..2a86ebb7229
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pcap-enumerator/default.nix
@@ -0,0 +1,14 @@
+{ cabal, enumerator, pcap, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "pcap-enumerator";
+  version = "0.4";
+  sha256 = "0ka2n7740s02marvd1b11mrxc663kj0zcn7hksl5i13ls026hpb8";
+  buildDepends = [ enumerator pcap transformers ];
+  meta = {
+    homepage = "http://github.com/cutsea110/pcap-enumerator";
+    description = "Convert a pcap into an enumerator";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pcap/default.nix b/pkgs/development/libraries/haskell/pcap/default.nix
new file mode 100644
index 00000000000..876905a4a5a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pcap/default.nix
@@ -0,0 +1,15 @@
+{ cabal, libpcap, network, time }:
+
+cabal.mkDerivation (self: {
+  pname = "pcap";
+  version = "0.4.5.2";
+  sha256 = "0pydw62qqw61sxfd8x9vvwgpgl3zp6mqv8rm4c825ymzyipjxsg7";
+  buildDepends = [ network time ];
+  extraLibraries = [ libpcap ];
+  meta = {
+    homepage = "https://github.com/bos/pcap";
+    description = "A system-independent interface for user-level packet capture";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
index c7d6b532db6..4195a048458 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-postgresql";
-  version = "1.2.0";
-  sha256 = "0i5ha1vs91makwrw4qqwdzp92i24ynmmsmjyqpik6q80fxxiwps6";
+  version = "1.2.1";
+  sha256 = "04gl1qdhag60q4j2r61qr1skim1wcyx2vq34j51qk1a62wyqsdrl";
   buildDepends = [
     aeson blazeBuilder conduit monadControl persistent postgresqlLibpq
     postgresqlSimple text time transformers
diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
index bb7a6731a26..e4a3bc77600 100644
--- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-sqlite";
-  version = "1.2.0";
-  sha256 = "09xd9z16rcq9ymx5ysshzdr30lih55b9kasvbq5xw6wq7lvg6q4h";
+  version = "1.2.1";
+  sha256 = "1lbb8s6p3xixlkgwx30p473b438qjnw9s41bcm1q38vkklpa75y0";
   buildDepends = [
     aeson conduit monadControl monadLogger persistent text transformers
   ];
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 57bb615800b..a336ab4fb88 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.0.2";
-  sha256 = "026zdfccy57dbsacg8227jzcdyq50nb1bkcr56ryxi91ymlyf50k";
+  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/pipes-concurrency/default.nix b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
index d931845f16e..970321bf286 100644
--- a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-concurrency";
-  version = "1.2.0";
-  sha256 = "058v9d3wf9n1d25rhdq5vj60p8mll5yv2zn2k1092bg7qisip1fq";
+  version = "1.2.1";
+  sha256 = "036cn6pafqpf2811iigablks3zk747bnzji9ykrgwhpja427vlbl";
   buildDepends = [ pipes stm ];
   meta = {
     description = "Concurrency for the pipes ecosystem";
diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
index 90a92019f0e..a3ffd276c2c 100644
--- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-libpq";
-  version = "0.8.2.2";
-  sha256 = "1mmsfgia318p34l8jx8hihb160sx2wpg2h5r741akcs50v6p5878";
+  version = "0.8.2.3";
+  sha256 = "08l3va5v8ppajgl8ywmzjdvd6v2vhqfj0y55mb1jxkdpvkd5hckl";
   extraLibraries = [ postgresql ];
   meta = {
     homepage = "http://github.com/lpsmith/postgresql-libpq";
diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index 888f992b159..2b99bb2eb6c 100644
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-simple";
-  version = "0.3.3.2";
-  sha256 = "1gh2ih1n6g17jry12g7nv344sfzrhfc1assslx0cjlsryhbz25lp";
+  version = "0.3.5.0";
+  sha256 = "09w9cdjn9jvmcwh63ydjl8p28xfhrhy448y211z3carx2zwryshi";
   buildDepends = [
     attoparsec blazeBuilder blazeTextual postgresqlLibpq text time
     transformers vector
diff --git a/pkgs/development/libraries/haskell/pretty-show/1.5.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.1.nix
similarity index 85%
rename from pkgs/development/libraries/haskell/pretty-show/1.5.nix
rename to pkgs/development/libraries/haskell/pretty-show/1.6.1.nix
index 5fedd0aca29..dc31b452a1b 100644
--- a/pkgs/development/libraries/haskell/pretty-show/1.5.nix
+++ b/pkgs/development/libraries/haskell/pretty-show/1.6.1.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pretty-show";
-  version = "1.5";
-  sha256 = "1n04f9aypgbhkq0lbji9czv1mjfwv4f80w1c6hqs55gmzwif63m4";
+  version = "1.6.1";
+  sha256 = "17zdljvpf7ra9x3lny5kbjvmz3psn8y1k9cwbg97m017gh87gsh0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath haskellLexer ];
diff --git a/pkgs/development/libraries/haskell/profunctor-extras/default.nix b/pkgs/development/libraries/haskell/profunctor-extras/default.nix
index df16898ddd3..6844bcc369a 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";
-  sha256 = "0sdiwc1d2jx2xrzsxjsxjh8m24f4blr2m8vmh78knpi9hy0bxgvr";
+  version = "3.3.3.1";
+  sha256 = "16naa6ksgwy6fh8vwflcc9s0rpamn886as8qhjqrkpjlc8s83h7g";
   buildDepends = [
     comonad profunctors semigroupoidExtras semigroupoids tagged
     transformers
diff --git a/pkgs/development/libraries/haskell/qrencode/default.nix b/pkgs/development/libraries/haskell/qrencode/default.nix
new file mode 100644
index 00000000000..bd46bb9b415
--- /dev/null
+++ b/pkgs/development/libraries/haskell/qrencode/default.nix
@@ -0,0 +1,14 @@
+{ cabal, qrencode }:
+
+cabal.mkDerivation (self: {
+  pname = "haskell-qrencode";
+  version = "1.0.4";
+  sha256 = "1cq6fpz4vsx1kfnxnxnqz0pi5nzfg86s76vd0hcqvyqxnqbcd8hj";
+  extraLibraries = [ qrencode ];
+  meta = {
+    homepage = "https://github.com/jamessanders/haskell-qrencode";
+    description = "Haskell bindings for libqrencode";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix
index acc0285a59a..895a001d46f 100644
--- a/pkgs/development/libraries/haskell/random-source/default.nix
+++ b/pkgs/development/libraries/haskell/random-source/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "random-source";
-  version = "0.3.0.4";
-  sha256 = "1gvx9r6vy36lx7fy537zdbnbhpmfxz88a7gh0aiyd2vi7bvnndxy";
+  version = "0.3.0.6";
+  sha256 = "0wsv41kpswqml04ym5bq2nan4i637f7h3fmvda2zy506xwxfrpzk";
   buildDepends = [
     flexibleDefaults mersenneRandomPure64 mtl mwcRandom random stateref
     syb thExtras
diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix
index 8d1ee0ffc95..0bf7747d46b 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 acf9dc712f3..2ec3fb3172e 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 4b2defc79d7..3887abad71c 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 00000000000..cc031470593
--- /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/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix
index 4f1367dd559..aa7176f7e16 100644
--- a/pkgs/development/libraries/haskell/semigroupoids/default.nix
+++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "semigroupoids";
-  version = "3.0.2";
-  sha256 = "0k137iafw0srgmy4qwx3cbx00519c0h91nmszdbx6pzpvf6m5fwm";
+  version = "3.1";
+  sha256 = "02147y0nnvyc9ykvjbbxa9gzmkk9kgpsmx40ahwnjk9igjkbyp9g";
   buildDepends = [ comonad contravariant semigroups transformers ];
   meta = {
     homepage = "http://github.com/ekmett/semigroupoids";
diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index b7f605c2b7e..26171a56fdc 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shake";
-  version = "0.10.5";
-  sha256 = "1abbls2rmpyxpj41c0afvfjh1bw6j6rz1n0w4jhqrmq0d32kpg7a";
+  version = "0.10.6";
+  sha256 = "0d2wrgraifcj0rv9jmvc5a0gl0j1jjkc4r0nmaypnv6929kl26q8";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index a18df3062e2..df12c935d71 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "1.0.5.1";
-  sha256 = "06x57cm9ni7cgdizdwzqzpqdmgzhchax7c4mbqvk3ymgf3lybrss";
+  version = "1.0.6.2";
+  sha256 = "1w29k0k5124vygydavb6a5szrv5a6n9qqhf1f27bkk86br55vnw6";
   buildDepends = [ parsec shakespeare text transformers ];
   testDepends = [ hspec HUnit shakespeare text ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index 802fc885137..917ea0c6cad 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "1.1.4";
-  sha256 = "05hnqpg1icf6akvchhiam8sd2xkfiyvbwq504gnys55rxgjabfy3";
+  version = "1.1.4.1";
+  sha256 = "1mvsdbc3c6vgdpdb4m8b2d28vrh79v64vb9wkpnvhfg0jn7kb5c0";
   buildDepends = [ aeson shakespeare text ];
   testDepends = [ aeson hspec HUnit shakespeare text ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index d4cc135cc62..e2ff7ff27e1 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-text";
-  version = "1.0.0.5";
-  sha256 = "176yzx43sh0fnxpszn8kximd6i96yf2s374z55kvc1kspf7jk736";
+  version = "1.0.0.6";
+  sha256 = "1qlf51rpyzgnxdhyfs6g3vh8zq5vyq263qhm577w7rc9s4hjxk45";
   buildDepends = [ shakespeare text ];
   testDepends = [ hspec HUnit text ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 16ad7ffa44a..4864adfe83a 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/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index 1e9e1f8c6cc..dc9367b4463 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -1,17 +1,13 @@
-{ cabal, hspec, HUnit, mtl, systemFileio, systemFilepath, text
-, time, unixCompat
+{ cabal, mtl, systemFileio, systemFilepath, text, time, unixCompat
 }:
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "0.15.4.1";
-  sha256 = "12m11s22izz0ny1syb1ykp2hi9n240myf0nhapvn8jx1fgf5iyck";
+  version = "1.3.0.7";
+  sha256 = "08ydsvgc8n0bvk5vcz3a3rpdbnranlbv8y84imkkh7i0p3nqyg2m";
   buildDepends = [
     mtl systemFileio systemFilepath text time unixCompat
   ];
-  testDepends = [
-    hspec HUnit mtl systemFileio systemFilepath text time unixCompat
-  ];
   meta = {
     homepage = "https://github.com/yesodweb/Shelly.hs";
     description = "shell-like (systems) programming in Haskell";
diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
index 9e8f638c65c..b8c527daf1a 100644
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "simple-sendfile";
-  version = "0.2.11";
-  sha256 = "1q9m9lxv9jfkn6a1lf07jcl4li3n5996df1qrfkfjq2n0bvn4qfj";
+  version = "0.2.12";
+  sha256 = "019n82700fbhsqxgn1cwfqii27r436gljis7yl02zjnzy7xlvrha";
   buildDepends = [ network ];
   testDepends = [ conduit hspec HUnit network networkConduit ];
   doCheck = false;
diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index 3db59020b15..4a89019906f 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/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix
index 6d82e7e5132..bf4ba55e751 100644
--- a/pkgs/development/libraries/haskell/smallcheck/default.nix
+++ b/pkgs/development/libraries/haskell/smallcheck/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "smallcheck";
-  version = "1.0.2";
-  sha256 = "09zlsvgbwgpjwkjhizbzzww2nvkyxvkf214yqxzfaa1cj9xzbbdi";
+  version = "1.0.4";
+  sha256 = "0zqssw7r56k7gi1lxdss3f4piqa692y728rli9p81q9rbcvi3x7z";
   buildDepends = [ logict mtl ];
   meta = {
     homepage = "https://github.com/feuerbach/smallcheck";
diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index 80cdf575d70..11ef315a523 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap";
-  version = "0.12.0";
-  sha256 = "0nccmbvhwrcfkz4771bhc210mh2ic0i93ks1752ndgk3007rkiff";
+  version = "0.12.1";
+  sha256 = "0mmmai257r3ssmy58v4c3hds0i0hwrww6r495j8yb2r90b31b1gg";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -19,6 +19,7 @@ cabal.mkDerivation (self: {
     snapCore snapServer stm syb text time transformers
     unorderedContainers vector vectorAlgorithms xmlhtml
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://snapframework.com/";
     description = "Top-level package for the Snap Web Framework";
diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
index 79171aefb9f..a2da329121b 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 1d2cea756ff..5c1059e634c 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 42f0beef125..ee808800c55 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";
-  sha256 = "0w2sx6lys074y5ck2ll53dmak39pfnckbh6llgmicrj4zhgcd8jm";
+  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 8082e77d282..ec8ccd01054 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/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix
index da14adfe339..8fb51c77dbf 100644
--- a/pkgs/development/libraries/haskell/th-orphans/default.nix
+++ b/pkgs/development/libraries/haskell/th-orphans/default.nix
@@ -2,10 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "th-orphans";
-  version = "0.6";
-  sha256 = "1ablf4c8vp9kzvr75ngl5yz3ip5klk6zmq7bcqcvks758b9c6qgj";
+  version = "0.7.0.1";
+  sha256 = "19lfq2m7c6n2z8gz4n57wc92x5x5rkgv4chbfq7w4n531qya4bgr";
   buildDepends = [ thLift ];
-  noHaddock = true;
   meta = {
     description = "Orphan instances for TH datatypes";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix
index dc058844247..e4a82835c55 100644
--- a/pkgs/development/libraries/haskell/threadmanager/default.nix
+++ b/pkgs/development/libraries/haskell/threadmanager/default.nix
@@ -2,11 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "threadmanager";
-  version = "0.1.5";
-  sha256 = "0jdr0rrpx7frnh0a2vibg0170w48wvn6gv8imkiqiz6y6481ny5p";
+  version = "0.1.7";
+  sha256 = "17s26hlailbr8c9d3dv1pwiy81m3nzr3sw0v9y716rmhldf7k09f";
   meta = {
-    homepage = "http://github.com/bsl/threadmanager";
-    description = "Simple thread management";
+    description = "(deprecated in favor of 'threads') Simple thread management";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
diff --git a/pkgs/development/libraries/haskell/time/1.4.0.2.nix b/pkgs/development/libraries/haskell/time/1.4.1.nix
similarity index 85%
rename from pkgs/development/libraries/haskell/time/1.4.0.2.nix
rename to pkgs/development/libraries/haskell/time/1.4.1.nix
index 62232d1aa5a..1e675110190 100644
--- a/pkgs/development/libraries/haskell/time/1.4.0.2.nix
+++ b/pkgs/development/libraries/haskell/time/1.4.1.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "time";
-  version = "1.4.0.2";
-  sha256 = "0p4ncankr9968lp4fnbq6pc5xwv2198gxhbds656da9jbv74w7j8";
+  version = "1.4.1";
+  sha256 = "04ndcp7m1a7mia4by15dqrwl5k0d2477x20s6xcrdb7in8w9ccvp";
   buildDepends = [ deepseq ];
   testDepends = [
     Cabal deepseq QuickCheck testFramework testFrameworkQuickcheck2
diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
index b53b948c41d..55b2582017c 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/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix
index f3120a61f20..2abd6efa0ce 100644
--- a/pkgs/development/libraries/haskell/transformers-compat/default.nix
+++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix
@@ -5,7 +5,6 @@ cabal.mkDerivation (self: {
   version = "0.1.1.1";
   sha256 = "0i0bcfmqsnqa8fyp81virr5bh3hk23261xyx28jcfamrc18ly9ij";
   buildDepends = [ transformers ];
-  noHaddock = true;
   meta = {
     homepage = "http://github.com/ekmett/transformers-compat/";
     description = "A small compatibility shim exposing the new types from transformers 0.3 to older Haskell platforms.";
diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix
index a90381202e1..df57bbbdac7 100644
--- a/pkgs/development/libraries/haskell/unbound/default.nix
+++ b/pkgs/development/libraries/haskell/unbound/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unbound";
-  version = "0.4.1.1";
-  sha256 = "0niv8mm4zjkndj0g32dgr32177dfp647hi32hqzwiis77vcfvdzb";
+  version = "0.4.2";
+  sha256 = "1bnnnv4rmzb0pw7i56nzr7k7pahr9rcmlfi4xkpsjhrxmizcfml9";
   buildDepends = [ mtl RepLib transformers ];
   meta = {
     homepage = "http://code.google.com/p/replib/";
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 00000000000..b50713d5291
--- /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/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix
index 8519ff451b2..8b0825ea119 100644
--- a/pkgs/development/libraries/haskell/uniplate/default.nix
+++ b/pkgs/development/libraries/haskell/uniplate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uniplate";
-  version = "1.6.10";
-  sha256 = "0j0hsvlkml8v9f8iijcgq58qnxnmk7gzxcnl9rxx4fdr9fnaffj3";
+  version = "1.6.11";
+  sha256 = "10ppc9hqc0y17r3y4vdajshrp3956dybna7qa5zm0akgl3pbla9j";
   buildDepends = [ hashable syb unorderedContainers ];
   meta = {
     homepage = "http://community.haskell.org/~ndm/uniplate/";
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 00000000000..49022b12a29
--- /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 6ee4304ac17..1f04d939d9c 100644
--- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
@@ -1,10 +1,10 @@
-{ cabal, conduit, hspec, transformers }:
+{ cabal, conduit, filepath, hspec, stm, time, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "unix-process-conduit";
-  version = "0.2.0.2";
-  sha256 = "1n9ja7dlxhsxyglfzk397xdgvdny766y1isrb5d065srxprsj2g6";
-  buildDepends = [ conduit transformers ];
+  version = "0.2.2";
+  sha256 = "15n6n925avv51kr2avwkp8sq8mfl287i0445vl9iy6hyxjjgpgr6";
+  buildDepends = [ conduit filepath stm time transformers ];
   testDepends = [ conduit hspec transformers ];
   meta = {
     homepage = "https://github.com/snoyberg/conduit";
diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix
index 22d3af28fd0..846e3d88883 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.8";
-  sha256 = "1s9r2i4hl7nm1f4zya03q0a2ayliby51caziz1w79schhplfa5sv";
+  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/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix
index 591040a9548..39cdcd8407f 100644
--- a/pkgs/development/libraries/haskell/void/default.nix
+++ b/pkgs/development/libraries/haskell/void/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "void";
-  version = "0.6";
-  sha256 = "0g1dja7qcp2d9a4m8j1f4ddyvbl003znyk7yn5w5qiiqr1pacs1n";
+  version = "0.6.1";
+  sha256 = "09pa0n17b7cz7sa699gjdmp1hxcshl3170nl5sx2x99zvxz2mv42";
   buildDepends = [ hashable semigroups ];
   meta = {
     homepage = "http://github.com/ekmett/void";
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 3192def654e..270ca004c49 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/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix
index 2d0f6637171..bbc1ed1d136 100644
--- a/pkgs/development/libraries/haskell/wai-test/default.nix
+++ b/pkgs/development/libraries/haskell/wai-test/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-test";
-  version = "1.3.1";
-  sha256 = "0dw9lbwb27yr3953ill0r727ivqav5b2ica8gbaalvnh3h5c8akg";
+  version = "1.3.1.1";
+  sha256 = "0daaq8kn1c35y26y7pb00sw1jyhp84zpzk6vfy1p4vfay4ppknd2";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie
     httpTypes HUnit network text transformers wai
diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix
new file mode 100644
index 00000000000..5655ed9d8a1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/warp-tls/default.nix
@@ -0,0 +1,20 @@
+{ cabal, certificate, conduit, cprngAes, cryptocipher
+, cryptoRandomApi, network, networkConduit, pem, tls, tlsExtra
+, transformers, wai, warp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "warp-tls";
+  version = "1.4.1.3";
+  sha256 = "0g26cw86kjg61agplqskhjb41ywcydyfzb46pjjc38g77xlcm2wx";
+  buildDepends = [
+    certificate conduit cprngAes cryptocipher cryptoRandomApi network
+    networkConduit pem tls tlsExtra transformers wai warp
+  ];
+  meta = {
+    homepage = "http://github.com/yesodweb/wai";
+    description = "HTTP over SSL/TLS support for Warp via the TLS package";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 3cf1f8e6ba6..2134077e61a 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -1,22 +1,23 @@
 { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
-, conduit, hashable, hspec, httpTypes, HUnit, liftedBase, network
-, networkConduit, QuickCheck, simpleSendfile, transformers
-, unixCompat, void, wai
+, conduit, hashable, hspec, httpAttoparsec, httpTypes, HUnit
+, liftedBase, network, networkConduit, QuickCheck, simpleSendfile
+, transformers, unixCompat, void, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.3.8.2";
-  sha256 = "0s8na04n21glgkc0bcc0171ikh9cagx35s2h6i1pb5pwa8l0akv6";
+  version = "1.3.9.1";
+  sha256 = "0s8jrgn9pxqkjvdbgvrxd0bnclkhn3hix2mff66hqpx8x4znh0zv";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
-    httpTypes liftedBase network networkConduit simpleSendfile
-    transformers unixCompat void wai
+    httpAttoparsec httpTypes liftedBase network networkConduit
+    simpleSendfile transformers unixCompat void wai
   ];
   testDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
-    hspec httpTypes HUnit liftedBase network networkConduit QuickCheck
-    simpleSendfile transformers unixCompat void wai
+    hspec httpAttoparsec httpTypes HUnit liftedBase network
+    networkConduit QuickCheck simpleSendfile transformers unixCompat
+    void wai
   ];
   meta = {
     homepage = "http://github.com/yesodweb/wai";
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index b586a6336bc..bd21eee5aa9 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.3";
-  sha256 = "04mnn6j9bbkhvav04gl9cbd4rldl7bwgcapvykwvf2p3nb3d7bi4";
+  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/xml-types/default.nix b/pkgs/development/libraries/haskell/xml-types/default.nix
index 48bd32b7c89..94a7d3f7dff 100644
--- a/pkgs/development/libraries/haskell/xml-types/default.nix
+++ b/pkgs/development/libraries/haskell/xml-types/default.nix
@@ -1,10 +1,10 @@
-{ cabal, text }:
+{ cabal, deepseq, text }:
 
 cabal.mkDerivation (self: {
   pname = "xml-types";
-  version = "0.3.3";
-  sha256 = "0jvchgzmqsnc0dax73nh7wa7x6n07qnl4wr1d58v21rlbqcklgcn";
-  buildDepends = [ text ];
+  version = "0.3.4";
+  sha256 = "1689ijr4xxh4shxxvd51wdkpc535kzv6liqg4m1prag96aq05r8y";
+  buildDepends = [ deepseq text ];
   meta = {
     homepage = "https://john-millikin.com/software/haskell-xml/";
     description = "Basic types for representing XML";
diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
index 89bdab65b17..d75f68818ef 100644
--- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix
+++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xss-sanitize";
-  version = "0.3.3";
-  sha256 = "0xnyp8nwglh4waawijk1q5z8higf8mggh6hp0pp6ys4bm7gsp74a";
+  version = "0.3.4";
+  sha256 = "0xal75mk90a2hj70ipgcj95n6yw8hiki1r1vzad918aq2ihjqa53";
   buildDepends = [
     attoparsec cssText network tagsoup text utf8String
   ];
diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index fe40fb785c9..1e22f1ae4ba 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.2.4";
-  sha256 = "0gk2h3wfx818jibj51jh5ksrrkghx4ykvdqfji4lrh1mv08ah3d0";
+  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 22f1c583011..66ed9df2d20 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.1";
-  sha256 = "02nljkc12mgjhvkiv876w6w13q9s9iigya8v4jzj6myv48lainvd";
+  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 717ca54d808..3dfedd471fe 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.0.1";
-  sha256 = "0dikjxs1wdqv87ng6iqnnc3pwi3hzgqfwnnj3bb1fpz4plv4bnbc";
+  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 d2188c68951..3fcec1a7d9f 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.2";
-  sha256 = "1fapqx1lrhhqjc9k9yc964sxnawj7ga62w83csbkkhwq3g5425yp";
+  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 d693cd1d0a4..926cba46499 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";
-  sha256 = "1y729h61w30yi4mcva727317gdc70nhn6jzxb7fmc9hqgnh136nc";
+  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-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix
index fbec41ce124..3d900d94cda 100644
--- a/pkgs/development/libraries/haskell/yesod-platform/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix
@@ -1,21 +1,22 @@
 { cabal, aeson, ansiTerminal, asn1Data, asn1Types, attoparsec
 , attoparsecConduit, authenticate, base64Bytestring
 , baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml
-, blazeMarkup, byteorder, caseInsensitive, cereal, certificate
-, cipherAes, cipherRc4, clientsession, conduit, cookie, cprngAes
-, cryptoApi, cryptoConduit, cryptohash, cryptoNumbers, cryptoPubkey
-, cryptoPubkeyTypes, cryptoRandomApi, cssText, dataDefault
-, dataDefaultClass, dataDefaultInstancesBase
+, blazeMarkup, byteable, byteorder, caseInsensitive, cereal
+, certificate, cipherAes, cipherRc4, clientsession, conduit, cookie
+, cprngAes, cryptoApi, cryptoConduit, cryptohash, cryptoNumbers
+, cryptoPubkey, cryptoPubkeyTypes, cryptoRandomApi, cssText
+, dataDefault, dataDefaultClass, dataDefaultInstancesBase
 , dataDefaultInstancesContainers, dataDefaultInstancesDlist
 , dataDefaultInstancesOldLocale, dateCache, dlist, emailValidate
 , entropy, failure, fastLogger, fileEmbed, filesystemConduit
-, hamlet, hashable, hjsmin, hspec, hspecExpectations, htmlConduit
-, httpConduit, httpDate, httpTypes, languageJavascript, liftedBase
-, mimeMail, mimeTypes, mmorph, monadControl, monadLogger
-, networkConduit, pathPieces, pem, persistent, persistentTemplate
-, poolConduit, primitive, publicsuffixlist, pureMD5, pwstoreFast
-, quickcheckIo, resourcePool, resourcet, safe, semigroups, setenv
-, SHA, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs
+, hamlet, hjsmin, hspec, hspecExpectations, htmlConduit
+, httpAttoparsec, httpConduit, httpDate, httpTypes
+, languageJavascript, liftedBase, mimeMail, mimeTypes, mmorph
+, monadControl, monadLogger, networkConduit, pathPieces, pem
+, persistent, persistentTemplate, poolConduit, primitive
+, publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo
+, resourcePool, resourcet, safe, semigroups, setenv, SHA
+, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs
 , shakespeareText, silently, simpleSendfile, skein, socks
 , stringsearch, systemFileio, systemFilepath, tagged, tagsoup
 , tagstreamConduit, tls, tlsExtra, transformersBase, unixCompat
@@ -28,25 +29,26 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-platform";
-  version = "1.2.1";
-  sha256 = "1wa1g37ipigscv8xwb5zyfawjw0fxqmwr2l6wdf507r0kvclk2ap";
+  version = "1.2.3";
+  sha256 = "16hp64gqgvpmlrwg6h8ldakw2n3x985cnv4pzmv9akjq27jq8rjl";
   buildDepends = [
     aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
     authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
-    blazeBuilderConduit blazeHtml blazeMarkup byteorder caseInsensitive
-    cereal certificate cipherAes cipherRc4 clientsession conduit cookie
-    cprngAes cryptoApi cryptoConduit cryptohash cryptoNumbers
-    cryptoPubkey cryptoPubkeyTypes cryptoRandomApi cssText dataDefault
-    dataDefaultClass dataDefaultInstancesBase
-    dataDefaultInstancesContainers dataDefaultInstancesDlist
-    dataDefaultInstancesOldLocale dateCache dlist emailValidate entropy
-    failure fastLogger fileEmbed filesystemConduit hamlet hashable
-    hjsmin hspec hspecExpectations htmlConduit httpConduit httpDate
-    httpTypes languageJavascript liftedBase mimeMail mimeTypes mmorph
-    monadControl monadLogger networkConduit pathPieces pem persistent
-    persistentTemplate poolConduit primitive publicsuffixlist pureMD5
-    pwstoreFast quickcheckIo resourcePool resourcet safe semigroups
-    setenv SHA shakespeare shakespeareCss shakespeareI18n shakespeareJs
+    blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder
+    caseInsensitive cereal certificate cipherAes cipherRc4
+    clientsession conduit cookie cprngAes cryptoApi cryptoConduit
+    cryptohash cryptoNumbers cryptoPubkey cryptoPubkeyTypes
+    cryptoRandomApi cssText dataDefault dataDefaultClass
+    dataDefaultInstancesBase dataDefaultInstancesContainers
+    dataDefaultInstancesDlist dataDefaultInstancesOldLocale dateCache
+    dlist emailValidate entropy failure fastLogger fileEmbed
+    filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit
+    httpAttoparsec httpConduit httpDate httpTypes languageJavascript
+    liftedBase mimeMail mimeTypes mmorph monadControl monadLogger
+    networkConduit pathPieces pem persistent persistentTemplate
+    poolConduit primitive publicsuffixlist pureMD5 pwstoreFast
+    quickcheckIo resourcePool resourcet safe semigroups setenv SHA
+    shakespeare shakespeareCss shakespeareI18n shakespeareJs
     shakespeareText silently simpleSendfile skein socks stringsearch
     systemFileio systemFilepath tagged tagsoup tagstreamConduit tls
     tlsExtra transformersBase unixCompat unorderedContainers utf8Light
diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix
index f32e90dab17..c4ad5b29acd 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 d2d0417da27..fd68a161c68 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";
-  sha256 = "19gwhav6sr6gd2kh92ga8a09hq9grllmnacdqkgasxwjsfxqa6zg";
+  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/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
index 3b4f9f8ff32..1240d4390a6 100644
--- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
@@ -1,12 +1,14 @@
-{ cabal, ansiTerminal, checkers, MonadCatchIOTransformers
-, QuickCheck, transformers, zeromq
+{ cabal, ansiTerminal, async, checkers, MonadCatchIOTransformers
+, QuickCheck, semigroups, transformers, zeromq
 }:
 
 cabal.mkDerivation (self: {
   pname = "zeromq3-haskell";
-  version = "0.3.1";
-  sha256 = "0wr157wl2qpnbfsqy4nlsnd6nbkl063387f7ab4qa07yhj5av80f";
-  buildDepends = [ MonadCatchIOTransformers transformers ];
+  version = "0.5";
+  sha256 = "16qh3q5rshaxzl79aiivrysl3dhilnd2mw2p45ifgbgv87m277gq";
+  buildDepends = [
+    async MonadCatchIOTransformers semigroups transformers
+  ];
   testDepends = [
     ansiTerminal checkers MonadCatchIOTransformers QuickCheck
     transformers
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix
index 2b7952d3b20..3c9ad9cfc33 100644
--- a/pkgs/development/libraries/ilmbase/default.nix
+++ b/pkgs/development/libraries/ilmbase/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ilmbase-1.0.1";
   
   src = fetchurl {
-    url = http://download.savannah.nongnu.org/releases/openexr/ilmbase-1.0.1.tar.gz;
+    url = mirror://savannah/openexr/ilmbase-1.0.1.tar.gz;
     sha256 = "0z9r3r0bxyhgwhkdwln0dg1lnxz691qnjygrqlg3jym34rxzq52g";
   };
 }
diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix
index 9bbfd381a0d..bbfc6ed38cc 100644
--- a/pkgs/development/libraries/java/classpath/default.nix
+++ b/pkgs/development/libraries/java/classpath/default.nix
@@ -54,6 +54,6 @@ stdenv.mkDerivation rec {
     # The exception makes it similar to LGPLv2+ AFAICS.
     license = "GPLv2+ + exception";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/java/icedtea/default.nix b/pkgs/development/libraries/java/icedtea/default.nix
index bdaa32a78d2..51f375a36f9 100644
--- a/pkgs/development/libraries/java/icedtea/default.nix
+++ b/pkgs/development/libraries/java/icedtea/default.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://icedtea.classpath.org/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
 
     # Restrict to GNU systems for now.
     platforms = stdenv.lib.platforms.gnu;
diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix
index ea9b1029efc..7a6db1ad4b3 100644
--- a/pkgs/development/libraries/java/junit/default.nix
+++ b/pkgs/development/libraries/java/junit/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://github.com/downloads/KentBeck/junit/junit4.8.2.zip;
+    url = https://github.com/downloads/junit-team/junit/junit4.8.2.zip;
     sha256 = "01simvc3pmgp27p7vzavmsx5rphm6hqzwrqfkwllhf3812dcqxy6";
   };
 
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix
index 3e666c9fa23..a61ea5e6045 100644
--- a/pkgs/development/libraries/java/rhino/default.nix
+++ b/pkgs/development/libraries/java/rhino/default.nix
@@ -51,6 +51,6 @@ in
 
       licenses = [ "MPLv1.1" /* or */ "GPLv2+" ];
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
     };
   }
diff --git a/pkgs/development/libraries/java/xalanj/default.nix b/pkgs/development/libraries/java/xalanj/default.nix
index 0aee98d27bd..c5ffed50be1 100644
--- a/pkgs/development/libraries/java/xalanj/default.nix
+++ b/pkgs/development/libraries/java/xalanj/default.nix
@@ -52,6 +52,6 @@ in
       homepage = http://xml.apache.org/xalan-j/;
       license = "Apache-2.0";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
     };
   }
diff --git a/pkgs/development/libraries/java/xerces/default.nix b/pkgs/development/libraries/java/xerces/default.nix
index a40c30ae6c7..ed46747dbb2 100644
--- a/pkgs/development/libraries/java/xerces/default.nix
+++ b/pkgs/development/libraries/java/xerces/default.nix
@@ -52,6 +52,6 @@ in
 
       license = "Apache-2.0";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
     };
   }
diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix
index 232f2775c00..e84bd0656c4 100644
--- a/pkgs/development/libraries/leptonica/default.nix
+++ b/pkgs/development/libraries/leptonica/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, libpng12, libtiff, libjpeg, zlib}:
+{stdenv, fetchurl, libpng, libtiff, libjpeg, zlib}:
 
 stdenv.mkDerivation {
   name = "leptonica-1.68";
-  
+
   src = fetchurl {
     url = http://www.leptonica.org/source/leptonica-1.68.tar.gz;
     sha256 = "13qzm24zy46bj9b476jxzbw9qh7p96jikfzxg88kz4dj1p2vdvxc";
   };
 
-  buildInputs = [ libpng12 libtiff libjpeg zlib ];
+  buildInputs = [ libpng libtiff libjpeg zlib ];
 
   meta = {
     description = "Image processing and analysis library";
diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index feeed3c14a6..21b4eac30af 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, x11, libXp, libXau}:
 
 stdenv.mkDerivation {
-  name = "lesstif-0.95-p2";
+  name = "lesstif-0.95.0-p2";
   src = fetchurl {
     url = mirror://sourceforge/lesstif/lesstif-0.95.0.tar.bz2;
     md5 = "ab895165c149d7f95843c7584b1c7ad4";
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 710f6bd8700..c0552845054 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix
index d2d68640560..1da25527ef7 100644
--- a/pkgs/development/libraries/libcdr/default.nix
+++ b/pkgs/development/libraries/libcdr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libwpg, libwpd, lcms2, pkgconfig }:
+{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "libcdr-0.0.8";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "117a8gp29xs3kin6kaisb3frsx8dwrsjgs4wq4y5hjqprzy6lwz0";
   };
 
-  buildInputs = [ libwpg libwpd lcms2 ];
+  buildInputs = [ libwpg libwpd lcms ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/development/libraries/libchamplain/0.6.nix b/pkgs/development/libraries/libchamplain/0.6.nix
index 86b8dc5d550..c8169b3037c 100644
--- a/pkgs/development/libraries/libchamplain/0.6.nix
+++ b/pkgs/development/libraries/libchamplain/0.6.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "libchamplain-0.6.1";
 
   src = fetchurl {
-    url = "http://download.gnome.org/sources/libchamplain/0.6/${name}.tar.gz";
+    url = "mirror://gnome/sources/libchamplain/0.6/${name}.tar.gz";
     sha256 = "1l1in4khnral157j46aq2d26nviz23icnm353587vcwjhdbw86sg";
   };
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
          OpenCycleMap, OpenAerialMap, and Maps for free.
       '';
 
-     maintainers = [ stdenv.lib.maintainers.ludo ];
+     maintainers = [ ];
      platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 4df3d00d1f4..7f229ad539e 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
          OpenCycleMap, OpenAerialMap, and Maps for free.
       '';
 
-     maintainers = [ stdenv.lib.maintainers.ludo ];
+     maintainers = [ ];
      platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/libcm/default.nix b/pkgs/development/libraries/libcm/default.nix
index 197a1e7fc97..09ef21dff59 100644
--- a/pkgs/development/libraries/libcm/default.nix
+++ b/pkgs/development/libraries/libcm/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libcm-0.1.1";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/libcm/0.1/libcm-0.1.1.tar.bz2;
+    url = mirror://gnome/sources/libcm/0.1/libcm-0.1.1.tar.bz2;
     sha256 = "11i5z8l5v5ffihif35k5j8igj0rahsk4jdmsj24xhdw2s0zx53kn";
   };
   buildInputs = [
diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix
index 3dee7ca6e32..f9666ccf4dd 100644
--- a/pkgs/development/libraries/libdaemon/default.nix
+++ b/pkgs/development/libraries/libdaemon/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     license = "LGPLv2+";
 
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix
index b37bf593c03..7236a4e3a97 100644
--- a/pkgs/development/libraries/libelf/default.nix
+++ b/pkgs/development/libraries/libelf/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     license = "LGPLv2+";
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index b2987689be7..a2a8403b498 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl}:
 
-let version = "2.0.17"; in
+let version = "2.0.21"; in
 stdenv.mkDerivation {
   name = "libevent-${version}";
 
   src = fetchurl {
     url = "https://github.com/downloads/libevent/libevent/libevent-${version}-stable.tar.gz";
-    sha256 = "51735d1241f9f6d2d6465d8abc76f7511764f6de7d81026120c629612296faa6";
+    sha256 = "1xblymln9vihdmf1aqkp8chwvnhpdch3786bh30bj75slnl31992";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index b1aaaa7f2c8..a3122dcf9a9 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -65,6 +65,6 @@ stdenv.mkDerivation rec {
 
     license = "GPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix
index 920f40abd5a..07e8d2869ce 100644
--- a/pkgs/development/libraries/libgeotiff/default.nix
+++ b/pkgs/development/libraries/libgeotiff/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libtiff }:
 
 stdenv.mkDerivation {
-  name = "libgeotiff-1.2.4";
+  name = "libgeotiff-1.2.5";
 
   src = fetchurl {
     url = ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/libgeotiff-1.2.5.tar.gz;
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 7f44e6b1706..249e9291fa3 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
       dealing with different structured file formats.
     '';
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index c13af535429..7562765a3ac 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/libiconv/;
     license = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
 
     # This library is not needed on GNU platforms.
     platforms = [ "i686-cygwin" ];
diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 94e785ee53b..1bd8aaca9dc 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix
index f49c885c066..a22ae64dfde 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 00000000000..f074c8ba3aa
--- /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 00000000000..3475b22d26d
--- /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 00000000000..c0217abd786
--- /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/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix
index 6e2e2c949cc..883ad072c7b 100644
--- a/pkgs/development/libraries/libmad/default.nix
+++ b/pkgs/development/libraries/libmad/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, autoconf}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "libmad-0.15.1b";
   
   src = fetchurl {
-    url = mirror://sourceforge/mad/libmad-0.15.1b.tar.gz;
+    url = "mirror://sourceforge/mad/${name}.tar.gz";
     sha256 = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690";
   };
 
@@ -16,10 +16,13 @@ stdenv.mkDerivation {
   preConfigure = ''
     autoconf
     substituteInPlace configure --replace "-fforce-mem" ""
+    substituteInPlace configure --replace "arch=\"-march=i486\"" ""
   '';
 
-  meta = {
-    homepage = http://sourceforge.net/projects/mad/;
+  meta = with stdenv.lib; {
+    homepage    = http://sourceforge.net/projects/mad/;
     description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2";
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 42f7c60610e..9ad9f944b4a 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/libmicrohttpd/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix
index cde3aecce07..8ef95650ce6 100644
--- a/pkgs/development/libraries/libmikmod/default.nix
+++ b/pkgs/development/libraries/libmikmod/default.nix
@@ -6,15 +6,17 @@ stdenv.mkDerivation rec {
     sha256 = "07k6iyx6pyzisncgdkd071w2dhm3rx6l34hbja3wbc7rpf888k3k";
   };
   buildInputs = [ texinfo ];
-  meta = {
+
+  meta = with stdenv.lib; {
     description = "A library for playing tracker music module files";
+    homepage    = http://mikmod.shlomifish.org/;
+    license     = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ astsmtl lovek323 ];
+    platforms   = platforms.unix;
+
     longDescription = ''
       A library for playing tracker music module files supporting many formats,
       including MOD, S3M, IT and XM.
     '';
-    homepage = http://mikmod.shlomifish.org/;
-    license = "LGPLv2+";
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix
index 395b254d34d..b1f7b0071c8 100644
--- a/pkgs/development/libraries/libmrss/default.nix
+++ b/pkgs/development/libraries/libmrss/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, curl, libnxml, pkgconfig}:
 
 stdenv.mkDerivation {
-  name = "libmrss-1.0";
+  name = "libmrss-0.19.2";
 
   src = fetchurl {
     url = "http://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz";
diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix
index 45f75b4f805..66d07b547c5 100644
--- a/pkgs/development/libraries/liboil/default.nix
+++ b/pkgs/development/libraries/liboil/default.nix
@@ -12,9 +12,15 @@ stdenv.mkDerivation rec {
 
   patches = [ ./x86_64-cpuid.patch ];
 
-  meta = {
-    homepage = http://liboil.freedesktop.org;
+  # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix"
+  # errors
+  configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64";
+
+  meta = with stdenv.lib; {
     description = "A library of simple functions that are optimized for various CPUs";
-    license = "BSD-2";
+    homepage    = http://liboil.freedesktop.org;
+    license     = licenses.bsd2;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 0a150610781..c537ce55cf2 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -1,12 +1,19 @@
-{ stdenv, fetchurl, zlib }:
+{ stdenv, fetchurl, zlib, apngSupport ? false}:
 
 assert zlib != null;
 
-stdenv.mkDerivation rec {
-  name = "libpng-1.6.2";
+let whenPatched = stdenv.lib.optionalString apngSupport;
+    version = "1.6.2";
+    patch_src = fetchurl {
+      url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
+      sha256 = "0fy7p197ilr9phwqqk9h91s1mc28r6gj0w2ilrw5liagi71z75j1";
+    };
+
+in stdenv.mkDerivation (rec {
+  name = "libpng" + whenPatched "-apng" + "-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libpng/${name}.tar.xz";
+    url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
     sha256 = "1pljkqjqgyz8c32w8fipd9f0v2gcyhah2ypp0h7ya1r1q85sk5qw";
   };
 
@@ -17,9 +24,15 @@ stdenv.mkDerivation rec {
   passthru = { inherit zlib; };
 
   meta = {
-    description = "The official reference implementation for the PNG file format";
+    description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch";
     homepage = http://www.libpng.org/pub/png/libpng.html;
     license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
     platforms = stdenv.lib.platforms.all;
   };
-}
+} // stdenv.lib.optionalAttrs apngSupport {
+
+  postPatch = ''
+    gunzip < ${patch_src} | patch -Np1
+  '';
+
+})
diff --git a/pkgs/development/libraries/libpng/libpng-apng.nix b/pkgs/development/libraries/libpng/libpng-apng.nix
deleted file mode 100644
index bc6a773dba3..00000000000
--- a/pkgs/development/libraries/libpng/libpng-apng.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, zlib }:
-
-stdenv.mkDerivation rec {
-  version = "1.5.14";
-  name = "libpng-apng-${version}";
-
-  patch_src = fetchurl {
-    url = "mirror://sourceforge/libpng-apng/libpng15/${version}/libpng-${version}-apng.patch.gz";
-    sha256 = "1vcqbkdssy4srm8jqyzaipdc70xzanilqssypmwqyngp8ph0m45p";
-  };
-
-  src = fetchurl {
-    url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
-    sha256 = "0m3vz3gig7s63zanq5b1dgb5ph12qm0cylw4g4fbxlsq3f74hn8l";
-  };
-
-  preConfigure = ''
-    gunzip < ${patch_src} | patch -Np1
-  '';
-
-  propagatedBuildInputs = [ zlib ];
-
-  passthru = { inherit zlib; };
-
-  meta = {
-    description = "The official reference implementation for the PNG file format with animation patch";
-    homepage = http://www.libpng.org/pub/png/libpng.html;
-    license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
-  };
-}
diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix
index 0e2f042104d..b70fddb9671 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/pkgs/development/libraries/libsamplerate/default.nix
@@ -17,14 +17,19 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "bin" "out" ];
 
-  meta = {
+  # need headers from the Carbon.framework in /System/Library/Frameworks to
+  # compile this on darwin -- not sure how to handle
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
+    "-I/System/Library/Frameworks/Carbon.framework/Versions/A/Headers";
+
+  meta = with stdenv.lib; {
     description = "Sample Rate Converter for audio";
-    homepage = http://www.mega-nerd.com/SRC/index.html;
+    homepage    = http://www.mega-nerd.com/SRC/index.html;
     # you can choose one of the following licenses:
-    license = [
-      "GPL"
-      # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf
-      "libsamplerate Commercial Use License"
-    ];
+    # GPL or a commercial-use license (available at
+    # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf)
+    licenses    = with licenses; [ gpl3.shortName unfree ];
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix
index 6436a88bdc8..29a7093dbbd 100644
--- a/pkgs/development/libraries/libsigcxx/1.2.nix
+++ b/pkgs/development/libraries/libsigcxx/1.2.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libsigc++-1.2.7";
   
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/${name}.tar.bz2";
+    url = "mirror://gnome/sources/libsigc++/1.2/${name}.tar.bz2";
     sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr";
   };
 
diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix
index f8fdb4c28c2..b1e4f31c567 100644
--- a/pkgs/development/libraries/libsigcxx/default.nix
+++ b/pkgs/development/libraries/libsigcxx/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libsigc++-2.2.10";
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/${name}.tar.xz";
+    url = "mirror://gnome/sources/libsigc++/2.2/${name}.tar.xz";
     sha256 = "8ceb6f2732f5399ef50d5b70f433d49945a12e0900b8f9f43c135866a2e5bf47";
   };
 
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index 7140843a453..85faba4a9dc 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -14,33 +14,36 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" "bin" "doc" ];
 
-  meta = {
-    description = "Libsndfile, a C library for reading and writing files containing sampled sound";
+  # need headers from the Carbon.framework in /System/Library/Frameworks to
+  # compile this on darwin -- not sure how to handle
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
+    "-I/System/Library/Frameworks/Carbon.framework/Versions/A/Headers";
 
-    longDescription =
-      '' Libsndfile is a C library for reading and writing files containing
-         sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format)
-         through one standard library interface.  It is released in source
-         code format under the GNU Lesser General Public License.
+  meta = with stdenv.lib; {
+    description = "A C library for reading and writing files containing sampled sound";
+    homepage    = http://www.mega-nerd.com/libsndfile/;
+    license     = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ lovek323 ];
+    platfomrs   = platforms.unix;
 
-         The library was written to compile and run on a Linux system but
-         should compile and run on just about any Unix (including MacOS X).
-         There are also pre-compiled binaries available for 32 and 64 bit
-         windows.
+    longDescription = ''
+      Libsndfile is a C library for reading and writing files containing
+      sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format)
+      through one standard library interface.  It is released in source
+      code format under the GNU Lesser General Public License.
 
-         It was designed to handle both little-endian (such as WAV) and
-         big-endian (such as AIFF) data, and to compile and run correctly on
-         little-endian (such as Intel and DEC/Compaq Alpha) processor systems
-         as well as big-endian processor systems such as Motorola 68k, Power
-         PC, MIPS and SPARC.  Hopefully the design of the library will also
-         make it easy to extend for reading and writing new sound file
-         formats.
-       '';
+      The library was written to compile and run on a Linux system but
+      should compile and run on just about any Unix (including MacOS X).
+      There are also pre-compiled binaries available for 32 and 64 bit
+      windows.
 
-    homepage = http://www.mega-nerd.com/libsndfile/;
-
-    license = "LGPLv2+";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+      It was designed to handle both little-endian (such as WAV) and
+      big-endian (such as AIFF) data, and to compile and run correctly on
+      little-endian (such as Intel and DEC/Compaq Alpha) processor systems
+      as well as big-endian processor systems such as Motorola 68k, Power
+      PC, MIPS and SPARC.  Hopefully the design of the library will also
+      make it easy to extend for reading and writing new sound file
+      formats.
+    '';
   };
 }
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 08784a0f257..a5ce0fda270 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, glib, libxml2, pkgconfig
-, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }:
+, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking
+, libintlOrEmpty }:
 
 stdenv.mkDerivation {
   name = "libsoup-2.38.1";
@@ -10,6 +11,7 @@ stdenv.mkDerivation {
   };
 
 
+  buildInputs = libintlOrEmpty;
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ glib libxml2 ]
     ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
@@ -18,6 +20,8 @@ stdenv.mkDerivation {
   # glib_networking is a runtime dependency, not a compile-time dependency
   configureFlags = "--disable-tls-check";
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+
   meta = {
     inherit (glib.meta) maintainers platforms;
   };
diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix
new file mode 100644
index 00000000000..c48c5265fc4
--- /dev/null
+++ b/pkgs/development/libraries/libspatialindex/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+let version = "1.8.1"; in
+
+stdenv.mkDerivation rec {
+  name = "libspatialindex-${version}";
+
+  src = fetchurl {
+    url = "http://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz";
+    sha256 = "1ay1kxn4baccd0cqx466v7fn8c8gcfbhlnd5mbdnd7s4aw0ix88j";
+  };
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Extensible spatial index library in C++";
+    homepage = http://libspatialindex.github.io/;
+    license = "MIT";
+  };
+}
diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix
new file mode 100644
index 00000000000..d5b401b804f
--- /dev/null
+++ b/pkgs/development/libraries/libspatialite/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, sqlite, zlib, proj, geos }:
+
+stdenv.mkDerivation rec {
+  name = "libspatialite-4.1.1";
+
+  src = fetchurl {
+    url = "http://www.gaia-gis.it/gaia-sins/${name}.tar.gz";
+    sha256 = "03wikddl60ly0yh8szrra1ng2iccsdzz645vkn6a7x2jz45a5084";
+  };
+
+  buildInputs = [ sqlite zlib proj geos ];
+
+  configureFlags = "--disable-freexl";
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Extensible spatial index library in C++";
+    homepage = https://www.gaia-gis.it/fossil/libspatialite;
+    # They allow any of these
+    license = [ "GPLv2+" "LGPLv2+" "MPL1.1" ];
+  };
+}
diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix
index 1972a4be653..000112008a3 100644
--- a/pkgs/development/libraries/libspotify/default.nix
+++ b/pkgs/development/libraries/libspotify/default.nix
@@ -1,25 +1,57 @@
-{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey }:
+{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey, unzip, gnused }:
 
 let version = "12.1.51"; in
 
-if stdenv.system != "x86_64-linux" then throw ''
-  Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here
-'' else stdenv.mkDerivation {
+if (stdenv.system != "x86_64-linux" && stdenv.system != "x86_64-darwin")
+then throw "Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here"
+else stdenv.mkDerivation {
   name = "libspotify-${version}";
 
-  src = fetchurl {
-    url = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Linux-x86_64-release.tar.gz";
-
-    sha256 = "0n0h94i4xg46hfba95n3ypah93crwb80bhgsg00f6sms683lx8a3";
-  };
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url    = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Linux-x86_64-release.tar.gz";
+        sha256 = "0n0h94i4xg46hfba95n3ypah93crwb80bhgsg00f6sms683lx8a3";
+      }
+    else if stdenv.system == "x86_64-darwin" then
+      fetchurl {
+        url    = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Darwin-universal.zip";
+        sha256 = "1gcgrc8arim3hnszcc886lmcdb4iigc08abkaa02l6gng43ky1c0";
+      }
+    else
+      null;
 
+  # common
   buildPhase = "true";
+  # no patch or build phase for darwin
+  phases = 
+    [ "unpackPhase" ] ++ 
+    (stdenv.lib.optionals (stdenv.system == "x86_64-linux") [ "patchPhase" "buildPhase" ]) ++
+    [ "installPhase" ];
+  installPhase = if (stdenv.system == "x86_64-linux")
+    then "installPhase"
+    else ''
+      mkdir -p "$out"/include/libspotify
+      mv -v libspotify.framework/Versions/Current/Headers/api.h \
+        "$out"/include/libspotify
+      mkdir -p "$out"/lib
+      mv -v libspotify.framework/Versions/Current/libspotify \
+        "$out"/lib/libspotify.dylib
+      mkdir -p "$out"/share/man
+      mv -v man3 "$out"/share/man
+    '';
+ 
 
-  installFlags = "prefix=$(out)";
+  # darwin-specific
+  buildInputs = stdenv.lib.optional (stdenv.system == "x86_64-darwin") unzip;
 
-  postInstall = "mv -v share $out";
-
-  patchPhase = "sed -i 's/ldconfig//' Makefile";
+  # linux-specific
+  installFlags = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+    "prefix=$(out)";
+  patchPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+    "${gnused}/bin/sed -i 's/ldconfig//' Makefile";
+  postInstall = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+    "mv -v share $out";
 
   passthru = {
     samples = if apiKey == null
@@ -27,35 +59,27 @@ if stdenv.system != "x86_64-linux" then throw ''
         Please visit ${libspotify.meta.homepage} to get an api key then set config.libspotify.apiKey accordingly
       '' else stdenv.mkDerivation {
         name = "libspotify-samples-${version}";
-
         src = libspotify.src;
-
-        buildInputs = [ pkgconfig libspotify alsaLib readline ];
-
+        buildInputs = [ pkgconfig libspotify readline ]
+          ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
         postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples";
-
         patchPhase = "cp ${apiKey} appkey.c";
-
         installPhase = ''
           mkdir -p $out/bin
           install -m 755 jukebox/jukebox $out/bin
           install -m 755 spshell/spshell $out/bin
           install -m 755 localfiles/posix_stu $out/bin
         '';
-
         meta = libspotify.meta // { description = "Spotify API library samples"; };
       };
 
     inherit apiKey;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Spotify API library";
-
-    homepage = https://developer.spotify.com/technologies/libspotify;
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
-
-    license = stdenv.lib.licenses.unfree;
+    homepage    = https://developer.spotify.com/technologies/libspotify;
+    maintainers = with maintainers; [ lovek323 shlevy ];
+    license     = licenses.unfree;
   };
 }
diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index f5c07f47379..ad5783ae4f8 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix
new file mode 100644
index 00000000000..9cf8decf4c8
--- /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/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index 49e23017369..5c3670e2365 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libunwind-1.0.1";
   
   src = fetchurl {
-    url = "http://download.savannah.nongnu.org/releases/libunwind/${name}.tar.gz";
+    url = "mirror://savannah/libunwind/${name}.tar.gz";
     sha256 = "aa95fd184c0b90d95891c2f3bac2c7df708ff016d2a6ee8b2eabb769f864101f";
   };
   
diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix
new file mode 100644
index 00000000000..74c6b8fa615
--- /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/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index 15810624705..835e2711a77 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
   buildInputs = with xlibs; [ pkgconfig dri2proto libXext ];
 
   propagatedBuildInputs = [ xlibs.libX11 ];
+  
+  configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--build=x86_64" ];
 
   meta = {
     homepage = http://people.freedesktop.org/~aplattner/vdpau/;
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 6a6b693cbbe..e1e4a759e06 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python
-, iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext 
-, libtasn1, ebtables, libgcrypt, yajl
+, iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext
+, libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils
 }:
 
-let version = "1.0.3"; in
+let version = "1.1.0"; in
 
 stdenv.mkDerivation {
   name = "libvirt-${version}";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
-    sha256 = "0mr727n0ygxk6y69srg3ahmjd7wligamw683x2snmz6wgk6llkzn";
+    sha256 = "0a39cwvzwf79gv3zw5mwp9q9n792rr1m0rl9ji39bdgcjxb7d7nf";
   };
 
   buildInputs =
     [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2
-      utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl
+      utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper
     ];
 
   preConfigure =
@@ -32,6 +32,8 @@ stdenv.mkDerivation {
     ''
       substituteInPlace $out/libexec/libvirt-guests.sh \
         --replace "$out/bin" "${gettext}/bin"
+      wrapProgram $out/sbin/libvirtd \
+        --prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin
     '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix
new file mode 100644
index 00000000000..b831fd9bdd3
--- /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/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix
index 65a8880fc9d..7856183e5e9 100644
--- a/pkgs/development/libraries/libvncserver/default.nix
+++ b/pkgs/development/libraries/libvncserver/default.nix
@@ -12,7 +12,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/libvncserver/LibVNCServer-${version}.tar.gz";
+    url = "mirror://sourceforge/libvncserver/LibVNCServer-${version}.tar.gz";
     sha256 = "1y83z31wbjivbxs60kj8a8mmjmdkgxlvr2x15yz95yy24lshs1ng";
   };
 
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 494a5c36a3c..46e73a121fe 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -21,27 +21,26 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     mkdir -p build
     cd build
+    substituteInPlace make/configure.sh --replace "-arch x86_64" "-march=x86-64"
   '';
 
   configureScript = "../configure";
-  configureFlags = [
-    "--disable-install-srcs"
-    "--disable-install-docs"
-    "--disable-examples"
-    "--enable-vp8"
-    "--enable-runtime-cpu-detect"
-    "--enable-shared"
-    "--enable-pic"
-  ];
+  configureFlags =
+    [ "--disable-install-srcs" "--disable-install-docs" "--disable-examples"
+      "--enable-vp8" "--enable-runtime-cpu-detect" "--enable-pic" ]
+    # --enable-shared is only supported on ELF
+    ++ stdenv.lib.optional (!stdenv.isDarwin) "--enable-shared";
 
   installPhase = ''
     make quiet=false DIST_DIR=$out install
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "VP8 video encoder";
-    homepage = http://code.google.com/p/webm;
-    license = "BSD";
+    homepage    = http://code.google.com/p/webm;
+    license     = licenses.bsd3;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 }
 
diff --git a/pkgs/development/libraries/libxml2/setup-hook.sh b/pkgs/development/libraries/libxml2/setup-hook.sh
index f8e4f5e0fd6..112dbe0c513 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/libxtc_dxtn/default.nix b/pkgs/development/libraries/libxtc_dxtn/default.nix
index a23d74a2be8..1f94bcbef99 100644
--- a/pkgs/development/libraries/libxtc_dxtn/default.nix
+++ b/pkgs/development/libraries/libxtc_dxtn/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libtxc_dxtn-1.0.1";
 
   src = fetchurl {
-    url = "people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2";
+    url = "http://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2";
     sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5";
   };
 
diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix
index 9e569eea580..b18aa6848bf 100644
--- a/pkgs/development/libraries/libzrtpcpp/default.nix
+++ b/pkgs/development/libraries/libzrtpcpp/default.nix
@@ -1,14 +1,21 @@
-{ stdenv, fetchurl, cmake, ucommon, openssl, pkgconfig, ccrtp }:
+{ stdenv, fetchurl, cmake, openssl, pkgconfig, ccrtp }:
 
 stdenv.mkDerivation rec {
-  name = "libzrtpcpp-2.0.0";
+  name = "libzrtpcpp-2.3.4";
 
   src = fetchurl {
     url = "mirror://gnu/ccrtp/${name}.tar.gz";
-    sha256 = "05yw8n5xpj0jxkvzgsvn3xkxirpypc1japy9k1jqs9301fgb1a3i";
+    sha256 = "020hfyrh8qdwkqdg1r1n65wdzj5i01ba9dzjghbm9lbz93gd9r83";
   };
 
-  buildInputs = [ cmake ucommon openssl pkgconfig ccrtp ];
+  # We disallow 'lib64', or pkgconfig will not find it.
+  prePatch = ''
+    sed -i s/lib64/lib/ CMakeLists.txt
+  '';
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  propagatedBuildInputs = [ openssl ccrtp ];
 
   meta = { 
     description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann";
diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix
index 1da10147889..f153c684629 100644
--- a/pkgs/development/libraries/lzo/default.nix
+++ b/pkgs/development/libraries/lzo/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     license = "GPLv2+";
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index 4aa78570b2f..3b1fd9faa6b 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -1,21 +1,20 @@
-{ stdenv, fetchurl, pkgconfig, alsaLib, ffmpeg, speex, ortp, pulseaudio, xorg,
-  libv4l, libtheora, intltool, libvpx, gsm }:
+{ stdenv, fetchurl, pkgconfig, alsaLib, ffmpeg, speex, ortp, pulseaudio,
+libv4l, libtheora, intltool, libvpx, gsm, mesa, libX11, libXv, libXext,
+glew, libopus, libupnp, vim }:
 
 stdenv.mkDerivation rec {
-  name = "mediastreamer-2.8.2";
+  name = "mediastreamer-2.9.0";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz";
-    sha256 = "0csg9a4mwfw5j475q9d5klhy82jnpcqfrlbvw81nxnqki40bnbm6";
+    sha256 = "1mdcaqkcdwzlj7hy3bz0ipkrrqiw1cgy01in8f24rfra9i2bjif2";
   };
 
 # TODO: make it load plugins from *_PLUGIN_PATH
   nativeBuildInputs = [pkgconfig intltool];
 
-  propagatedBuildInputs = [alsaLib ffmpeg speex ortp pulseaudio xorg.libX11
-    xorg.libXv xorg.libXext libv4l libtheora libvpx gsm ];
-
-#patches = [ ./h264.patch ./plugins.patch ];
+  propagatedBuildInputs = [ alsaLib ffmpeg speex ortp pulseaudio libX11
+    libXv libXext libv4l libtheora libvpx gsm mesa glew libopus libupnp vim ];
 
   configureFlags = "--enable-external-ortp";
 }
diff --git a/pkgs/development/libraries/minmay/default.nix b/pkgs/development/libraries/minmay/default.nix
new file mode 100644
index 00000000000..4518b4dd760
--- /dev/null
+++ b/pkgs/development/libraries/minmay/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, cmake, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "minmay-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "https://github.com/mazhe/minmay/archive/1.0.0.tar.gz";
+    sha256 = "1amycxvhbd0lv6j5zsvxiwrx29jvndcy856j3b3bisys24h95zw2";
+  };
+
+  buildInputs = [ cmake openssl ];
+
+  meta = {
+    homepage = "https://github.com/mazhe/minmay";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    description = "An XMPP library (forked from the iksemel project)";
+  };
+}
diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix
index 0ad2d4e4749..5fba9c56418 100644
--- a/pkgs/development/libraries/mpich2/default.nix
+++ b/pkgs/development/libraries/mpich2/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     homepage = http://www.mcs.anl.gov/mpi/mpich2/;
     license = "free, see http://www.mcs.anl.gov/research/projects/mpich2/downloads/index.php?s=license";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/ncurses/5_4.nix b/pkgs/development/libraries/ncurses/5_4.nix
new file mode 100644
index 00000000000..1cf08bd30c6
--- /dev/null
+++ b/pkgs/development/libraries/ncurses/5_4.nix
@@ -0,0 +1,75 @@
+{stdenv, fetchurl, unicode ? true}:
+
+let
+  /* C++ bindings fail to build on `i386-pc-solaris2.11' with GCC 3.4.3:
+     <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6395191>.
+     It seems that it could be worked around by #including <wchar.h> in the
+     right place, according to
+     <http://mail.python.org/pipermail/python-bugs-list/2006-September/035362.html>,
+     but this is left as an exercise to the reader.
+     So disable them for now.  */
+  cxx = stdenv.system != "i686-solaris";
+in
+stdenv.mkDerivation (rec {
+  name = "ncurses-5.4";
+
+  src = fetchurl {
+    url = "mirror://gnu/ncurses/${name}.tar.gz";
+    sha256 = "0div11f5flig67v702fd3sj362zagrnaj0d8wvs905s3rxiy1g2s";
+  };
+
+  configureFlags = ''
+    --with-shared --includedir=''${out}/include --without-debug
+    ${if unicode then "--enable-widec" else ""}${if cxx then "" else "--without-cxx-binding"}
+  '';
+
+  selfNativeBuildInput = true;
+
+  enableParallelBuilding = true;
+
+  preBuild =
+    # On Darwin, we end up using the native `sed' during bootstrap, and it
+    # fails to run this command, which isn't needed anyway.
+    stdenv.lib.optionalString (!stdenv.isDarwin)
+    ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile'';
+
+  # When building a wide-character (Unicode) build, create backward
+  # compatibility links from the the "normal" libraries to the
+  # wide-character libraries (e.g. libncurses.so to libncursesw.so).
+  postInstall = if unicode then ''
+    ${if cxx then "chmod 644 $out/lib/libncurses++w.a" else ""}
+    for lib in curses ncurses form panel menu; do
+      if test -e $out/lib/lib''${lib}w.a; then
+        rm -f $out/lib/lib$lib.so
+        echo "INPUT(-l''${lib}w)" > $out/lib/lib$lib.so
+        ln -svf lib''${lib}w.a $out/lib/lib$lib.a
+        ln -svf lib''${lib}w.so.5 $out/lib/lib$lib.so.5
+      fi
+    done;
+  '' else "";
+
+  meta = {
+    description = "GNU Ncurses, a free software emulation of curses in SVR4 and more";
+
+    longDescription = ''
+      The Ncurses (new curses) library is a free software emulation of
+      curses in System V Release 4.0, and more.  It uses Terminfo
+      format, supports pads and color and multiple highlights and
+      forms characters and function-key mapping, and has all the other
+      SYSV-curses enhancements over BSD Curses.
+
+      The ncurses code was developed under GNU/Linux.  It has been in
+      use for some time with OpenBSD as the system curses library, and
+      on FreeBSD and NetBSD as an external package.  It should port
+      easily to any ANSI/POSIX-conforming UNIX.  It has even been
+      ported to OS/2 Warp!
+    '';
+
+    homepage = http://www.gnu.org/software/ncurses/;
+
+    license = "X11";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.all;
+  };
+} // ( if stdenv.isDarwin then { postFixup = "rm $out/lib/*.so"; } else { } ) )
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index d38fc19f40e..de980d718f3 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 960fe0ef7a7..89c82f1b87d 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 bc3a98ec143..b3e35b1d2d1 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 4942debcd30..00000000000
--- 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/ode/default.nix b/pkgs/development/libraries/ode/default.nix
index 31b2aa7dad9..e7368e4f60b 100644
--- a/pkgs/development/libraries/ode/default.nix
+++ b/pkgs/development/libraries/ode/default.nix
@@ -10,7 +10,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/opende/ode-${version}.tar.bz2";
+    url = "mirror://sourceforge/opende/ode-${version}.tar.bz2";
     sha256 = "1883gbsnn7zldrpwfdh6kwj20g627n5bspz3yb2z6lrxdal88y47";
   };
 
diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix
index 2c23e51c22a..75d6033e1cc 100644
--- a/pkgs/development/libraries/openal/default.nix
+++ b/pkgs/development/libraries/openal/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     name = "openal-soft-${version}.tar.bz2";
   };
 
-  buildInputs = [ cmake alsaLib ];
+  buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
 
   meta = {
     description = "OpenAL, a cross-platform 3D audio API";
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 33397e8b98e..b54375ae062 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "openexr-1.7.1";
   
   src = fetchurl {
-    url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
+    url = "mirror://savannah/openexr/${name}.tar.gz";
     sha256 = "0l2rdbx9lg4qk2ms98hwbsnzpggdrx3pbjl6pcvrrpjqp5m905n6";
   };
   
diff --git a/pkgs/development/libraries/openexr_ctl/default.nix b/pkgs/development/libraries/openexr_ctl/default.nix
index 1b15fdb6c9e..cd26aae660c 100644
--- a/pkgs/development/libraries/openexr_ctl/default.nix
+++ b/pkgs/development/libraries/openexr_ctl/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "openexr_ctl-1.0.1";
 
   src = fetchurl {
-    url = http://kent.dl.sourceforge.net/sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz;
+    url = mirror://sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz;
     sha256 = "1jg9smpaplal8l14djp184wzk11nwd3dvm4lhkp69kjgw8jdd21d";
   };
 
diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix
index 7fd18af450c..a47cacd62bc 100644
--- a/pkgs/development/libraries/openjpeg/default.nix
+++ b/pkgs/development/libraries/openjpeg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libpng, libtiff, lcms2, glib/*passthru only*/ }:
+{ stdenv, fetchurl, pkgconfig, libpng, libtiff, lcms, glib/*passthru only*/ }:
 
 stdenv.mkDerivation rec {
   name = "openjpeg-1.5.1";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativebuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ libpng libtiff lcms2 ]; # in closure anyway
+  propagatedBuildInputs = [ libpng libtiff lcms ]; # in closure anyway
 
   postInstall = glib.flattenInclude;
 
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 1d5a0961340..60b9c7738a0 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}:
 
 stdenv.mkDerivation rec {
-  name = "openldap-2.4.34";
+  name = "openldap-2.4.35";
 
   src = fetchurl {
     url = "ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/${name}.tgz";
-    sha256 = "01h6zq6zki9b1k07pbyps5vxj9w39ybzjvkyz5h9xk09dd54raza";
+    sha256 = "1swy3rly6y0asikp862sigmab8gcll6scb65ln10vps7q5s0640n";
   };
 
   buildInputs = [ openssl cyrus_sasl db4 groff ];
diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index 255d9198105..ff7536de403 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -1,13 +1,17 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, srtp, libzrtpcpp, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "ortp-0.18.0";
+  name = "ortp-0.22.0";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz";
-    sha256 = "1cgx9xid0abk3cad3xjdvx7p9whinlhrviphyrd9zkhhx7ddkih2";
+    sha256 = "02rdm6ymgblbx8fnjfvivkl4qkgbdizrf35fyb0vln9m7jdy4dvf";
   };
 
+  configureFlags = "--enable-zrtp";
+
+  propagatedBuildInputs = [ srtp libzrtpcpp pkgconfig ];
+
   meta = {
     description = "A Real-Time Transport Protocol (RFC3550) stack";
     homepage = http://www.linphone.org/index.php/eng/code_review/ortp;
diff --git a/pkgs/development/libraries/osip/3.nix b/pkgs/development/libraries/osip/3.nix
new file mode 100644
index 00000000000..2c1b148251c
--- /dev/null
+++ b/pkgs/development/libraries/osip/3.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation rec {
+  version = "3.6.0";
+  src = fetchurl {
+    url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
+    sha256 = "1kcndqvsyxgbhkksgydvvjw15znfq6jiznvw058d21h5fq68p8f9";
+  };
+  name = "libosip2-${version}";
+
+  meta = {
+    license = "LGPLv2.1+";
+    homepage = http://www.gnu.org/software/osip/;
+    description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)";
+    maintainers = with stdenv.lib.maintainers; [ raskin ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index 2c1b148251c..3ec3dac221f 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
-  version = "3.6.0";
+  version = "4.0.0";
   src = fetchurl {
     url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
-    sha256 = "1kcndqvsyxgbhkksgydvvjw15znfq6jiznvw058d21h5fq68p8f9";
+    sha256 = "05dhj4s5k4qmhn2amca070xgh1gkcl42n040fhwsn3vm86524bdv";
   };
   name = "libosip2-${version}";
 
diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix
index 7f4d14dfbac..d03aa4311fe 100644
--- a/pkgs/development/libraries/pangomm/2.28.x.nix
+++ b/pkgs/development/libraries/pangomm/2.28.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }:
+{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng, cairo }:
 
 stdenv.mkDerivation rec {
   name = "pangomm-2.28.4";
@@ -9,10 +9,16 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ pango glibmm cairomm libpng ];
+  propagatedBuildInputs = [ pango glibmm cairomm libpng cairo ];
 
-  meta = {
+  NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
+
+  meta = with stdenv.lib; {
     description = "C++ interface to the Pango text rendering library";
+    homepage    = http://www.pango.org/;
+    license     = with licenses; [ lgpl2 lgpl21 ];
+    maintainers = with maintainers; [ lovek323 raskin ];
+    platforms   = platforms.unix;
 
     longDescription = ''
       Pango is a library for laying out and rendering of text, with an
@@ -21,11 +27,5 @@ stdenv.mkDerivation rec {
       far has been done in the context of the GTK+ widget toolkit.
       Pango forms the core of text and font handling for GTK+-2.x.
     '';
-
-    homepage = http://www.pango.org/;
-    license = "LGPLv2+";
-
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/poppler/0.18.nix b/pkgs/development/libraries/poppler/0.18.nix
index 29e99b67549..123d229f2ba 100644
--- a/pkgs/development/libraries/poppler/0.18.nix
+++ b/pkgs/development/libraries/poppler/0.18.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, cairo, freetype, fontconfig, zlib
 , libjpeg, curl, libpthreadstubs, xorg, openjpeg
-, libxml2, pkgconfig, cmake, lcms2, libiconvOrEmpty
+, libxml2, pkgconfig, cmake, lcms, libiconvOrEmpty
 , glibSupport ? false, glib, gtk3Support ? false, gtk3 # gtk2 no longer accepted
 , qt4Support ? false, qt4 ? null
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = with xorg;
-    [ zlib cairo freetype fontconfig libjpeg lcms2 curl
+    [ zlib cairo freetype fontconfig libjpeg lcms curl
       libpthreadstubs libxml2 stdenv.gcc.libc
       libXau libXdmcp libxcb libXrender libXext
       openjpeg
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 7c392832406..55ab0da0cfd 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchgit, pkgconfig, cmake, libiconvOrEmpty, libintlOrEmpty
-, zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg
+, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
 , qt4Support ? false, qt4 ? null
 }:
 
@@ -26,7 +26,7 @@ let
       inherit sha256;
     };
 
-    propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms2 curl openjpeg ];
+    propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ];
 
     nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty ++ libintlOrEmpty;
 
diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index 89361bf3121..34d5bac6adb 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -8,13 +8,40 @@ stdenv.mkDerivation rec {
     sha256 = "168vmcag3c5y3zwf7h5298ydh83g72q5bznskrw9cr2h1lrx29lw";
   };
 
-  buildInputs = [ alsaLib pkgconfig ];
-  
-  meta = {
+  buildInputs = [ pkgconfig ]
+    ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
+
+  configureFlags = stdenv.lib.optionals stdenv.isDarwin
+    [ "--build=x86_64" "--without-oss" "--enable-static" "--enable-shared" ];
+
+  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i '50 i\
+      #include <CoreAudio/AudioHardware.h>\
+      #include <CoreAudio/AudioHardwareBase.h>\
+      #include <CoreAudio/AudioHardwareDeprecated.h>' \
+      include/pa_mac_core.h
+
+    # disable two tests that don't compile
+    sed -i -e 105d Makefile
+    sed -i -e 107d Makefile
+  '';
+
+  # not sure why, but all the headers seem to be installed by the make install
+  installPhase = if stdenv.isDarwin then ''
+    mkdir -p "$out"
+    cp -r include "$out"
+    cp -r lib "$out"
+  '' else ''
+    make install
+  '';
+
+  meta = with stdenv.lib; {
     description = "Portable cross-platform Audio API";
-    homepage = http://www.portaudio.com/;
+    homepage    = http://www.portaudio.com/;
     # Not exactly a bsd license, but alike
-    license = "BSD";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 
   passthru = {
diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index b24b4e06cb9..2ba6b5cb907 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 91eec5fcd31..9b5cb0452d6 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -7,11 +7,9 @@
 , threadSupport ? true
 , mysqlSupport ? false, mysql ? null
 , openglSupport ? false, mesa ? null, libXmu ? null
-, x11, xextproto, zlib, libjpeg, libpng12, which
+, x11, xextproto, zlib, libjpeg, libpng, which
 }:
 
-let libpng = libpng12; in
-
 assert xftSupport -> libXft != null;
 assert xrenderSupport -> xftSupport && libXrender != null;
 assert xrandrSupport -> libXrandr != null && randrproto != null;
@@ -59,10 +57,10 @@ stdenv.mkDerivation {
   patches = [
     # Don't strip everything so we can get useful backtraces.
     ./strip.patch
-    
+
     # Build on NixOS.
     ./qt-pwd.patch
-    
+
     # randr.h and Xrandr.h need not be in the same prefix.
     ./xrandr.patch
 
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index b797f631b8e..29116d0eb11 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -147,10 +147,10 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = http://qt-project.org/;
+    homepage    = http://qt-project.org/;
     description = "A cross-platform application framework for C++";
-    license = "GPL/LGPL";
-    maintainers = with maintainers; [ urkud sander phreedom ];
-    platforms = platforms.all;
+    license     = "GPL/LGPL";
+    maintainers = with maintainers; [ lovek323 phreedom sander urkud ];
+    platforms   = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix
index d621eed6728..12662b9dea9 100644
--- a/pkgs/development/libraries/sbc/default.nix
+++ b/pkgs/development/libraries/sbc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libsndfile, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "sbc-1.0";
+  name = "sbc-1.1";
 
   src = fetchurl {
     url = "http://www.kernel.org/pub/linux/bluetooth/${name}.tar.xz";
-    sha256 = "10mq2rmh3h90bwq5cdcmizf93zf8f2br8gds0jxr9i962ai0m5xz";
+    sha256 = "1ipvkhilyhdbd2nzq0la6l7q361l0zm0c6kvga2a0y89q8nssc4s";
   };
 
   buildInputs = [ pkgconfig libsndfile ];
diff --git a/pkgs/development/libraries/science/biology/biolib/default.nix b/pkgs/development/libraries/science/biology/biolib/default.nix
index b12366c0142..4e4c3c55361 100644
--- a/pkgs/development/libraries/science/biology/biolib/default.nix
+++ b/pkgs/development/libraries/science/biology/biolib/default.nix
@@ -1,26 +1,25 @@
-{ stdenv, fetchurl, cmake, rLang, zlib }:
+{ stdenv, fetchurl, cmake, R, zlib }:
 
 stdenv.mkDerivation rec {
   name = "biolib-${version}";
-  
+
   version = "0.0.1";
-  
+
   src = fetchurl {
     url = "http://bio3.xparrot.eu/download/nix-biology/biolib-${version}.tar.gz";
     sha256 = "1la639rs0v4f3ayvarqv0yxwlnwn188bb1v71d2ybw1xr6gdy688";
   };
 
-  buildInputs = [cmake rLang zlib];
+  buildInputs = [cmake R zlib];
 
   meta = {
+    homepage = "http://biolib.open-bio.org/";
     description = "BioLib";
-    longDescription =
-      ''
-        BioLib brings together a set of opensource libraries written
-        in C/C++ and makes them available for major Bio* languages:
-        BioPerl, BioRuby, BioPython
-      '';
     license = "GPL2";
-    homepage = http://biolib.open-bio.org/; 
+    longDescription = ''
+      BioLib brings together a set of opensource libraries written
+      in C/C++ and makes them available for major Bio* languages:
+      BioPerl, BioRuby, BioPython
+    '';
   };
 }
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 029deecb93a..f1c99397452 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }:
-let 
-  atlasMaybeShared = if shared then atlas.override {shared=true;} else atlas;
+let
+  atlasMaybeShared = atlas.override { inherit shared; };
   usedLibExtension = if shared then ".so" else ".a";
 in
 stdenv.mkDerivation {
@@ -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/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix
index 8ca16ff72c7..1447dd5346a 100644
--- a/pkgs/development/libraries/soprano/default.nix
+++ b/pkgs/development/libraries/soprano/default.nix
@@ -2,11 +2,11 @@
 , pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "soprano-2.9.2";
+  name = "soprano-2.9.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/soprano/${name}.tar.bz2";
-    sha256 = "105xlng1ka0661gk2ap39rjjy7znp670df0c5569x04vppgd45g1";
+    sha256 = "08gb5d8bgy7vc6qd6r1kkmmc5rli67dlglpjqjlahpnvs26r1cwl";
   };
 
   patches = [ ./find-virtuoso.patch ];
diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix
index 25f42275644..e281b1fcf9d 100644
--- a/pkgs/development/libraries/spice-protocol/default.nix
+++ b/pkgs/development/libraries/spice-protocol/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "spice-protocol-0.12.2";
+  name = "spice-protocol-0.12.6";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
-    sha256 = "0v6msf6gbl8g69qamp97dggz148zpc3ncbfgbq3b472wszjdkclb";
+    sha256 = "16r5x2sppiaa6pzawkrvk5q4hmw7ynmlp2xr38f1vaxj5rh4aiwx";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index 2bcb9e593b8..dd16d6ef94e 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib, openssl
 , libXrandr, libXfixes, libXext, libXrender, libXinerama, libjpeg, zlib
-, spice_protocol, python, pyparsing }:
+, spice_protocol, python, pyparsing, glib }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "spice-0.12.0";
+  name = "spice-0.12.3";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
-    sha256 = "15mp6nz467h4l5jg3vk51si6r5w7g329jvsy61f2gl3yabwcxmva";
+    sha256 = "0il50hcw87mzs3dw80a9gkidmhgf9s8691xmki3gj9358qf5xmmz";
   };
 
   buildInputs = [ pixman celt alsaLib openssl libjpeg zlib
                   libXrandr libXfixes libXrender libXext libXinerama
-                  python pyparsing ];
+                  python pyparsing glib ];
 
   nativeBuildInputs = [ pkgconfig spice_protocol ];
 
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-sasl=no"
     "--disable-smartcard"
+    "--enable-client"
   ];
 
   postInstall = ''
diff --git a/pkgs/development/libraries/sqlite/3.7.14.nix b/pkgs/development/libraries/sqlite/3.7.14.nix
index be3a24c1e4c..50338f98a2c 100644
--- a/pkgs/development/libraries/sqlite/3.7.14.nix
+++ b/pkgs/development/libraries/sqlite/3.7.14.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.sqlite.org/;
     description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/sqlite/3.7.16.nix b/pkgs/development/libraries/sqlite/3.7.16.nix
index 231f4e5d69c..f681e94c6ba 100644
--- a/pkgs/development/libraries/sqlite/3.7.16.nix
+++ b/pkgs/development/libraries/sqlite/3.7.16.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.sqlite.org/;
     description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix
index 1b8b654ca80..c6cf56e59d6 100644
--- a/pkgs/development/libraries/srtp/default.nix
+++ b/pkgs/development/libraries/srtp/default.nix
@@ -11,10 +11,10 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="srtp";
-    version="1.4.2";
+    version="1.4.4";
     name="${baseName}-${version}";
-    url="http://srtp.sourceforge.net/${name}.tgz";
-    hash="1497mcxharnhiccjhny30g4wlv28ckdxhj14jrwvdnnvhl80jf43";
+    url="mirror://sourceforge/${baseName}/${name}.tgz";
+    hash="057k191hx7sf84wdvc8wr1nk4whhrvbg1vv3r4nyswjir6qwphnr";
   };
 in
 rec {
diff --git a/pkgs/development/libraries/srtp/linphone.nix b/pkgs/development/libraries/srtp/linphone.nix
new file mode 100644
index 00000000000..9108be5e30c
--- /dev/null
+++ b/pkgs/development/libraries/srtp/linphone.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchgit, automake, autoconf, libtool }:
+
+stdenv.mkDerivation {
+  name = "srtp-linphone-git-20130530-1c9bd9065";
+
+  src = fetchgit {
+    url = git://git.linphone.org/srtp.git;
+    rev = "1c9bd9065";
+    sha256 = "0r4wbrih8bggs69fnfmzm17z1pp1zp8x9qwcckcq6wc54b16d9g3";
+  };
+
+  preConfigure = "autoreconf -vfi";
+
+  buildInputs = [ automake autoconf libtool ];
+}
diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix
new file mode 100644
index 00000000000..9e3f749ca8f
--- /dev/null
+++ b/pkgs/development/libraries/stfl/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, ncurses, libiconvOrEmpty }:
+
+stdenv.mkDerivation rec {
+  name = "stfl-0.22";
+
+  src = fetchurl {
+    url = "http://www.clifford.at/stfl/${name}.tar.gz";
+    sha256 = "062lqlf3qhp8bcapbpc0k3wym7x6ngncql8jmx5x06p6679szp9d";
+  };
+
+  buildInputs = [ ncurses ] ++ libiconvOrEmpty;
+
+  buildPhase = ''
+    sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h
+  '' + ( stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i 's/LDLIBS += -lncursesw/LDLIBS += -lncursesw -liconv/' Makefile
+    sed -i s/-soname/-install_name/ Makefile
+  '' ) + ''
+    make
+  '';
+
+  installPhase = ''
+    DESTDIR=$out prefix=\"\" make install
+
+    # some programs rely on libstfl.so.0 to be present, so link it
+    ln -s $out/lib/libstfl.so.0.22 $out/lib/libstfl.so.0
+  '';
+
+  meta = {
+    homepage    = http://www.clifford.at/stfl/;
+    description = "A library which implements a curses-based widget set for text terminals";
+    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
+    license     = stdenv.lib.licenses.lgpl3;
+    platforms   = stdenv.lib.platforms.unix;
+  };
+}
+
diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix
index 86953682034..02a1008cda5 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/pkgs/development/libraries/tdb/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     homepage = http://tdb.samba.org/;
     license = "LGPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 431b8773978..b6faee6c298 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix
index 290580e5212..a45c4217c7b 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl, x11 }:
+{ stdenv, fetchurl, tcl, x11, libX11 }:
 
 stdenv.mkDerivation {
   name = "tk-8.5.7";
@@ -16,11 +16,18 @@ stdenv.mkDerivation {
   
   preConfigure = "cd unix";
 
-  buildInputs = [tcl x11];
+  buildInputs = [ tcl x11 libX11 ];
   
   inherit tcl;
 
   passthru = {
     libPrefix = "tk8.5";
   };
+
+  meta = {
+    description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages";
+    homepage = http://www.tcl.tk/;
+    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
+    platforms = stdenv.lib.platforms.all;
+  };
 }
diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix
index 59afb3345ca..82ce734d173 100644
--- a/pkgs/development/libraries/tokyo-cabinet/default.nix
+++ b/pkgs/development/libraries/tokyo-cabinet/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix
index b623c773142..ee742487e26 100644
--- a/pkgs/development/libraries/tokyo-tyrant/default.nix
+++ b/pkgs/development/libraries/tokyo-tyrant/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
     license = "LGPLv2.1+";
 
     platforms = stdenv.lib.platforms.gnu;         # arbitrary choice
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix
index e9739d44bca..cef853698a8 100644
--- a/pkgs/development/libraries/ucl/default.nix
+++ b/pkgs/development/libraries/ucl/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "ucl-1.0.3";
+  name = "ucl-1.03";
   src = fetchurl {
     url = http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz;
     sha256 = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348";
diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix
index cfcb47dd54f..699da60768f 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "ucommon-5.2.2";
+  name = "ucommon-6.0.5";
 
   src = fetchurl {
-    url = mirror://gnu/commoncpp/ucommon-5.2.2.tar.gz;
-    sha256 = "1s9r7yhvqnj57aiw7sklp2p6llfzn1jxvc3hwhpli5zq3r6kypwx";
+    url = mirror://gnu/commoncpp/ucommon-6.0.5.tar.gz;
+    sha256 = "0w5nl2a2l630n4kvfaz22by1s92ybd87g0q1zpcmsl8i5d00789l";
   };
 
   buildInputs = [ pkgconfig gnutls zlib ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/commoncpp/;
     license = "LGPLv3+";
 
-    maintainers = with stdenv.lib.maintainers; [ viric ludo ];
+    maintainers = with stdenv.lib.maintainers; [ viric ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix
index 24234469fa2..c92df5a8bcb 100644
--- a/pkgs/development/libraries/vmime/default.nix
+++ b/pkgs/development/libraries/vmime/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, gsasl, gnutls, pkgconfig, zlib, libtasn1, libgcrypt }:
 
 stdenv.mkDerivation {
-  name = "vmime-0.9.2svn";
+  name = "vmime-0.9.2-pre-svn603";
   src = fetchurl {
     url = http://download.zarafa.com/community/final/7.0/7.0.5-31880/sourcecode/libvmime-0.9.2+svn603.tar.bz2;
     #url = mirror://sourceforge/vmime/libvmime-0.9.1.tar.bz2;
diff --git a/pkgs/development/libraries/webkit/svn.nix b/pkgs/development/libraries/webkit/svn.nix
deleted file mode 100644
index db6fe1ba55c..00000000000
--- 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/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix
index fca5a4a278e..f61c7eafd73 100644
--- a/pkgs/development/libraries/wxGTK-2.9/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.9/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
-, gstreamer, gst_plugins_base, GConf
+, gstreamer, gst_plugins_base, GConf, setfile
 , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
 }:
 
@@ -18,19 +18,23 @@ stdenv.mkDerivation {
     sha256 = "04jda4bns7cmp7xy68qz112yg0lribpc6xs5k9gilfqcyhshqlvc";
   };
 
-  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ]
-    ++ optional withMesa mesa;
+  buildInputs =
+    [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
+      gst_plugins_base GConf ]
+    ++ optional withMesa mesa
+    ++ optional stdenv.isDarwin setfile;
 
   nativeBuildInputs = [ pkgconfig ];
 
-  configureFlags = [
-    "--enable-gtk2"
-    (if compat24 then "--enable-compat24" else "--disable-compat24")
-    (if compat26 then "--enable-compat26" else "--disable-compat26")
-    "--disable-precomp-headers"
-    (if unicode then "--enable-unicode" else "")
-    "--enable-mediactrl"
-  ] ++ optional withMesa "--with-opengl";
+  configureFlags =
+    [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl"
+      (if compat24 then "--enable-compat24" else "--disable-compat24")
+      (if compat26 then "--enable-compat26" else "--disable-compat26") ]
+    ++ optional unicode "--enable-unicode"
+    ++ optional withMesa "--with-opengl"
+    ++ optionals stdenv.isDarwin
+      # allow building on 64-bit
+      [ "--with-cocoa" "--enable-universal-binaries" ];
 
   SEARCH_LIB = optionalString withMesa "${mesa}/lib";
 
@@ -38,7 +42,11 @@ stdenv.mkDerivation {
     substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
     substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
     substituteInPlace configure --replace /usr /no-such-path
-  ";
+  " + optionalString stdenv.isDarwin ''
+    substituteInPlace configure --replace \
+      'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
+      'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
+  '';
 
   postInstall = "
     (cd $out/include && ln -s wx-*/* .)
diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix
index e03773292bb..fd5efdcc3d1 100644
--- a/pkgs/development/libraries/xvidcore/default.nix
+++ b/pkgs/development/libraries/xvidcore/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, nasm}:
+{ stdenv, fetchurl, nasm, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   name = "xvidcore-1.3.2";
@@ -8,20 +8,36 @@ stdenv.mkDerivation rec {
     sha256 = "1x0b2rq6fv99ramifhkakycd0prjc93lbzrffbjgjwg7w4s17hfn";
   };
 
-  preConfigure = "cd build/generic";
+  preConfigure = ''
+    cd build/generic
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace configure --replace "-no-cpp-precomp" ""
+  '';
 
-  buildInputs = [ nasm ];
+  configureFlags = stdenv.lib.optionals stdenv.isDarwin
+    [ "--enable-macosx_module" "--disable-assembly" ];
 
-  postInstall =
-    ''
-      rm $out/lib/*.a
-      (cd $out/lib && ln -s *.so.4.* libxvidcore.so && ln -s *.so.4.* libxvidcore.so.4 )
-    '';
+  buildInputs = [ nasm ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ autoconf automake libtool ];
+
+  # don't delete the '.a' files on darwin -- they're needed to compile ffmpeg
+  # (and perhaps other things)
+  postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    rm $out/lib/*.a
+  '' + ''
+    cd $out/lib
+    ln -s *.so.4.* libxvidcore.so
+    if [ ! -e libxvidcore.so.4 ]; then
+        ln -s *.so.4.* libxvidcore.so.4
+    fi
+  '';
   
-  meta = {
+  meta = with stdenv.lib; {
     description = "MPEG-4 video codec for PC";
-    homepage = http://www.xvid.org/;
-    license = "GPLv2+";
+    homepage    = http://www.xvid.org/;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.all;
   };
 }
 
diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index e9de92fb3ce..69e53d4e8f6 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://zziplib.sourceforge.net/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = python.meta.platforms;
   };
 }
diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
index fb5d324d778..635d0ae964f 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 f26db5c2cb7..651c84533f0 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 e8e1f919fe4..38377cf8bbb 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 8b770ede0fc..2792d364f15 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 00000000000..0d9cbc22080
--- /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 a76deb98b6e..3339a065e2a 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 3cbe5723806..9c843fa8c37 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 983d8bde87b..8ac4ad328f4 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 1802ae63efe..249f044550b 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 00000000000..31ab72add36
--- /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 dc28c27f45f..90b1e04c229 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 1224ebbd4e8..be9947d536a 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 55499608290..bf263741bdd 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 f544fcc08be..2ca937b5534 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 a1434bbe56c..c89cb9ed127 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 7bbbaf1e362..4e180ac4b3e 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 2e9690de7a2..ca1988527e2 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 00000000000..c839d283f4e
--- /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 00000000000..f0e8347f6db
--- /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 b35b4298983..bc78ea11e6f 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 24bb1d2d93a..4dbf6c5e82e 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/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
index ac6bbc7f282..ade629759f0 100644
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -23,7 +23,6 @@ let
   # Set some default values here
   
   _target = if target == null then name else target;
-  _scheme = if scheme == null then name else scheme;
 
   _configuration = if configuration == null
     then
@@ -75,7 +74,7 @@ stdenv.mkDerivation {
       ''}
 
     # Do the building
-    xcodebuild -target ${_target} -configuration ${_configuration} -scheme ${_scheme} -sdk ${_sdk} -arch ${_arch} ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName"'' else ""}
+    xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} -arch ${_arch} ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName"'' else ""}
     
     ${stdenv.lib.optionalString release ''
       ${stdenv.lib.optionalString generateIPA ''
diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix
index 96f70ea3832..7c98ce76a1a 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 77d2c4c867e..1cbab99e365 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/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix
index 037ebdea6b6..21610f8f310 100644
--- a/pkgs/development/ocaml-modules/camlimages/default.nix
+++ b/pkgs/development/ocaml-modules/camlimages/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng12, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
+{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -9,14 +9,14 @@ in
 stdenv.mkDerivation {
   name = "${pname}-${version}";
 
-  src = fetchurl { 
+  src = fetchurl {
     url = "https://bitbucket.org/camlspotter/camlimages/get/v4.0.1.tar.gz";
     sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4";
   };
 
-  buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript libtiff libjpeg libpng12 giflib freetype libXpm ];
- 
-  propagatedbuildInputs = [libtiff libjpeg libpng12 giflib freetype libXpm ];
+  buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript libtiff libjpeg libpng giflib freetype libXpm ];
+
+  propagatedbuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix
index d59dbae45fe..41620b9424f 100644
--- a/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/pkgs/development/ocaml-modules/extlib/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, ocaml, findlib}:
 
 stdenv.mkDerivation {
-  name = "ocaml-extlib-1.5.2";
+  name = "ocaml-extlib-1.5.3";
 
   src = fetchurl {
     url = http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz;
diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
new file mode 100644
index 00000000000..403bb264892
--- /dev/null
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock
+, libselinux, cryptsetup, multipath_tools, lsof, utillinux
+, useNixUdev ? true, udev ? null
+# This is only used when useNixUdev is false
+, udevSoMajor ? 1
+}:
+
+assert useNixUdev -> udev != null;
+
+let
+  pyenable = { enablePython = true; };
+  selinuxWithPython = libselinux.override pyenable;
+  cryptsetupWithPython = cryptsetup.override pyenable;
+in buildPythonPackage rec {
+  name = "blivet-${version}";
+  version = "0.17-1";
+
+  src = fetchurl {
+    url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/"
+        + "${name}.tar.bz2";
+    sha256 = "1k3mws2q0ryb7422mml6idmaasz2i2v6ngyvg6d976dx090qnmci";
+  };
+
+  postPatch = ''
+    sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \
+      blivet/devicelibs/mpath.py blivet/devices.py
+    sed -i -e '/"wipefs"/ {
+      s|wipefs|${utillinux}/sbin/wipefs|
+      s/-f/--force/
+    }' blivet/formats/__init__.py
+    sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
+    sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py
+    sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py
+  '' + (if useNixUdev then ''
+    sed -i -e '/find_library/,/find_library/ {
+      c libudev = "${udev}/lib/libudev.so.1"
+    }' blivet/pyudev.py
+  '' else ''
+    sed -i -e '/^somajor *=/s/=.*/= ${toString udevSoMajor}/p' \
+      blivet/pyudev.py
+  '');
+
+  propagatedBuildInputs = [
+    pykickstart pyparted pyblock selinuxWithPython cryptsetupWithPython
+  ] ++ stdenv.lib.optional useNixUdev udev;
+
+  # tests are currently _heavily_ broken upstream
+  doCheck = false;
+
+  meta = {
+    homepage = "https://fedoraproject.org/wiki/Blivet";
+    description = "Module for management of a system's storage configuration";
+    license = [ "GPLv2+" "LGPLv2.1+" ];
+  };
+}
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index d32c6818bb2..6a7d5e5f3d5 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -5,7 +5,7 @@
 
 { python, setuptools, wrapPython, lib, offlineDistutils, recursivePthLoader }:
 
-{ name, namePrefix ? "python-"
+{ name, namePrefix ? python.libPrefix + "-"
 
 , buildInputs ? []
 
@@ -33,7 +33,7 @@
 , checkPhase ?
     ''
       runHook preCheck
-      python setup.py test
+      ${python}/bin/${python.executable} setup.py test
       runHook postCheck
     ''
 
@@ -55,7 +55,7 @@ python.stdenv.mkDerivation (attrs // {
   meta = {
     platforms = python.meta.platforms;
   } // meta // {
-    maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow ];
+    maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow lib.maintainers.iElectric ];
   };
 
   # checkPhase after installPhase to run tests on installed packages
diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index 6b02369927b..a7c839799b1 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -23,10 +23,13 @@ wrapPythonProgramsIn() {
         fi
         
         if head -n1 "$i" | grep -q /python; then
-            echo "wrapping \`$i'..."
-            wrapProgram "$i" \
-                --prefix PYTHONPATH ":" $program_PYTHONPATH \
-                --prefix PATH ":" $program_PATH
+            # dont wrap EGG-INFO scripts since they are called from python
+            if echo "$i" | grep -v EGG-INFO/scripts; then
+                echo "wrapping \`$i'..."
+                wrapProgram "$i" \
+                    --prefix PYTHONPATH ":" $program_PYTHONPATH \
+                    --prefix PATH ":" $program_PATH
+            fi
         fi
     done
 }
diff --git a/pkgs/development/python-modules/irclib/default.nix b/pkgs/development/python-modules/irclib/default.nix
index c840e0a1003..3e0eda34b17 100644
--- a/pkgs/development/python-modules/irclib/default.nix
+++ b/pkgs/development/python-modules/irclib/default.nix
@@ -9,7 +9,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://prdownloads.sourceforge.net/sourceforge/python-irclib/python-irclib-${version}.tar.gz";
+    url = "mirror://sourceforge/python-irclib/python-irclib-${version}.tar.gz";
     sha256 = "1x5456y4rbxmnw4yblhb4as5791glcw394bm36px3x6l05j3mvl1";
   };
   patches = [(fetchurl {
diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index 912642e3ea9..a6efb8bdc2b 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation {
   meta = {
     description = "Python library for games";
     homepage = "http://www.pygame.org/";
-    licences = "LGPLv2.1+";
+    license = "LGPLv2.1+";
   };
 }
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index b5b8f8408aa..ffbe906a900 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "pygobject-3.0.4";
    
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.0/${name}.tar.xz";
+    url = "mirror://gnome/sources/pygobject/3.0/${name}.tar.xz";
     sha256 = "f457b1d7f6b8bfa727593c3696d2b405da66b4a8d34cd7d3362ebda1221f0661";
   };
 
diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix
index 8d6a1368d8b..9393b0a2f94 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "pygobject-2.28.6";
   
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/${name}.tar.xz";
+    url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz";
     sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv";
   };
 
diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
index 940ba18f2a2..e291544911c 100644
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/pkgs/development/python-modules/pygtk/default.nix
@@ -5,7 +5,7 @@ buildPythonPackage rec {
   name = "pygtk-2.22.0";
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.22/${name}.tar.bz2";
+    url = "mirror://gnome/sources/pygtk/2.22/${name}.tar.bz2";
     sha256 = "4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8";
   };
 
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
new file mode 100644
index 00000000000..d45d724ae58
--- /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/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix
index afb258cec70..12ec5a7ef51 100644
--- a/pkgs/development/python-modules/pyside/generatorrunner.nix
+++ b/pkgs/development/python-modules/pyside/generatorrunner.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, cmake, pysideApiextractor, python27Packages, qt4 }:
 
 stdenv.mkDerivation {
-  name = "pyside-generatorrunner-0.6.13-9-g567ca6e";
+  name = "pyside-generatorrunner-0.6.15";
 
   src = fetchgit {
     url = "git://github.com/PySide/Generatorrunner.git";
diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix
index fa958971cf3..6d79cf53a6b 100644
--- a/pkgs/development/python-modules/python-sip/default.nix
+++ b/pkgs/development/python-modules/python-sip/default.nix
@@ -10,14 +10,21 @@ stdenv.mkDerivation rec {
     ];
     sha256 = "1bwdd5xhrx8dx8rr86r043ddlbg7gd1vh0pm2nxw5l1yprwa7paa";
   };
-  
-  configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include";
+
+  configurePhase = stdenv.lib.optionalString stdenv.isDarwin ''
+    # prevent sip from complaining about python not being built as a framework
+    sed -i -e 1564,1565d siputils.py
+  '' + ''
+    python ./configure.py -d $out/lib/${python.libPrefix}/site-packages \
+      -b $out/bin -e $out/include
+  '';
   
   buildInputs = [ python ];
   
-  meta = {
+  meta = with stdenv.lib; {
     description = "Creates C++ bindings for Python modules";
-    license = "GPL";
-    maintainers = with stdenv.lib.maintainers; [ urkud sander ];
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ lovek323 sander urkud ];
+    platforms   = platforms.all;
   };
 }
diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix
new file mode 100644
index 00000000000..7d82ef9adf2
--- /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/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix
index 7b33932492b..92330a378c8 100644
--- a/pkgs/development/python-modules/rhpl/default.nix
+++ b/pkgs/development/python-modules/rhpl/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "rhpl-0.218";
   
   src = fetchurl {
-    url = http://ftp.stw-bonn.de/pub/fedora/linux/releases/10/Everything/source/SRPMS/rhpl-0.218-1.src.rpm;
+    url = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/releases/10/Everything/source/SRPMS//rhpl-0.218-1.src.rpm;
     md5 = "a72c6b66df782ca1d4950959d2aad292";
   };
   
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 92c39afc249..4c719e7dc42 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -2,35 +2,43 @@
 
 stdenv.mkDerivation rec {
   shortName = "setuptools-${version}";
-  name = "python-${shortName}";
+  name = "${python.executable}-${shortName}";
 
-  version = "0.6c11";
+  version = "0.9.8";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz";
-    sha256 = "1lx1hwxkhipyh206bgl90ddnfcnb68bzcvyawczbf833fadyl3v3";
+    sha256 = "037b8x3fdhx8s6xafqndi3yr8x2vr42n1kzs7jxk6j9s9fd65gs2";
   };
 
+  patches = [
+    # https://bitbucket.org/pypa/setuptools/issue/55/1-failure-lc_all-c-python33m-setuppy-test
+    ./distribute-skip-sdist_with_utf8_encoded_filename.patch
+  ];
+
   buildInputs = [ python wrapPython ];
 
-  buildPhase = "python setup.py build --build-base $out";
+  buildPhase = "${python}/bin/${python.executable} setup.py build --build-base $out";
 
   installPhase =
     ''
       dst=$out/lib/${python.libPrefix}/site-packages
       mkdir -p $dst
-      PYTHONPATH=$dst:$PYTHONPATH
-      python setup.py install --prefix=$out
+      PYTHONPATH="$dst:$PYTHONPATH"
+      ${python}/bin/${python.executable} setup.py install --prefix=$out
       wrapPythonPrograms
     '';
 
-  doCheck = false; # doesn't work with Python 2.7
+  doCheck = (!stdenv.isDarwin);
 
-  checkPhase = "python setup.py test";
+  checkPhase = ''
+    ${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/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch b/pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch
new file mode 100644
index 00000000000..96a4f81ee58
--- /dev/null
+++ b/pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch
@@ -0,0 +1,28 @@
+diff -r f5ac515f062a setuptools/tests/test_sdist.py
+--- a/setuptools/tests/test_sdist.py	Fri Jul 26 09:52:26 2013 +0200
++++ b/setuptools/tests/test_sdist.py	Sat Jul 27 20:22:17 2013 +0200
+@@ -3,12 +3,14 @@
+ 
+ 
+ import os
++import locale
+ import shutil
+ import sys
+ import tempfile
+ import unittest
+ import unicodedata
+ 
++from setuptools.tests.py26compat import skipIf
+ from setuptools.compat import StringIO, unicode
+ from setuptools.command.sdist import sdist
+ from setuptools.command.egg_info import manifest_maker
+@@ -318,6 +320,9 @@
+             filename = filename.decode('latin-1')
+             self.assertFalse(filename in cmd.filelist.files)
+ 
++
++    @skipIf(sys.version_info >= (3,) and locale.getpreferredencoding() != 'UTF-8',
++            'Unittest fails if locale is not utf-8 but the manifests is recorded correctly')
+     def test_sdist_with_utf8_encoded_filename(self):
+         # Test for #303.
+         dist = Distribution(SETUP_ATTRS)
diff --git a/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch b/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch
new file mode 100644
index 00000000000..cca4a202104
--- /dev/null
+++ b/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch
@@ -0,0 +1,62 @@
+From abd9f52ade78c737571be69f21dba384be3edf4e Mon Sep 17 00:00:00 2001
+From: Mike Bayer <mike_mp@zzzcomputing.com>
+Date: Sat, 2 Mar 2013 16:24:50 -0500
+Subject: [PATCH] - Fixed an import of "logging" in test_execute which was not
+ working on some linux platforms. [ticket:2669]
+
+---
+ doc/build/changelog/changelog_07.rst | 10 ++++++++++
+ lib/sqlalchemy/__init__.py           |  2 +-
+ test/engine/test_execute.py          |  2 +-
+ 3 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/doc/build/changelog/changelog_07.rst b/doc/build/changelog/changelog_07.rst
+index 416df5a..f07c9ec 100644
+--- a/doc/build/changelog/changelog_07.rst
++++ b/doc/build/changelog/changelog_07.rst
+@@ -3,6 +3,16 @@
+ 0.7 Changelog
+ ==============
+ 
++.. changelog::
++    :version: 0.7.11
++
++    .. change::
++        :tags: bug, tests
++        :tickets: 2669
++        :pullreq: 41
++
++      Fixed an import of "logging" in test_execute which was not
++      working on some linux platforms.
+ 
+ .. changelog::
+     :version: 0.7.10
+diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
+index 9a21a70..6523ccb 100644
+--- a/lib/sqlalchemy/__init__.py
++++ b/lib/sqlalchemy/__init__.py
+@@ -120,7 +120,7 @@
+ __all__ = sorted(name for name, obj in locals().items()
+                  if not (name.startswith('_') or inspect.ismodule(obj)))
+ 
+-__version__ = '0.7.10'
++__version__ = '0.7.11'
+ 
+ del inspect, sys
+ 
+diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
+index 69b94f1..a37f684 100644
+--- a/test/engine/test_execute.py
++++ b/test/engine/test_execute.py
+@@ -9,7 +9,7 @@
+ import sqlalchemy as tsa
+ from test.lib import testing, engines
+ from test.lib.engines import testing_engine
+-import logging
++import logging.handlers
+ from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam
+ from sqlalchemy.engine import base, default
+ from sqlalchemy.engine.base import Connection, Engine
+-- 
+1.8.1.6
+
diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix
index df5d37853f7..57b35ad91ed 100644
--- a/pkgs/development/python-modules/xmpppy/default.nix
+++ b/pkgs/development/python-modules/xmpppy/default.nix
@@ -9,7 +9,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://prdownloads.sourceforge.net/sourceforge/xmpppy/xmpppy-${version}.tar.gz";
+    url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz";
     sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si";
   };
 
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index add0c08e95a..97f238302ec 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, qt48 }:
 
 let
-  baseVersion = "2.7";
-  revision = "1";
+  baseVersion = "2.8";
+  revision = "0";
   version = "${baseVersion}.${revision}";
   qt4_for_qtcreator = qt48.override {
     developerBuild = true;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-${version}-src.tar.gz";
-    sha256 = "04vn7y3dkk9vi1rsmsxby57mvc2h9n5q842hayq2mdlsax4qnhjv";
+    sha256 = "7ac5d9a36c2f561f74d77378d4eae95a78c7752b323e1df924d6e895e99f45d2";
   };
 
   buildInputs = [ qt4_for_qtcreator ];
diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix
index 8f4c118c08e..21064ebe870 100644
--- a/pkgs/development/tools/analysis/lcov/default.nix
+++ b/pkgs/development/tools/analysis/lcov/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     homepage = http://ltp.sourceforge.net/coverage/lcov.php;
     license = "GPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix
index cb804b9e6b0..e8a056bca5a 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/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index e4f04623ebb..4592c1bb53f 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (rec {
 
     license = "GPLv2+";
 
-    maintainers = with stdenv.lib.maintainers; [ eelco ludo ];
+    maintainers = with stdenv.lib.maintainers; [ eelco ];
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/tools/build-managers/apache-ant/from-source.nix b/pkgs/development/tools/build-managers/apache-ant/from-source.nix
index ef6763a0fa2..01fdd5541ec 100644
--- a/pkgs/development/tools/build-managers/apache-ant/from-source.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/from-source.nix
@@ -84,7 +84,7 @@ EOF
 
     license = "APLv2";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index 8058c8dbd96..c872d67146b 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -80,7 +80,7 @@ buildPythonPackage (rec {
          in code.
       '';
 
-    maintainers = with maintainers; [ ludo bjornfor ];
+    maintainers = with maintainers; [ bjornfor ];
     platforms = platforms.all;
   };
 })
diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix
new file mode 100644
index 00000000000..9d62b4e187b
--- /dev/null
+++ b/pkgs/development/tools/build-managers/colormake/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchgit, perl}:
+
+stdenv.mkDerivation rec {
+  name = "colormake-${version}";
+  version = "2.1.0";
+
+  buildInputs = [perl];
+
+  src = fetchgit {
+    url = https://github.com/pagekite/Colormake.git;
+    rev = "66544f40d";
+    sha256 = "8e714c5540305d169989d9387dbac47b8b9fb2cfb424af7bcd412bfe684dc6d7";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -fa colormake.pl colormake colormake-short clmake clmake-short $out/bin
+  '';
+
+  meta = {
+    description = "A simple wrapper around make to colorize the output.";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh
index c4b7002a718..f5489a4a76f 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 bf1a275046e..4ca362ede0a 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 00000000000..68eacf8d2ea
--- /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 4676850fd93..dee25727384 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 05dcb2aa119..29585256216 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/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index 99b4ff3d1bc..c6640873a52 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -4,13 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.8.46";
-  sha256 = "0mq25xv0lmxfp9099pj7akmmw5pi0adq2w286wb4lpli82v8nfzf";
+  version = "1.8.50";
+  sha256 = "02gbqlyi1c82jjzy9ipmrvxcyizvs86af7z35x9wz3imlnzx1l6c";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     cpphs filepath haskellSrcExts hscolour transformers uniplate
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://community.haskell.org/~ndm/hlint/";
     description = "Source code suggestions";
diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix
index f9d09abcc3f..7e8b3ea11ff 100644
--- a/pkgs/development/tools/haskell/keter/default.nix
+++ b/pkgs/development/tools/haskell/keter/default.nix
@@ -1,23 +1,23 @@
 { cabal, attoparsec, blazeBuilder, caseInsensitive, conduit
-, dataDefault, filepath, hinotify, httpConduit, httpReverseProxy
+, dataDefault, filepath, fsnotify, httpConduit, httpReverseProxy
 , httpTypes, mtl, network, networkConduit, networkConduitTls
 , random, regexTdfa, systemFileio, systemFilepath, tar, text, time
 , transformers, unixCompat, unixProcessConduit, wai, waiAppStatic
-, yaml, zlib
+, warp, warpTls, yaml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "keter";
-  version = "0.3.6.1";
-  sha256 = "0jww64q74kx5h69mnv9wgc4kx0nlb06r7lf651gjkai8mf9dkqf2";
+  version = "0.4.0";
+  sha256 = "0ny8z2rfn090vci262xvyrdbkmdb7qjb4x15r81l2691ibf09ppv";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     attoparsec blazeBuilder caseInsensitive conduit dataDefault
-    filepath hinotify httpConduit httpReverseProxy httpTypes mtl
+    filepath fsnotify httpConduit httpReverseProxy httpTypes mtl
     network networkConduit networkConduitTls random regexTdfa
     systemFileio systemFilepath tar text time transformers unixCompat
-    unixProcessConduit wai waiAppStatic yaml zlib
+    unixProcessConduit wai waiAppStatic warp warpTls yaml zlib
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix
index 4bd47b8decd..f1b15a731d5 100644
--- a/pkgs/development/tools/haskell/splot/default.nix
+++ b/pkgs/development/tools/haskell/splot/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "splot";
-  version = "0.3.8";
-  sha256 = "188v9c070wn6gr47k5q55gsiph0lj96d96bss76gz7znknfj9rm3";
+  version = "0.3.9";
+  sha256 = "039k6lgwdvpyc8w74zh98wxi1wj2jmin69jnwp7gnmv43kjpbgh5";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix
index bd69e8aeb5b..cfcd8564b4c 100644
--- a/pkgs/development/tools/java/fastjar/default.nix
+++ b/pkgs/development/tools/java/fastjar/default.nix
@@ -26,6 +26,6 @@ let version = "0.94"; in
 
       license = "GPLv2+";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
     };
   }
diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix
new file mode 100644
index 00000000000..bc3785181a8
--- /dev/null
+++ b/pkgs/development/tools/misc/avarice/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, perl, libusb }:
+
+stdenv.mkDerivation rec {
+
+  name="avarice-2.13";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/avarice/${name}.tar.bz2";
+    sha256 = "0jhh1h1k5b41v2ycq8kn43nkrkh0b9l7xjmw38rak871g3z3hix1";
+  };
+
+  buildInputs = [ pkgconfig perl libusb ];
+
+  meta = {
+    license = stdenv.lib.licenses.gpl2;
+    description = "AVaRICE translates between GDB's remote debug protocol and the AVR JTAG ICE protocol";
+    homepage = http://sourceforge.net/projects/avarice/files/avarice/;
+    maintainers = [ stdenv.lib.maintainers.smironov ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
+
diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix
index 7a294e72078..7574500dbbb 100644
--- a/pkgs/development/tools/misc/avrdude/default.nix
+++ b/pkgs/development/tools/misc/avrdude/default.nix
@@ -1,4 +1,4 @@
-{ composableDerivation, fetchurl, yacc, flex, texLive }:
+{ composableDerivation, fetchurl, yacc, flex, texLive, libusb }:
 
 let edf = composableDerivation.edf; in
 
@@ -6,13 +6,13 @@ composableDerivation.composableDerivation {} rec {
   name="avrdude-5.10";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/avrdude/${name}.tar.gz";
+    url = "mirror://savannah/avrdude/${name}.tar.gz";
     sha256 = "0pmy73777x8p7f2aj2w2q1dnk1bvhd1cm7hcs1s9hsdqsmiinl41";
   };
 
   configureFlags = [ "--disable-dependency-tracking" ];
 
-  buildInputs = [ yacc flex ];
+  buildInputs = [ yacc flex libusb ];
 
   flags =
        edf { name = "doc"; enable = { buildInputs = texLive; configureFlags = ["--enable-doc"]; }; }
diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix
new file mode 100644
index 00000000000..d19bb24eb37
--- /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 00000000000..63c585b00a9
--- /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 00000000000..1ff5daca02c
--- /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/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index d31e2ec5f3b..122c256657f 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -56,7 +56,7 @@ in stdenv.mkDerivation {
     homepage = http://coccinelle.lip6.fr/;
     license = "GPLv2";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
index 2e419f67eb0..e5c9df96aab 100644
--- a/pkgs/development/tools/misc/cpphs/default.nix
+++ b/pkgs/development/tools/misc/cpphs/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cpphs";
-  version = "1.16";
-  sha256 = "1fv91s3h2s76h1hadb3mmnkg0rrfakmbfsrw6q522kshvpk2wmmp";
+  version = "1.17.1";
+  sha256 = "1xk1gk3skgiy6bc8rdhm7i3f6b5nqsm9nz6qswbxq94nxmw3pg9p";
   isLibrary = true;
   isExecutable = true;
   meta = {
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 45bd988a471..4dd83f63c7d 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -79,6 +79,6 @@ stdenv.mkDerivation rec {
     license = "GPLv3+";
 
     platforms = with platforms; linux ++ cygwin;
-    maintainers = with maintainers; [ ludo pierron ];
+    maintainers = with maintainers; [ pierron ];
   };
 }
diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix
index ff4eec81d96..dc7a467fb0c 100644
--- a/pkgs/development/tools/misc/gengetopt/default.nix
+++ b/pkgs/development/tools/misc/gengetopt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix
index 00ff11c3c88..0c82c2cd275 100644
--- a/pkgs/development/tools/misc/indent/default.nix
+++ b/pkgs/development/tools/misc/indent/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "indent-2.2.10";
 
   src = fetchurl {
-    url = "ftp://ftp.gnu.org/gnu/indent/${name}.tar.gz";
+    url = "mirror://gnu/indent/${name}.tar.gz";
     sha256 = "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa";
   };
 
diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
new file mode 100644
index 00000000000..9bc24b9387b
--- /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 00000000000..7d9edbda97a
--- /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 00000000000..d234a7b74f8
--- /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 00000000000..df9f81d02e6
--- /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/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index da44a7d73a5..7681c8153db 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -3,7 +3,7 @@ let
   s = # Generated upstream information
   rec {
     baseName="luarocks";
-    version="2.0.13";
+    version="2.0.13-rc1";
     name="${baseName}-${version}";
     hash="1cpdi61dwcc2i4bwrn7bb8fibkd1s75jrr0bjcbs8p76rn6hkb2y";
     url="http://luarocks.org/releases/luarocks-2.0.13-rc1.tar.gz";
diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index c87bd9d5535..e0da284887c 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.7.0";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/openocd/openocd/${version}/openocd-${version}.tar.bz2";
+    url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2";
     sha256 = "0qwfyd821sy5p0agz0ybgn5nd7vplipw4mhm485ldj1hcmw7n8sj";
   };
 
diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix
index e7adb30d316..9dc50abf3f7 100644
--- a/pkgs/development/tools/misc/sloccount/default.nix
+++ b/pkgs/development/tools/misc/sloccount/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.dwheeler.com/sloccount/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix
new file mode 100644
index 00000000000..25140093f51
--- /dev/null
+++ b/pkgs/development/tools/misc/srecord/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, boost, libtool, groff, ghostscript }:
+
+stdenv.mkDerivation rec {
+  name = "srecord-1.62";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/srecord/${name}.tar.gz";
+    sha256 = "0bfbmhsm9mbwiik3yrhm95q8bgx1k4mh2ai412k8zjyi8f5f3904";
+  };
+
+  buildInputs = [ boost libtool groff ghostscript ];
+
+  meta = with stdenv.lib; {
+    description = "Collection of powerful tools for manipulating EPROM load files";
+    homepage = http://srecord.sourceforge.net/;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.bjornfor ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix
new file mode 100644
index 00000000000..496288285c7
--- /dev/null
+++ b/pkgs/development/tools/misc/stm32flash/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation {
+  name = "stm32flash-1.0";
+
+  src = fetchurl {
+    url = https://stm32flash.googlecode.com/files/stm32flash.tar.gz;
+    sha256 = "04k631g9lzvp9xr4sw51xpq1g542np61s1l8fpwx9rbsc8m5l0i6";
+  };
+
+  buildInputs = [];
+
+  installPhase = ''
+    # Manually copy, make install copies to /usr/local/bin
+    mkdir -pv $out/bin/
+    cp stm32flash $out/bin/
+  '';
+
+  meta = { 
+    description = "Open source flash program for the STM32 ARM processors using the ST bootloader.";
+    homepage = https://code.google.com/p/stm32flash/;
+    license = "GPLv2";
+    platforms = stdenv.lib.platforms.all; # Should work on all platforms
+    maintainers = [ stdenv.lib.maintainers.the-kenny ];
+  };
+}
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index d5bb2b06e12..bdf3a7d0561 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/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix
index bd67941de6d..f56598e2f0f 100644
--- a/pkgs/development/tools/misc/swig/2.x.nix
+++ b/pkgs/development/tools/misc/swig/2.x.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     # Licensing is a mess: http://www.swig.org/Release/LICENSE .
     license = "BSD-style";
 
-    maintainers = with stdenv.lib.maintainers; [ ludo urkud ];
+    maintainers = with stdenv.lib.maintainers; [ urkud ];
   };
 }
diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix
index d711e7a44d9..1f37fd87f8a 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/pkgs/development/tools/misc/swig/default.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     # Licensing is a mess: http://www.swig.org/Release/LICENSE .
     license = "BSD-style";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix
index 2089142284f..7fa604e4af6 100644
--- a/pkgs/development/tools/misc/texi2html/default.nix
+++ b/pkgs/development/tools/misc/texi2html/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "texi2html-1.82";
 
   src = fetchurl {
-    url = "http://www.very-clever.com/download/nongnu/texi2html/${name}.tar.bz2";
+    url = "mirror://savannah/texi2html/${name}.tar.bz2";
     sha256 = "1wdli2szkgm3l0vx8rf6lylw0b0m47dlz9iy004n928nqkzix76n";
   };
 
diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix
index ac1bc2f1abc..36047210a92 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 94%
rename from pkgs/development/tools/parsing/bison/default.nix
rename to pkgs/development/tools/parsing/bison/2.x.nix
index b397a22443a..77ba164f07a 100644
--- a/pkgs/development/tools/parsing/bison/default.nix
+++ b/pkgs/development/tools/parsing/bison/2.x.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
       to use Bison.
     '';
 
-    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.simons ];
     platforms = stdenv.lib.platforms.unix;
   };
 
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 00000000000..d076d8ba4db
--- /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.simons ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+
+  passthru = { glrSupport = true; };
+}
diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix
index 5d9433cc5ca..e17038692f5 100644
--- a/pkgs/development/tools/phantomjs/default.nix
+++ b/pkgs/development/tools/phantomjs/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, upx, freetype, fontconfig }:
+{ stdenv, fetchurl, freetype, fontconfig }:
 
 assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" ];
 
 stdenv.mkDerivation rec {
-  name = "phantomjs-1.7.0";
+  name = "phantomjs-1.9.1";
 
   # I chose to use the binary build for now.
   # The source version is quite nasty to compile
@@ -13,19 +13,15 @@ stdenv.mkDerivation rec {
   src = if stdenv.system == "i686-linux" then
           fetchurl {
             url = "http://phantomjs.googlecode.com/files/${name}-linux-i686.tar.bz2";
-            sha256 = "045d80lymjxnsssa0sgp5pgkahm651jk69ibk3mjczk3ykc1k91f";
+            sha256 = "1r4ssx6v0ah18jy3vjswhki2i21r45qbs1jzh4x672wdc9lxz2p6";
           }
         else # x86_64-linux
           fetchurl {
             url = "http://phantomjs.googlecode.com/files/${name}-linux-x86_64.tar.bz2";
-            sha256 = "1m14czhi3b388didn0a881glsx8bnsg9gnxgj5lghr4l5mgqyrd7";
+            sha256 = "1l7hlhspzw3zzsgz9cq0a3j26giynjicvb6y96fj3ipkn4shznnn";
           };
 
-  nativeBuildInputs = stdenv.lib.optional (stdenv.system == "x86_64-linux") upx;
-
-  buildPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
-    upx -d bin/phantomjs
-  '' + ''
+  buildPhase = ''
     patchelf \
       --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
       --set-rpath ${freetype}/lib:${fontconfig}/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib \
diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix
index af83765c7a2..c0056697743 100644
--- a/pkgs/development/tools/profiling/oprofile/default.nix
+++ b/pkgs/development/tools/profiling/oprofile/default.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
     homepage = http://oprofile.sourceforge.net/;
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix
index c611764cc01..293ff66f29d 100644
--- a/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/pkgs/development/tools/profiling/systemtap/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index d260b290016..975ec896fe2 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -1,6 +1,6 @@
 { stdenv, runCommand, nodejs, neededNatives}:
 
-args @ { name, src, deps ? [], flags ? [], ... }:
+args @ { name, src, deps ? [], peerDependencies ? [], flags ? [], ... }:
 
 with stdenv.lib;
 
@@ -11,8 +11,6 @@ let
     tar xf ${nodejs.src}
     mv *node* $out
   '';
-
-  requireName = (builtins.parseDrvName name).name;
 in
 stdenv.mkDerivation ({
   unpackPhase = "true";
@@ -20,40 +18,65 @@ stdenv.mkDerivation ({
   configurePhase = ''
     runHook preConfigure
     mkdir node_modules
-    ${stdenv.lib.concatStrings (map (dep: ''
-      ln -sv ${dep}/node_modules/${(builtins.parseDrvName dep.name).name} node_modules/
-    '') deps)}
+    ${concatStrings (concatMap (dep: map (name: ''
+      ln -sv ${dep}/lib/node_modules/${name} node_modules/
+    '') dep.names) deps)}
+    ${concatStrings (concatMap (dep: map (name: ''
+      ln -sv ${dep}/lib/node_modules/${name} node_modules/
+    '') dep.names) peerDependencies)}
     export HOME=$(pwd)
     runHook postConfigure
   '';
 
   buildPhase = ''
     runHook preBuild
-    npm --registry http://www.example.com --nodedir=${sources} install ${src} ${npmFlags}
+    npm --registry http://www.example.com --nodedir=${sources} install ${concatStringsSep " " src} ${npmFlags}
     runHook postBuild
   '';
 
   installPhase = ''
     runHook preInstall
-    mkdir -p $out/node_modules
-    mv node_modules/${requireName} $out/node_modules
-    mv node_modules/.bin $out/node_modules 2>/dev/null || true
-    mv node_modules $out/node_modules/${requireName}
-    if [ -d "$out/node_modules/.bin" ]; then
-      ln -sv node_modules/.bin $out/bin
-      find -L $out/node_modules/.bin/* -type f -print0 | \
-        xargs -0 sed --follow-symlinks -i 's@#!/usr/bin/env node@#!${nodejs}/bin/node@'
+    mkdir -p $out/lib/node_modules
+    ${concatStrings (map (name: ''
+      mv node_modules/${name} $out/lib/node_modules
+      rm -fR $out/lib/node_modules/${name}/node_modules
+      ln -sv $out/.dependent-node-modules $out/lib/node_modules/${name}/node_modules
+      if [ -e "$out/lib/node_modules/${name}/man" ]; then
+        mkdir -p $out/share
+        for dir in "$out/lib/node_modules/${name}/man/"*; do
+          mkdir -p $out/share/man/$(basename "$dir")
+          for page in "$dir"/*; do
+            ln -sv $page $out/share/man/$(basename "$dir")
+          done
+        done
+      fi
+    '') args.passthru.names)}
+    ${concatStrings (concatMap (dep: map (name: ''
+      mv node_modules/${dep.name} $out/lib/node_modules
+    '') dep.names) peerDependencies)}
+    mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true
+    mv node_modules $out/.dependent-node-modules
+    if [ -d "$out/lib/node_modules/.bin" ]; then
+      ln -sv $out/lib/node_modules/.bin $out/bin
+      node=`type -p node`
+      coffee=`type -p coffee || true`
+      find -L $out/lib/node_modules/.bin/* -type f -print0 | \
+        xargs -0 sed --follow-symlinks -i \
+          -e 's@#!/usr/bin/env node@#!'"$node"'@' \
+          -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \
+          -e 's@#!/.*/node@#!'"$node"'@' \
+          -e 's@#!/.*/coffee@#!'"$coffee"'@'
     fi
     runHook postInstall
   '';
 
-  preFixup = ''
+  preFixup = concatStringsSep "\n" (map (src: ''
     find $out -type f -print0 | xargs -0 sed -i 's|${src}|${src.name}|g'
-  '';
+  '') src);
 } // args // {
   # Run the node setup hook when this package is a build input
   propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ];
 
   # Make buildNodePackage useful with --run-env
-  nativeBuildInputs = (args.nativeBuildInputs or []) ++ deps ++ neededNatives;
+  nativeBuildInputs = (args.nativeBuildInputs or []) ++ deps ++ peerDependencies ++ neededNatives;
 } )
diff --git a/pkgs/development/web/nodejs/setup-hook.sh b/pkgs/development/web/nodejs/setup-hook.sh
index c2888471044..41a9746ba42 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.6.nix b/pkgs/development/web/plone/4.1.6.nix
deleted file mode 100644
index 47bd00b80cb..00000000000
--- a/pkgs/development/web/plone/4.1.6.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.5.nix b/pkgs/development/web/plone/4.2.5.nix
deleted file mode 100644
index 6006e5908b2..00000000000
--- a/pkgs/development/web/plone/4.2.5.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.0.nix b/pkgs/development/web/plone/4.3.0.nix
deleted file mode 100644
index 6dd85a17994..00000000000
--- a/pkgs/development/web/plone/4.3.0.nix
+++ /dev/null
@@ -1,5417 +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.3.0.json -p plone/4.3.0.txt -o plone/4.3.0.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.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.3.zip";
-      md5 = "2222bde82199670b40a6d1a242ce100a";
-    };
-    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-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";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.zip";
-      md5 = "932a31c6d6c7328dca87ed2fcf25f5a8";
-    };
-    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
-      ];
-    };
-  };
-
-  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";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.zip";
-      md5 = "be281b5b740f8e35c73ba15adcd0f98d";
-    };
-    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 = [  ];
-    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
-      ];
-    };
-  };
-
-  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
-      ];
-    };
-  };
-
-  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.9";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.9.zip";
-      md5 = "5ce62a45272c5501bf7d99325d2352c6";
-    };
-    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.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
-      ];
-    };
-  };
-
-  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.0b1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0b1.zip";
-      md5 = "813a7d2d89fedf4f8e90e0c8da949c48";
-    };
-    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.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.3.zip";
-      md5 = "396677c3fba762077360ed97b14071e6";
-    };
-    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.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
-      ];
-    };
-  };
-
-  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.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.1.zip";
-      md5 = "8f78a3e79dce692a568c5fbc58ba742a";
-    };
-    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.13";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.13.zip";
-      md5 = "c87de8564cea91eb21c620669ef1a660";
-    };
-    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.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.1.4.zip";
-      md5 = "00a139248309043e7b539dee5462e105";
-    };
-    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.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.1.2.zip";
-      md5 = "3404947376be89f18e54bbfb5c0d3595";
-    };
-    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
-      ];
-    };
-  };
-
-  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.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
-      ];
-    };
-  };
-
-  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.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
-      ];
-    };
-  };
-
-  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.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.1.zip";
-      md5 = "e2008dae3dad458dd7bf3be10e95160b";
-    };
-    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.8.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.8.7.zip";
-      md5 = "b8a6b04a2f01251e0da1681199511537";
-    };
-    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.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.1.zip";
-      md5 = "05f3e5f79237ef9c318730a7c9b367be";
-    };
-    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.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.7.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.2.zip";
-      md5 = "aa8d1d45f8072ccfbfe0a608cd7144b6";
-    };
-    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.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.5.zip";
-      md5 = "a6c3a6e5590943f6ac63a49f8e075cdb";
-    };
-    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";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Plone/Plone-4.3.zip";
-      md5 = "be27f5d87cf44338be6f209459b13b70";
-    };
-    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.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.2.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.1.zip";
-      md5 = "b60d1553b297d41d9e2181afe15da4f4";
-    };
-    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.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.2.2.zip";
-      md5 = "d4659a2c4cfb3a66cd6c7ff1ca17be7f";
-    };
-    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.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
-      ];
-    };
-  };
-
-  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-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.3.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.1.zip";
-      md5 = "ebbfe71e31e40df535c8c1a2bc6133e6";
-    };
-    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.0b4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0b4.zip";
-      md5 = "6e419868c2ea94a322dd631a1b0b753c";
-    };
-    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.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.1.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.1.zip";
-      md5 = "96d9967254ea616783ca8b340a542d46";
-    };
-    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.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-3.0.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.1.zip";
-      md5 = "08138cb6e3f15a2a9d43990f55fdae5f";
-    };
-    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.16";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PloneTestCase/Products.PloneTestCase-0.9.16.zip";
-      md5 = "968a265bede995f485988158e4e6dd7f";
-    };
-    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
-      ];
-    };
-  };
-
-  plone_formwidget_namedfile = buildPythonPackage rec {
-    name = "plone.formwidget.namedfile-1.0.5";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.5.zip";
-      md5 = "7d39a5760d679c89d8e41abbc295240f";
-    };
-    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.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.4.zip";
-      md5 = "0358cdcfcaaafd6ff407a49752c8066b";
-    };
-    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.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.3.zip";
-      md5 = "3a88b1d1cbd34b860fbe6b3de979e2ea";
-    };
-    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.0a3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.0a3.zip";
-      md5 = "557032834c90b71cf55b1068ee41472b";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_site zope_pagetemplate zope_interface zope_browserresource six zope_security zope_configuration zope_component 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.7";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.7.zip";
-      md5 = "3187fc0a9082847d773eeec9bce6d217";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ collective_z3cform_datetimewidget zope_interface zope_component plone_dexterity plone_autoform plone_behavior lxml zope_publisher products_genericsetup plone_supermodel plone_namedfile plone_app_content plone_app_textfield plone_app_z3cform plone_rfc822 plone_formwidget_namedfile z3c_form 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.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.4.zip";
-      md5 = "817819f27ad46fcb8a9d66e988fa08f2";
-    };
-    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.2";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.2.zip";
-      md5 = "8da95b396f3a9ec54895085ef12202a7";
-    };
-    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.9";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.9.zip";
-      md5 = "bde68dc585ca0a4715ab55d4b4afcf9a";
-    };
-    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.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.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.3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.zip";
-      md5 = "25be0a93702c242ed5985cebde34f872";
-    };
-    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.4";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.4.zip";
-      md5 = "d01b8c188498080a52275de2a50b25eb";
-    };
-    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.2a1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.2a1.zip";
-      md5 = "b63b6443b4bbc5562bddcb43600349f7";
-    };
-    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.1";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.1.zip";
-      md5 = "9739c2fe25977d7e050a85eaed9e776a";
-    };
-    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.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 plone43Packages
diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix
new file mode 100644
index 00000000000..9df7e3126d5
--- /dev/null
+++ b/pkgs/development/web/twitter-bootstrap/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, lessc, closurecompiler }:
+
+stdenv.mkDerivation rec {
+  name = "twitter-bootstrap-${version}";
+  version = "2.3.2";
+
+  src = fetchgit {
+    url = https://github.com/twitter/bootstrap.git;
+    rev = "refs/tags/v${version}";
+    sha256 = "093z4yxqhrr30vna67ksxz3bq146q2xr05hinh78pg2ls88k77la";
+  };  
+
+  buildInputs = [ lessc closurecompiler ];
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/css $out/js $out/img
+    cp $src/img/* $out/img/
+    closure-compiler --js $src/js/*.js > $out/js/bootstrap.js
+    lessc $src/less/bootstrap.less -O2 -x > $out/css/bootstrap.css
+  ''; 
+
+  meta = {
+    description = "Front-end framework for faster and easier web development";
+    homepage = http://getbootstrap.com/;
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix
index f0d93180a62..c923f089405 100644
--- a/pkgs/games/ball-and-paddle/default.nix
+++ b/pkgs/games/ball-and-paddle/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/ballandpaddle/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
 
     # The fancy libs aren't available on {Cyg,Dar}win.
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
index 5c10154998d..7e4f6b00587 100644
--- a/pkgs/games/blobby/default.nix
+++ b/pkgs/games/blobby/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boost, zip, zlib}:
 stdenv.mkDerivation rec {
-  version = "2.0-rc3";
+  version = "1.0-rc3";
   name = "blobby-volley-${version}";
 
   src = fetchurl {
diff --git a/pkgs/games/castle-combat/default.nix b/pkgs/games/castle-combat/default.nix
index 6e1af276c1f..a9ed0592385 100644
--- a/pkgs/games/castle-combat/default.nix
+++ b/pkgs/games/castle-combat/default.nix
@@ -64,6 +64,6 @@ export LD_LIBRARY_PATH=\"$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64\:"'${do
 
     license = "unknown";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index b8a215e3b49..4f1b126ac47 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, SDL, SDL_mixer, libvorbis, mesa, gtk, pkgconfig, nasm, libvpx, flac, makeDesktopItem}:
 
 stdenv.mkDerivation rec {
-  name = "eduke32-3542";
+  name = "eduke32-20130303-3542";
   
   src = fetchurl {
     url = http://dukeworld.duke4.net/eduke32/synthesis/20130303-3542/eduke32_src_20130303-3542.tar.bz2;
diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix
index db24a6d1ebf..898334a1d4a 100644
--- a/pkgs/games/extremetuxracer/default.nix
+++ b/pkgs/games/extremetuxracer/default.nix
@@ -12,7 +12,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-${version}.tar.gz";
+    url = "mirror://sourceforge/extremetuxracer/extremetuxracer-${version}.tar.gz";
     sha256 = "04d99fsfna5mc9apjxsiyw0zgnswy33kwmm1s9d03ihw6rba2zxs";
   };
 
diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix
index 2b60abd0092..f1ffec85566 100644
--- a/pkgs/games/globulation/default.nix
+++ b/pkgs/games/globulation/default.nix
@@ -15,7 +15,7 @@ let
     version="0.9.4";
     patchlevel="4";
     name="${baseName}-${version}.${patchlevel}";
-    url="http://dl.sv.nongnu.org/releases/glob2/${version}/${name}.tar.gz";
+    url="mirror://savannah/glob2/${version}/${name}.tar.gz";
     hash="1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g";
   };
 in
diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix
index ae7938c02b8..8a4bfe5f6ec 100644
--- a/pkgs/games/gnuchess/default.nix
+++ b/pkgs/games/gnuchess/default.nix
@@ -6,7 +6,7 @@ let
     version="6.0.3";
     name="${baseName}-${version}";
     hash="01ff8qd8pk39c6pv24wbcqkx78kvay8rxvgxqq9cqp9gqv39jfkw";
-    url="http://ftp.gnu.org/gnu/chess/gnuchess-6.0.3.tar.gz";
+    url="mirror://gnu/chess/gnuchess-6.0.3.tar.gz";
     sha256="01ff8qd8pk39c6pv24wbcqkx78kvay8rxvgxqq9cqp9gqv39jfkw";
   };
   buildInputs = [
diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix
index d0793a8d13d..3dded927ba1 100644
--- a/pkgs/games/gtypist/default.nix
+++ b/pkgs/games/gtypist/default.nix
@@ -1,19 +1,16 @@
 {stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation {
-  name = "gtypist-2.9.1";
+  name = "gtypist-2.9.3";
 
   src = fetchurl {
-    url = "ftp://ftp.gnu.org/gnu/gtypist/gtypist-2.9.1.tar.xz";
-    sha256 = "1yv209aih1ixbs477vzzk1xj013g6w32vi33g0hldfzvfxbl9y5s";
+    url = "mirror://gnu/gtypist/gtypist-2.9.3.tar.xz";
+    sha256 = "0srwa841caci69hzqb47xfbxxf7fvz3640qka083p72vm8z9hsxw";
   };
 
   buildInputs = [ncurses];
 
-  patches = [ (fetchurl {
-    url = "http://projects.archlinux.org/svntogit/community.git/plain/trunk/ncurses.patch?h=packages/gtypist";
-    sha256 = "14crgh21gghszwijxjvixpijqzsgn62wx6kz28zkjskdw0p5vij1";
-  })];
+  patchPhase = "sed -e 's#ncursesw/##' -i configure src/*";
 
   meta = {
     homepage = http://www.gnu.org/software/gtypist;
diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
index 0d46e187d7b..6ab6b8d79d7 100644
--- a/pkgs/games/instead/default.nix
+++ b/pkgs/games/instead/default.nix
@@ -1,18 +1,14 @@
 { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }:
 
 let
-  version = "1.2.2";
+  version = "1.9.1";
 
-  # I took two games at random from http://instead.syscall.ru/games/
+  # I took several games at random from http://instead.syscall.ru/games/
   games = [
     (fetchurl {
       url = http://instead-games.googlecode.com/files/instead-apple-day-1.2.zip;
       sha256 = "0d4m554hiqmgl4xl0jp0b3bqjl35879768hqznh9y57y04sygd2a";
     })
-    (fetchurl {
-      url = http://instead-games.googlecode.com/files/instead-cat-1.3.zip;
-      sha256 = "0vmsn7jg2vy5kqqbzad289vk4j3piarj1xpwyz72wgyc3k7djg4v";
-    })
     (fetchurl {
       url = http://instead-games.googlecode.com/files/instead-cat_en-1.2.zip;
       sha256 = "0jlm3ssqlka16dm0rg6qfjh6xdh3pv7lj2s4ib4mqwj2vfy0v6sg";
@@ -22,8 +18,12 @@ let
       sha256 = "15qdbg82zp3a8vz4qxminr0xbzbdpnsciliy2wm3raz4hnadawg1";
     })
     (fetchurl {
-      url = http://instead-games.googlecode.com/files/instead-toilet-1.1.zip;
-      sha256 = "17mlkr93y77pxhimq0v9f0w78fz8alkxwjwsr8z67p458iw6s1wr";
+      url = http://instead-games.googlecode.com/files/instead-toilet3in1-1.2.zip;
+      sha256 = "0wz4bljbg67m84qwpaqpzs934a5pcbhpgh39fvbbbfvnnlm4lirl";
+    })
+    (fetchurl {
+      url = http://instead-games.googlecode.com/files/instead-kayleth-0.4.1.zip;
+      sha256 = "0xmn9inys0kbcdd02qaqp8gazqs67xq3fq7hvcy2qb9jbq85j8b2";
     })
   ];
 in
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
   name = "instead-" + version;
 
   src = fetchurl {
-    url = "http://instead.googlecode.com/files/instead_${version}.tar.gz";
-    sha256 = "178xxqvjl5v1bhjrlf8cqpkw85j25fldf0wn6bgyzicr6fspxb25";
+    url = "http://downloads.sourceforge.net/project/instead/instead/${version}/instead_${version}.tar.gz";
+    sha256 = "f5577c5118b5f4a2897c7bb26f3ad7993005dbf0ae8fe762b4434e1151ddb430";
   };
 
   NIX_LDFLAGS = "-llua -lgcc_s";
@@ -41,16 +41,15 @@ stdenv.mkDerivation rec {
   buildInputs = [ SDL SDL_ttf SDL_image SDL_mixer pkgconfig lua zlib unzip ];
 
   configurePhase = ''
-    sed -i -e "s,DATAPATH=.,DATAPATH=$out/share/${name}/," Rules.make
+    { echo 2; echo $out; } | ./configure.sh
   '';
 
   inherit games;
 
   installPhase = ''
-    mkdir -p $out/bin $out/share/${name}
-    cp sdl-instead $out/bin
-    cp -R games languages stead themes $out/share/${name}
-    pushd $out/share/${name}/games
+    make install
+
+    pushd $out/share/instead/games
     for a in $games; do
       unzip $a
     done
diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index 085c990f1a0..292aa2ff190 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -14,7 +14,7 @@ rec {
   name = "liquidwar6-0.0.13beta";
 
   src = a.fetchurl {
-    url = "http://ftp.gnu.org/gnu/liquidwar6/${name}.tar.gz";
+    url = "mirror://gnu/liquidwar6/${name}.tar.gz";
     sha256 = "1jjf7wzb8jf02hl3473vz1q74fhmxn0szbishgi1f1j6a7234wx2";
   };
 
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 3b06cd8694c..6c860d42925 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, irrlicht3843, libpng12, bzip2,
+{ stdenv, fetchgit, cmake, irrlicht3843, libpng, bzip2,
   libjpeg, libXxf86vm, mesa, openal, libvorbis, x11 }:
 
 let
@@ -15,23 +15,23 @@ let
   };
 in stdenv.mkDerivation {
   name = "minetest-${version}";
-  
+
   src = sources.src;
-  
+
   cmakeFlags = [
     "-DIRRLICHT_INCLUDE_DIR=${irrlicht3843}/include/irrlicht"
   ];
-  
+
   buildInputs = [
-    cmake irrlicht3843 libpng12 bzip2 libjpeg
+    cmake irrlicht3843 libpng bzip2 libjpeg
     libXxf86vm mesa openal libvorbis x11
   ];
-  
+
   postInstall = ''
     mkdir -pv $out/share/minetest/games/minetest_game/
     cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/
   '';
-  
+
   meta = {
     homepage = "http://minetest.net/";
     description = "Minetest is an infinite-world block sandbox game.";
diff --git a/pkgs/games/pong3d/default.nix b/pkgs/games/pong3d/default.nix
index 24baff5394a..d5f9ca6ee23 100644
--- a/pkgs/games/pong3d/default.nix
+++ b/pkgs/games/pong3d/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, libX11}:
 
 stdenv.mkDerivation {
-  name = "3dpong-0.5.0";
+  name = "3dpong-0.5";
   src = fetchurl {
     url = ftp://ftp.tuxpaint.org/unix/x/3dpong/src/3dpong-0.5.tar.gz;
     sha256 = "1ibb79sbzlbn4ra3n0qk22gqr6fg7q0jy6cm0wg2qj4z64c7hmdi";
diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
new file mode 100644
index 00000000000..1e8c0db9045
--- /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 4aab9aed42c..c52cc5ed879 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 1f82c75f9cf..07055c41558 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/games/xboard/default.nix b/pkgs/games/xboard/default.nix
index 21870fc3777..7e73bfad540 100644
--- a/pkgs/games/xboard/default.nix
+++ b/pkgs/games/xboard/default.nix
@@ -8,7 +8,7 @@ let
     version="4.7.1";
     name="${baseName}-${version}";
     hash="0hnav2swswaf0463c4wnmgwaif3g42f2a1mqyqc5fa1py32iy6ry";
-    url="http://ftp.gnu.org/gnu/xboard/xboard-4.7.1.tar.gz";
+    url="mirror://gnu/xboard/xboard-4.7.1.tar.gz";
     sha256="0hnav2swswaf0463c4wnmgwaif3g42f2a1mqyqc5fa1py32iy6ry";
   };
   buildInputs = [
diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index 0669bc3f5c3..b88945b9eec 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";
@@ -76,11 +82,7 @@
     url = http://www.eclipse.org/legal/epl-v10.html;
   };
 
-  gpl2 = {
-    shortName = "GPLv2";
-    fullName = "GNU General Public License version 2 only";
-    url = http://www.gnu.org/licenses/old-licenses/gpl-2.0.html;
-  };
+  gpl2 = "GPLv2";
 
   gpl2Oss = {
     shortName = "GPLv2+OSS";
@@ -136,11 +138,7 @@
     url = https://fedoraproject.org/wiki/Licensing/libtiff;
   };
 
-  lgpl2 = {
-    shortName = "LGPLv2";
-    fullName = "GNU Library General Public License version 2";
-    url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html;
-  };
+  lgpl2 = "LGPLv2";
 
   lgpl2Plus = {
     shortName = "LGPLv2+";
@@ -148,11 +146,7 @@
     url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html;
   };
 
-  lgpl21 = {
-    shortName = "LGPLv2.1";
-    fullName = "GNU Lesser General Public License version 2.1 only";
-    url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html;
-  };
+  lgpl21 = "LGPLv2.1";
 
   lgpl21Plus = {
     shortName = "LGPLv2.1+";
@@ -160,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/lists.nix b/pkgs/lib/lists.nix
index 3c01b165fc1..578686ae366 100644
--- a/pkgs/lib/lists.nix
+++ b/pkgs/lib/lists.nix
@@ -1,9 +1,13 @@
 # General list operations.
-with {
+let
   inherit (import ./trivial.nix) deepSeq;
-};
 
-rec {
+  inc = builtins.add 1;
+
+  dec = n: builtins.sub n 1;
+
+  inherit (builtins) elemAt;
+in rec {
   inherit (builtins) head tail length isList add sub lessThan;
 
 
@@ -17,50 +21,39 @@ rec {
   # `list' with `nul' as the starting value, i.e., `fold op nul [x_1
   # x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'.  (This is
   # Haskell's foldr).
-  fold =
-    if builtins ? elemAt
-    then op: nul: list:
-      let
-        len = length list;
-        fold' = n:
-          if n == len
-          then nul
-          else op (builtins.elemAt list n) (fold' (add n 1));
-      in fold' 0
-    else op: nul:
-      let fold' = list:
-        if list == []
+  fold = op: nul: list:
+    let
+      len = length list;
+      fold' = n:
+        if n == len
         then nul
-        else op (head list) (fold' (tail list));
-      in fold';
+        else op (elemAt list n) (fold' (inc n));
+    in fold' 0;
 
-    
   # Left fold: `fold op nul [x_1 x_2 ... x_n] == op (... (op (op nul
   # x_1) x_2) ... x_n)'.
-  foldl =
-    if builtins ? elemAt
-    then op: nul: list:
-      let
-        len = length list;
-        foldl' = n:
-          if n == minus1
-          then nul
-          else op (foldl' (sub n 1)) (builtins.elemAt list n);
-      in foldl' (sub (length list) 1)
-    else op:
-      let foldl' = nul: list:
-        if list == []
+  foldl = op: nul: list:
+    let
+      len = length list;
+      foldl' = n:
+        if n == minus1
         then nul
-        else foldl' (op nul (head list)) (tail list);
-      in foldl';
+        else op (foldl' (dec n)) (elemAt list n);
+    in foldl' (dec (length list));
 
-  minus1 = sub 0 1;
+  minus1 = dec 0;
 
 
   # map with index: `imap (i: v: "${v}-${toString i}") ["a" "b"] ==
   # ["a-1" "b-2"]'
   imap = f: list:
-    zipListsWith f (range 1 (length list)) list;
+    let
+      len = length list;
+      imap' = n:
+        if n == len
+          then []
+          else [ (f (inc n) (elemAt list n)) ] ++ imap' (inc n);
+    in imap' 0;
 
     
   # Concatenate a list of lists.
@@ -102,10 +95,10 @@ rec {
   # predicate, returns `default' if no such element exists, or
   # `multiple' if there are multiple matching elements.
   findSingle = pred: default: multiple: list:
-    let found = filter pred list;
-    in if found == [] then default
-       else if tail found != [] then multiple
-       else head found;
+    let found = filter pred list; len = length found;
+    in if len == 0 then default
+      else if len != 1 then multiple
+      else head found;
 
 
   # Find the first element in the list matching the specified
@@ -159,65 +152,84 @@ rec {
 
 
   zipListsWith = f: fst: snd:
-    if fst != [] && snd != [] then
-      [ (f (head fst) (head snd)) ]
-      ++ zipListsWith f (tail fst) (tail snd)
-    else [];
+    let
+      len1 = length fst;
+      len2 = length snd;
+      len = if builtins.lessThan len1 len2 then len1 else len2;
+      zipListsWith' = n:
+        if n != len then
+          [ (f (elemAt fst n) (elemAt snd n)) ]
+          ++ zipListsWith' (inc n)
+        else [];
+    in zipListsWith' 0;
 
   zipLists = zipListsWith (fst: snd: { inherit fst snd; });
 
   
   # Reverse the order of the elements of a list.
-  reverseList = l:
-    let reverse_ = accu: l:
-      if l == [] then accu
-      else reverse_ ([(head l)] ++ accu) (tail l);
-    in reverse_ [] l;
+  reverseList = fold (e: acc: acc ++ [ e ]) [];
 
-    
   # Sort a list based on a comparator function which compares two
   # elements and returns true if the first argument is strictly below
   # the second argument.  The returned list is sorted in an increasing
   # order.  The implementation does a quick-sort.
   sort = strictLess: list:
     let
-      # This implementation only has one element list on the left hand
-      # side of the concatenation operator.
-      qs = l: concat:
-        if l == [] then concat
-        else if length l == 1 then l ++ concat
-        else let
-          part = partition (strictLess (head l)) (tail l);
-        in
-          qs part.wrong ([(head l)] ++ qs part.right concat);
+      len = length list;
+      first = head list;
+      pivot' = n: acc@{ left, right }: let el = elemAt list n; next = pivot' (inc n); in
+        if n == len
+          then acc
+        else if strictLess first el
+          then next { inherit left; right = [ el ] ++ right; }
+        else
+          next { left = [ el ] ++ left; inherit right; };
+      pivot = pivot' 1 { left = []; right = []; };
     in
-      qs list [];
+      if lessThan len 2 then list
+      else (sort strictLess pivot.left) ++  [ first ] ++  (sort strictLess pivot.right);
 
 
   # Return the first (at most) N elements of a list.
   take = count: list:
-    if list == [] || count == 0 then []
-    else [ (head list) ] ++ take (builtins.sub count 1) (tail list);
+    let
+      len = length list;
+      take' = n:
+        if n == len || n == count
+          then []
+        else
+          [ (elemAt list n) ] ++ take' (inc n);
+    in take' 0;
 
     
   # Remove the first (at most) N elements of a list.
   drop = count: list:
-    if count == 0 then list
-    else drop (builtins.sub count 1) (tail list);
+    let
+      len = length list;
+      drop' = n:
+        if n == minus1 || lessThan n count
+          then []
+        else
+          drop' (dec n) ++ [ (elemAt list n) ];
+    in drop' (dec len);
 
     
   last = list:
-    assert list != [];
-    let loop = l: if tail l == [] then head l else loop (tail l); in
-    loop list;
+    assert list != []; elemAt list (dec (length list));
 
 
   # Zip two lists together.
   zipTwoLists = xs: ys:
-    if xs != [] && ys != [] then
-      [ {first = head xs; second = head ys;} ]
-      ++ zipTwoLists (tail xs) (tail ys)
-    else [];
+    let
+      len1 = length xs;
+      len2 = length ys;
+      len = if lessThan len1 len2 then len1 else len2;
+      zipTwoLists' = n:
+        if n != len then
+          [ { first = elemAt xs n; second = elemAt ys n; } ]
+          ++ zipTwoLists' (inc n)
+        else [];
+    in zipTwoLists' 0;
 
   deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y;
 }
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index 5e506ce25c2..97bc8b915b8 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -16,20 +16,22 @@
   bjg = "Brian Gough <bjg@gnu.org>";
   bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
   bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
+  bodil = "Bodil Stokke <nix@bodil.org>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
+  ertes = "Ertugrul Söylemez <es@ertes.de>";
   garbas = "Rok Garbas <rok@garbas.si>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
   guibert = "David Guibert <david.guibert@gmail.com>";
   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>";
-  neznalek = "Vladimír Čunát <vcunat@gmail.com>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
   page = "Carles Pagès <page@cubata.homelinux.net>";
@@ -48,6 +50,7 @@
   thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
   the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
   urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
+  vcunat = "Vladimír Čunát <vcunat@gmail.com>";
   viric = "Lluís Batlle i Rossell <viric@viric.name>";
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
   z77z = "Marco Maggesi <maggesi@math.unifi.it>";
diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix
index ea38010cecc..9dda89b09f0 100644
--- a/pkgs/lib/modules.nix
+++ b/pkgs/lib/modules.nix
@@ -309,7 +309,7 @@ rec {
               let opt = option.decl; in
               opt.apply (
                 if isNotDefined then
-                  opt.default or (throw "Not defined.")
+                  opt.default or (throw "Option `${addName name}' not defined and does not have a default value.")
                 else opt.merge defs
               )
             );
diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix
index 1fdf9ad8088..5c896d5714c 100644
--- a/pkgs/lib/options.nix
+++ b/pkgs/lib/options.nix
@@ -28,6 +28,13 @@ rec {
     # extraConfigs (list of possible configurations)
   };
 
+  mkEnableOption = name: mkOption {
+    default = false;
+    example = true;
+    description = "Whether to enable ${name}";
+    type = lib.types.bool;
+  };
+
   mapSubOptions = f: opt:
     if opt ? options then
       opt // {
diff --git a/pkgs/lib/strings.nix b/pkgs/lib/strings.nix
index ed668e2b927..024a9ac7d7a 100644
--- a/pkgs/lib/strings.nix
+++ b/pkgs/lib/strings.nix
@@ -163,6 +163,10 @@ rec {
   versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1;
 
 
+  # Return true iff string v1 denotes a version equal to or newer than v2.
+  versionAtLeast = v1: v2: !versionOlder v1 v2;
+
+
   # Get the version of the specified derivation, as specified in its
   # ‘name’ attribute.
   getVersion = drv: (builtins.parseDrvName drv.name).version;
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 471fbcdc464..92207bd46bc 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
-, dbus, libusb1, acl }:
+, dbus, libusb, acl }:
 
 let version = "1.5.4"; in
 
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
new file mode 100644
index 00000000000..a98e6db2db4
--- /dev/null
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, which
+, SDL, mesa, alsaLib
+}:
+
+stdenv.mkDerivation rec {
+  name = "retroarch-0.9.9";
+
+  src = fetchurl {
+    url = "http://themaister.net/retroarch-dl/${name}.tar.gz";
+    sha256 = "08xlndpl14c4ccgp752ixx3a7ajf3xp93nawhinwxq0cw801prda";
+  };
+
+  buildInputs = [
+    pkgconfig which SDL mesa alsaLib
+  ];
+
+  preConfigure = ''
+    configureFlags="--global-config-dir=$out/etc"
+  '';
+
+  meta = {
+    description = "A cross-platform multi-system emulator";
+    homepage = "http://themaister.net/retroarch.html";
+    license = stdenv.lib.licenses.gpl3Plus;
+    platform = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 69bcea87f6a..4e6ef5af00d 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/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 79f36744603..5fe1d680b2b 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl
-, lcms2, freetype, libpaper, jbig2dec, expat, libiconvOrEmpty
+, lcms, freetype, libpaper, jbig2dec, expat, libiconvOrEmpty
 , x11Support, x11 ? null
 , cupsSupport ? false, cups ? null
 , gnuFork ? true
@@ -25,7 +25,7 @@ let
     license = "GPLv3+";
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.viric ];
+    maintainers = [ stdenv.lib.maintainers.viric ];
   };
 
   gnuForkSrc = rec {
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms2
+    libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms
     libpaper jbig2dec expat
   ] ++ stdenv.lib.optionals x11Support [x11 freetype]
     ++ stdenv.lib.optional cupsSupport cups
diff --git a/pkgs/misc/themes/gtk2/gtk-engines/default.nix b/pkgs/misc/themes/gtk2/gtk-engines/default.nix
new file mode 100644
index 00000000000..e64b13f9305
--- /dev/null
+++ b/pkgs/misc/themes/gtk2/gtk-engines/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
+
+stdenv.mkDerivation {
+  name = "gtk-engines-2.20.2";
+
+  src = fetchurl {
+    url = "ftp://ftp.gnome.org/pub/gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2";
+    sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm";
+  };
+
+  buildInputs = [ pkgconfig intltool gtk2 ];
+
+  meta = {
+    description = "Theme engines for GTK+ 2";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
index 185532589c6..3a619220bcf 100644
--- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
+++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
@@ -2,12 +2,12 @@
   cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.2.1";
+  version = "1.3.4";
   name = "oxygen-gtk2-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2";
-    sha256 = "19l0dhjswvm7y99pvbd3qnz37k0p5y2slljy8mm4r8awjff3v4qi";
+    sha256 = "02q46kq0hhrmzwbjngg31ydl2198ls5bxgnz2si4amdmqii1nlmj";
   };
 
   buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index da06eaec35c..6e337b8feef 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,4 +1,4 @@
-{fetchurl, stdenv, python, cmake, vim}:
+{fetchurl, stdenv, python, cmake, vim, perl, ruby}:
 
 /*
 About Vim and plugins
@@ -11,7 +11,7 @@ typical plugin files:
   plugin/P1.vim
   autoload/P1.vim
   ftplugin/xyz.vim
-  doc/plugin-documentation.txt
+  doc/plugin-documentation.txt (traditional documentation)
   README(.md) (nowadays thanks to github)
 
 Traditionally plugins were installed into ~/.vim/* so it was your task to keep track
@@ -25,16 +25,16 @@ this to your .vimrc should make most plugins work:
   set rtp+=~/.nix-profile/vim-plugins/YouCompleteMe
   " or for p in ["YouCompleteMe"] | exec 'set rtp+=~/.nix-profile/vim-plugins/'.p | endfor
 
-Its what
-pathogen, vundle, vim-addon-manager (VAM) use.
+Its what pathogen, vundle, vim-addon-manager (VAM) use.
 
 VAM's benefits:
-- works around after/* directories if they are used in non ~/.vim locations
 - allows activating plugins at runtime, eg when you need them. (works around
   some au command hooks, eg required for TheNerdTree plugin)
 - VAM checkous out all sources (vim.sf.net, git, mercurial, ...)
 - runs :helptags on update/installation only. Obviously it cannot do that on
   store paths.
+- it reads addon-info.json files which can declare dependencies by name
+  (without version)
 
 VAM is made up of
 - the code loading plugins
@@ -63,31 +63,50 @@ How to install VAM? eg provide such a bash function:
     EOF
     }
 
-IMHO having no plugins listed might be better than having outdated ones.
+Marc Weber thinks that having no plugins listed might be better than having
+outdated ones.
 
 So which plugins to add here according to what Marc Weber thinks is best?
-complicated plugins requiring dependencies, such as YouCompleteMe.
+Complicated plugins requiring dependencies, such as YouCompleteMe.
 Then its best to symlink ~/.nix-profile/vim-plugins/YouCompleteMe to
 ~/.vim/{vim-addons,bundle} or whatever plugin management solution you use.
 
 If you feel differently change the comments and proceed.
 */
 
-let vimHelptags = path: ''
-  ${vim}/bin/vim -N -u NONE -i NONE -n -e -s -c "helptags ${path}" +quit!
-'';
+# provide a function creating tag files for vim help documentation (doc/*.txt)
+let vimHelpTags = ''
+    vimHelpTags(){
+      if [ -d "$1/doc" ]; then
+        ${vim}/bin/vim -N -u NONE -i NONE -n -e -s -c "helptags $1/doc" +quit!
+      fi
+    }
+  '';
+
+  # install a simple standard vim plugin
+  simpleDerivation = a@{name, src, path, buildPhase ? "", ...} : stdenv.mkDerivation (a // {
+    inherit buildPhase;
+
+    installPhase = ''
+      target=$out/vim-plugins/$path
+      ensureDir $out/vim-plugins
+      ls -l
+      cp -r . $target
+      ${vimHelpTags}
+      vimHelpTags $target
+    '';
+  });
 
 in
 
 {
 
-  #TODO :helptags should be run
-
   vimAddonNix = {
     # github.com/MarcWeber/vim-addon-nix provides some additional support for
     # editing .nix files
 
-    # This is a placeholder, because I think you always should be using latest git version
+    # This is a placeholder, because I think you always should be using latest
+    # git version. It also depends on some additional plugins (see addon-info.json)
   };
 
   YouCompleteMe = stdenv.mkDerivation {
@@ -100,7 +119,6 @@ in
     configurePhase = ":";
 
     buildPhase = ''
-      set -x
       target=$out/vim-plugins/YouCompleteMe
       mkdir -p $target
       cp -a ./ $target
@@ -110,7 +128,8 @@ in
       cmake -G "Unix Makefiles" . $target/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7
       make -j -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
 
-      ${vimHelptags "$out/vim-plugins/YouCompleteMe/doc"}
+      ${vimHelpTags}
+      vimHelpTags $target
     '';
 
     # TODO: implement proper install phase rather than keeping everything in store
@@ -126,45 +145,56 @@ in
     };
   };
 
-  syntastic = stdenv.mkDerivation {
+  syntastic = simpleDerivation {
     name = "vim-syntastic-3.0.0";
-   
     src = fetchurl {
       url = "https://github.com/scrooloose/syntastic/archive/3.0.0.tar.gz";
       sha256 = "0nf69wpa8qa7xcfvywy2khmazs4dn1i2nal9qwjh2bzrbwbbkdyl";
     };
-
-    buildPhase = "";
-
-    installPhase = ''
-      mkdir -p "$out/vim-plugins"
-      cp -R autoload "$out/vim-plugins"
-      cp -R doc "$out/vim-plugins"
-      cp -R plugin "$out/vim-plugins"
-      cp -R syntax_checkers "$out/vim-plugins"
-    '';
+    path = "syntastic";
   };
 
-  coffeeScript = stdenv.mkDerivation {
+  coffeeScript = simpleDerivation {
     name = "vim-coffee-script-v002";
-
     src = fetchurl {
       url = "https://github.com/vim-scripts/vim-coffee-script/archive/v002.tar.gz";
       sha256 = "1xln6i6jbbihcyp5bsdylr2146y41hmp2xf7wi001g2ymj1zdsc0";
     };
+    path = "vim-coffee-script";
+  };
 
-    buildPhase = "";
+  command_T = simpleDerivation {
 
-    installPhase = ''
-      mkdir -p "$out/vim-plugins"
-      cp -R after "$out/vim-plugins"
-      cp -R compiler "$out/vim-plugins"
-      cp -R doc "$out/vim-plugins"
-      cp -R ftdetect "$out/vim-plugins"
-      cp -R ftplugin "$out/vim-plugins"
-      cp -R indent "$out/vim-plugins"
-      cp -R syntax "$out/vim-plugins"
+    name = "vim-command-t-1.4";
+
+    src = fetchurl {
+      url    = "https://github.com/wincent/Command-T/archive/1.4.tar.gz";
+      sha256 = "1ka9hwx9n0vj1dd5qsd2l1wq0kriwl76jmmdjzh7zaf0p547v98s";
+    };
+
+    path = "Command-T";
+
+    buildInputs = [ perl ruby ];
+
+    buildPhase = ''
+      pushd ruby/command-t
+      ruby extconf.rb
+      make
+      popd
     '';
   };
-}
 
+  xdebug = simpleDerivation {
+
+    name = "vim-xdebug-a4980fa65f7f159780593ee37c178281691ba2c4";
+
+    src = fetchurl {
+      url = "https://github.com/joonty/vim-xdebug/archive/a4980fa65f7f159780593ee37c178281691ba2c4.tar.gz";
+      sha256 = "1348gzp0zhc2wifvs5vmf92m9y8ik8ldnvy7bawsxahy8hmhiksk";
+    };
+
+    path = "xdebug";
+
+    postInstall = false;
+  };
+}
diff --git a/pkgs/os-specific/darwin/install_name_tool/default.nix b/pkgs/os-specific/darwin/install_name_tool/default.nix
new file mode 100644
index 00000000000..6a7e6caaa26
--- /dev/null
+++ b/pkgs/os-specific/darwin/install_name_tool/default.nix
@@ -0,0 +1,29 @@
+{ stdenv }:
+
+assert stdenv.isDarwin;
+
+stdenv.mkDerivation {
+  name = "install_name_tool";
+  src = "/usr/bin/install_name_tool";
+  unpackPhase = "true";
+  configurePhase = "true";
+  buildPhase = "true";
+
+  installPhase = ''
+    mkdir -p "$out"/bin
+    ln -s "$src" "$out"/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Change dynamic shared library install names";
+    homepage    = https://developer.apple.com/library/mac/documentation/Darwin/Reference/Manpages/man1/install_name_tool.1.html;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.darwin;
+
+    longDescription = ''
+      Install_name_tool changes the dynamic shared library install names and or
+      adds, changes or deletes the rpaths recorded in a Mach-O binary.
+    '';
+  };
+}
+
diff --git a/pkgs/os-specific/darwin/otool/default.nix b/pkgs/os-specific/darwin/otool/default.nix
new file mode 100644
index 00000000000..c998253d148
--- /dev/null
+++ b/pkgs/os-specific/darwin/otool/default.nix
@@ -0,0 +1,35 @@
+{ stdenv }:
+
+# this tool only exists on darwin
+assert stdenv.isDarwin;
+
+stdenv.mkDerivation {
+  name = "otool";
+
+  src = "/usr/bin/otool";
+
+  unpackPhase = "true";
+  configurePhase = "true";
+  buildPhase = "true";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    ln -s $src "$out/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Object file displaying tool";
+    homepage    = https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/otool.1.html;
+    license     = licenses.unfree;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.darwin;
+
+    longDescription = ''
+      The otool command displays specified parts of object files or libraries.
+      If the, -m option is not used, the file arguments may be of the form
+      libx.a(foo.o), to request information about only that object file and not
+      the entire library.
+    '';
+  };
+}
+
diff --git a/pkgs/os-specific/darwin/setfile/default.nix b/pkgs/os-specific/darwin/setfile/default.nix
new file mode 100644
index 00000000000..94320c94bc0
--- /dev/null
+++ b/pkgs/os-specific/darwin/setfile/default.nix
@@ -0,0 +1,35 @@
+{ stdenv }:
+
+# this tool only exists on darwin
+assert stdenv.isDarwin;
+
+stdenv.mkDerivation {
+  name = "setfile";
+
+  src = "/usr/bin/SetFile";
+
+  unpackPhase = "true";
+  configurePhase = "true";
+  buildPhase = "true";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    ln -s $src "$out/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Set attributes of files and directories";
+    homepage    = "http://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man1/setfile.1.html";
+    license     = licenses.unfree;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.darwin;
+
+    longDescription = ''
+      SetFile is a tool to set the file attributes on files in an HFS+
+      directory. It attempts to be similar to the setfile command in MPW. It can
+      apply rules to more than one file with the options apply- ing to all files
+      listed.
+    '';
+  };
+}
+
diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix
index 43902aded67..9fd8168948d 100644
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@@ -5,13 +5,13 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = "git://github.com/mkottman/acpi_call.git";
-    rev = "b570c3b6c7016174107558464e864391d8bbd176";
-    sha256 = "a89c62d391b721bb87a094f81cefc77d9c80de4bb314bb6ea449c3ef2decad5e";
+    rev = "46dd97e115ddc7219c88b0818c4d5b235162fe6e";
+    sha256 = "1bi0azd7xxhrivjhnmxllj2sfj12br56mxii20mnqdpqwyz0rhni";
   };
   
   preBuild = ''
-    sed -e 's/break/true/' -i test_off.sh
-    sed -e 's@/bin/bash@.bin/sh@' -i test_off.sh
+    sed -e 's/break/true/' -i examples/turn_off_gpu.sh
+    sed -e 's@/bin/bash@.bin/sh@' -i examples/turn_off_gpu.sh
     sed -e "s@/lib/modules/\$(.*)@${kernelDev}/lib/modules/${kernelDev.modDirVersion}@" -i Makefile
   '';
  
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     mkdir -p $out/lib/modules/${kernelDev.modDirVersion}/misc
     cp acpi_call.ko $out/lib/modules/${kernelDev.modDirVersion}/misc
     mkdir -p $out/bin
-    cp test_off.sh $out/bin/test_discrete_video_off.sh
+    cp examples/turn_off_gpu.sh $out/bin/test_discrete_video_off.sh
     chmod a+x $out/bin/test_discrete_video_off.sh
   '';
 
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index 693f0067701..e4b4d1104b0 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/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 43ba9dfc2b5..816a099e243 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
     description = "Kernel module driver for some Broadcom's wireless cards";
     homepage = http://www.broadcom.com/support/802.11/linux_sta.php;
     license = "unfree-redistributable";
-    maintainers = [ stdenv.lib.maintainers.neznalek ];
+    maintainers = [ stdenv.lib.maintainers.vcunat ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix
index f0649ccc390..e6b5035bd8e 100644
--- a/pkgs/os-specific/linux/dmidecode/default.nix
+++ b/pkgs/os-specific/linux/dmidecode/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "dmidecode-2.11";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/dmidecode/${name}.tar.bz2";
+    url = "mirror://savannah/dmidecode/${name}.tar.bz2";
     sha256 = "0l9v8985piykc98hmbg1cq5r4xwvp0jjl4li3avr3ddkg4s699bd";
   };
 
diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix
index 8d1320afc68..e1abeea49b7 100644
--- a/pkgs/os-specific/linux/e1000e/default.nix
+++ b/pkgs/os-specific/linux/e1000e/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "e1000e-1.5.1-${kernelDev.version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/e1000/e1000e-1.5.1.tar.gz";
+    url = "mirror://sourceforge/e1000/e1000e-1.5.1.tar.gz";
     sha256 = "0nzjlarpqcpm5y112n3vzra4qv32hiygpfkk10y8g4nln4adhqsw";
   };
 
diff --git a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
deleted file mode 100644
index fb43c7d67e1..00000000000
--- 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 24906f2b0db..9ddddfde259 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 abc6bf08dac..00000000000
--- 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 5c4989b878a..00000000000
--- 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 8acb75c3ed6..00000000000
--- 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 bc9c8efe063..00000000000
--- 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 77756e771ae..00000000000
--- 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 266c7795d23..00000000000
--- 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 3e15374c65f..00000000000
--- 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 8805f1393fb..00000000000
--- 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 dca427cbff5..00000000000
--- 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 2e88f1bba74..00000000000
--- 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 ef259b70975..00000000000
--- 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 0fee3acd0a3..00000000000
--- 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 ad277ac8dda..00000000000
--- 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 = "1y3xr7qc7cvszgw0bh66vzy36pn4m1sj17bzy5dc9kfw01kq3n0y";
-  };
-
-  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 9a298ab96d4..00000000000
--- 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 79b16b1dcea..00000000000
--- 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 abf12fd672b..00000000000
--- 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 0a1cb655572..00000000000
--- 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 15de7c30586..00000000000
--- 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 dbd2fa45b7b..00000000000
--- 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 f06fcb149e8..00000000000
--- 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/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix
index a717bd9e117..cb4466dc20f 100644
--- a/pkgs/os-specific/linux/firmware/zd1211/default.nix
+++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   
   src = fetchurl {
-    url = "http://surfnet.dl.sourceforge.net/sourceforge/zd1211/${name}.tar.bz2";
+    url = "mirror://sourceforge/zd1211/${name}.tar.bz2";
     sha256 = "866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1";
   };
   
diff --git a/pkgs/os-specific/linux/frandom/default.nix b/pkgs/os-specific/linux/frandom/default.nix
index 10876e96fc8..a28ba527218 100644
--- a/pkgs/os-specific/linux/frandom/default.nix
+++ b/pkgs/os-specific/linux/frandom/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "${baseName}-${kernelDev.version}";
 
   src = fetchurl {
-    url = "http://sourceforge.net/projects/frandom/files/${baseName}.tar.gz";
+    url = "mirror://sourceforge/frandom/${baseName}.tar.gz";
     sha256 = "15rgyk4hfawqg7z1spk2xlk1nn6rcdls8gdhc70f91shrc9pvlls";
   };
 
diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix
index 00676319b03..b28320c0625 100644
--- a/pkgs/os-specific/linux/ipsec-tools/default.nix
+++ b/pkgs/os-specific/linux/ipsec-tools/default.nix
@@ -7,11 +7,11 @@
 # the time being.
 
 stdenv.mkDerivation rec {
-  name = "ipsec-tools-0.8.0";
+  name = "ipsec-tools-0.8.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/ipsec-tools/${name}.tar.bz2";
-    sha256 = "2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717";
+    sha256 = "1m1x2planqqxi0587g7d8xhy0gkyfaxs3ry4hhdh0bw46sxrajps";
   };
 
   buildInputs = [ readline openssl flex krb5 pam ];
diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh
index 14d8108ba16..8fb5e9f91eb 100644
--- a/pkgs/os-specific/linux/kernel/builder.sh
+++ b/pkgs/os-specific/linux/kernel/builder.sh
@@ -1,7 +1,7 @@
 source $stdenv/setup
 
 
-makeFlags="ARCH=$arch SHELL=/bin/sh"
+makeFlags="ARCH=$arch SHELL=/bin/sh 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 8168ffb5a1a..00000000000
--- 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 00000000000..90210b8d5eb
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -0,0 +1,308 @@
+{ 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
+
+  # Enable the complete Linux kernel ".config" file to be saved in the kernel.
+  # Also, make it available at runtime as /proc/config.gz.
+  IKCONFIG y
+  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 05b6867bc55..78663098fb3 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 50469eb5383..1ade2473627 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 add982951ad..00000000000
--- 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 bfcbcf44aa4..00000000000
--- 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 9f1a36db7dd..48197ae14ca 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
new file mode 100644
index 00000000000..e054e5e16f5
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "3.10.9";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "1kwi5v4rw06rmb548wjkgi27amsfvpfd2n07bmyjvjqnqrldm5bk";
+  };
+
+  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 c07448b43b5..7597a9c695e 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.47";
-
-    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 = "1554c7r32q87jxkkpggpgwg4rcc4zanahmrw30sg39krxbf2s7q1";
-    };
-
-    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 cd7e9f2b375..74304f5239c 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.47";
-    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 = "0hdrwzhfnm3c26i2iaw2rfhi7rl89n7dpvbznn29k27p3ifi3rp6";
-    };
-
-    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.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix
deleted file mode 100644
index 8f77334901d..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.7.nix
+++ /dev/null
@@ -1,279 +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
-      SCSI_LOGGING y # SCSI logging facility
-      SERIAL_8250 y # 8250/16550 and compatible serial support
-      SLIP_COMPRESSED y # CSLIP compressed headers
-      SLIP_SMART y
-      THERMAL_HWMON y # Hardware monitoring support
-      USB_DEBUG n
-      USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
-      USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
-      X86_CHECK_BIOS_CORRUPTION y
-      X86_MCE y
-      XEN_DOM0 y
-
-      # Linux Containers
-      RT_GROUP_SCHED? y
-      CGROUP_DEVICE? y
-      MEMCG? y
-      MEMCG_SWAP? y
-      DEVPTS_MULTIPLE_INSTANCES? y
-
-      # Enable staging drivers.  These are somewhat experimental, but
-      # they generally don't hurt.
-      STAGING y
-
-      # PROC_EVENTS requires that the netlink connector is not built
-      # as a module.  This is required by libcgroup's cgrulesengd.
-      CONNECTOR y
-      PROC_EVENTS y
-
-      # Tracing
-      FTRACE y
-      FUNCTION_TRACER y
-      FTRACE_SYSCALLS y
-      SCHED_TRACER y
-
-      # Devtmpfs support.
-      DEVTMPFS y
-
-      # Media support
-      MEDIA_CAMERA_SUPPORT? y
-      MEDIA_RC_SUPPORT? y
-      MEDIA_USB_SUPPORT y
-
-      # Easier debug of NFS issues
-      SUNRPC_DEBUG y
-
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
-in
-
-import ./generic.nix (
-
-  rec {
-    version = "3.7.10";
-    testing = false;
-
-    preConfigure = ''
-      substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
-    '';
-
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "1l8b40z95ahc2v9babmhrbi8jn2bhwkapq0libq0z21iipqsya4v";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-    features.efiBootStub = true;
-    features.needsCifsUtils = true;
-    features.canDisableNetfilterConntrackHelpers = true;
-    features.netfilterRPFilter = true;
-  }
-
-  // removeAttrs args ["extraConfig"]
-)
diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix
deleted file mode 100644
index 6681438edd5..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.8.nix
+++ /dev/null
@@ -1,282 +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
-      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 4a2a0c1d163..51bcf35b3fe 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix
@@ -1,281 +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
-      SCSI_LOGGING y # SCSI logging facility
-      SERIAL_8250 y # 8250/16550 and compatible serial support
-      SLIP_COMPRESSED y # CSLIP compressed headers
-      SLIP_SMART y
-      THERMAL_HWMON y # Hardware monitoring support
-      USB_DEBUG n
-      USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
-      USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
-      X86_CHECK_BIOS_CORRUPTION y
-      X86_MCE y
-      XEN_DOM0 y
-
-      # Linux Containers
-      RT_GROUP_SCHED? y
-      CGROUP_DEVICE? y
-      MEMCG? y
-      MEMCG_SWAP? y
-      DEVPTS_MULTIPLE_INSTANCES? y
-
-      # Enable staging drivers.  These are somewhat experimental, but
-      # they generally don't hurt.
-      STAGING y
-
-      # PROC_EVENTS requires that the netlink connector is not built
-      # as a module.  This is required by libcgroup's cgrulesengd.
-      CONNECTOR y
-      PROC_EVENTS y
-
-      # Tracing
-      FTRACE y
-      FUNCTION_TRACER y
-      FTRACE_SYSCALLS y
-      SCHED_TRACER y
-
-      # Devtmpfs support.
-      DEVTMPFS y
-
-      # Media support
-      MEDIA_CAMERA_SUPPORT? y
-      MEDIA_RC_SUPPORT? y
-      MEDIA_USB_SUPPORT y
-
-      # Easier debug of NFS issues
-      SUNRPC_DEBUG y
-
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
-in
-
-import ./generic.nix (
-
-  rec {
-    version = "3.9.7";
-    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 = "1xgk13bj33wayrs2jfgb2vf4xfys3vm28ijaavpjgs2wlsav94lx";
-    };
-
-    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 cf88544abd5..319c2ba42b4 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 73146d8b67d..561cdc8f957 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -55,6 +55,13 @@ rec {
     features.apparmor = true;
   };
 
+  apparmor_3_4 = rec {
+    version = "3.4";
+    name = "apparmor-${version}";
+    patch = makeAppArmorPatch { inherit apparmor version; };
+    features.apparmor = true;
+  };
+
   sec_perm_2_6_24 =
     { name = "sec_perm-2.6.24";
       patch = ./sec_perm-2.6.24.patch;
@@ -103,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;
@@ -147,19 +131,12 @@ rec {
       patch = ./mips-ext3-n32.patch;
     };
 
-  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;
+  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_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/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index ebbf9557245..04924f013a4 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation {
   preConfigure = ''
     cd tools/perf
     sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile
+    [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion
     export makeFlags="DESTDIR=$out $makeFlags"
   '';
 
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 cc4e6ab3552..161af38ff60 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/kqemu/default.nix b/pkgs/os-specific/linux/kqemu/default.nix
deleted file mode 100644
index 97b7c495bb3..00000000000
--- a/pkgs/os-specific/linux/kqemu/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, kernelDev, perl }:
-
-stdenv.mkDerivation rec {
-  name = "kqemu-1.4.0pre1-${kernelDev.version}";
-  
-  src = fetchurl {
-    url = "http://www.nongnu.org/qemu/${name}.tar.gz";
-    sha256 = "14dlmawn3gia1j401ag5si5k1a1vav7jpv86rl37p1hwmr7fihxs";
-  };
-
-  buildInputs = [ perl ];
-  
-  configureFlags = [ ''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernelDev}/lib/modules/*/build)'' ];
-  
-  preConfigure = '' 
-    sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c
-
-    sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c
-    sed -e 's/`uname -r`/'"$(basename ${kernelDev}/lib/modules/*)"'/' -i install.sh
-    sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
-    sed -e '/depmod/d' -i install.sh
-    cat install.sh
-  '';
-
-  meta = {
-    description = "Kernel module for QEMU acceleration";
-  }; 
-}
diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix
index d5c857cf4c9..eb776dcb86d 100644
--- a/pkgs/os-specific/linux/latencytop/default.nix
+++ b/pkgs/os-specific/linux/latencytop/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://latencytop.org;
     description = "Tool to show kernel reports on latencies (LATENCYTOP option)";
-    licence = "GPLv2";
+    license = "GPLv2";
     maintainers = [ stdenv.lib.maintainers.viric ];
     platforms = stdenv.lib.platforms.linux;
   };
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 00000000000..7495deb231d
--- /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 00000000000..dfe6d21be84
--- /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/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index c2a9deaa11f..c1dec8b926a 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "lxc-0.9.0";
 
   src = fetchurl {
-    url = "http://lxc.sf.net/download/lxc/${name}.tar.gz";
+    url = "mirror://sourceforge/lxc/${name}.tar.gz";
     sha256 = "0821clxymkgp71n720xj5ngs22s2v8jks68f5j4vypycwvm6f5qy";
   };
 
diff --git a/pkgs/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/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix
index 109faac97c5..e2db1a4106b 100644
--- a/pkgs/os-specific/linux/ndiswrapper/default.nix
+++ b/pkgs/os-specific/linux/ndiswrapper/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   # should we use unstable? 
   src = fetchurl {
-    url = http://downloads.sourceforge.net/ndiswrapper/ndiswrapper-1.56.tar.gz;
+    url = mirror://sourceforge/ndiswrapper/ndiswrapper-1.56.tar.gz;
     sha256 = "10yqg1a08v6z1qm1qr1v4rbhl35c90gzrazapr09vp372hky8f57";
   };
 
diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix
index 4ca8235f3ae..9a34c503f6d 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/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index c1e60a79082..28e2bd5642c 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -74,7 +74,7 @@ installPhase() {
         # Install the programs.
         mkdir -p $out/bin
 
-        for i in nvidia-settings nvidia-xconfig; do
+        for i in nvidia-settings nvidia-smi nvidia-xconfig; do
 	    cp $i $out/bin/$i
 	    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
 	        --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 809ae316516..268cdac8505 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -8,25 +8,36 @@
 
 with stdenv.lib;
 
-let versionNumber = "319.17"; in
+let
+
+  versionNumber = "319.32";
+  kernel310patch = fetchurl {
+    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia&id=415c1daa9ccb1ec46c172b304f40929239d87af8";
+    name = "nvidia-linux-3.10.patch";
+    sha256 = "0nhzg6jdk9sf1vzj519gqi8a2n9xydhz2bcz472pss2cfgbc1ahb";
+  };
+
+in
 
 stdenv.mkDerivation {
   name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}";
 
   builder = ./builder.sh;
 
-  patches = [ ./version-test.patch ];
+  patches =
+    [ ./version-test.patch ]
+    ++ optional (!libsOnly && versionAtLeast kernelDev.version "3.10") kernel310patch;
 
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "1ja5hc74dff8nhsccqhd5km732a8mafdv7xvzj39asw2r3ma37bp";
+        sha256 = "02rjiizgb9mgal0qrklzjvfzybv139yv6za8xp045k7qdyqvsqzf";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "0a6yir07x38b0z51pi7kqgsaidhsib781rd53bpkkkk33yzviaqj";
+        sha256 = "18268q3pa6v4ygfnlm888jmp84dmg1w9c323cr51pn5jg54vygcm";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 
diff --git a/pkgs/os-specific/linux/pam_console/default.nix b/pkgs/os-specific/linux/pam_console/default.nix
index fbdcce2d1b1..7c1e83c0ed6 100644
--- a/pkgs/os-specific/linux/pam_console/default.nix
+++ b/pkgs/os-specific/linux/pam_console/default.nix
@@ -9,7 +9,7 @@ let
 in
    
 stdenv.mkDerivation {
-  name = "pam_console-0.99.5";
+  name = "pam_console-0.99.5-1";
    
   src = fetchurl {
     url = http://cvs.fedora.redhat.com/repo/dist/pam/pam-redhat-0.99.5-1.tar.bz2/e2edde7861c48195728bc531e5a277e0/pam-redhat-0.99.5-1.tar.bz2;
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 2f93769d280..00000000000
--- 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 57de288723e..00000000000
--- 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 a73df310629..00000000000
--- 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/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix
index 4e28dce1670..b4e37a36ff5 100644
--- a/pkgs/os-specific/linux/statifier/default.nix
+++ b/pkgs/os-specific/linux/statifier/default.nix
@@ -9,7 +9,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://sourceforge.net/projects/statifier/files/statifier/statifier-${version}.tar.gz";
+    url = "mirror://sourceforge/statifier/statifier-${version}.tar.gz";
     sha256 = "0lhdbp7hc15nn6r31yxx7i993a5k8926n5r6j2gi2vvkmf1hciqf";
   };
 
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index 3956b5e04d0..b7d139a534f 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -11,16 +11,17 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "usbutils-006";
+  name = "usbutils-007";
 
   src = fetchurl {
-    url = mirror://kernel/linux/utils/usb/usbutils/usbutils-006.tar.xz;
-    sha256 = "03pd57vv8c6x0hgjqcbrxnzi14h8hcghmapg89p8k5zpwpkvbdfr";
+    url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz";
+    sha256 = "197gpbxnspy6ncqv5mziaikcfqgb3irbqqlfwjgzvh5v4hbs14vm";
   };
 
   buildInputs = [ pkgconfig libusb1 ];
 
-  preBuild = "bunzip2 < ${usbids} > usb.ids";
+  # currently up-to-date
+  #preBuild = "bunzip2 < ${usbids} > usb.ids";
 
   meta = {
     homepage = http://www.linux-usb.org/;
diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
new file mode 100644
index 00000000000..877be1d74b8
--- /dev/null
+++ b/pkgs/servers/apcupsd/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils, nettools, man
+, enableCgiScripts ? true, gd
+}:
+
+stdenv.mkDerivation rec {
+  pname = "apcupsd";
+  name = "${pname}-3.14.10";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+    sha256 = "0ci0xyg1hzj8lnmm3vxfsvgpb3wdgh1ii3gb8jgdxyqnk7nba1q7";
+  };
+
+  buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd;
+
+  # ./configure ignores --prefix, so we must specify some paths manually
+  # There is no real reason for a bin/sbin split, so just use bin.
+  preConfigure = ''
+    export ac_cv_path_SHUTDOWN=${systemd}/sbin/shutdown
+    export ac_cv_path_WALL=${utillinux}/bin/wall
+    sed -i 's|/bin/cat|${coreutils}/bin/cat|' configure
+    export configureFlags="\
+        --bindir=$out/bin \
+        --sbindir=$out/bin \
+        --sysconfdir=$out/etc/apcupsd \
+        --mandir=$out/share/man \
+        --with-halpolicydir=$out/share/halpolicy \
+        --localstatedir=/var/ \
+        --with-nologin=/run \
+        --with-log-dir=/var/log/apcupsd \
+        --with-pwrfail-dir=/run/apcupsd \
+        --with-lock-dir=/run/lock \
+        --with-pid-dir=/run \
+        --enable-usb \
+        ${stdenv.lib.optionalString enableCgiScripts "--enable-cgi --with-cgi-bin=$out/libexec/cgi-bin"}
+        "
+  '';
+
+  postInstall = ''
+    for file in "$out"/etc/apcupsd/*; do
+        sed -i -e 's|^WALL=.*|WALL="${utillinux}/bin/wall"|g' \
+               -e 's|^HOSTNAME=.*|HOSTNAME=`${nettools}/bin/hostname`|g' \
+               "$file"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A daemon for controlling APC UPSes";
+    homepage = http://www.apcupsd.com/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix
new file mode 100644
index 00000000000..3b7e7f068af
--- /dev/null
+++ b/pkgs/servers/diod/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, munge, lua5, libcap, perl, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "diod-${version}";
+  version = "1.0.21";
+
+  src = fetchurl {
+    url = "https://github.com/chaos/diod/archive/${version}.tar.gz";
+    sha256 = "1864i42a4rm3f1q68nc19kcshc0hcf6zfgsdq0ppmmwry4mrvij0";
+  };
+
+  buildInputs = [ munge lua5 libcap perl ncurses ];
+
+  meta = {
+    description = "An I/O forwarding server that implements a variant of the 9P protocol";
+    maintainers = [ stdenv.lib.maintainers.rickynils];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 4d256f92626..6c4841dc8af 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, openssl, libtool, perl, libxml2 }:
 
-let version = "9.9.3-P1"; in
+let version = "9.9.3-P2"; in
 
 stdenv.mkDerivation rec {
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "0ddlvdxsyibm24v1wzbknywvalsrvl06gbvsrigpqc1vgkj25ahv";
+    sha256 = "0y66ns28n3bcq8hp8srgpaxi9ix7myh2rlcsrr3qpwvkgdnb12jy";
   };
 
   patchPhase = ''
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index 12dfc20e736..8ad16a3df2e 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -22,7 +22,7 @@
 */
 
 stdenv.mkDerivation rec {
-  version = "2.5.2";
+  version = "2.5.2.26539-0";
   name = "firebird-${version}";
 
   configureFlags =
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     ++ (stdenv.lib.optional superServer "--enable-superserver=true");
 
   src = fetchurl {
-    url = "mirror://sourceforge/firebird/Firebird-${version}.26539-0.tar.bz2";
+    url = "mirror://sourceforge/firebird/Firebird-${version}.tar.bz2";
     sha256 = "1j5bcfl35hr6i4lcd08zls19bal2js3ar16gnwkzbhwxkxbyb43b";
   };
 
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index 450936d343c..784c1454322 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert mpm == "prefork" || mpm == "worker" || mpm == "event";
 
 stdenv.mkDerivation rec {
-  version = "2.2.24";
+  version = "2.2.25";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "f73bce14832ec40c1aae68f4f8c367cab2266241";
+    sha1 = "e34222d1a8de38825397a1c70949bcc5836a1236";
   };
 
   outputs = [ "dev" "out" "doc" ];
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index da353212657..bbf84a852b8 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     optional libxml2Support libxml2;
 
   # Required for ‘pthread_cancel’.
-  NIX_LDFLAGS = "-lgcc_s";
+  NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
 
   configureFlags = ''
     --with-apr=${apr}
@@ -58,11 +58,11 @@ stdenv.mkDerivation rec {
     inherit apr aprutil sslSupport proxySupport ldapSupport;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Apache HTTPD, the world's most popular web server";
-    homepage = "http://httpd.apache.org/";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    homepage    = http://httpd.apache.org/;
+    license     = licenses.asl20;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with maintainers; [ lovek323 simons ];
   };
 }
diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix
index b6aff880e62..8c0118912f5 100644
--- a/pkgs/servers/http/myserver/default.nix
+++ b/pkgs/servers/http/myserver/default.nix
@@ -37,7 +37,7 @@ let version = "0.11"; in
 
       license = "GPLv3+";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
 
       # libevent fails to build on Cygwin and Guile has troubles on Darwin.
       platforms = stdenv.lib.platforms.gnu;
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 52a17ea399c..083dbc482f0 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -9,11 +9,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "nginx-1.2.8";
+  name = "nginx-${meta.version}";
 
   src = fetchurl {
     url = "http://nginx.org/download/${name}.tar.gz";
-    sha256 = "0dvi8n3ljh3zz80r5zkb5q7f94mg62kkakn0wsqi3lxyqnc7r56j";
+    sha256 = "06ficmjiya3m8mdlyq3bgqx604h475n77qc5c502kfjijzld39dw";
   };
 
   buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat;
@@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
     description = "A reverse proxy and lightweight webserver";
     maintainers = [ stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.all;
+    version = "1.4.1";
   };
 }
diff --git a/pkgs/servers/http/nginx/default.upstream b/pkgs/servers/http/nginx/default.upstream
new file mode 100644
index 00000000000..f6a12eedda4
--- /dev/null
+++ b/pkgs/servers/http/nginx/default.upstream
@@ -0,0 +1,8 @@
+url http://nginx.org/en/download.html
+version_link '.*-([0-9]+[.][0-9]*[02468]([.][0-9]+)*)[.]tar[.][a-z0-9]*$' 
+
+do_overwrite() {
+  ensure_hash
+  set_var_value version "$CURRENT_VERSION"
+  set_var_value sha256 "$CURRENT_HASH" 2
+}
diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix
new file mode 100644
index 00000000000..e03183cbe49
--- /dev/null
+++ b/pkgs/servers/http/thttpd/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "thttpd-${version}";
+  version = "2.25b";
+
+  src = fetchurl {
+    url = "http://acme.com/software/thttpd/${name}.tar.gz";
+    sha256 = "0q13sfkh6amn5wk0ccbmxq3mnhlm8g5pnyk910fa5xngn449nw87";
+  };
+
+  prePatch = ''
+    sed -i -e 's/getline/getlineX/' extras/htpasswd.c
+  '';
+
+  preInstall = ''
+    ensureDir "$out/man/man1"
+    sed -i -e 's/-o bin -g bin *//' Makefile
+    sed -i -e '/chgrp/d' extras/Makefile
+  '';
+
+  meta = {
+    description = "Tiny/turbo/throttling HTTP server";
+    homepage = "http://www.acme.com/software/thttpd/";
+    license = stdenv.lib.licenses.bsd2;
+  };
+}
diff --git a/pkgs/servers/mail/dovecot-pigeonhole/default.nix b/pkgs/servers/mail/dovecot-pigeonhole/default.nix
new file mode 100644
index 00000000000..844219925b1
--- /dev/null
+++ b/pkgs/servers/mail/dovecot-pigeonhole/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchurl, dovecot22, openssl}:
+
+stdenv.mkDerivation rec {
+  name = "dovecot-pigeonhole-${version}";
+  version = "0.4.1";
+
+  src = fetchurl {
+    url = "http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz";
+    sha256 = "0vk9khwijl8qbjlm1q36a5dvpilrminp756n87c452kc3cfgc71n";
+  };  
+
+  buildInputs = [ dovecot22 openssl ];
+
+  preConfigure = ''
+    substituteInPlace src/managesieve/managesieve-settings.c --replace \
+      ".executable = \"managesieve\"" \
+      ".executable = \"$out/libexec/dovecot/managesieve\""
+    substituteInPlace src/managesieve-login/managesieve-login-settings.c --replace \
+      ".executable = \"managesieve-login\"" \
+      ".executable = \"$out/libexec/dovecot/managesieve-login\""
+  ''; 
+
+  configureFlags = [ 
+    "--with-dovecot=${dovecot22}/lib/dovecot"
+    "--without-dovecot-install-dirs"
+    "--with-moduledir=$(out)/lib/dovecot"
+  ];  
+
+  meta = with stdenv.lib; {
+    homepage = http://pigeonhole.dovecot.org/;
+    description = "A sieve plugin for the Dovecot IMAP server.";
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.rickynils ];
+  };  
+}
diff --git a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
new file mode 100644
index 00000000000..cce63fe250c
--- /dev/null
+++ b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
@@ -0,0 +1,114 @@
+diff -ur dovecot-2.2.2-orig/src/auth/main.c dovecot-2.2.2/src/auth/main.c
+--- dovecot-2.2.2-orig/src/auth/main.c	2013-03-13 15:26:46.000000000 +0100
++++ dovecot-2.2.2/src/auth/main.c	2013-05-20 20:23:58.126024535 +0200
+@@ -193,7 +193,7 @@
+ 	mod_set.debug = global_auth_settings->debug;
+ 	mod_set.filter_callback = auth_module_filter;
+ 
+-	modules = module_dir_load(AUTH_MODULE_DIR, NULL, &mod_set);
++	modules = module_dir_load("/var/lib/dovecot/modules/auth", NULL, &mod_set);
+ 	module_dir_init(modules);
+ 
+ 	if (!worker)
+@@ -223,7 +223,7 @@
+ 	mod_set.debug = global_auth_settings->debug;
+ 	mod_set.ignore_missing = TRUE;
+ 
+-	modules = module_dir_load_missing(modules, AUTH_MODULE_DIR, names,
++	modules = module_dir_load_missing(modules, "/var/lib/dovecot/modules/auth", names,
+ 					  &mod_set);
+ 	module_dir_init(modules);
+ }
+diff -ur dovecot-2.2.2-orig/src/config/all-settings.c dovecot-2.2.2/src/config/all-settings.c
+--- dovecot-2.2.2-orig/src/config/all-settings.c	2013-05-15 12:20:55.000000000 +0200
++++ dovecot-2.2.2/src/config/all-settings.c	2013-05-21 00:31:46.624073562 +0200
+@@ -766,7 +766,7 @@
+ 	.last_valid_gid = 0,
+ 
+ 	.mail_plugins = "",
+-	.mail_plugin_dir = MODULEDIR,
++	.mail_plugin_dir = "/var/lib/dovecot/modules",
+ 
+ 	.mail_log_prefix = "%s(%u): ",
+ 
+@@ -3274,7 +3274,7 @@
+ 	.base_dir = PKG_RUNDIR,
+ 	.libexec_dir = PKG_LIBEXECDIR,
+ 	.mail_plugins = "",
+-	.mail_plugin_dir = MODULEDIR,
++	.mail_plugin_dir = "/var/lib/dovecot/modules",
+ 	.doveadm_socket_path = "doveadm-server",
+ 	.doveadm_worker_count = 0,
+ 	.doveadm_port = 0,
+diff -ur dovecot-2.2.2-orig/src/config/config-parser.c dovecot-2.2.2/src/config/config-parser.c
+--- dovecot-2.2.2-orig/src/config/config-parser.c	2013-02-04 22:05:42.000000000 +0100
++++ dovecot-2.2.2/src/config/config-parser.c	2013-05-20 20:23:58.106024534 +0200
+@@ -990,7 +990,7 @@
+ 
+ 	memset(&mod_set, 0, sizeof(mod_set));
+ 	mod_set.abi_version = DOVECOT_ABI_VERSION;
+-	modules = module_dir_load(CONFIG_MODULE_DIR, NULL, &mod_set);
++	modules = module_dir_load("/var/lib/dovecot/modules/settings", NULL, &mod_set);
+ 	module_dir_init(modules);
+ 
+ 	i_array_init(&new_roots, 64);
+diff -ur dovecot-2.2.2-orig/src/dict/main.c dovecot-2.2.2/src/dict/main.c
+--- dovecot-2.2.2-orig/src/dict/main.c	2013-02-04 22:05:42.000000000 +0100
++++ dovecot-2.2.2/src/dict/main.c	2013-05-20 20:23:58.101024534 +0200
+@@ -61,7 +61,7 @@
+ 	mod_set.abi_version = DOVECOT_ABI_VERSION;
+ 	mod_set.require_init_funcs = TRUE;
+ 
+-	modules = module_dir_load(DICT_MODULE_DIR, NULL, &mod_set);
++	modules = module_dir_load("/var/lib/dovecot/modules/dict", NULL, &mod_set);
+ 	module_dir_init(modules);
+ 
+ 	/* Register only after loading modules. They may contain SQL drivers,
+diff -ur dovecot-2.2.2-orig/src/doveadm/doveadm-settings.c dovecot-2.2.2/src/doveadm/doveadm-settings.c
+--- dovecot-2.2.2-orig/src/doveadm/doveadm-settings.c	2013-04-07 19:13:06.000000000 +0200
++++ dovecot-2.2.2/src/doveadm/doveadm-settings.c	2013-05-20 20:23:58.399024539 +0200
+@@ -76,7 +76,7 @@
+ 	.base_dir = PKG_RUNDIR,
+ 	.libexec_dir = PKG_LIBEXECDIR,
+ 	.mail_plugins = "",
+-	.mail_plugin_dir = MODULEDIR,
++	.mail_plugin_dir = "/var/lib/dovecot/modules",
+ 	.doveadm_socket_path = "doveadm-server",
+ 	.doveadm_worker_count = 0,
+ 	.doveadm_port = 0,
+diff -ur dovecot-2.2.2-orig/src/lib-fs/fs-api.c dovecot-2.2.2/src/lib-fs/fs-api.c
+--- dovecot-2.2.2-orig/src/lib-fs/fs-api.c	2013-04-18 16:07:26.000000000 +0200
++++ dovecot-2.2.2/src/lib-fs/fs-api.c	2013-05-20 20:23:58.099024534 +0200
+@@ -82,7 +82,7 @@
+ 	mod_set.abi_version = DOVECOT_ABI_VERSION;
+ 	mod_set.ignore_missing = TRUE;
+ 
+-	fs_modules = module_dir_load_missing(fs_modules, MODULE_DIR,
++	fs_modules = module_dir_load_missing(fs_modules, "/var/lib/dovecot/modules",
+ 					     module_name, &mod_set);
+ 	module_dir_init(fs_modules);
+ 
+diff -ur dovecot-2.2.2-orig/src/lib-ssl-iostream/iostream-ssl.c dovecot-2.2.2/src/lib-ssl-iostream/iostream-ssl.c
+--- dovecot-2.2.2-orig/src/lib-ssl-iostream/iostream-ssl.c	2013-04-09 22:45:19.000000000 +0200
++++ dovecot-2.2.2/src/lib-ssl-iostream/iostream-ssl.c	2013-05-20 20:23:58.089024534 +0200
+@@ -28,7 +28,7 @@
+ 	memset(&mod_set, 0, sizeof(mod_set));
+ 	mod_set.abi_version = DOVECOT_ABI_VERSION;
+ 	mod_set.setting_name = "<built-in lib-ssl-iostream lookup>";
+-	ssl_module = module_dir_load(MODULE_DIR, plugin_name, &mod_set);
++	ssl_module = module_dir_load("/var/lib/dovecot/modules", plugin_name, &mod_set);
+ 
+ 	ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs");
+ 	if (ssl_vfuncs == NULL) {
+diff -ur dovecot-2.2.2-orig/src/lib-storage/mail-storage-settings.c dovecot-2.2.2/src/lib-storage/mail-storage-settings.c
+--- dovecot-2.2.2-orig/src/lib-storage/mail-storage-settings.c	2013-05-15 12:20:00.000000000 +0200
++++ dovecot-2.2.2/src/lib-storage/mail-storage-settings.c	2013-05-20 20:23:57.858024531 +0200
+@@ -260,7 +260,7 @@
+ 	.last_valid_gid = 0,
+ 
+ 	.mail_plugins = "",
+-	.mail_plugin_dir = MODULEDIR,
++	.mail_plugin_dir = "/var/lib/dovecot/modules",
+ 
+ 	.mail_log_prefix = "%s(%u): ",
+ 
diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix
new file mode 100644
index 00000000000..15c3b65b754
--- /dev/null
+++ b/pkgs/servers/mail/dovecot/2.2.x.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, perl, systemd, openssl, pam, bzip2, zlib, openldap
+, inotifyTools }:
+
+stdenv.mkDerivation rec {
+  name = "dovecot-2.2.4";
+
+  buildInputs = [perl systemd openssl pam bzip2 zlib openldap inotifyTools];
+
+  src = fetchurl {
+    url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
+    sha256 = "1i5x7l03q854h4j210cpzair4vak95saccp9gb5p4xx7ndggm3q1";
+  };
+
+  preConfigure = ''
+    substituteInPlace src/config/settings-get.pl --replace \
+      "/usr/bin/env perl" "${perl}/bin/perl"
+  '';
+
+  patches = [
+    # Make dovecot look for plugins in /var/lib/dovecot/modules
+    # so we can symlink plugins from several packages there
+    # The symlinking needs to be done in NixOS, as part of the
+    # dovecot service start-up
+    ./2.2.x-module_dir.patch
+  ];
+
+  configureFlags = [
+    # It will hardcode this for /var/lib/dovecot.
+    # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211
+    "--localstatedir=/var"
+    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+    "--with-ldap"
+  ];
+
+  meta = {
+    homepage = "http://dovecot.org/";
+    description = "Open source IMAP and POP3 email server written with security primarily in mind";
+    maintainers = with stdenv.lib.maintainers; [viric simons rickynils];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
new file mode 100644
index 00000000000..fc518e4f889
--- /dev/null
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, libevent, zlib, openssl, db4, bison, pam }:
+
+stdenv.mkDerivation rec {
+  name = "opensmtpd-${version}";
+  version = "201307151923p1";
+
+  buildInputs = [ libevent zlib openssl db4 bison pam ];
+
+  src = fetchurl {
+    url = "http://www.opensmtpd.org/archives/${name}.tar.gz";
+    sha256 = "0cggq60zzz5mgj093pmgwjp4bm6znnhyv6ibp1vhkba7cxjavr4g";
+  };  
+
+  configureFlags = [ 
+    "--with-mantype=doc"
+    "--with-pam"
+    "--without-bsd-auth"
+    "--with-sock-dir=/run"
+    "--with-privsep-user=smtpd"
+    "--with-queue-user=smtpq"
+  ];  
+
+  meta = {
+    homepage = "http://www.postfix.org/";
+    description = ''
+      A free implementation of the server-side SMTP protocol as defined by
+      RFC 5321, with some additional standard extensions.
+    '';
+    license = stdenv.lib.licenses.isc;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.rickynils ];
+  };
+}
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index 17c674b4d06..1c3c3f706e4 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation {
     homepage = http://memcached.org/;
     license = "bsd";
     maintainers = [ stdenv.lib.maintainers.coconnor ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
 
diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix
index fef5010218c..90206f35853 100644
--- a/pkgs/servers/monitoring/zabbix/2.0.nix
+++ b/pkgs/servers/monitoring/zabbix/2.0.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext
-, enableJabber ? false, iksemel ? null }:
+, enableJabber ? false, minmay ? null }:
 
-assert enableJabber -> iksemel != null;
+assert enableJabber -> minmay != null;
 
 let
 
@@ -37,7 +37,15 @@ in
       "--with-postgresql"
       "--with-libcurl"
       "--with-gettext"
-    ] ++ stdenv.lib.optional enableJabber "--with-jabber=${iksemel}";
+    ] ++ stdenv.lib.optional enableJabber "--with-jabber=${minmay}";
+
+    postPatch = ''
+      sed -i -e 's/iksemel/minmay/g' configure src/libs/zbxmedia/jabber.c
+      sed -i \
+        -e '/^static ikstransport/,/}/d' \
+        -e 's/iks_connect_with\(.*\), &zbx_iks_transport/mmay_connect_via\1/' \
+        -e 's/iks/mmay/g' -e 's/IKS/MMAY/g' src/libs/zbxmedia/jabber.c
+    '';
 
     buildInputs = [ pkgconfig postgresql curl openssl zlib ];
 
diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix
index 0189f3dd8fd..6ee4712ae65 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/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 54c9d160565..43da84dcb81 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -18,8 +18,7 @@
 , samplerateSupport ? true, libsamplerate
 , mmsSupport ? true, libmms
 , mpg123Support ? true, mpg123
-, aacSupport ? true, faad2
-}:
+, aacSupport ? true, faad2 }:
 
 let
 
@@ -28,17 +27,20 @@ let
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
 
 in stdenv.mkDerivation rec {
-  name = "mpd-0.17.3";
+  name = "mpd-0.17.4";
   src = fetchurl {
-    url = "mirror://sourceforge/musicpd/${name}.tar.bz2";
-    sha256 = "1iilimlyhw22lpbqiab4qprznxg9c4d68fkrr9jww765b4c7x1ip";
+    url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz";
+    sha256 = "06diyprg65xx0c0bgxdwlgrc5bhwy6cf39rabwnv9ikhimh94ir3";
   };
 
-  buildInputs = [ pkgconfig glib systemd ]
-    ++ opt alsaSupport alsaLib
+  buildInputs = [ pkgconfig glib ]
+    ++ opt (!stdenv.isDarwin) systemd
+    ++ opt (!stdenv.isDarwin && alsaSupport) alsaLib
     ++ opt flacSupport flac
     ++ opt vorbisSupport libvorbis
-    ++ opt madSupport libmad
+    # using libmad to decode mp3 files on darwin is causing a segfault -- there
+    # is probably a solution, but I'm disabling it for now
+    ++ opt (!stdenv.isDarwin && madSupport) libmad
     ++ opt id3tagSupport libid3tag
     ++ opt mikmodSupport libmikmod
     ++ opt shoutSupport libshout
@@ -47,7 +49,7 @@ in stdenv.mkDerivation rec {
     ++ opt soupSupport libsoup
     ++ opt bzip2Support bzip2
     ++ opt audiofileSupport audiofile
-    ++ opt ffadoSupport ffado
+    ++ opt (!stdenv.isDarwin && ffadoSupport) ffado
     ++ opt ffmpegSupport ffmpeg
     ++ opt fluidsynthSupport fluidsynth
     ++ opt samplerateSupport libsamplerate
@@ -56,45 +58,47 @@ in stdenv.mkDerivation rec {
     ++ opt aacSupport faad2
     ++ opt zipSupport zziplib;
 
-  configureFlags = [
-    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
-    (mkFlag alsaSupport "alsa")
-    (mkFlag flacSupport "flac")
-    (mkFlag vorbisSupport "vorbis")
-    (mkFlag vorbisSupport "vorbis-encoder")
-    (mkFlag madSupport "mad")
-    (mkFlag mikmodSupport "mikmod")
-    (mkFlag id3tagSupport "id3")
-    (mkFlag shoutSupport "shout")
-    (mkFlag sqliteSupport "sqlite")
-    (mkFlag curlSupport "curl")
-    (mkFlag soupSupport "soup")
-    (mkFlag audiofileSupport "audiofile")
-    (mkFlag bzip2Support "bzip2")
-    (mkFlag ffadoSupport "ffado")
-    (mkFlag ffmpegSupport "ffmpeg")
-    (mkFlag fluidsynthSupport "fluidsynth")
-    (mkFlag zipSupport "zzip")
-    (mkFlag samplerateSupport "lsr")
-    (mkFlag mmsSupport "mms")
-    (mkFlag mpg123Support "mpg123")
-    (mkFlag aacSupport "aac")
-  ];
+  configureFlags =
+    [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa")
+      (mkFlag flacSupport "flac")
+      (mkFlag vorbisSupport "vorbis")
+      (mkFlag vorbisSupport "vorbis-encoder")
+      (mkFlag (!stdenv.isDarwin && madSupport) "mad")
+      (mkFlag mikmodSupport "mikmod")
+      (mkFlag id3tagSupport "id3")
+      (mkFlag shoutSupport "shout")
+      (mkFlag sqliteSupport "sqlite")
+      (mkFlag curlSupport "curl")
+      (mkFlag soupSupport "soup")
+      (mkFlag audiofileSupport "audiofile")
+      (mkFlag bzip2Support "bzip2")
+      (mkFlag (!stdenv.isDarwin && ffadoSupport) "ffado")
+      (mkFlag ffmpegSupport "ffmpeg")
+      (mkFlag fluidsynthSupport "fluidsynth")
+      (mkFlag zipSupport "zzip")
+      (mkFlag samplerateSupport "lsr")
+      (mkFlag mmsSupport "mms")
+      (mkFlag mpg123Support "mpg123")
+      (mkFlag aacSupport "aac")
+      "--enable-debugging" ]
+    ++ opt (!stdenv.isDarwin)
+      "--with-systemdsystemunitdir=$(out)/etc/systemd/system";
 
   NIX_LDFLAGS = ''
     ${if shoutSupport then "-lshout" else ""}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A flexible, powerful daemon for playing music";
+    homepage    = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ astsmtl ];
+    platforms   = platforms.unix;
+
     longDescription = ''
       Music Player Daemon (MPD) is a flexible, powerful daemon for playing
       music. Through plugins and libraries it can play a variety of sound
       files while being controlled by its network protocol.
     '';
-    homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
-    license = "GPLv2";
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 612db162e5c..11dff324420 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -1,25 +1,15 @@
 { stdenv, fetchurl, scons, boost, v8, gperftools, pcre, snappy }:
 
-with stdenv.lib;
-
-let installerPatch = fetchurl {
-      url = "https://jira.mongodb.org/secure/attachment/18160/SConscript.client.patch";
-      sha256 = "0n60fh2r8i7m6g113k0iw4adc8jv2by4ahrd780kxg47kzfgw06a";
-    };
-
-in
-stdenv.mkDerivation rec {
-  name = "mongodb-2.4.3";
+let version = "2.4.5"; in stdenv.mkDerivation rec {
+  name = "mongodb-${version}";
 
   src = fetchurl {
-    url = http://downloads.mongodb.org/src/mongodb-src-r2.4.3.tar.gz;
-    sha256 = "1k653xmwphdk88z2byz5fglr8xcsm8nw13prls1rx16qnc6h1pb1";
+    url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
+    sha256 = "01c7lb3jdr51gy7459vg5rg002xxg0mj79vlhy54n50kr31cnxmm";
   };
 
   nativeBuildInputs = [ scons boost v8 gperftools pcre snappy ];
 
-  patches = [ installerPatch ];
-
   postPatch = ''
     substituteInPlace SConstruct \
         --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" \
diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix
index 495326acf3e..898bfb711ff 100644
--- a/pkgs/servers/pies/default.nix
+++ b/pkgs/servers/pies/default.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/pies/;
 
     platforms = stdenv.lib.platforms.gnu;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index e315f788904..46f6735edee 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
 , gconf, gtk, intltool, gettext
-, alsaLib, libsamplerate, libsndfile, speex, bluez, udev
+, alsaLib, libsamplerate, libsndfile, speex, bluez, sbc, udev, libcap
 , jackaudioSupport ? false, jackaudio ? null
 , x11Support ? false, xlibs
 , json_c
@@ -10,19 +10,19 @@
 assert jackaudioSupport -> jackaudio != null;
 
 stdenv.mkDerivation rec {
-  name = "pulseaudio-2.1";
+  name = "pulseaudio-4.0";
 
   src = fetchurl {
-    url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-2.1.tar.xz";
-    sha256 = "0zyal2mix7lzhxmr3pxlmss5kjca061iapvrh20bkgvsyixk8szg";
+    url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-4.0.tar.xz";
+    sha256 = "1bndz4l8jxyq3zq128gzp3gryxl6yjs66j2y1d7yabw2n5mv7kim";
   };
 
-  # Since `libpulse*.la' contain `-lgdbm', it must be propagated.
-  propagatedBuildInputs = [ gdbm ];
+  # Since `libpulse*.la' contain `-lgdbm' and `-lcap', it must be propagated.
+  propagatedBuildInputs = [ gdbm libcap ];
 
   buildInputs =
     [ pkgconfig gnum4 libtool intltool glib dbus avahi
-      libsamplerate libsndfile speex alsaLib bluez udev
+      libsamplerate libsndfile speex alsaLib bluez sbc udev
       json_c
       #gtk gconf 
     ]
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
     # dependency on `libsamplerate'.  See `LICENSE' for details.
     licenses = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;
   };
 }
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index 33965299a9b..8d8a677647c 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "rpcbind-0.2.0";
   
   src = fetchurl {
-    url = "http://freefr.dl.sourceforge.net/project/rpcbind/rpcbind/0.2.0/rpcbind-0.2.0.tar.bz2";
+    url = "mirror://sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2";
     sha256 = "c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497a00de3";
   };
 
diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index 50e07f27329..599f6ee31f3 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "sabnzbd-0.4.12";
   
   src = fetchurl {
-    url = http://mesh.dl.sourceforge.net/project/sabnzbdplus/sabnzbdplus/sabnzbd-0.4.12/SABnzbd-0.4.12-src.tar.gz;
+    url = mirro://sourceforge/sabnzbdplus/SABnzbd-0.4.12-src.tar.gz;
     sha256 = "35ce4172688925ef608fba433ff676357dab7d2abdc1cf83112a1c99682fdd32";
   };
 
diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index 059b1c1a217..8b58bd8d2a2 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -18,18 +18,13 @@
 assert useKerberos -> kerberos != null;
 
 stdenv.mkDerivation rec {
-  name = "samba-3.6.8";
+  name = "samba-3.6.18";
 
   src = fetchurl {
     url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz";
-    sha256 = "1phl6mmrc72jyvbyrw6cv6b92cxq3v2pbn1fh97nnb4hild1fnjg";
+    sha256 = "14lrb7724952wyc1sah4nsngd6cv8x8y96cm7f3awzjnfyxajwbd";
   };
 
-  patches =
-    [ # Allow cross-builds for GNU/Hurd.
-      ./libnss-wins-pthread.patch
-    ];
-
   buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ]
     ++ stdenv.lib.optional useKerberos kerberos;
 
diff --git a/pkgs/servers/samba/libnss-wins-pthread.patch b/pkgs/servers/samba/libnss-wins-pthread.patch
deleted file mode 100644
index 63e1485c20d..00000000000
--- a/pkgs/servers/samba/libnss-wins-pthread.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-`libnss_wins' uses pthreads but is built without `-pthread'.  This is
-not a problem when building natively on GNU/Linux, but causes troubles
-when cross-building for GNU/Hurd (undefined references to libpthread
-functions.)
-
---- samba-3.6.1/source3/Makefile.in	2012-02-22 15:25:15.000000000 +0100
-+++ samba-3.6.1/source3/Makefile.in	2012-02-22 15:25:47.000000000 +0100
-@@ -2760,6 +2760,7 @@ bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP
- 	@echo "Linking $@"
- 	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
- 		$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \
-+		$(PTHREAD_LDFLAGS) \
- 		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
- 
- bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT)
diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix
index 097dde325f1..90e71f5e47a 100644
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/pkgs/servers/sip/sipwitch/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "sipwitch-1.2.4";
+  name = "sipwitch-1.6.1";
 
   src = fetchurl {
     url = "mirror://gnu/sipwitch/${name}.tar.gz";
-    sha256 = "1c826832xi9p85l7c9va33xx8hx01m3jq49s0d1xl4c8kvri7bsj";
+    sha256 = "1sa4fbv8filzcxqx2viyixsq4pwgvkidn6l6g3k62gl8bvdfk7p9";
   };
 
   buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ];
diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix
index 27982601f73..422ddd8c73d 100644
--- a/pkgs/servers/xmpp/pyIRCt/default.nix
+++ b/pkgs/servers/xmpp/pyIRCt/default.nix
@@ -9,7 +9,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://prdownloads.sourceforge.net/sourceforge/xmpppy/irc-transport-${version}.tar.gz";
+    url = "mirror://sourceforge/xmpppy/irc-transport-${version}.tar.gz";
     sha256 = "0gbc0dvj1p3088b6x315yjrlwnc5vvzp0var36wlf9z60ghvk8yb";
   };
 
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index 0bad70e9eef..61f6478629d 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 
   passthru = {
diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix
index 84ca7f04e7e..79c61b8ed23 100644
--- a/pkgs/shells/ipython/default.nix
+++ b/pkgs/shells/ipython/default.nix
@@ -13,12 +13,12 @@ assert qtconsoleSupport == true -> pyqt4 != null;
 assert pylabQtSupport == true -> pyqt4 != null && sip != null;
 
 buildPythonPackage rec {
-  name = "ipython-0.13.1";
+  name = "ipython-1.0.0";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
-    sha256 = "1h7q2zlyfn7si2vf6gnq2d0krkm1f5jy5nbi105by7zxqjai1grv";
+    sha256 = "074i08a1zr7wjpqc7rm0k3rnq0laf0gjrcxlfvvb3qc48wdm41qd";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix
index 871dc5e130a..f4776933e53 100644
--- a/pkgs/tools/X11/autocutsel/default.nix
+++ b/pkgs/tools/X11/autocutsel/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   inherit name;
  
   src = fetchurl {
-    url = "http://savannah.nongnu.org/download/autocutsel/${name}.tar.gz";
+    url = "mirror://savannah/autocutsel/${name}.tar.gz";
     sha256 = "0hp335qq57l0kp58pfwb0bk930zx5497frq8y0lzr4icvk1fpw5y";
   };
  
diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix
new file mode 100644
index 00000000000..96241bd02cd
--- /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/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix
new file mode 100644
index 00000000000..f4705bdb0d4
--- /dev/null
+++ b/pkgs/tools/X11/wmctrl/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, libX11, glib, pkgconfig, libXmu }:
+
+stdenv.mkDerivation rec {
+  
+  name = "wmctrl-1.07";
+ 
+  src = fetchurl {
+    url = "http://tomas.styblo.name/wmctrl/dist/${name}.tar.gz";
+    sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np";
+  };
+ 
+  buildInputs = [ libX11 libXmu glib pkgconfig ];
+
+  meta = {
+    homepage = http://tomas.styblo.name/wmctrl/;
+    description = "wmctrl is a UNIX/Linux command line tool to interact with an EWMH/NetWM compatible X Window Manager";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix
new file mode 100644
index 00000000000..272f1ca0907
--- /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/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index df5d59c7b57..52ddb5a0f6b 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, file }:
 
 stdenv.mkDerivation rec {
-  name = "xdg-utils-1.0.2";
+  name = "xdg-utils-1.1.0-rc1";
   
   src = fetchurl {
-    url = "http://portland.freedesktop.org/download/${name}.tgz";
-    sha256 = "1b019d3r1379b60p33d6z44kx589xjgga62ijz9vha95dg8vgbi1";
+    url = "http://portland.freedesktop.org/download/${name}.tar.gz";
+    sha256 = "00lisw4x43sp189lb7dz46j2l09y5v2fijk3d0sxx3mvwj55a1bv";
   };
 
   postInstall = ''
diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix
index 98808c7d399..ce439d22c21 100644
--- a/pkgs/tools/X11/xnee/default.nix
+++ b/pkgs/tools/X11/xnee/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/xnee/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix
new file mode 100644
index 00000000000..5158963258c
--- /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 00000000000..aa8361c737f
--- /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/admin/webdruid/src-for-default.nix b/pkgs/tools/admin/webdruid/src-for-default.nix
index edc770a5fbb..73102be6afe 100644
--- a/pkgs/tools/admin/webdruid/src-for-default.nix
+++ b/pkgs/tools/admin/webdruid/src-for-default.nix
@@ -1,7 +1,7 @@
 rec {
   advertisedUrl="http://downloads.sourceforge.net/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz";
   version = "0.6.0-alpha5";
-  url="http://downloads.sourceforge.net/webdruid/files/webdruid/${version}/webdruid-${version}.tar.gz";
+  url="mirror://sourceforge/webdruid/webdruid-${version}.tar.gz";
   hash = "1aiqffccayvf02snl9la62zqb1674cp4rv19af6xyxgvw4334hw0";
   name = "webdruid-0.6.0-alpha5";
   
diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix
index d376f75a552..f041f2050ea 100644
--- a/pkgs/tools/archivers/atool/default.nix
+++ b/pkgs/tools/archivers/atool/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl, perl}:
 
 stdenv.mkDerivation rec {
-  name = "atool-0.39";
+  name = "atool-0.39.0";
   src = fetchurl {
-    url = http://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz;
+    url = mirror://savannah/atool/atool-0.39.0.tar.gz;
     sha256 = "aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b";
   };
 
diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix
index 3512d62223f..fdba02d12b7 100644
--- a/pkgs/tools/archivers/cromfs/default.nix
+++ b/pkgs/tools/archivers/cromfs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, fuse, perl }:
 
 stdenv.mkDerivation rec {
-  name = "cromfs-1.5.10";
+  name = "cromfs-1.5.10.1";
   
   src = fetchurl {
     url = "http://bisqwit.iki.fi/src/arch/${name}.tar.bz2";
-    sha256 = "1w079zb5scv6bj919ndr0fkiirq2bkyjrnmwqrr9yzwbyinzg73j";
+    sha256 = "0fg6vnbxr5jk4gqj31yqc9fj1gp3bj955qhxav28nvc6sbql7ac2";
   };
 
   patchPhase = ''sed -i 's@/bin/bash@/bin/sh@g' configure'';
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 51d5d35fe80..24249e38395 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index 767e85d6773..ff51b28f34b 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/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index 7346b8e4e05..273b394881b 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/pkgs/tools/archivers/sharutils/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
new file mode 100644
index 00000000000..f5d4322ec93
--- /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/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix
new file mode 100644
index 00000000000..ecdf40be0a5
--- /dev/null
+++ b/pkgs/tools/backup/httrack/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, zlib, openssl }:
+
+stdenv.mkDerivation rec {
+  version = "3.47.21";
+  name = "httrack-${version}";
+
+  src = fetchurl {
+    url = "http://mirror.httrack.com/httrack-${version}.tar.gz";
+    sha256 = "1jqw0zx74jpi0svivvqhja3ixcrfkh9sbi9fwfw83jga27bc1sp0";
+  };
+
+  buildInputs = [ zlib openssl ];
+
+  meta = {
+    homepage = "http://www.httrack.com";
+    description = "HTTrack is a free (GPL, libre/free software) and easy-to-use offline browser utility.";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix
index d06ef2c8366..009dc90576b 100644
--- a/pkgs/tools/backup/partimage/default.nix
+++ b/pkgs/tools/backup/partimage/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = http://sourceforge.net/projects/partimage/files/stable/0.6.9/partimage-0.6.9.tar.bz2;
+    url = mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2;
     sha256 = "0db6xiphk6xnlpbxraiy31c5xzj0ql6k4rfkmqzh665yyj0nqfkm";
   };
   configureFlags = "--with-ssl-headers=${openssl}/include/openssl";
diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix
index f108e6a5063..d52cbdebb67 100644
--- a/pkgs/tools/backup/rdiff-backup/default.nix
+++ b/pkgs/tools/backup/rdiff-backup/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "rdiff-backup-1.2.8";
 
   src = fetchurl {
-    url = http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-1.2.8.tar.gz;
+    url = mirror://savannah/rdiff-backup/rdiff-backup-1.2.8.tar.gz;
     sha256 = "1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d";
   };
 
diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index bcf03356c68..ae432c6122a 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, zlib, e2fsprogs }:
 
 stdenv.mkDerivation {
-  name = "tarsnap-1.0.33";
+  name = "tarsnap-1.0.35";
 
   src = fetchurl {
-    url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.33.tgz";
-    sha256 = "0z8bmra3xms9vcgvkiy9fy1j97192z6w7n658j6zr5cniid8438c";
+    url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz";
+    sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc";
   };
 
   buildInputs = [ openssl zlib e2fsprogs ];
diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index b1fd5a10c2b..0b97f03a9ad 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, p7zip, mtools, syslinux }:
 
-let version = "563"; in
+let version = "585"; in
 
 stdenv.mkDerivation rec {
   name = "unetbootin-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz";
-    sha256 = "1j4ka6rjf5akhcdb4pbfdrka9zflhch97b5i42zk1cf8hd6wx939";
+    sha256 = "1jwwmh4bfrsy4clmnmk9y7h5cd9nh2z3bbm6qwd5p5aw0ich9vk3";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix
index 2c2eb2f80d1..514b69a1992 100644
--- a/pkgs/tools/cd-dvd/xorriso/default.nix
+++ b/pkgs/tools/cd-dvd/xorriso/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/xorriso/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index d15b26f48b6..0e674225344 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index de29c34f150..03a8a7f169d 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ texinfo ];
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/lzip/${name}.tar.gz";
+    url = "mirror://savannah/lzip/${name}.tar.gz";
     sha256 = "1rybhk2pxpfh2789ck9mrkdv3bpx7b7miwndlshb5vb02m9crxbz";
   };
 
diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix
index f3b8037a9f1..4df2947d137 100644
--- a/pkgs/tools/compression/upx/default.nix
+++ b/pkgs/tools/compression/upx/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "upx-3.07";
   src = fetchurl {
-    url = http://upx.sourceforge.net/download/upx-3.07-src.tar.bz2;
+    url = mirror://sourceforge/upx/upx-3.07-src.tar.bz2;
     sha256 = "07pcgjn7x0a734mvhgqwz24qkm1rzqrkcp67pmagzz6i765cp7bs";
   };
 
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index 6b74ba41eca..26c1597f2aa 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
       '';
 
     licenses = [ "GPLv2+" "LGPLv2.1+" ];
-    maintainers = with stdenv.lib.maintainers; [ sander ludo ];
+    maintainers = with stdenv.lib.maintainers; [ sander ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index a091142db24..9c8d18231f0 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/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index b0ee47e23b5..a98def32835 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -1,14 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dosfstools-3.0.11";
+  name = "dosfstools-3.0.21";
 
   src = fetchurl {
-    urls = [
-      "http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2"
-      "http://pkgs.fedoraproject.org/repo/pkgs/dosfstools/${name}.tar.bz2/8d2211d5bd813164e20740e7c852aa06/${name}.tar.bz2"
-    ];
-    sha256 = "1a6rzjy82f6579ywaln33g1wc7k8gbgjdss9q2q8daplac7pmcll";
+    url = "http://daniel-baumann.ch/files/software/dosfstools/${name}.tar.xz";
+    sha256 = "12c9ilcpknm7hg3czkc50azndd0yjdj4jjnvizhwqxy3g0gm2960";
   };
 
   makeFlags = "PREFIX=$(out)";
diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix
new file mode 100644
index 00000000000..3d8fa0827ca
--- /dev/null
+++ b/pkgs/tools/filesystems/extundelete/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, e2fsprogs }:
+
+stdenv.mkDerivation rec {
+  version = "0.2.4";
+  name = "extundelete-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/extundelete/extundelete-0.2.4.tar.bz2";
+    sha256 = "1x0r7ylxlp9lbj3d7sqf6j2a222dwy2nfpff05jd6mkh4ihxvyd1";
+  };
+
+  buildInputs = [ e2fsprogs ];
+
+  meta = with stdenv.lib; {
+    description = "utility that can recover deleted files from an ext3 or ext4 partition";
+    homepage = http://extundelete.sourceforge.net/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.iElectric ];
+  };
+}
diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix
index 717b08acc5f..bbb6d2efc7b 100644
--- a/pkgs/tools/filesystems/httpfs/default.nix
+++ b/pkgs/tools/filesystems/httpfs/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     license = "GPLv2+";
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/filesystems/jfsrec/default.nix b/pkgs/tools/filesystems/jfsrec/default.nix
index 91060795e7c..fb5b72d714a 100644
--- a/pkgs/tools/filesystems/jfsrec/default.nix
+++ b/pkgs/tools/filesystems/jfsrec/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "jfsrec-pre-svn-7";
   
   src = fetchurl {
-    url = http://downloads.sourceforge.net/jfsrec/jfsrec-svn-7.tar.gz;
+    url = mirror://sourceforge/jfsrec/jfsrec-svn-7.tar.gz;
     sha256 = "163z6ljr05vw2k5mj4fim2nlg4khjyibrii95370pvn474mg28vg";
   };
 
diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix
index bf7b5f40801..f5c07b031b8 100644
--- a/pkgs/tools/filesystems/mtools/default.nix
+++ b/pkgs/tools/filesystems/mtools/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/mtools/;
     description = "GNU mtools, utilities to access MS-DOS disks";
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix
new file mode 100644
index 00000000000..2cd40bb0867
--- /dev/null
+++ b/pkgs/tools/filesystems/nixpart/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, buildPythonPackage, blivet
+# Propagated to blivet
+, useNixUdev ? null, udevSoMajor ? null
+}:
+
+let
+  blivetOverrides = stdenv.lib.filterAttrs (k: v: v != null) {
+    inherit useNixUdev udevSoMajor;
+  };
+in buildPythonPackage rec {
+  name = "nixpart-${version}";
+  version = "0.4.1";
+
+  src = fetchurl {
+    url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz";
+    sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp";
+  };
+
+  propagatedBuildInputs = [ (blivet.override blivetOverrides) ];
+
+  doCheck = false;
+
+  meta = {
+    description = "NixOS storage manager/partitioner";
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.aszlig ];
+  };
+}
diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix
index 946d18b8cc5..6f8ec54c4c0 100644
--- a/pkgs/tools/graphics/barcode/default.nix
+++ b/pkgs/tools/graphics/barcode/default.nix
@@ -12,8 +12,7 @@ let
     version="0.98";
     baseName="barcode";
     name="${baseName}-${version}";
-    # mirror://gnu/ doesn't work for this package
-    url="http://ftp.gnu.org/gnu/${baseName}/${name}.tar.gz";
+    url="mirror://gnu/${baseName}/${name}.tar.gz";
     hash="0ddn17a6hz817bchgjxrjg76v64kzl5zlll8x73ply5rg69f2aa2";
   };
 in
diff --git a/pkgs/tools/graphics/dmtx/default.nix b/pkgs/tools/graphics/dmtx/default.nix
index ae3a227a4fe..29c6b5ebf79 100644
--- a/pkgs/tools/graphics/dmtx/default.nix
+++ b/pkgs/tools/graphics/dmtx/default.nix
@@ -12,7 +12,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://prdownloads.sourceforge.net/libdmtx/libdmtx-${version}.tar.bz2";
+    url = "mirror://sourceforge/libdmtx/libdmtx-${version}.tar.bz2";
     sha256 = "0iin2j3ad7ldj32dwc04g28k54iv3lrc5121rgyphm7l9hvigbvk";
   };
 
diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix
new file mode 100644
index 00000000000..64222185044
--- /dev/null
+++ b/pkgs/tools/graphics/editres/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, libXt, libXaw, libXres, utilmacros }:
+
+stdenv.mkDerivation rec {
+  name = "editres-1.0.6";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/${name}.tar.gz";
+    sha256 = "06kv7dmw6pzlqc46dbh8k9xpb6sn4ihh0bcpxq0zpvw2lm66dx45";
+  };
+
+  buildInputs = [ pkgconfig libXt libXaw libXres utilmacros ];
+
+  preConfigure = "configureFlags=--with-appdefaultdir=$out/share/X11/app-defaults/editres";
+
+  meta = {
+    homepage = "http://cgit.freedesktop.org/xorg/app/editres/";
+    description = "a dynamic resource editor for X Toolkit applications";
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index 485edf7335d..5dee1079ae2 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, gd, texinfo, makeWrapper
+{ stdenv, fetchurl, zlib, gd, texinfo, makeWrapper, readline
 , texLive ? null
 , lua ? null
 , emacs ? null
@@ -10,9 +10,9 @@
 , pango ? null
 , cairo ? null
 , pkgconfig ? null
-, readline
-, fontconfig ? null, gnused ? null, coreutils ? null
-}:
+, fontconfig ? null
+, gnused ? null
+, coreutils ? null }:
 
 assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null);
 
@@ -26,11 +26,14 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw
-      wxGTK pango cairo pkgconfig makeWrapper
-    ];
+      pango cairo pkgconfig makeWrapper ]
+    # compiling with wxGTK causes a malloc (double free) error on darwin
+    ++ stdenv.lib.optional (!stdenv.isDarwin) wxGTK;
 
   configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"];
 
+  NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
+
   postInstall = stdenv.lib.optionalString (libX11 != null) ''
     wrapProgram $out/bin/gnuplot \
        --prefix PATH : '${gnused}/bin' \
@@ -39,9 +42,10 @@ stdenv.mkDerivation rec {
        --run '. ${./set-gdfontpath-from-fontconfig.sh}'
   '';
 
-  meta = {
-    homepage = "http://www.gnuplot.info";
+  meta = with stdenv.lib; {
+    homepage    = http://www.gnuplot.info;
     description = "A portable command-line driven graphing utility for many platforms";
-    platforms = stdenv.lib.platforms.all;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ lovek323 ];
   };
 }
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 2af863e37bc..39e134ad906 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2, makeWrapper, libX11 }:
+{ stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2, makeWrapper, libX11, libtiff }:
 
 let rev = 1742; in
 stdenv.mkDerivation {
@@ -12,18 +12,28 @@ stdenv.mkDerivation {
 
   NIX_CFLAGS_COMPILE = "-fPIC"; # Gentoo adds this on every platform
 
-  buildInputs = [ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libX11 ];
+  buildInputs = [ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libX11 libtiff ];
 
-  configurePhase = "cp config.mk.in config.mk";
+  configurePhase = ''
+    cp config.mk.in config.mk
+    substituteInPlace "config.mk" \
+        --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff}/lib/libtiff.so" \
+        --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff}/include" \
+        --replace "TIFFLIB_NEEDS_JPEG = Y" "TIFFLIB_NEEDS_JPEG = N" \
+        --replace "TIFFLIB_NEEDS_Z = Y" "TIFFLIB_NEEDS_Z = N"
+  '';
 
   preBuild = ''
-    export LDFLAGS=-lz
+    export LDFLAGS="-lz"
     substituteInPlace "pm_config.in.h" \
         --subst-var-by "rgbPath1" "$out/lib/rgb.txt" \
         --subst-var-by "rgbPath2" "/var/empty/rgb.txt" \
         --subst-var-by "rgbPath3" "/var/empty/rgb.txt"
+    touch lib/standardppmdfont.c
   '';
 
+  enableParallelBuilding = true;
+
   installPhase = ''
     make package pkgdir=$PWD/netpbmpkg
     # Pass answers to the script questions
@@ -51,5 +61,6 @@ stdenv.mkDerivation {
     homepage = http://netpbm.sourceforge.net/;
     description = "Toolkit for manipulation of graphic images";
     license = "GPL,free";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix
index b3d75106980..efdeffe1ad7 100644
--- a/pkgs/tools/graphics/pstoedit/default.nix
+++ b/pkgs/tools/graphics/pstoedit/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pstoedit-3.50";
 
   src = fetchurl {
-    url = http://prdownloads.sourceforge.net/pstoedit/pstoedit-3.50.tar.gz;
+    url = mirror://sourceforge/pstoedit/pstoedit-3.50.tar.gz;
     sha256 = "04ap21fxj2zn6vj9mv7zknj4svcbkb1gxwfzxkw5i0sksx969c92";
   };
 
diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix
new file mode 100644
index 00000000000..bec0840490d
--- /dev/null
+++ b/pkgs/tools/misc/aescrypt/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, libiconvOrEmpty }:
+ 
+stdenv.mkDerivation rec {
+  version = "3.0.9";
+  name = "aescrypt-${version}";
+  
+  src = fetchurl {
+    url = "http://www.aescrypt.com/download/v3/linux/${name}.tgz";
+    sha256 = "3f3590f9b7e50039611ba9c0cf1cae1b188a44bd39cfc41553db7ec5709c0882";
+  };
+
+  preBuild = ''
+    cd src
+  '';
+
+  installPhase= ''
+    mkdir -p $out/bin
+    cp aescrypt $out/bin
+    cp aescrypt_keygen $out/bin
+  '';
+ 
+  buildInputs = [ libiconvOrEmpty ];
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv";
+ 
+  meta = with stdenv.lib; {
+    description = "A file encryption util that uses the industry standard Advanced Encryption Standard (AES) to easily and securely encrypt files";
+    homepage    = http://www.aescrypt.com/;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ lovek323 qknight ];
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
+
diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix
index 459c9c86ce4..9b9155a1edb 100644
--- a/pkgs/tools/misc/autojump/default.nix
+++ b/pkgs/tools/misc/autojump/default.nix
@@ -16,6 +16,9 @@ in
     dontBuild = true;
 
     installPhase = ''
+      # don't check shell support (we're running with bash anyway)
+      sed -i -e 150,153d install.sh
+
       bash ./install.sh -d $out
 
       mkdir -p "$out/etc/bash_completion.d"
diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix
new file mode 100644
index 00000000000..29a6db4e6d2
--- /dev/null
+++ b/pkgs/tools/misc/bmon/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, ncurses, confuse, libnl }:
+
+stdenv.mkDerivation {
+  name = "bmon-3.1";
+
+  src = fetchurl {
+    url = http://www.carisma.slowglass.com/~tgr/bmon/files/bmon-3.1.tar.gz;
+    sha256 = "005ib7c3g3cva0rdwsgl6hfakxd5yp88sf4bjxb6iarcm3ax18ky";
+  };
+
+  buildInputs = [ pkgconfig ncurses confuse libnl ];
+
+  meta = with stdenv.lib; {
+    description = "Network bandwidth monitor";
+    homepage = http://www.carisma.slowglass.com/~tgr/bmon/;
+    # Neither the homepage nor the source archive has license info, but in the
+    # latest git version there is a LICENSE file that is the 2-clause BSD
+    # license.
+    #  - https://github.com/tgraf/bmon/blob/master/LICENSE
+    #  - http://opensource.org/licenses/BSD-2-Clause
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/tools/misc/coreutils/8.19.nix b/pkgs/tools/misc/coreutils/8.19.nix
index f3bee551960..23db167f307 100644
--- a/pkgs/tools/misc/coreutils/8.19.nix
+++ b/pkgs/tools/misc/coreutils/8.19.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
 
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index f55fbc31925..da3e8d09a23 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -72,7 +72,7 @@ let
 
       license = "GPLv3+";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix
index b9a15ac6a20..75a9a2037db 100644
--- a/pkgs/tools/misc/dmg2img/default.nix
+++ b/pkgs/tools/misc/dmg2img/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, bzip2, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "dmg2img-1.6.2";
+  name = "dmg2img-1.6.4";
 
   src = fetchurl {
     url = "http://vu1tur.eu.org/tools/${name}.tar.gz";
-    sha256 = "1ibxjsrl9g877qi3jjpv0zdgl4x8j1vnd4y27q17a8my1jkhh5cg";
+    sha256 = "1vcrkphrxdn6dlna8j47a5zaxvdr74msf1sqnc4ldskf35k87fyb";
   };
- 
+
   buildInputs = [zlib bzip2 openssl];
 
   installPhase = ''
diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index 1fc03a4ebff..90d345daa13 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -1,11 +1,18 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "ethtool-3.2";
+stdenv.mkDerivation rec {
+  name = "ethtool-3.10";
 
   src = fetchurl {
-    url = mirror://kernel/software/network/ethtool/ethtool-3.2.tar.xz;
-    sha256 = "0g9ldaba3vwlsmf490j33y3fgsmpfzxlzzblwashl448f8lcfap7";
+    url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
+    sha256 = "0h0wvi0s6s80v26plkh66aiyybpfyi18sjg5pl9idrd0ccdr93gq";
   };
 
+  meta = with stdenv.lib; {
+    description = "Utility for controlling network drivers and hardware";
+    homepage = https://www.kernel.org/pub/software/network/ethtool/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
 }
diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
new file mode 100644
index 00000000000..ea54ab4a543
--- /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/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index d824d76a864..91933224467 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = with stdenv.lib.maintainers; [ ludo shlevy ];
+    maintainers = with stdenv.lib.maintainers; [ shlevy ];
 
     platforms = if EFIsupport then
       [ "i686-linux" "x86_64-linux" ]
diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix
index eb9aa5feaa3..f3c5dd02c7e 100644
--- a/pkgs/tools/misc/hddtemp/default.nix
+++ b/pkgs/tools/misc/hddtemp/default.nix
@@ -4,12 +4,12 @@ stdenv.mkDerivation {
   name = "hddtemp-0.3_beta15";
 
   db = fetchurl{
-    url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db;
+    url = mirror://savannah/hddtemp/hddtemp.db;
     sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya";
   };
 
   src = fetchurl {
-    url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2;
+    url = mirror://savannah/hddtemp/hddtemp-0.3-beta15.tar.bz2;
     sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1";
   };
 
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index c8ba478af33..0aacf744b1a 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -3,7 +3,7 @@
 , fetchurl
 }:
 stdenv.mkDerivation {
-  name = "hdf5-1.8.10";
+  name = "hdf5-1.8.10-patch1";
   src = fetchurl {
     url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.10-patch1.tar.gz;
     sha256 = "08ad32fhnci6rdfn6mn3w9v1wcaxdcd326n3ljwkcq4dzhkh28qz";  			
diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix
index b76b9a18715..e01a28ab185 100644
--- a/pkgs/tools/misc/idutils/default.nix
+++ b/pkgs/tools/misc/idutils/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/idutils/;
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index 54367e671ea..5374cb74361 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "man-db-2.5.1";
   
   src = fetchurl {
-    url = http://download.savannah.nongnu.org/releases/man-db/man-db-2.5.1.tar.gz;
+    url = mirror://savannah/man-db/man-db-2.5.1.tar.gz;
     sha256 = "178w1fk23ffh8vabj29cn0yyg5ps7bwy1zrrrcsw8aypbh3sfjy3";
   };
   
diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix
new file mode 100644
index 00000000000..7701f0e2059
--- /dev/null
+++ b/pkgs/tools/misc/mcrypt/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, libmcrypt, libmhash }:
+ 
+stdenv.mkDerivation rec {
+  version = "2.6.8";
+  name = "mcrypt-${version}";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${name}.tar.gz";
+    sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098";
+  };
+ 
+  buildInputs = [libmcrypt libmhash];
+ 
+  meta = {
+    description = "mcrypt, and the accompanying libmcrypt, are intended to be replacements for the old Unix crypt, except that they are under the GPL and support an ever-wider range of algorithms and modes.";
+    homepage = http://mcrypt.sourceforge.net;
+    license = "GPLv2";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.qknight ];
+  };
+}
diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix
index 9b1968c6fd1..ee9dc4f28b6 100644
--- a/pkgs/tools/misc/mdbtools/default.nix
+++ b/pkgs/tools/misc/mdbtools/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "mdbtools-0.6pre1";
 
   src = fetchurl {
-    url = http://prdownloads.sourceforge.net/mdbtools/mdbtools-0.6pre1.tar.gz;
+    url = mirror://sourceforge/mdbtools/mdbtools-0.6pre1.tar.gz;
     sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi";
   };
 
diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix
index ef735bf4384..2ab1195020c 100644
--- a/pkgs/tools/misc/minicom/default.nix
+++ b/pkgs/tools/misc/minicom/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "minicom-2.4";
+  name = "minicom-2.6.2";
 
   src = fetchurl {
-    url = "http://alioth.debian.org/frs/download.php/3195/${name}.tar.gz";
-    sha256 = "0j0ayimh3389pciqs60fsfafn87p9gnmmmqz15xq9fkkn10g4ykb";
+    url = "http://alioth.debian.org/frs/download.php/file/3869/${name}.tar.gz";
+    sha256 = "0s4ibk8scspm8a0raf5s4zgp9b82c4bn529rir9abzqlg5gj3kzk";
   };
 
   buildInputs = [ncurses];
diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix
index 713d6dc70b8..f177e9e84c2 100644
--- a/pkgs/tools/misc/mktorrent/default.nix
+++ b/pkgs/tools/misc/mktorrent/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, openssl}:
 
 stdenv.mkDerivation {
-  name = "mktorrent-1.0.0";
+  name = "mktorrent-1.0";
 
   src = fetchurl {
     url = mirror://sourceforge/mktorrent/mktorrent-1.0.tar.gz;
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index ead17461750..d58b57196d2 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
     license = "GPLv3+";
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix
index 04ff98b5e7b..0eceea4a57e 100644
--- a/pkgs/tools/misc/parcellite/default.nix
+++ b/pkgs/tools/misc/parcellite/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "parcellite-1.1.4";
+  name = "parcellite-1.1.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/parcellite/${name}.tar.gz";
-    sha256 = "10lr2gx81i7nlxvafa9j9hnlj402k1szyi08xsl841hs1m9zdwan";
+    sha256 = "0nz951ykj162mfbcn3w9zk525ww6qcqn5yqdx13nx70fnn6rappi";
   };
 
   buildInputs = [ pkgconfig intltool gtk2 ];
@@ -14,5 +14,7 @@ stdenv.mkDerivation rec {
     description = "Lightweight GTK+ clipboard manager";
     homepage = "http://parcellite.sourceforge.net";
     license = "GPLv3+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
   };
 }
diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix
new file mode 100644
index 00000000000..17be93dda8f
--- /dev/null
+++ b/pkgs/tools/misc/ponysay/default.nix
@@ -0,0 +1,33 @@
+{ 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 ];
+
+  inherit python3;
+
+  phases = "unpackPhase installPhase fixupPhase";
+
+  installPhase = ''
+    find -type f -name "*.py" | xargs sed -i "s@/usr/bin/env python3@$python3/bin/python3@g"
+    substituteInPlace setup.py --replace \
+        "fileout.write(('#!/usr/bin/env %s\n' % env).encode('utf-8'))" \
+        "fileout.write(('#!%s/bin/%s\n' % (os.environ['python3'], env)).encode('utf-8'))"
+    python3 setup.py --prefix=$out --freedom=partial install \
+        --with-shared-cache=$out/share/ponysay \
+        --with-bash
+  '';
+
+  meta = {
+    description = "cowsay reimplemention for ponies.";
+    homepage = http://terse.tk/ponysay/;
+    license = "GPLv3";
+    maintainers = with stdenv.lib.maintainers; [ bodil ];
+  };
+}
diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix
index 739fe8b801c..e798ee669e2 100644
--- a/pkgs/tools/misc/recutils/default.nix
+++ b/pkgs/tools/misc/recutils/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     license = "GPLv3+";
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix
index 6d4793a4aab..527dbe85813 100644
--- a/pkgs/tools/misc/renameutils/default.nix
+++ b/pkgs/tools/misc/renameutils/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, readline}:
 
 stdenv.mkDerivation {
-  name = "renameutils-0.12";
+  name = "renameutils-0.12.0";
 
   src = fetchurl {
     url = mirror://savannah/renameutils/renameutils-0.12.0.tar.gz;
diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index a1cf21aa64a..805bcf6b01c 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -8,6 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "bea39a5872b39d3596e756f242967bc5bde6febeb996fdcd63fbcf5bfdc75f01";
   };
 
+  preConfigure = ''
+    substituteInPlace Makefile.in \
+      --replace "/usr/" "/"
+  '';
+
   makeFlags="DESTDIR=$(out)";
 
   meta = {
diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index 2a3f53d6741..7363719b66d 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix
index 6ccfea50482..47734b4cd69 100644
--- a/pkgs/tools/misc/testdisk/default.nix
+++ b/pkgs/tools/misc/testdisk/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "testdisk-6.13";
-  
+
   src = fetchurl {
     url = http://www.cgsecurity.org/testdisk-6.13.tar.bz2;
     sha256 = "087jrn41z3ymf1b6njl2bg99pr79v8l1f63f7rn5ni69vz6mq9s8";
@@ -13,6 +13,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.cgsecurity.org/wiki/TestDisk;
     license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
     longDescription = ''
       TestDisk is a program for data recovery, primarily designed to
       help recover lost partitions and/or make non-booting disks
diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix
index 659b04a6238..5a03e099539 100644
--- a/pkgs/tools/misc/ttf2pt1/default.nix
+++ b/pkgs/tools/misc/ttf2pt1/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ttf2pt1-3.4.4";
 
   src = fetchurl {
-    url = http://prdownloads.sourceforge.net/ttf2pt1/ttf2pt1-3.4.4.tgz;
+    url = mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz;
     sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf";
   };
 
diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix
index 8cf31ff7208..b267074e77f 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/misc/units/default.nix b/pkgs/tools/misc/units/default.nix
index a056ec13f02..d4cd07aa4c6 100644
--- a/pkgs/tools/misc/units/default.nix
+++ b/pkgs/tools/misc/units/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation {
   name = "units-1.86";
 
   src = fetchurl {
-    url = ftp://ftp.gnu.org/gnu/units/units-1.86.tar.gz;
+    url = mirror://gnu/units/units-1.86.tar.gz;
     sha256 = "1syc4d3x1wb03hcxnz7rkgapk96biazfk2qqn2wfyx54bq829lhi";
   };
 
diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix
index 661f1ae46eb..f8ad1fd4d15 100644
--- a/pkgs/tools/misc/uucp/default.nix
+++ b/pkgs/tools/misc/uucp/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     license = "GPLv2+";
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix
new file mode 100644
index 00000000000..b4f9732dec6
--- /dev/null
+++ b/pkgs/tools/misc/venus/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, python, pythonPackages, libxslt, libxml2, makeWrapper }:
+
+let
+  rev = "9de21094a8cf565bdfcf75688e121a5ad1f5397b";
+in
+
+stdenv.mkDerivation rec {
+  name = "venus-${rev}";
+
+  src = fetchurl {
+    url = "https://github.com/rubys/venus/tarball/${rev}";
+    name = "${name}.tar.bz";
+    sha256 = "0lsc9d83grbi3iwm8ppaig4h9vbmd5h4vvz83lmpnyp7zqfka7dy";
+  };
+
+  preConfigure = ''
+    substituteInPlace tests/test_spider.py \
+        --replace "urllib.urlopen('http://127.0.0.1:%d/' % _PORT).read()" "" \
+        --replace "[200,200,200,200,404]" "[200,200,200,404]"
+    substituteInPlace planet.py \
+        --replace "#!/usr/bin/env python" "#!${python}/bin/python"
+    substituteInPlace tests/test_apply.py \
+        --replace "'xsltproc" "'${libxslt}/bin/xsltproc"
+    substituteInPlace planet/shell/xslt.py \
+        --replace "'xsltproc" "'${libxslt}/bin/xsltproc"
+  '';
+
+  doCheck = true;
+  checkPhase = "python runtests.py";
+
+  buildInputs = [ python python.modules.bsddb python.modules.ssl libxslt
+    libxml2 pythonPackages.genshi pythonPackages.lxml makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -R ./* $out/
+    ln -s $out/planet.py $out/bin/venus-planet
+    wrapProgram $out/planet.py \
+        --prefix PYTHONPATH : $PYTHONPATH:${pythonPackages.lxml}/lib/${python.libPrefix}/site-packages:${pythonPackages.genshi}/lib/${python.libPrefix}/site-packages
+    python runtests.py
+  '';
+
+  meta = {
+    description = "Planet Venus is an awesome ‘river of news’ feed reader. It downloads news feeds published by web sites and aggregates their content together into a single combined feed, latest news first.";
+    homepage = "http://intertwingly.net/code/venus/docs/index.html";
+    license = stdenv.lib.licenses.psfl;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+  };
+}
diff --git a/pkgs/tools/misc/vfdecrypt/default.nix b/pkgs/tools/misc/vfdecrypt/default.nix
index 5692aecebbf..de7ee27d704 100644
--- a/pkgs/tools/misc/vfdecrypt/default.nix
+++ b/pkgs/tools/misc/vfdecrypt/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "vfdecrypt";
 
   src = fetchgit {
-    url = git://github.com/dra1nerdrake/VFDecrypt.git;
+    url = git://github.com/drakealleg/VFDecrypt.git;
     rev = "4e2fa32816254907e82886b936afcae9859a876c";
     sha256 = "0b945805f7f60bf48556c2db45c9ab26485fb05acbc6160a563d529b20cb56a3";
   };
diff --git a/pkgs/tools/networking/aria/default.nix b/pkgs/tools/networking/aria/default.nix
index 120e32ab29c..4f58463ecf9 100644
--- a/pkgs/tools/networking/aria/default.nix
+++ b/pkgs/tools/networking/aria/default.nix
@@ -4,7 +4,7 @@ let version="0.14.0"; in
 rec {
   src = /* Here a fetchurl expression goes */
   fetchurl {
-    url = "http://downloads.sourceforge.net/aria2/aria2c-${version}.tar.bz2";
+    url = "mirror://sourceforge/aria2/aria2c-${version}.tar.bz2";
     sha256 = "0d6vpy7f4228byahsg4dlhalfkbscx941klhdlxd0y5c3mxxwkfr";
   };
 
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 383a2963ff2..75b6492a851 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, openssl, libxml2, zlib }:
+{ stdenv, fetchurl, pkgconfig, openssl, libxml2, sqlite, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "aria2-1.10.8";
+  name = "aria2-1.17.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.bz2";
-    sha256 = "1cbcrxwdc6gp4l4zqg2i18zdg5ry5f9r3zj66kx6l5plwfjv9fdc";
+    sha256 = "0v0cdbv6v7fb4870rz5s9vscsj74fzbj70gsa2y4hysai4a0im3y";
   };
 
-  buildInputs = [ openssl libxml2 zlib ];
+  buildInputs = [ pkgconfig openssl libxml2 sqlite zlib ];
 
   meta = {
     homepage = http://aria2.sourceforge.net/;
diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix
new file mode 100644
index 00000000000..88460d86730
--- /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 73dcb44269c..40e2d970622 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.30.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/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index e83ad7933f1..91061a457d4 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchgit, python, sysstat }:
+{ stdenv, fetchurl, python, sysstat, unzip }:
 
 stdenv.mkDerivation rec {
-    name = "dd-agent-ab14fde6f9";
+    version = "3.8.0";
+    name = "dd-agent-${version}";
 
-    src = fetchgit {
-      url = git://github.com/DataDog/dd-agent.git;
-      rev = "ab14fde6f9b9f6cb3544f643cece97ef18a0d770";
-      sha256 = "2615a2f122ac97363eba8973dfc6c2ce81cb61a26eb61c2988faad2abd05efc5";
+    src = fetchurl {
+      url = "https://github.com/DataDog/dd-agent/archive/${version}.zip";
+      sha256 = "1mh22rbja07gc7ydn357hlij0dl2rygkqsya9ckynsvmkkzn2gyx";
     };
 
-    buildInputs = [ python ];
+    buildInputs = [ python unzip ];
+    propagatedBuildInputs = [ python ];
 
     postUnpack = "export sourceRoot=$sourceRoot/packaging";
 
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
 
       homepage = http://www.datadoghq.com;
 
-      maintainers = [ stdenv.lib.maintainers.shlevy ];
+      maintainers = [ stdenv.lib.maintainers.shlevy stdenv.lib.maintainers.iElectric ];
 
       license = stdenv.lib.licenses.bsd3;
 
diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix
new file mode 100644
index 00000000000..99cfb92a18b
--- /dev/null
+++ b/pkgs/tools/networking/easyrsa/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, autoconf, automake111x, makeWrapper
+, gnugrep, openssl}:
+
+stdenv.mkDerivation rec {
+  name = "easyrsa-2.2.0";
+
+  src = fetchurl {
+    url = "https://github.com/OpenVPN/easy-rsa/archive/v2.2.0.tar.gz";
+    sha256 = "1xq4by5frb6ikn53ss3y8v7ss639dccxfq8jfrbk07ynkmk668qk";
+  };
+
+  # Copy missing files and autoreconf
+  preConfigure = ''
+    cp ${automake111x}/share/automake/install-sh .
+    cp ${automake111x}/share/automake/missing .
+
+    autoreconf
+  '';
+
+  preBuild = ''
+    mkdir -p $out/share/easy-rsa
+  '';
+
+  nativeBuildInputs = [ autoconf makeWrapper automake111x ];
+  buildInputs = [ gnugrep openssl];
+
+  # Make sane defaults and patch default config vars
+  postInstall = ''
+    for prog in $(find "$out/share/easy-rsa" -executable); do
+      makeWrapper "$prog" "$out/bin/$(basename $prog)" \
+        --set EASY_RSA "$out/share/easy-rsa" \
+        --set OPENSSL "${openssl}/bin/openssl" \
+        --set GREP "${gnugrep}/bin/grep"
+    done
+    sed -i "/EASY_RSA=\|OPENSSL=\|GREP=/d" $out/share/easy-rsa/vars
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple shell based CA utility";
+    homepage = http://openvpn.net/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.offline ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix
index 8649eda4bf7..13efc944bd0 100644
--- a/pkgs/tools/networking/eggdrop/default.nix
+++ b/pkgs/tools/networking/eggdrop/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, tcl}:
 
 stdenv.mkDerivation {
-  name = "eggdrop-1.6.19";
+  name = "eggdrop-1.6.19+ctcpfix";
 
   src = fetchurl {
     url = ftp://ftp.eggheads.org/pub/eggdrop/GNU/1.6/eggdrop1.6.19+ctcpfix.tar.gz;
diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix
index 052367400ef..a6700284af5 100644
--- a/pkgs/tools/networking/fdm/default.nix
+++ b/pkgs/tools/networking/fdm/default.nix
@@ -11,10 +11,10 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="fdm";
-    version="1.6";
+    version="1.7";
     name="${baseName}-${version}";
-    url="http://downloads.sourceforge.net/${baseName}/${name}.tar.gz";
-    hash="01ipxay4rv52ra2zzybf92x6n1hyklib94ncsg04k3rp4w5a8sbj";
+    url="mirror://sourceforge/${baseName}/${baseName}/${name}.tar.gz";
+    hash="0apg1jasn4m5j3vh0v9lr2l3lyzy35av1ylxr0wf8k0j9w4p8i28";
   };
 in
 rec {
@@ -26,7 +26,7 @@ rec {
   inherit (sourceInfo) name version;
   inherit buildInputs;
 
-  phaseNames = ["fixInstall" "doMakeInstall"];
+  phaseNames = ["doConfigure" "fixInstall" "doMakeInstall"];
   makeFlags = ["PREFIX=$out"];
   fixInstall = a.fullDepEntry (''
     sed -i */Makefile -i Makefile -e 's@ -g bin @ @'
diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix
index 3072ba3bd4f..fc2b56efd10 100644
--- a/pkgs/tools/networking/filegive/default.nix
+++ b/pkgs/tools/networking/filegive/default.nix
@@ -18,9 +18,8 @@ stdenv.mkDerivation rec {
   name = "filegive-${version}";
 
   src = fetchurl {
-    url = "http://viric.name/cgi-bin/filegive/tarball/${name}.tar.gz?uuid=v${version}";
-    name = "${name}.tar.gz";
-    sha256 = "172cvm41bqaixz50f86ppqbbridb0qnrcdldfswrs03dc569szm1";
+    url = "http://viric.name/cgi-bin/filegive/tarball/${name}.tar.gz";
+    sha256 = "11rjw906nr73kysm9l84yg443rxzh22l934hir7892h02924i4c4";
   };
 
   buildInputs = [ go ];
diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix
index cbc07522019..c9bc05658d0 100644
--- a/pkgs/tools/networking/flvstreamer/default.nix
+++ b/pkgs/tools/networking/flvstreamer/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "flvstreamer-2.1c1";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/flvstreamer/source/${name}.tar.gz";
+    url = "mirror://savannah/flvstreamer/source/${name}.tar.gz";
     sha256 = "e90e24e13a48c57b1be01e41c9a7ec41f59953cdb862b50cf3e667429394d1ee";
   };
 
diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix
index 1ea2b761fc8..8ab93948191 100644
--- a/pkgs/tools/networking/gmvault/default.nix
+++ b/pkgs/tools/networking/gmvault/default.nix
@@ -24,6 +24,7 @@ buildPythonPackage rec {
   patchPhase = ''
     cat ${startScript} > etc/scripts/gmvault
     chmod +x etc/scripts/gmvault
+    substituteInPlace setup.py --replace "Logbook==0.4.1" "Logbook==0.4.2"
   '';
 
   meta = {
diff --git a/pkgs/tools/networking/gvpe/src-for-default.nix b/pkgs/tools/networking/gvpe/src-for-default.nix
index 097f275feff..88264c5d771 100644
--- a/pkgs/tools/networking/gvpe/src-for-default.nix
+++ b/pkgs/tools/networking/gvpe/src-for-default.nix
@@ -2,7 +2,7 @@ rec {
    version="2.24";
    name="gvpe-2.24";
    hash="1szwia7n24fx9n40yvmdidna55b97459ccq6d2c4863q4pfkqpjy";
-   url="http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz";
+   url="mirror://gnu/gvpe/gvpe-${version}.tar.gz";
    advertisedUrl="http://ftp.gnu.org/gnu/gvpe/gvpe-2.24.tar.gz";
   
   
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 0a43251dc35..d44c9f831f3 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -1,21 +1,29 @@
-{ stdenv, fetchurl }:
+{ stdenv, pkgs, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "haproxy-1.4.20";
+stdenv.mkDerivation rec {
+  version = "1.4.24";
+  name = "haproxy-${version}";
   
   src = fetchurl {
-    url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.20.tar.gz;
-    sha256 = "0gi81dg8k3ypljs7ifbppvpfrwrnbafjv41fjpwnyqfwbxa4j2gh";
+    url = "http://haproxy.1wt.eu/download/1.4/src/${name}.tar.gz";
+    sha256 = "1vy7jz7l8qdd6ah3y65zarz9x9pf3bs02icxnrckpgh1s3s2h2b8";
   };
 
-  buildInputs = [];
+  buildInputs = [ ];
 
+  # TODO: make it work on darwin/bsd as well
   preConfigure = ''
-    export makeFlags="TARGET=linux26 PREFIX=$out"
+    export makeFlags="TARGET=linux2628 PREFIX=$out"
   '';
-  
+
   meta = {
     description = "HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications.";
-    homepage = http://haproxy.1wt.eu/;
+    homepage = http://haproxy.1wt.eu;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    platforms = stdenv.lib.platforms.linux;
+    license = [
+       stdenv.lib.licenses.gpl2
+       stdenv.lib.licenses.lgpl21
+    ];
   };
 }
diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix
index 3a9c0e10a78..a1f5026fb28 100644
--- a/pkgs/tools/networking/iftop/default.nix
+++ b/pkgs/tools/networking/iftop/default.nix
@@ -18,10 +18,15 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ncurses libpcap];
 
-  meta = {
-    description = "iftop does for network usage what top(1) does for CPU usage. It listens to network traffic on a named interface and displays a table of current bandwidth usage by pairs of hosts.";
-
-    license = "GPLv2+";
+  meta = with stdenv.lib; {
+    description = "Display bandwidth usage on a network interface";
+    longDescription = ''
+      iftop does for network usage what top(1) does for CPU usage. It listens
+      to network traffic on a named interface and displays a table of current
+      bandwidth usage by pairs of hosts.
+    '';
+    license = licenses.gpl2Plus;
     homepage = http://ex-parrot.com/pdw/iftop/;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix
index 33cc53d5511..f6be163bb83 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/iperf/default.nix b/pkgs/tools/networking/iperf/default.nix
index 1cb984e3d1c..66f600f7678 100644
--- a/pkgs/tools/networking/iperf/default.nix
+++ b/pkgs/tools/networking/iperf/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "iperf-2.0.4";
 
   src = fetchurl {
-    url = http://garr.dl.sourceforge.net/sourceforge/iperf/iperf-2.0.4.tar.gz;
+    url = mirror://sourceforge/iperf/iperf-2.0.4.tar.gz;
     sha256 = "0i3r75prbyxs56rngjbrag8rg480ki3daaa924krrafng30z2liv";
   };
 
diff --git a/pkgs/tools/networking/mpack/build-fix.patch b/pkgs/tools/networking/mpack/build-fix.patch
new file mode 100644
index 00000000000..0329bedd07f
--- /dev/null
+++ b/pkgs/tools/networking/mpack/build-fix.patch
@@ -0,0 +1,29 @@
+diff -ubr mpack-1.6-orig/unixos.c mpack-1.6/unixos.c
+--- mpack-1.6-orig/unixos.c	2013-08-17 14:32:38.102772775 +0200
++++ mpack-1.6/unixos.c	2013-08-17 14:32:43.180792505 +0200
+@@ -38,10 +38,6 @@
+ #define MAXHOSTNAMELEN 64
+ #endif
+ 
+-extern int errno;
+-extern char *malloc();
+-extern char *getenv();
+-
+ int overwrite_files = 0;
+ int didchat;
+ 
+Only in mpack-1.6: unixos.o
+Only in mpack-1.6: unixunpk.o
+Only in mpack-1.6: uudecode.o
+diff -ubr mpack-1.6-orig/xmalloc.c mpack-1.6/xmalloc.c
+--- mpack-1.6-orig/xmalloc.c	2013-08-17 14:32:38.102772775 +0200
++++ mpack-1.6/xmalloc.c	2013-08-17 14:33:08.900892319 +0200
+@@ -24,7 +24,6 @@
+  */
+ #include <stdio.h>
+ #include <string.h>
+-extern char *malloc(), *realloc();
+ 
+ char *xmalloc (int size)
+ {
+Only in mpack-1.6: xmalloc.o
diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/tools/networking/mpack/default.nix
new file mode 100644
index 00000000000..0d004a63920
--- /dev/null
+++ b/pkgs/tools/networking/mpack/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, glib }:
+
+stdenv.mkDerivation rec {
+  name = "mpack-1.6";
+
+  src = fetchurl {
+    url = "http://ftp.andrew.cmu.edu/pub/mpack/${name}.tar.gz";
+    sha256 = "0k590z96509k96zxmhv72gkwhrlf55jkmyqlzi72m61r7axhhh97";
+  };
+
+  patches = [ ./build-fix.patch ];
+
+  preConfigure = "configureFlags=--mandir=$out/share/man";
+
+  meta = {
+    description = "utilities for encoding and decoding binary files in MIME";
+    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 7e86b576967..69c7b77e3f9 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
+, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring, gnome_keyring
 , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
-, makeWrapper, networkmanager_openvpn, udev }:
+, makeWrapper, networkmanager_openvpn, networkmanager_vpnc
+, networkmanager_openconnect, udev, hicolor_icon_theme }:
 
 let
   pn = "network-manager-applet";
@@ -18,19 +19,31 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    gtk libglade networkmanager GConf libnotify libsecret dbus_glib
-    polkit isocodes makeWrapper udev libgnome_keyring
+    gtk libglade networkmanager libnotify libsecret dbus_glib
+    polkit isocodes makeWrapper udev GConf libgnome_keyring
   ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
+  propagatedUserEnvPkgs = [ GConf gnome_keyring hicolor_icon_theme ];
+
   makeFlags = [
     ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''
   ];
 
   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 00000000000..ccb5badd903
--- /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 9817a8cddd1..c51bf09f99c 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 a60199aab2d..41dda0086e4 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 00000000000..683a7e76948
--- /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/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix
index dfade689124..7ef5eb17dc1 100644
--- a/pkgs/tools/networking/nss-mdns/default.nix
+++ b/pkgs/tools/networking/nss-mdns/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
     # Supports both the GNU and FreeBSD NSS.
     platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix
index 92cb053bb44..a63ec2a3d68 100644
--- a/pkgs/tools/networking/nss-pam-ldapd/default.nix
+++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nss-pam-ldapd-${version}";
-  version = "0.8.11";
+  version = "0.8.13";
   
   src = fetchurl {
     url = "http://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz";
-    sha256 = "9a841f6a46bf9f87213dc806c0f6507ac5016a2ee550d42c3ed9fb280c1e38e6";
+    sha256 = "08jxxskzv983grc28zksk9fd8q5qad64rma9vcjsq0l4r6cax4mp";
   };
   
   buildInputs = [ makeWrapper pkgconfig python openldap pam ];
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 1b1aa768a25..a5b46ebbc3c 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 8542580e431..4296ba57f88 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 c341889b3a4..00000000000
--- 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/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix
index eafa51fb4f2..43de92afe9a 100644
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/pkgs/tools/networking/p2p/amule/default.nix
@@ -62,6 +62,6 @@ mkDerivation rec {
     license = "GPLv2+";
 
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.phreedom ];
+    maintainers = [ stdenv.lib.maintainers.phreedom ];
   };
 }
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index 277e95eac96..38adea8af8f 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -90,7 +90,7 @@ buildPythonPackage {
 
     license = [ "GPLv2+" /* or */ "TGPPLv1+" ];
 
-    maintainers = [ lib.maintainers.ludo lib.maintainers.simons  ];
+    maintainers = [ lib.maintainers.simons  ];
     platforms = lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix
index 7457a72b5d5..af5b9aacffc 100644
--- a/pkgs/tools/networking/philter/default.nix
+++ b/pkgs/tools/networking/philter/default.nix
@@ -13,7 +13,7 @@ let
     baseName="philter";
     version="1.1";
     name="${baseName}-${version}";
-    url="http://prdownloads.sourceforge.net/${baseName}/${name}.tar.gz";
+    url="mirror://sourceforge/${baseName}/${name}.tar.gz";
     hash="177pqfflhdn2mw9lc1wv9ik32ji69rjqr6dw83hfndwlsva5151l";
   };
 in
diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
new file mode 100644
index 00000000000..15ca99f47e9
--- /dev/null
+++ b/pkgs/tools/networking/speedtest-cli/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit, pythonPackages }:
+
+stdenv.mkDerivation rec {
+  name = "speedtest-cli-dev";
+  
+  src = fetchgit {
+    url = "https://github.com/sivel/speedtest-cli.git";
+    rev = "fe0940c5744ebe74ca31ad44e6b181d82a89edab";
+    sha256 = "0iywcmgqi58bhldcf8qn1nr7mihypi5fp9s13d4vqc7797xvb28k";
+  };
+
+  buildInputs = [ pythonPackages.python ];
+
+  installPhase = ''
+      mkdir -p $out/bin
+      cp speedtest-cli $out/bin/
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/sivel/speedtest-cli;
+    description = "Command line interface for testing internet bandwidth using speedtest.net";
+    platforms = platforms.all;
+    license = licenses.asl20;
+    maintainers = [ maintainers.iElectric ];
+  };
+}
diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix
index 007efa42827..bf0c2f80694 100644
--- a/pkgs/tools/networking/swec/default.nix
+++ b/pkgs/tools/networking/swec/default.nix
@@ -68,6 +68,6 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix
index 8c8c0241204..54390d4f9ee 100644
--- a/pkgs/tools/networking/uwimap/default.nix
+++ b/pkgs/tools/networking/uwimap/default.nix
@@ -1,22 +1,30 @@
 {stdenv, fetchurl, pam, openssl}:
 
 stdenv.mkDerivation {
-  name = "uw-imap-2007";
+  name = "uw-imap-2007f";
 
   src = fetchurl {
     url = "ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz";
     sha256 = "0a2a00hbakh0640r2wdpnwr8789z59wnk7rfsihh3j0vbhmmmqak";
   };
 
-  makeFlags = "lnp"; # Linux with PAM modules
+  makeFlags = if stdenv.isDarwin
+    then "osx"
+    else "lnp" # Linux with PAM modules;
+    # -fPIC is required to compile php with imap on x86_64 systems
+    + stdenv.lib.optionalString stdenv.isx86_64 " EXTRACFLAGS=-fPIC";
 
-  buildInputs = [ pam openssl ];
+  buildInputs = [ openssl ]
+    ++ stdenv.lib.optional (!stdenv.isDarwin) pam;
 
   patchPhase = ''
     sed -i -e s,/usr/local/ssl,${openssl}, \
       src/osdep/unix/Makefile
   '';
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
+    "-I${openssl}/include/openssl";
+
   installPhase = ''
     mkdir -p $out/bin $out/lib $out/include
     cp c-client/*.h c-client/linkage.c $out/include
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 3b6c28d2ac1..3e3b74dfe90 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/wget/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 47e417ffd8a..524c93d218a 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/networking/wicd/dhclient.patch b/pkgs/tools/networking/wicd/dhclient.patch
index 52d91846518..fbda1caacb7 100644
--- a/pkgs/tools/networking/wicd/dhclient.patch
+++ b/pkgs/tools/networking/wicd/dhclient.patch
@@ -1,4 +1,23 @@
-diff -ruN wicd-1.7.2.4.orig/wicd/wnettools.py wicd-1.7.2.4/wicd/wnettools.py
+diff -ruN wicd-1.7.2.4.orig/wicd/wicd-daemon.py wicd-1.7.2.4/wicd/wicd-daemon.py
+--- wicd-1.7.2.4.orig/wicd/wicd-daemon.py	2013-06-22 18:55:02.641242947 +0000
++++ wicd-1.7.2.4/wicd/wicd-daemon.py	2013-06-22 18:58:33.990244153 +0000
+@@ -69,6 +69,7 @@
+ wireless_conf = os.path.join(wpath.etc, "wireless-settings.conf")
+ wired_conf = os.path.join(wpath.etc, "wired-settings.conf")
+ dhclient_conf = os.path.join(wpath.etc, "dhclient.conf.template")
++dhclient_conf_default = os.path.join(wpath.share, "other", "dhclient.conf.template.default")
+ 
+ class WicdDaemon(dbus.service.Object):
+     """ The main wicd daemon class.
+@@ -910,7 +911,7 @@
+ 
+         if not os.path.isfile(dhclient_conf):
+             print "dhclient.conf.template not found, copying..."
+-            shutil.copy(dhclient_conf + ".default", dhclient_conf)            
++            shutil.copy(dhclient_conf_default, dhclient_conf)
+         # Hide the files, so the keys aren't exposed.
+         print "chmoding configuration files 0600..."
+         os.chmod(app_conf.get_config(), 0600)diff -ruN wicd-1.7.2.4.orig/wicd/wnettools.py wicd-1.7.2.4/wicd/wnettools.py
 --- wicd-1.7.2.4.orig/wicd/wnettools.py	2013-03-30 21:47:19.804907552 +0000
 +++ wicd-1.7.2.4/wicd/wnettools.py	2013-03-31 08:44:37.572792110 +0000
 @@ -37,6 +37,7 @@
diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix
deleted file mode 100644
index beae2e3b5f6..00000000000
--- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchurl
-, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null
-, enableApacheWebApplication ? false
-, enableAxis2WebService ? false
-, enableEjabberdDump ? false
-, enableMySQLDatabase ? false
-, enablePostgreSQLDatabase ? false
-, enableSubversionRepository ? false
-, enableTomcatWebApplication ? false
-, catalinaBaseDir ? "/var/tomcat"
-}:
-
-assert enableMySQLDatabase -> mysql != null;
-assert enablePostgreSQLDatabase -> postgresql != null;
-assert enableSubversionRepository -> subversion != null;
-assert enableEjabberdDump -> ejabberd != null;
-
-stdenv.mkDerivation {
-  name = "disnix-activation-scripts-0.3pre30423";
-  src = fetchurl {
-    url = http://hydra.nixos.org/build/2794103/download/1/disnix-activation-scripts-0.3pre30423.tar.gz;
-    sha256 = "1x1702isjnrkvwzycryc8rvjgka4qqmd1dk34pwl51y1l2bxymrx";
-  };
-  
-  preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
-  
-  configureFlags = ''
-                     ${if enableApacheWebApplication then "--with-apache" else "--without-apache"}
-		     ${if enableAxis2WebService then "--with-axis2" else "--without-axis2"}
-		     ${if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd"}
-		     ${if enableMySQLDatabase then "--with-mysql" else "--without-mysql"}
-		     ${if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql"}
-		     ${if enableSubversionRepository then "--with-subversion" else "--without-subversion"}
-		     ${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"}
-		   '';
-		   
-  buildInputs = []
-                ++ stdenv.lib.optional enableEjabberdDump ejabberd
-                ++ stdenv.lib.optional enableMySQLDatabase mysql
-		++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
-		++ stdenv.lib.optional enableSubversionRepository subversion;
-
-  meta = {
-    description = "Provides various activation types for Disnix";
-    license = "MIT";
-    maintainers = [ stdenv.lib.maintainers.sander ];
-  };
-}
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index 9c17b9b78f7..62a644e195a 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,17 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv }:
+{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, libintlOrEmpty, libiconvOrEmpty }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.3pre32254";
+  name = "disnix-0.3pre57b56b6b9d43b48ce72e4e47f6acfdb3b1cbe3ef";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/2368541/download/4/disnix-0.3pre32254.tar.gz;
-    sha256 = "1jznx4mb6vwpzzpbk4c16j73hjgng7v1nraq8yya7f7m1s2gyhcw";
+    url = http://hydra.nixos.org/build/5576475/download/4/disnix-0.3pre57b56b6b9d43b48ce72e4e47f6acfdb3b1cbe3ef.tar.gz;
+    sha256 = "18sxs4c3a1sr2sldd6p7rmxg6541v1hsl987vzc7ij8mwkcnm1r0";
   };
   
-  buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ]
-                ++ stdenv.lib.optional (!stdenv.isLinux) libiconv
-                ++ stdenv.lib.optional (!stdenv.isLinux) gettext;
-                
+  buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty ];
+
   dontStrip = true;
   
   meta = {
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 93cd2f3f846..80ac91b5489 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.2pre33586";
+  name = "disnixos-0.2pre77208b9bf296b2376bd95154b333db304b50bec0.tar.gz";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/2368187/download/3/disnixos-0.2pre33586.tar.gz;
-    sha256 = "110vn4390447dws343py8ss6s8jizx8yg7yl38i64nlqh0bcn4ny";
+    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
new file mode 100644
index 00000000000..de3690e3e20
--- /dev/null
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl
+, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null
+, enableApacheWebApplication ? false
+, enableAxis2WebService ? false
+, enableEjabberdDump ? false
+, enableMySQLDatabase ? false
+, enablePostgreSQLDatabase ? false
+, enableSubversionRepository ? false
+, enableTomcatWebApplication ? false
+, catalinaBaseDir ? "/var/tomcat"
+}:
+
+assert enableMySQLDatabase -> mysql != null;
+assert enablePostgreSQLDatabase -> postgresql != null;
+assert enableSubversionRepository -> subversion != null;
+assert enableEjabberdDump -> ejabberd != null;
+
+stdenv.mkDerivation {
+  name = "dysnomia-0.3pre7c81cc254a0f6966dd9ac55f945c458b45b3d428.tar.gz";
+  src = fetchurl {
+    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 "";
+  
+  configureFlags = ''
+     ${if enableApacheWebApplication then "--with-apache" else "--without-apache"}
+     ${if enableAxis2WebService then "--with-axis2" else "--without-axis2"}
+     ${if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd"}
+     ${if enableMySQLDatabase then "--with-mysql" else "--without-mysql"}
+     ${if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql"}
+     ${if enableSubversionRepository then "--with-subversion" else "--without-subversion"}
+     ${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"}
+   '';
+  
+  buildInputs = []
+    ++ stdenv.lib.optional enableEjabberdDump ejabberd
+    ++ stdenv.lib.optional enableMySQLDatabase mysql
+    ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
+    ++ stdenv.lib.optional enableSubversionRepository subversion;
+
+  meta = {
+    description = "Automated deployment of mutable components and services for Disnix";
+    license = "MIT";
+    maintainers = [ stdenv.lib.maintainers.sander ];
+  };
+}
diff --git a/pkgs/tools/package-management/guix/default.nix b/pkgs/tools/package-management/guix/default.nix
new file mode 100644
index 00000000000..7c4a098cad8
--- /dev/null
+++ b/pkgs/tools/package-management/guix/default.nix
@@ -0,0 +1,69 @@
+{ fetchurl, stdenv, guile, libgcrypt, sqlite, bzip2, pkgconfig }:
+
+let
+  # Getting the bootstrap Guile binary.  This is normally performed by Guix's build system.
+  base_url = arch:
+    "http://alpha.gnu.org/gnu/guix/bootstrap/${arch}-linux/20130105/guile-2.0.7.tar.xz";
+  boot_guile = {
+    i686 = fetchurl {
+      url = base_url "i686";
+      sha256 = "f9a7c6f4c556eaafa2a69bcf07d4ffbb6682ea831d4c9da9ba095aca3ccd217c";
+    };
+    x86_64 = fetchurl {
+      url = base_url "x86_64";
+      sha256 = "bc43210dcd146d242bef4d354b0aeac12c4ef3118c07502d17ffa8d49e15aa2c";
+    };
+  };
+in stdenv.mkDerivation rec {
+  name = "guix-0.3";
+
+  src = fetchurl {
+    url = "ftp://alpha.gnu.org/gnu/guix/${name}.tar.gz";
+    sha256 = "0xpfdmlfkkpmgrb8lpaqs5wxx31m4jslajs6b9waz5wp91zk7fix";
+  };
+
+  configureFlags =
+     [ "--localstatedir=/nix/var"
+       "--with-libgcrypt-prefix=${libgcrypt}"
+     ];
+
+  preBuild =
+    # Copy the bootstrap Guile tarballs like Guix's makefile normally does.
+    '' cp -v "${boot_guile.i686}" gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz
+       cp -v "${boot_guile.x86_64}" gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz
+    '';
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ guile libgcrypt sqlite bzip2 ];
+
+  doCheck = true;
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Functional package manager with a Scheme interface";
+
+    longDescription = ''
+      GNU Guix is a purely functional package manager for the GNU system, and a distribution thereof.
+
+      In addition to standard package management features, Guix supports
+      transactional upgrades and roll-backs, unprivileged package management,
+      per-user profiles, and garbage collection.
+
+      It provides Guile Scheme APIs, including high-level embedded
+      domain-specific languages (EDSLs), to describe how packages are built
+      and composed.
+
+      A user-land free software distribution for GNU/Linux comes as part of
+      Guix.
+
+      Guix is based on the Nix package manager.
+    '';
+
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.linux;
+
+    homepage = http://www.gnu.org/software/guix;
+  };
+}
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 73bed52654f..4d5eeca12c1 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.5.3pre3141_1b6ee8f";
+  name = "nix-1.6pre3187_3fb7ae0";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/5305802/download/5/${name}.tar.xz";
-    sha256 = "834a0d23456331ac06b6117078f0b9bbeecbc8620d5f844b61455e3daac6ceb0";
+    url = "http://hydra.nixos.org/build/5663853/download/5/${name}.tar.xz";
+    sha256 = "3cd695b3bb23ea7f9e4779f5b79180319444204b30120ed2cc0f0bf1e070403f";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];
diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index 4e47a50078a..7f2b533383e 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,12 +1,12 @@
 { lib, pythonPackages, fetchurl, libxslt, docbook5_xsl }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "nixops-1.0";
+  name = "nixops-1.0.1";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://nixos.org/releases/nixops/${name}/${name}.tar.bz2";
-    sha256 = "9ae2dfac8e1fa895aef81323b14a3398f03a1cbd8c86ea10b6fff7312e1fadbb";
+    sha256 = "c6dda2597ba0ab2f60c984d4715163c02940f20803619668d6c16eba8570a394";
   };
 
   buildInputs = [ libxslt ];
@@ -21,6 +21,9 @@ pythonPackages.buildPythonPackage rec {
 
   postInstall =
     ''
+      # Backward compatibility symlink.
+      ln -s nixops $out/bin/charon
+
       make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \
         docdir=$out/share/doc/nixops mandir=$out/share/man
 
diff --git a/pkgs/tools/security/apg/apg.patch b/pkgs/tools/security/apg/apg.patch
new file mode 100644
index 00000000000..abc22647d52
--- /dev/null
+++ b/pkgs/tools/security/apg/apg.patch
@@ -0,0 +1,44 @@
+diff -rc apg-2.2.3/Makefile apg-2.2.3-new/Makefile
+*** apg-2.2.3/Makefile	2003-08-07 17:40:30.000000000 +0200
+--- apg-2.2.3-new/Makefile	2013-07-24 12:25:31.159938436 +0200
+***************
+*** 113,131 ****
+  	if test -x ./apg; then \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+  ./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+  fi
+  	if test -x ./apgd; then \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
+! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
+  ./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
+  fi
+  	if test -x ./apgbfm; then \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+  ./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+  fi
+  
+--- 113,131 ----
+  	if test -x ./apg; then \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+! ./install-sh -c -m 0755 ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+  ./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+  fi
+  	if test -x ./apgd; then \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
+! ./install-sh -c -m 0755 ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
+  ./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
+  fi
+  	if test -x ./apgbfm; then \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+  ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+! ./install-sh -c -m 0755 ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+  ./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+  fi
+  
diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix
index 7eeb491374a..28f66e1e492 100644
--- a/pkgs/tools/security/apg/default.nix
+++ b/pkgs/tools/security/apg/default.nix
@@ -8,10 +8,8 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     substituteInPlace Makefile --replace /usr/local "$out"
   '';
-  preInstall = ''
-    export CHOWNPROG=true
-    export CHGRPPROG=true
-  '';
+
+  patches = [ ./apg.patch ];
 
   meta = {
     description = "A tool set for random password generation.";
diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix
index 3200d27c004..5d6eaf55173 100644
--- a/pkgs/tools/security/bmrsa/11.nix
+++ b/pkgs/tools/security/bmrsa/11.nix
@@ -11,7 +11,7 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://prdownloads.sourceforge.net/sourceforge/bmrsa/bmrsa${version}.zip";
+    url = "mirror://sourceforge/bmrsa/bmrsa${version}.zip";
     sha256 = "0ksd9xkvm9lkvj4yl5sl0zmydp1wn3xhc55b28gj70gi4k75kcl4";
   };
 
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index bccf0cc77c5..cb32085a8cf 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   version = "0.97.5";
 
   src = fetchurl {
-    url = "http://tenet.dl.sourceforge.net/project/clamav/clamav/${version}/clamav-${version}.tar.gz";
+    url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz";
     sha256 = "039wm64wl2sx7k019g5ll5dkdlsq64fnd0ng0s00pjn8bqd5wv6v";
   };
 
diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index 2cac2819c16..baa8dd87ec1 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -13,11 +13,11 @@ assert useUsb -> (libusb != null);
 assert useCurl -> (curl != null);
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.0.20";
+  name = "gnupg-2.0.21";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "16mp0j5inrcqcb3fxbn0b3aamascy3n923wiy0y8marc0rzrp53f";
+    sha256 = "1xgf1q1phdawk6y66haaqcvfnlsqk12jmjin1m2d5x6fqw18kpq0";
   };
 
   buildInputs
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
       S/MIME.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ ludo urkud ];
+    maintainers = with stdenv.lib.maintainers; [ urkud ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix
index 58786f1bd61..80ab866e1f3 100644
--- a/pkgs/tools/security/oath-toolkit/default.nix
+++ b/pkgs/tools/security/oath-toolkit/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "oath-toolkit-2.0.2";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/oath-toolkit/${name}.tar.gz";
+    url = "mirror://savannah/oath-toolkit/${name}.tar.gz";
     sha256 = "0i2rf5j83kb8h3sd9lsm0a46zq805kzagvccc4rk7879lg1fnl99";
   };
 
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
new file mode 100644
index 00000000000..ba86b0b1d9c
--- /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/pius/default.nix b/pkgs/tools/security/pius/default.nix
index 3ca41032815..e693143e4c4 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation {
     license = "GPLv2";
 
     platforms = stdenv.lib.platforms.gnu;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix
index ecbc95362e6..aaa3b577657 100644
--- a/pkgs/tools/security/pwgen/default.nix
+++ b/pkgs/tools/security/pwgen/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation {
   name = "pwgen-2.05";
 
   src = fetchurl {
-    url = ftp://ftp.chg.ru/pub/sourceforge/p/pw/pwgen/pwgen-2.05.tar.gz;
+    url = mirror://sourceforge/pwgen/pwgen-2.05.tar.gz;
     sha256 = "1afxbkdl9b81760pyb972k18dmidrciy3vzcnspp3jg0aa316yn8";
   };
   meta = {
diff --git a/pkgs/tools/security/torbutton/default.nix b/pkgs/tools/security/torbutton/default.nix
new file mode 100644
index 00000000000..348d96b0024
--- /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/system/acct/default.nix b/pkgs/tools/system/acct/default.nix
index a2ea6176c74..1095d702d25 100644
--- a/pkgs/tools/system/acct/default.nix
+++ b/pkgs/tools/system/acct/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/acct/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.allBut "i686-cygwin";
   };
 }
diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index 8fa40e5710f..9afad675bb9 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
     license = "GPLv3+";
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix
index 988989b82f7..111408d1339 100644
--- a/pkgs/tools/system/fdisk/default.nix
+++ b/pkgs/tools/system/fdisk/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/fdisk/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     #platforms = stdenv.lib.platforms.linux; # was failing for long without anyone complaining
   };
 }
diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index 62afb2fe078..82377aa92f5 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = with stdenv.lib.maintainers; [ raskin ludo ];
+    maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 78ff9131fa8..3f63d077c7f 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -1,29 +1,26 @@
-{ stdenv, fetchurl, zlib }:
-
-stdenv.mkDerivation rec {
-  name = "pciutils-3.1.10";
-
-  src = fetchurl {
-    url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2";
-    sha256 = "0xdahcxd00c921wnxi0f0w3lzjqdfphwa5vglfcpf0lv3l2w40pl";
-  };
-
-  buildInputs = [ zlib ];
+{ stdenv, fetchurl, pkgconfig, zlib, kmod, which }:
 
+let
   pciids = fetchurl {
     # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2.
     url = http://tarballs.nixos.org/pci.ids.20120929.bz2;
     sha256 = "1q3i479ay88wam1zz1vbgkbqb2axg8av9qjxaigrqbnw2pv0srmb";
   };
+in
+stdenv.mkDerivation rec {
+  name = "pciutils-3.2.0";
 
-  # Override broken auto-detect logic.
-  # Note: we can't compress pci.ids (ZLIB=yes) because udev requires
-  # an uncompressed pci.ids.
-  makeFlags = "ZLIB=no DNS=yes SHARED=yes PREFIX=\${out}";
+  src = fetchurl {
+    url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2";
+    sha256 = "0d9as9jzjjg5c1nwf58z1y1i7rf9fqxmww1civckhcvcn0xr85mq";
+  };
 
-  preBuild = ''
-    bunzip2 < $pciids > pci.ids
-  '';
+  buildInputs = [ pkgconfig zlib kmod which ];
+
+  # currently up-to-date
+  #preBuild = "bunzip2 < ${pciids} > pci.ids";
+
+  makeFlags = "SHARED=yes PREFIX=\${out}";
 
   installTargets = "install install-lib";
 
diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index 909b0d832f7..be34fc52c7a 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -2,21 +2,21 @@
 
 let
   driverdb = fetchurl {
-    url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3797";
-    sha256 = "01ycm3vffxpfvfga9vp1d38jy3lqpkpxnxf78pidc8q1nn8bpdyz";
+    url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3812";
+    sha256 = "1x22ammjwlb7p3cmd13shqq1payb7nr9pgfa9xifs19qyr77mrwp";
     name = "smartmontools-drivedb.h";
   };
 in
 stdenv.mkDerivation rec {
-  name = "smartmontools-6.1";
+  name = "smartmontools-6.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
-    sha256 = "01yfv6hqsqandg6x8mnwa4g42hhqvc7dfxnfb3v849n8rj5kn059";
+    sha256 = "0nq6jvfh8nqwfrvp6fb6qs2rdydi3i9xgpi7p7vb83xvg42ncvs8";
   };
 
   patchPhase = ''
-    cp ${driverdb} drivedb.h
+    : cp ${driverdb} drivedb.h
     sed -i -e 's@which which >/dev/null || exit 1@alias which="type -p"@' update-smart-drivedb.in
   '';
 
diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index a13f500c34f..63850454b3d 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   name = "thinkfan-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/thinkfan/thinkfan-${version}.tar.gz";
+    url = "mirror://sourceforge/thinkfan/thinkfan-${version}.tar.gz";
     sha256 = "04akla66r8k10x0jvmcpfi92hj2sppygcl7hhwn8n8zsvvf0yqxs";
   };
   
diff --git a/pkgs/tools/text/cheetah-template/2.0.1.nix b/pkgs/tools/text/cheetah-template/2.0.1.nix
index c20f5db9798..0bfa72ca00d 100644
--- a/pkgs/tools/text/cheetah-template/2.0.1.nix
+++ b/pkgs/tools/text/cheetah-template/2.0.1.nix
@@ -1,7 +1,7 @@
 args : with args; 
 rec {
   src = fetchurl {
-    url = http://downloads.sourceforge.net/cheetahtemplate/Cheetah-2.0.1.tar.gz;
+    url = mirror://sourceforge/cheetahtemplate/Cheetah-2.0.1.tar.gz;
     sha256 = "134k4s5f116k23vb7wf9bynlx3gf0wwl7y0zp9ciz0q66nh1idkh";
   };
 
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index 98a737339d2..5a31d009610 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 
diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix
index c8c336ad202..e494eba13ce 100644
--- a/pkgs/tools/text/gnupatch/default.nix
+++ b/pkgs/tools/text/gnupatch/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index 66fcb3d1929..d34ed00d436 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation {
     license = "GPLv3+";
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix
index f971eb7b866..ea06a625550 100644
--- a/pkgs/tools/text/html-tidy/default.nix
+++ b/pkgs/tools/text/html-tidy/default.nix
@@ -36,6 +36,6 @@ let date = "2009-07-04"; in
 
       homepage = http://tidy.sourceforge.net/;
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
     };
   }
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index fc8813e7cec..52781ed3792 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, cmake, kdelibs, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "kdiff3-0.9.96";
+  name = "kdiff3-0.9.97";
   src = fetchurl {
     url = "mirror://sourceforge/kdiff3/${name}.tar.gz";
-    sha256 = "14fnflp5ansi7b59h8vn81mb8pdqpbanz0qzyw9sxk2pgp24xrqh";
+    sha256 = "0ajsnzfr0aqzdiv5wqssxsgfv87v4g5c2zl16264v0cw8jxiddz3";
   };
 
   buildInputs = [ kdelibs ];
diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix
index 466a7e0c44b..9f019440775 100644
--- a/pkgs/tools/text/namazu/default.nix
+++ b/pkgs/tools/text/namazu/default.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     homepage = http://namazu.org/;
 
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix
index eb5ebf612b2..1eae8c4d527 100644
--- a/pkgs/tools/text/numdiff/default.nix
+++ b/pkgs/tools/text/numdiff/default.nix
@@ -6,7 +6,7 @@ in
 stdenv.mkDerivation {
   name = "numdiff-${version}";
   src = fetchurl {
-    url = "http://ftp.igh.cnrs.fr/pub/nongnu/numdiff/numdiff-${version}.tar.gz";
+    url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz";
     sha256 = "062byxp9vajj4flg1rqh0r2nwg9yx608mbsj5y25wkrzmkgcq3fx";
   };
   meta = {
diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix
index 061f7651f9a..ca3ec39da71 100644
--- a/pkgs/tools/text/source-highlight/default.nix
+++ b/pkgs/tools/text/source-highlight/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     description = "GNU Source-Highlight, source code renderer with syntax highlighting";
     homepage = "http://www.gnu.org/software/src-highlite/";
     license = "GPLv3+";
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
     longDescription =
       ''
diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix
index b64d05e19e1..63de9c30693 100644
--- a/pkgs/tools/text/wdiff/default.nix
+++ b/pkgs/tools/text/wdiff/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/wdiff/;
     description = "GNU wdiff, comparing files on a word by word basis";
     license = "GPLv3+";
-    maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.ludo ];
+    maintainers = [ stdenv.lib.maintainers.eelco ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix
index 2b96ae526c4..ec1c9021522 100644
--- a/pkgs/tools/typesetting/lhs2tex/default.nix
+++ b/pkgs/tools/typesetting/lhs2tex/default.nix
@@ -1,18 +1,18 @@
-{cabal, texLive, regexCompat}:
+{ cabal, filepath, mtl, regexCompat, texLive }:
 
 cabal.mkDerivation (self: {
   pname = "lhs2tex";
   version = "1.18.1";
-  name = self.fname;
   sha256 = "0j4n7vkabsggn94gbwixy1vmckdck2nggdiqvk6n9nx164if5jnw";
-  extraBuildInputs = [regexCompat texLive];
-
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ filepath mtl regexCompat ];
+  extraLibraries = [ texLive ];
   postInstall = ''
     mkdir -p "$out/share/doc/$name"
     cp doc/Guide2.pdf $out/share/doc/$name
     mkdir -p "$out/nix-support"
   '';
-
   meta = {
     homepage = "http://www.andres-loeh.de/lhs2tex/";
     description = "Preprocessor for typesetting Haskell sources with LaTeX";
diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix
index 6ca85167aed..9774d7d1a94 100644
--- a/pkgs/tools/typesetting/tex/auctex/default.nix
+++ b/pkgs/tools/typesetting/tex/auctex/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation ( rec {
   };
 
   src = fetchurl {
-    url = "http://ftp.gnu.org/pub/gnu/${pname}/${name}.tar.gz";
+    url = "mirror://gnu/${pname}/${name}.tar.gz";
     sha256 = "aebbea00431f8fd1e6be6519d9cc28e974942000737f956027da2c952a6d304e";
   };
 
diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
index 6139911623f..d129cc62020 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
@@ -3,7 +3,10 @@ rec {
   version = "0.7";
   name = "moderntimeline-${version}";
   src = fetchurl {
-    url = "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip";
+    urls = [
+      "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip"
+      "http://mirror.ctan.org/macros/latex/contrib/moderntimeline.zip"
+    ];
     sha256 = "0dxwybanj7qvbr69wgsllha1brq6qjsnjfff6nw4r3nijzvvh876";
   };
 
diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix
index 42377238595..c72192317b7 100644
--- a/pkgs/tools/typesetting/xmlto/default.nix
+++ b/pkgs/tools/typesetting/xmlto/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     license = "GPLv2+";
     homepage = https://fedorahosted.org/xmlto/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix
index de2964a798f..e4c8e99efdb 100644
--- a/pkgs/tools/video/dvgrab/default.nix
+++ b/pkgs/tools/video/dvgrab/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
 
     license = "GPLv2+";
     platforms = stdenv.lib.platforms.gnu;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix
new file mode 100644
index 00000000000..f2f77bd84cd
--- /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 ad02fbf77ae..1ad8731a7c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -206,6 +206,8 @@ let
 
   nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { };
 
+  nixpkgs-lint = callPackage ../../maintainers/scripts/nixpkgs-lint.nix { };
+
 
   ### STANDARD ENVIRONMENT
 
@@ -350,10 +352,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;
@@ -389,10 +390,15 @@ let
 
   acct = callPackage ../tools/system/acct { };
 
+  acoustidFingerprinter = callPackage
+    ../tools/audio/acoustid-fingerprinter { };
+
   aefs = callPackage ../tools/filesystems/aefs { };
 
   aespipe = callPackage ../tools/security/aespipe { };
 
+  aescrypt = callPackage ../tools/misc/aescrypt { };
+
   ahcpd = callPackage ../tools/networking/ahcpd { };
 
   aircrackng = callPackage ../tools/networking/aircrack-ng { };
@@ -421,6 +427,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,6 +454,16 @@ 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 { };
+
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
 
   titaniumenv_2_1 = import ../development/mobile/titaniumenv {
@@ -499,6 +517,8 @@ let
 
   bfr = callPackage ../tools/misc/bfr { };
 
+  bmon = callPackage ../tools/misc/bmon { };
+
   boomerang = callPackage ../development/tools/boomerang { };
 
   bootchart = callPackage ../tools/system/bootchart { };
@@ -509,6 +529,8 @@ let
 
   btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { };
 
+  bwm_ng = callPackage ../tools/networking/bwm-ng { };
+
   byobu = callPackage ../tools/misc/byobu { };
 
   catdoc = callPackage ../tools/text/catdoc { };
@@ -526,6 +548,8 @@ let
   syslogng = callPackage ../tools/system/syslog-ng { };
   rsyslog = callPackage ../tools/system/rsyslog { };
 
+  mcrypt = callPackage ../tools/misc/mcrypt { };
+
   mcelog = callPackage ../os-specific/linux/mcelog { };
 
   asciidoc = callPackage ../tools/typesetting/asciidoc { };
@@ -609,6 +633,8 @@ let
 
   convertlit = callPackage ../tools/text/convertlit { };
 
+  colormake = callPackage ../development/tools/build-managers/colormake { };
+
   cowsay = callPackage ../tools/misc/cowsay { };
 
   cuetools = callPackage ../tools/cd-dvd/cuetools { };
@@ -723,6 +749,7 @@ let
 
   docbook2x = callPackage ../tools/typesetting/docbook2x {
     inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport;
+    texinfo = texinfo5;
   };
 
   dosfstools = callPackage ../tools/filesystems/dosfstools { };
@@ -746,10 +773,17 @@ let
 
   e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { };
 
+  easyrsa = callPackage ../tools/networking/easyrsa { };
+
   ebook_tools = callPackage ../tools/text/ebook-tools { };
 
   ecryptfs = callPackage ../tools/security/ecryptfs { };
 
+  editres = callPackage ../tools/graphics/editres {
+    inherit (xlibs) libXt libXaw;
+    inherit (xorg) utilmacros;
+  };
+
   edk2 = callPackage ../development/compilers/edk2 { };
 
   efibootmgr = callPackage ../tools/system/efibootmgr { };
@@ -774,6 +808,8 @@ let
 
   exiftags = callPackage ../tools/graphics/exiftags { };
 
+  extundelete = callPackage ../tools/filesystems/extundelete { };
+
   expect = callPackage ../tools/misc/expect { };
 
   fabric = pythonPackages.fabric;
@@ -802,6 +838,8 @@ let
 
   fio = callPackage ../tools/system/fio { };
 
+  flpsed = callPackage ../applications/editors/flpsed { };
+
   flvstreamer = callPackage ../tools/networking/flvstreamer { };
 
   libbsd = callPackage ../development/libraries/libbsd { };
@@ -903,7 +941,7 @@ let
   # use config.packageOverrides if you prefer original gnupg1
   gnupg1 = gnupg1compat;
 
-  gnupg = callPackage ../tools/security/gnupg { };
+  gnupg = callPackage ../tools/security/gnupg { libusb = libusb1; };
 
   gnupg2_1 = lowPrio (callPackage ../tools/security/gnupg/git.nix {
     libassuan = libassuan2_1;
@@ -912,6 +950,11 @@ let
   gnuplot = callPackage ../tools/graphics/gnuplot {
     texLive = null;
     lua = null;
+
+    # use gccApple to compile on darwin, seems to resolve a malloc error
+    stdenv = if stdenv.isDarwin
+      then stdenvAdapters.overrideGCC stdenv gccApple
+      else stdenv;
   };
 
   gnused = callPackage ../tools/text/gnused { };
@@ -944,7 +987,7 @@ let
     buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
   };
 
-  grub2 = callPackage ../tools/misc/grub/2.0x.nix { };
+  grub2 = callPackage ../tools/misc/grub/2.0x.nix { libusb = libusb1; };
 
   grub2_efi = grub2.override { EFIsupport = true; };
 
@@ -1151,7 +1194,7 @@ let
 
   lxc = callPackage ../os-specific/linux/lxc { };
 
-  lzip = callPackage ../tools/compression/lzip { };
+  lzip = callPackage ../tools/compression/lzip { texinfo = texinfo5; };
 
   lzma = xz;
 
@@ -1195,7 +1238,9 @@ let
 
   minecraft = callPackage ../games/minecraft { };
 
-  minetest = callPackage ../games/minetest { };
+  minetest = callPackage ../games/minetest {
+    libpng = libpng12;
+  };
 
   miniupnpc = callPackage ../tools/networking/miniupnpc { };
 
@@ -1300,8 +1345,16 @@ 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 { };
+
+  mpack = callPackage ../tools/networking/mpack { };
+
   pa_applet = callPackage ../tools/audio/pa-applet { };
 
   nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {};
@@ -1486,6 +1539,8 @@ let
 
   polkit_gnome = callPackage ../tools/security/polkit-gnome { };
 
+  ponysay = callPackage ../tools/misc/ponysay { };
+
   povray = callPackage ../tools/graphics/povray { };
 
   ppl = callPackage ../development/libraries/ppl { };
@@ -1740,18 +1795,24 @@ 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 {};
 
   ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
 
+  twitterBootstrap = callPackage ../development/web/twitter-bootstrap {};
+
   txt2man = callPackage ../tools/misc/txt2man { };
 
   ucl = callPackage ../development/libraries/ucl { };
@@ -1786,12 +1847,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
@@ -1887,6 +1950,10 @@ let
 
   varnish = callPackage ../servers/varnish { };
 
+  venus = callPackage ../tools/misc/venus {
+    python = python27;
+  };
+
   vlan = callPackage ../tools/networking/vlan { };
 
   wakelan = callPackage ../tools/networking/wakelan { };
@@ -2020,6 +2087,7 @@ let
 
   bashInteractive = appendToName "interactive" (callPackage ../shells/bash {
     interactive = true;
+    texinfo = texinfo5;
   });
 
   bashCompletion = callPackage ../shells/bash-completion { };
@@ -2046,8 +2114,12 @@ let
       javaCup = callPackage ../development/libraries/java/cup { };
     };
 
+  aldor = callPackage ../development/compilers/aldor { };
+
   aspectj = callPackage ../development/compilers/aspectj { };
 
+  avra = callPackage ../development/compilers/avra { };
+
   bigloo = callPackage ../development/compilers/bigloo { };
 
   chicken = callPackage ../development/compilers/chicken { };
@@ -2067,6 +2139,8 @@ let
 
   clean = callPackage ../development/compilers/clean { };
 
+  closurecompiler = callPackage ../development/compilers/closure { };
+
   cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
 
   cython = callPackage ../development/interpreters/cython { };
@@ -2145,9 +2219,9 @@ let
     binutils = binutils_deterministic;
     inherit stdenv coreutils zlib;
   };
-  
+
   wrapDeterministicGCC = wrapDeterministicGCCWith (import ../build-support/gcc-wrapper) glibc;
-  
+
   gcc46_deterministic = lowPrio (wrapDeterministicGCC (callPackage ../development/compilers/gcc/4.6 {
     inherit noSysDirs;
 
@@ -2253,12 +2327,6 @@ let
     cross = assert crossSystem != null; crossSystem;
   };
 
-  gcc43_multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc43.gcc.override {
-    stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc);
-    profiledCompiler = false;
-    enableMultilib = true;
-  }));
-
   gcc44 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.4) {
     inherit fetchurl stdenv texinfo gmp mpfr /* ppl cloogppl */
       gettext which noSysDirs;
@@ -2284,17 +2352,6 @@ let
       else null;
   }));
 
-  # A non-stripped version of GCC.
-  gcc45_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.5 {
-    stripped = false;
-
-    inherit noSysDirs;
-
-    # bootstrapping a profiled compiler does not work in the sheevaplug:
-    # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
-    profiledCompiler = !stdenv.system == "armv5tel-linux";
-  }));
-
   gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 {
     stdenv = stdenvMulti;
     inherit noSysDirs;
@@ -2312,6 +2369,7 @@ let
       if crossSystem != null && crossSystem.config == "i586-pc-gnu"
       then gnu.libpthreadCross
       else null;
+    texinfo = texinfo413;
   }));
 
   # A non-stripped version of GCC.
@@ -2324,12 +2382,14 @@ let
     binutilsCross = null;
   }));
 
-  gcc46_multi = if system == "x86_64-linux" then lowPrio (
+  gcc46_multi =
+    if system == "x86_64-linux" then lowPrio (
       wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.gcc.override {
-      stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc);
-      profiledCompiler = false;
-      enableMultilib = true;
-    })) else throw "Multilib gcc not supported on ‘${system}’";
+        stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc);
+        profiledCompiler = false;
+        enableMultilib = true;
+      }))
+    else throw "Multilib gcc not supported on ‘${system}’";
 
   gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 {
     inherit noSysDirs;
@@ -2679,6 +2739,8 @@ let
     fpc = fpc;
   };
 
+  lessc = callPackage ../development/compilers/lessc { };
+
   llvm = callPackage ../development/compilers/llvm {
     stdenv = if stdenv.isDarwin
       then stdenvAdapters.overrideGCC stdenv gccApple
@@ -2719,6 +2781,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 { };
@@ -2749,7 +2813,9 @@ let
     camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { };
     camomile = callPackage ../development/ocaml-modules/camomile { };
 
-    camlimages = callPackage ../development/ocaml-modules/camlimages { };
+    camlimages = callPackage ../development/ocaml-modules/camlimages {
+      libpng = libpng12;
+    };
 
     ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
 
@@ -2990,7 +3056,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 { };
 
@@ -3021,6 +3092,8 @@ let
      lua = lua5;
   };
 
+  lush2 = callPackage ../development/interpreters/lush {};
+
   maude = callPackage ../development/interpreters/maude { };
 
   octave = callPackage ../development/interpreters/octave {
@@ -3055,7 +3128,13 @@ let
 
   php_xcache = callPackage ../development/libraries/php-xcache { };
 
-  phpXdebug = 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 {};
 
@@ -3067,10 +3146,15 @@ let
 
   python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { });
   python33 = callPackage ../development/interpreters/python/3.3 { };
+  python32 = callPackage ../development/interpreters/python/3.2 { };
 
   python = python27;
   python26 = callPackage ../development/interpreters/python/2.6 { };
-  python27 = callPackage ../development/interpreters/python/2.7 { };
+  python27 = callPackage ../development/interpreters/python/2.7 {
+    libX11 = xlibs.libX11;
+  };
+
+  pypy = callPackage ../development/interpreters/pypy/2.0 { };
 
   pythonFull = python27Full;
   python26Full = callPackage ../development/interpreters/python/wrapper.nix {
@@ -3119,10 +3203,6 @@ let
 
   rubySqlite3 = callPackage ../development/ruby-modules/sqlite3 { };
 
-  rLang = callPackage ../development/interpreters/r-lang {
-    withBioconductor = config.rLang.withBioconductor or false;
-  };
-
   rubygemsFun = ruby: builderDefsPackage (import ../development/interpreters/ruby/rubygems.nix) {
     inherit ruby makeWrapper;
   };
@@ -3196,6 +3276,8 @@ let
 
   guile_ncurses = callPackage ../development/guile-modules/guile-ncurses { };
 
+  srecord = callPackage ../development/tools/misc/srecord { };
+
   windowssdk = (
     import ../development/misc/windows-sdk {
       inherit fetchurl stdenv cabextract;
@@ -3244,13 +3326,20 @@ let
 
   avrdude = callPackage ../development/tools/misc/avrdude { };
 
+  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 {
     inherit noSysDirs;
   };
 
-  binutils_deterministic = binutils.override { deterministic = true; };
+  binutils_deterministic = lowPrio (callPackage ../development/tools/misc/binutils {
+    inherit noSysDirs;
+    deterministic = true;
+  });
 
   binutils_gold = lowPrio (callPackage ../development/tools/misc/binutils {
     inherit noSysDirs;
@@ -3263,7 +3352,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;
@@ -3304,6 +3395,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 { };
@@ -3479,6 +3572,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 {
@@ -3558,10 +3657,14 @@ let
 
   sparse = callPackage ../development/tools/analysis/sparse { };
 
+  speedtest_cli = callPackage ../tools/networking/speedtest-cli { };
+
   spin = callPackage ../development/tools/analysis/spin { };
 
   splint = callPackage ../development/tools/analysis/splint { };
 
+  stm32flash = callPackage ../development/tools/misc/stm32flash { };
+
   strace = callPackage ../development/tools/misc/strace { };
 
   swig = callPackage ../development/tools/misc/swig { };
@@ -3671,7 +3774,11 @@ let
 
   aubio = callPackage ../development/libraries/aubio { };
 
-  audiofile = callPackage ../development/libraries/audiofile { };
+  audiofile = callPackage ../development/libraries/audiofile {
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
 
   axis = callPackage ../development/libraries/axis { };
 
@@ -3688,10 +3795,10 @@ let
   boost144 = callPackage ../development/libraries/boost/1.44.nix { };
   boost149 = callPackage ../development/libraries/boost/1.49.nix { };
   boost153 = callPackage ../development/libraries/boost/1.53.nix { };
-  boost = boost153;
+  boost154 = callPackage ../development/libraries/boost/1.54.nix { };
+  boost = boost154;
 
-  boostHeaders153 = callPackage ../development/libraries/boost/1.53-headers.nix { };
-  boostHeaders = boostHeaders153;
+  boostHeaders = callPackage ../development/libraries/boost/header-only-wrapper.nix { };
 
   botan = callPackage ../development/libraries/botan { };
 
@@ -3702,7 +3809,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 { };
 
@@ -3728,6 +3837,8 @@ let
 
   chmlib = callPackage ../development/libraries/chmlib { };
 
+  chromaprint = callPackage ../development/libraries/chromaprint { };
+
   cil = callPackage ../development/libraries/cil { };
 
   cilaterm = callPackage ../development/libraries/cil-aterm {
@@ -3808,6 +3919,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 { };
@@ -3860,6 +3973,10 @@ let
 
   ffmpeg = callPackage ../development/libraries/ffmpeg {
     vpxSupport = !stdenv.isMips;
+
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
   };
 
   ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix {
@@ -3868,6 +3985,7 @@ let
 
   ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix {
     vpxSupport = !stdenv.isMips;
+    texinfo = texinfo5;
   };
 
   ffms = callPackage ../development/libraries/ffms { };
@@ -3934,6 +4052,7 @@ let
 
   gegl_0_0_22 = callPackage ../development/libraries/gegl/0_0_22.nix {
     #  avocodec avformat librsvg
+    libpng = libpng12;
   };
 
   geoclue = callPackage ../development/libraries/geoclue {};
@@ -3965,8 +4084,6 @@ let
 
   glfw = callPackage ../development/libraries/glfw { };
 
-  glibc = glibc217;
-
   glibcCross = glibc217Cross;
 
   glibc213 = (callPackage ../development/libraries/glibc/2.13 {
@@ -3990,7 +4107,7 @@ let
         inherit fetchgit;
       }));
 
-  glibc217 = callPackage ../development/libraries/glibc/2.17 {
+  glibc = callPackage ../development/libraries/glibc/2.17 {
     stdenv = stdenvMulti;
     kernelHeaders = linuxHeaders;
     installLocales = config.glibc.locales or false;
@@ -3999,6 +4116,12 @@ let
     gccCross = null;
   };
 
+  glibc_memusage = callPackage ../development/libraries/glibc/2.17 {
+    kernelHeaders = linuxHeaders;
+    installLocales = false;
+    withGd = true;
+  };
+
   glibc217Cross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.17)
     (let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu";
      in {
@@ -4056,8 +4179,9 @@ let
 
   glpk = callPackage ../development/libraries/glpk { };
 
-  glsurf = callPackage ../applications/science/math/glsurf { 
+  glsurf = callPackage ../applications/science/math/glsurf {
     inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp;
+    libpng = libpng12;
   };
 
   gmime = callPackage ../development/libraries/gmime {
@@ -4141,8 +4265,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 { };
 
@@ -4191,7 +4315,8 @@ let
 
   cairo = callPackage ../development/libraries/cairo {
     stdenv = stdenvMulti;
-    glSupport = lib.elem system lib.platforms.mesaPlatforms;
+    glSupport = config.cairo.gl or (stdenv.isLinux &&
+      !stdenv.isArm && !stdenv.isMips);
   };
 
   cairo_1_12_2 = callPackage ../development/libraries/cairo/1.12.2.nix { };
@@ -4202,7 +4327,9 @@ let
     stdenv = stdenvMulti;
   };
 
-  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 { };
 
@@ -4364,7 +4491,9 @@ let
 
   levmar = callPackage ../development/libraries/levmar { };
 
-  leptonica = callPackage ../development/libraries/leptonica { };
+  leptonica = callPackage ../development/libraries/leptonica {
+    libpng = libpng12;
+  };
 
   lib3ds = callPackage ../development/libraries/lib3ds { };
 
@@ -4399,6 +4528,10 @@ let
   libcaca = callPackage ../development/libraries/libcaca { };
 
   libcanberra = callPackage ../development/libraries/libcanberra { };
+  libcanberra_gtk3 = libcanberra.override { gtk = gtk3; };
+  libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true)
+    then libcanberra.override { gtk = null; }
+    else libcanberra;
 
   libcello = callPackage ../development/libraries/libcello {};
 
@@ -4408,7 +4541,7 @@ let
 
   libcdio = callPackage ../development/libraries/libcdio { };
 
-  libcdr = callPackage ../development/libraries/libcdr { };
+  libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };
 
   libchamplain = callPackage ../development/libraries/libchamplain {
     inherit (gnome) libsoup;
@@ -4513,6 +4646,10 @@ let
 
   libexosip = callPackage ../development/libraries/exosip {};
 
+  libexosip_3 = callPackage ../development/libraries/exosip/3.x.nix {
+    libosip = libosip_3;
+  };
+
   libextractor = callPackage ../development/libraries/libextractor {
     libmpeg2 = mpeg2dec;
   };
@@ -4587,7 +4724,9 @@ let
   librem = callPackage ../development/libraries/librem {};
 
   libsamplerate = callPackage ../development/libraries/libsamplerate {
-    stdenv = stdenvMulti;
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenvMulti;
   };
 
   libspectre = callPackage ../development/libraries/libspectre { };
@@ -4652,7 +4791,12 @@ let
 
   libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { };
 
-  libmikmod = callPackage ../development/libraries/libmikmod { };
+  libmikmod = callPackage ../development/libraries/libmikmod {
+    # resolve the "stray '@' in program" errors
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
 
   libmilter = callPackage ../development/libraries/libmilter { };
 
@@ -4660,7 +4804,7 @@ let
 
   libmowgli = callPackage ../development/libraries/libmowgli { };
 
-  libmng = callPackage ../development/libraries/libmng { };
+  libmng = callPackage ../development/libraries/libmng { lcms = lcms2; };
 
   libmnl = callPackage ../development/libraries/libmnl { };
 
@@ -4710,6 +4854,8 @@ let
 
   libosip = callPackage ../development/libraries/osip {};
 
+  libosip_3 = callPackage ../development/libraries/osip/3.nix {};
+
   libotr = callPackage ../development/libraries/libotr { };
 
   libotr_3_2 = callPackage ../development/libraries/libotr/3.2.nix { };
@@ -4721,7 +4867,7 @@ let
   libpcap = callPackage ../development/libraries/libpcap { };
 
   libpng = callPackage ../development/libraries/libpng { };
-  libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix { };
+  libpng_apng = libpng.override { apngSupport = true; };
   libpng12 = callPackage ../development/libraries/libpng/12.nix { };
   libpng15 = callPackage ../development/libraries/libpng/15.nix { };
 
@@ -4749,7 +4895,9 @@ let
   libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { };
 
   libsndfile = callPackage ../development/libraries/libsndfile {
-    stdenv = stdenvMulti;
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenvMulti;
   };
 
   libsoup = callPackage ../development/libraries/libsoup { };
@@ -4760,6 +4908,10 @@ let
 
   libstartup_notification = callPackage ../development/libraries/startup-notification { };
 
+  libspatialindex = callPackage ../development/libraries/libspatialindex { };
+
+  libspatialite = callPackage ../development/libraries/libspatialite { };
+
   libtasn1 = callPackage ../development/libraries/libtasn1 { };
 
   libtheora = callPackage ../development/libraries/libtheora { };
@@ -4776,6 +4928,8 @@ let
 
   libtunepimp = callPackage ../development/libraries/libtunepimp { };
 
+  libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { };
+
   libgeotiff = callPackage ../development/libraries/libgeotiff { };
 
   libunistring = callPackage ../development/libraries/libunistring { };
@@ -4788,6 +4942,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
@@ -4814,6 +4970,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
@@ -4910,7 +5068,9 @@ let
   mdds = callPackage ../development/libraries/mdds { };
 
   # failed to build
-  mediastreamer = callPackage ../development/libraries/mediastreamer { };
+  mediastreamer = callPackage ../development/libraries/mediastreamer {
+    ffmpeg = ffmpeg_1;
+  };
 
   mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
 
@@ -4945,6 +5105,8 @@ let
 
   ming = callPackage ../development/libraries/ming { };
 
+  minmay = callPackage ../development/libraries/minmay { };
+
   mkvtoolnix = callPackage ../applications/video/mkvtoolnix { };
 
   mlt = callPackage ../development/libraries/mlt {
@@ -4977,7 +5139,14 @@ let
 
   mythes = callPackage ../development/libraries/mythes { };
 
-  ncurses = makeOverridable (import ../development/libraries/ncurses) {
+  ncurses_5_4 = makeOverridable (import ../development/libraries/ncurses/5_4.nix) {
+    inherit fetchurl;
+    unicode = system != "i686-cygwin";
+    stdenv = if stdenv.isDarwin
+      then allStdenvs.stdenvNative
+      else stdenv;
+  };
+  ncurses_5_9 = makeOverridable (import ../development/libraries/ncurses) {
     inherit fetchurl;
     unicode = system != "i686-cygwin";
     stdenv =
@@ -4988,6 +5157,7 @@ let
       then allStdenvs.stdenvNative
       else stdenv;
   };
+  ncurses = ncurses_5_9;
 
   neon = callPackage ../development/libraries/neon {
     compressionSupport = true;
@@ -5068,7 +5238,7 @@ let
 
   opal = callPackage ../development/libraries/opal {};
 
-  openjpeg = callPackage ../development/libraries/openjpeg { };
+  openjpeg = callPackage ../development/libraries/openjpeg { lcms = lcms2; };
 
   openscenegraph = callPackage ../development/libraries/openscenegraph {};
 
@@ -5081,7 +5251,9 @@ let
     };
   };
 
-  ortp = callPackage ../development/libraries/ortp { };
+  ortp = callPackage ../development/libraries/ortp {
+    srtp = srtp_linphone;
+  };
 
   p11_kit = callPackage ../development/libraries/p11-kit { };
 
@@ -5122,11 +5294,12 @@ let
 
   policykit = callPackage ../development/libraries/policykit { };
 
-  poppler = let popplers = callPackage ../development/libraries/poppler { };
+  poppler = let popplers = callPackage ../development/libraries/poppler { lcms = lcms2; };
     in popplers // popplers.poppler_glib;
   popplerQt4 = poppler.poppler_qt4;
 
   poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix {
+    lcms = lcms2;
     glibSupport = true;
     gtk3Support = false;
     qt4Support  = false;
@@ -5134,7 +5307,13 @@ let
 
   popt = callPackage ../development/libraries/popt { };
 
-  portaudio = callPackage ../development/libraries/portaudio { };
+  portaudio = callPackage ../development/libraries/portaudio {
+    # resolves a variety of compile-time errors
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
+
   portaudioSVN = callPackage ../development/libraries/portaudio/svn-head.nix { };
 
   prison = callPackage ../development/libraries/prison { };
@@ -5163,6 +5342,7 @@ let
 
   qt3 = callPackage ../development/libraries/qt-3 {
     openglSupport = mesaSupported;
+    libpng = libpng12;
   };
 
   qt4 = pkgs.kde4.qt4;
@@ -5171,15 +5351,20 @@ let
     # GNOME dependencies are not used unless gtkStyle == true
     inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
     cups = if stdenv.isLinux then cups else null;
+
+    # resolve unrecognised flag '-fconstant-cfstrings' errors
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
   };
 
-  qt48Full = callPackage ../development/libraries/qt-4.x/4.8 {
+  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 { };
 
@@ -5312,6 +5497,8 @@ let
 
   srtp = callPackage ../development/libraries/srtp {};
 
+  srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { };
+
   sqlite_3_7_16 = lowPrio (callPackage ../development/libraries/sqlite/3.7.16.nix {
     readline = null;
     ncurses = null;
@@ -5332,11 +5519,17 @@ let
     inherit readline ncurses;
   });
 
+  stfl = callPackage ../development/libraries/stfl {
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
+
   stlink = callPackage ../development/tools/misc/stlink { };
 
   stlport = callPackage ../development/libraries/stlport { };
 
-  strigi = callPackage ../development/libraries/strigi {};
+  strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; };
 
   suil = callPackage ../development/libraries/audio/suil { };
 
@@ -5376,7 +5569,9 @@ let
 
   tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };
 
-  tk = callPackage ../development/libraries/tk { };
+  tk = callPackage ../development/libraries/tk {
+    libX11 = xlibs.libX11;
+  };
 
   tnt = callPackage ../development/libraries/tnt { };
 
@@ -5453,21 +5648,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 { };
@@ -5482,6 +5662,11 @@ let
   wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix {
     inherit (gnome) GConf;
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
+
+    # use for Objective-C++ compiler
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
   };
 
   wtk = callPackage ../development/libraries/wtk { };
@@ -5636,6 +5821,14 @@ let
     __overrides = (config.perl510PackageOverrides or (p: {})) pkgs;
   };
 
+  perl514Packages = import ./perl-packages.nix {
+    pkgs = pkgs // {
+      perl = perl514;
+      buildPerlPackage = import ../development/perl-modules/generic perl514;
+    };
+    __overrides = (config.perl514PackageOverrides or (p: {})) pkgs;
+  };
+
   perlXMLParser = perlPackages.XMLParser;
 
   ack = perlPackages.ack;
@@ -5645,6 +5838,7 @@ let
 
   ### DEVELOPMENT / PYTHON MODULES
 
+  # python function with default python interpreter
   buildPythonPackage = pythonPackages.buildPythonPackage;
 
   pythonPackages = python27Packages;
@@ -5659,25 +5853,30 @@ let
     python = python26;
   };
 
+  python3Packages = python33Packages;
+
+  python33Packages = recurseIntoAttrs (import ./python-packages.nix {
+    inherit pkgs;
+    inherit (lib) lowPrio;
+    python = python33;
+  });
+
+  python32Packages = import ./python-packages.nix {
+    inherit pkgs;
+    inherit (lib) lowPrio;
+    python = python32;
+  };
+
   python27Packages = recurseIntoAttrs (import ./python-packages.nix {
     inherit pkgs;
     inherit (lib) lowPrio;
     python = python27;
   });
 
-  plone41Packages = recurseIntoAttrs (import ../development/web/plone/4.1.6.nix {
+  pypyPackages = recurseIntoAttrs (import ./python-packages.nix {
     inherit pkgs;
-    pythonPackages = python26Packages;
-  });
-
-  plone42Packages = recurseIntoAttrs (import ../development/web/plone/4.2.5.nix {
-    inherit pkgs;
-    pythonPackages = python26Packages;
-  });
-
-  plone43Packages = recurseIntoAttrs (import ../development/web/plone/4.3.0.nix {
-    inherit pkgs;
-    pythonPackages = python27Packages;
+    inherit (lib) lowPrio;
+    python = pypy;
   });
 
   foursuite = callPackage ../development/python-modules/4suite { };
@@ -5708,6 +5907,8 @@ let
 
   pyGtkGlade = pythonPackages.pyGtkGlade;
 
+  pylint = callPackage ../development/python-modules/pylint { };
+
   pyopenssl = builderDefsPackage (import ../development/python-modules/pyopenssl) {
     inherit python openssl;
   };
@@ -5732,6 +5933,8 @@ let
 
   pyxml = callPackage ../development/python-modules/pyxml { };
 
+  rbtools = callPackage ../development/python-modules/rbtools { };
+
   setuptools = pythonPackages.setuptools;
 
   wxPython = pythonPackages.wxPython;
@@ -5757,6 +5960,8 @@ let
     sslSupport = true;
   });
 
+  apcupsd = callPackage ../servers/apcupsd { };
+
   sabnzbd = callPackage ../servers/sabnzbd { };
 
   bind = callPackage ../servers/dns/bind { };
@@ -5781,7 +5986,15 @@ let
 
   dictdWordnet = callPackage ../servers/dict/dictd-wordnet.nix {};
 
-  dovecot = callPackage ../servers/mail/dovecot { };
+  diod = callPackage ../servers/diod { };
+
+  dovecot = dovecot21;
+
+  dovecot21 = callPackage ../servers/mail/dovecot { };
+
+  dovecot22 = callPackage ../servers/mail/dovecot/2.2.x.nix { };
+
+  dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { };
 
   ejabberd = callPackage ../servers/xmpp/ejabberd { };
 
@@ -5831,7 +6044,13 @@ let
 
   mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { };
 
-  mpd = callPackage ../servers/mpd { };
+  mpd = callPackage ../servers/mpd {
+    # resolve the "stray '@' in program" errors
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
+
   mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { };
 
   miniHttpd = callPackage ../servers/http/mini-httpd {};
@@ -5840,6 +6059,8 @@ let
 
   nginx = callPackage ../servers/http/nginx { };
 
+  opensmtpd = callPackage ../servers/mail/opensmtpd { };
+
   petidomo = callPackage ../servers/mail/petidomo { };
 
   popa3d = callPackage ../servers/mail/popa3d { };
@@ -5976,6 +6197,8 @@ let
   });
   squid = squids.squid31; # has ipv6 support
 
+  thttpd = callPackage ../servers/http/thttpd { };
+
   tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { };
 
   tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { };
@@ -6016,7 +6239,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 { };
 
@@ -6057,8 +6280,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;
   };
@@ -6171,32 +6392,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 { };
@@ -6240,7 +6437,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
@@ -6248,30 +6445,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_apparmor = linux_3_2.override {
+  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 = 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
@@ -6281,37 +6481,32 @@ let
       ];
   };
 
-  linux_3_7 = makeOverridable (import ../os-specific/linux/kernel/linux-3.7.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
-    kernelPatches =
-      [
-        kernelPatches.sec_perm_2_6_24
-        # kernelPatches.aufs3_7
-      ] ++ lib.optionals (platform.kernelArch == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
+  linux_3_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
+      ] ++ lib.optionals (platform.kernelArch == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
+  linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) {
+    inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
     kernelPatches =
       [
         kernelPatches.sec_perm_2_6_24
@@ -6369,11 +6564,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 { };
 
@@ -6391,8 +6582,6 @@ let
 
     wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { };
 
-    kqemu = callPackage ../os-specific/linux/kqemu { };
-
     klibc = callPackage ../os-specific/linux/klibc {
       linuxHeaders = glibc.kernelHeaders;
     };
@@ -6442,19 +6631,19 @@ 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 = 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_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 linuxPackages_3_7);
-  linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8);
   linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9);
+  linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
   # Update this when adding a new version!
-  linuxPackages_latest = pkgs.linuxPackages_3_9;
+  linuxPackages_latest = pkgs.linuxPackages_3_10;
 
   # The current default kernel / kernel modules.
   linux = linuxPackages.kernel;
-  linuxPackages = linuxPackages_3_2;
+  linuxPackages = linuxPackages_3_4;
 
   # A function to build a manually-configured kernel
   linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix {
@@ -6483,7 +6672,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 { };
 
@@ -6518,8 +6707,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 { };
@@ -6585,16 +6774,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 { };
@@ -6603,18 +6788,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 { };
@@ -6867,7 +7042,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 {};
 
@@ -6913,6 +7088,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;
   };
@@ -7093,7 +7270,7 @@ let
   chromium = lowPrio (callPackage ../applications/networking/browsers/chromium {
     channel = "stable";
     gconf = gnome.GConf;
-    pulseSupport = config.pulseaudio or false;
+    pulseSupport = config.pulseaudio or true;
   });
 
   chromiumBeta = lowPrio (chromium.override { channel = "beta"; });
@@ -7132,6 +7309,11 @@ let
   comical = callPackage ../applications/graphics/comical { };
 
   conkeror = callPackage ../applications/networking/browsers/conkeror { };
+  conkerorWrapper = wrapFirefox {
+    browser = conkeror;
+    browserName = "conkeror";
+    desktopName = "Conkeror";
+  };
 
   cuneiform = builderDefsPackage (import ../tools/graphics/cuneiform) {
     inherit cmake patchelf;
@@ -7165,6 +7347,8 @@ let
     inherit (pkgs.gnome) libart_lgpl libgnomeui;
   };
 
+  diffuse = callPackage ../applications/version-management/diffuse { };
+
   distrho = callPackage ../applications/audio/distrho {};
 
   djvulibre = callPackage ../applications/misc/djvulibre { };
@@ -7199,11 +7383,7 @@ let
 
   eaglemode = callPackage ../applications/misc/eaglemode { };
 
-  eclipses = recurseIntoAttrs (
-    (callPackage ../applications/editors/eclipse { }).deepOverride {
-      cairo = cairo_1_12_2;
-    }
-  );
+  eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { });
 
   ed = callPackage ../applications/editors/ed { };
 
@@ -7239,6 +7419,13 @@ let
     librsvg = null;
     alsaLib = null;
     imagemagick = null;
+    texinfo = texinfo5;
+
+    # use gccApple on darwin to deal with: unexec: 'my_edata is not in section
+    # __data'
+    stdenv = if stdenv.isDarwin
+      then stdenvAdapters.overrideGCC stdenv gccApple
+      else stdenv;
   };
 
   emacsPackages = emacs: self: let callPackage = newScope self; in rec {
@@ -7246,7 +7433,7 @@ let
 
     autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { };
 
-    bbdb = callPackage ../applications/editors/emacs-modes/bbdb { };
+    bbdb = callPackage ../applications/editors/emacs-modes/bbdb { texinfo = texinfo5; };
 
     cedet = callPackage ../applications/editors/emacs-modes/cedet { };
 
@@ -7266,9 +7453,9 @@ let
 
     emacsSessionManagement = callPackage ../applications/editors/emacs-modes/session-management-for-emacs { };
 
-    emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { };
+    emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { texinfo = texinfo5; };
 
-    emms = callPackage ../applications/editors/emacs-modes/emms { };
+    emms = callPackage ../applications/editors/emacs-modes/emms { texinfo = texinfo5; };
 
     ess = callPackage ../applications/editors/emacs-modes/ess { };
 
@@ -7304,15 +7491,15 @@ let
 
     loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { };
 
-    magit = callPackage ../applications/editors/emacs-modes/magit { };
+    magit = callPackage ../applications/editors/emacs-modes/magit { texinfo = texinfo5; };
 
     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.
-    org = hiPrio (callPackage ../applications/editors/emacs-modes/org { });
+    org = hiPrio (callPackage ../applications/editors/emacs-modes/org { texinfo = texinfo5; });
 
     org2blog = callPackage ../applications/editors/emacs-modes/org2blog { };
 
@@ -7425,10 +7612,6 @@ let
 
   firefox = pkgs.firefoxPkgs.firefox;
 
-  firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
-
-  firefoxPkgs = pkgs.firefox21Pkgs;
-
   firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
     inherit (gnome) libIDL;
   };
@@ -7441,19 +7624,13 @@ let
 
   firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; });
 
-  firefox20Pkgs = callPackage ../applications/networking/browsers/firefox/20.0.nix {
+  firefoxPkgs = callPackage ../applications/networking/browsers/firefox {
     inherit (gnome) libIDL;
     inherit (pythonPackages) pysqlite;
+    libpng = libpng.override { apngSupport = true; };
   };
 
-  firefox20Wrapper = lowPrio (wrapFirefox { browser = firefox20Pkgs.firefox; });
-
-  firefox21Pkgs = callPackage ../applications/networking/browsers/firefox/21.0.nix {
-    inherit (gnome) libIDL;
-    inherit (pythonPackages) pysqlite;
-  };
-
-  firefox21Wrapper = lowPrio (wrapFirefox { browser = firefox21Pkgs.firefox; });
+  firefoxWrapper = wrapFirefox { browser = firefoxPkgs.firefox; };
 
   flac = callPackage ../applications/audio/flac {
     stdenv = stdenvMulti;
@@ -7497,11 +7674,13 @@ let
 
   gimp_2_6 = callPackage ../applications/graphics/gimp {
     inherit (gnome) libart_lgpl;
+    libpng = libpng12;
   };
 
   gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix {
     inherit (gnome) libart_lgpl;
     webkit = null;
+    lcms = lcms2;
   };
 
   gimp = gimp_2_6;
@@ -7532,6 +7711,8 @@ let
 
   libquvi = callPackage ../applications/video/quvi/library.nix { };
 
+  mi2ly = callPackage ../applications/audio/mi2ly {};
+
   praat = callPackage ../applications/audio/praat { };
 
   quvi = callPackage ../applications/video/quvi/tool.nix { };
@@ -7620,7 +7801,9 @@ let
 
   googleearth = callPackage_i686 ../applications/misc/googleearth { };
 
-  google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin { };
+  google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin {
+    libpng = libpng12;
+  };
 
   gosmore = builderDefsPackage ../applications/misc/gosmore {
     inherit fetchsvn curl pkgconfig libxml2 gtk;
@@ -7638,6 +7821,8 @@ let
 
   hello = callPackage ../applications/misc/hello/ex-2 { };
 
+  herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { };
+
   hexedit = callPackage ../applications/editors/hexedit { };
 
   hipchat = callPackage_i686 ../applications/networking/instant-messengers/hipchat { };
@@ -7655,6 +7840,7 @@ let
   i3 = callPackage ../applications/window-managers/i3 { };
 
   i3lock = callPackage ../applications/window-managers/i3/lock.nix {
+    inherit (xorg) libxkbfile;
     cairo = cairo.override { xcbSupport = true; };
   };
 
@@ -7710,6 +7896,7 @@ let
 
   inkscape = callPackage ../applications/graphics/inkscape {
     inherit (pythonPackages) lxml;
+    lcms = lcms2;
   };
 
   ion3 = callPackage ../applications/window-managers/ion-3 {
@@ -7809,8 +7996,12 @@ let
       ];
     };
     poppler = poppler_0_18;
+    clucene_core = clucene_core_2;
+    lcms = lcms2;
   };
 
+  liferea = callPackage ../applications/networking/newsreaders/liferea { };
+
   lingot = callPackage ../applications/audio/lingot {
     inherit (gnome) libglade;
   };
@@ -7822,8 +8013,10 @@ let
 
   links2 = callPackage ../applications/networking/browsers/links2 { };
 
-  linphone = callPackage ../applications/networking/instant-messengers/linphone {
+  linphone = callPackage ../applications/networking/instant-messengers/linphone rec {
     inherit (gnome) libglade;
+    libexosip = libexosip_3;
+    libosip = libosip_3;
   };
 
   linuxsampler = callPackage ../applications/audio/linuxsampler { };
@@ -7867,7 +8060,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;
@@ -7990,7 +8183,7 @@ let
     lockfile = rubyLibs.lockfile;
     mime_types = rubyLibs.mime_types;
     ncursesw_sup = ruby_ncursesw_sup;
-    rake = rubyLibs.rake_10_0_4;
+    rake = rubyLibs.rake_10_1_0;
     rmail = rubyLibs.rmail;
     text = rubyLibs.text;
     trollop = rubyLibs.trollop;
@@ -8043,6 +8236,8 @@ let
 
   nvi = callPackage ../applications/editors/nvi { };
 
+  nvpy = callPackage ../applications/editors/nvpy { };
+
   ocrad = callPackage ../applications/graphics/ocrad { };
 
   offrss = callPackage ../applications/networking/offrss { };
@@ -8075,9 +8270,7 @@ let
 
   panotools = callPackage ../applications/graphics/panotools { };
 
-  pavucontrol = callPackage ../applications/audio/pavucontrol {
-    inherit (gnome) libglademm;
-  };
+  pavucontrol = callPackage ../applications/audio/pavucontrol { };
 
   paraview = callPackage ../applications/graphics/paraview { };
 
@@ -8158,6 +8351,10 @@ let
 
   qtractor = callPackage ../applications/audio/qtractor { };
 
+  quodlibet = callPackage ../applications/audio/quodlibet {
+    inherit (pythonPackages) mutagen;
+  };
+
   rakarrack = callPackage ../applications/audio/rakarrack {
     inherit (xorg) libXpm libXft;
     fltk = fltk13;
@@ -8193,6 +8390,7 @@ let
   # = urxvt
   rxvt_unicode = callPackage ../applications/misc/rxvt_unicode {
     perlSupport = true;
+    gdkPixbufSupport = true;
   };
 
   sakura = callPackage ../applications/misc/sakura {
@@ -8215,6 +8413,10 @@ let
 
   seq24 = callPackage ../applications/audio/seq24 { };
 
+  sflphone = callPackage ../applications/networking/instant-messengers/sflphone {
+    gtk = gtk3;
+  };
+
   siproxd = callPackage ../applications/networking/siproxd { };
 
   skype = callPackage_i686 ../applications/networking/instant-messengers/skype {
@@ -8223,7 +8425,6 @@ let
 
   skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };
 
-
   skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { };
 
   st = callPackage ../applications/misc/st {
@@ -8242,14 +8443,24 @@ let
 
   lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { };
 
-  slim = callPackage ../applications/display-managers/slim { };
+  # slic3r 0.9.10b says: "Running Slic3r under Perl >= 5.16 is not supported nor recommended"
+  slic3r = callPackage ../applications/misc/slic3r {
+    inherit (perl514Packages) EncodeLocale MathClipper ExtUtilsXSpp
+            BoostGeometryUtils MathConvexHullMonotoneChain MathGeometryVoronoi
+            MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus;
+    perl = perl514;
+  };
 
-  sndBase = builderDefsPackage (import ../applications/audio/snd) {
+  slim = callPackage ../applications/display-managers/slim {
+    libpng = libpng12;
+  };
+
+  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;
@@ -8270,6 +8481,7 @@ let
 
   spotify = callPackage ../applications/audio/spotify {
     inherit (gnome) GConf;
+    libpng = libpng12;
   };
 
   libspotify = callPackage ../development/libraries/libspotify {
@@ -8436,7 +8648,12 @@ let
     flup = pythonPackages.flup;
   };
 
-  vim = callPackage ../applications/editors/vim { };
+  vim = callPackage ../applications/editors/vim {
+    # for Objective-C compilation
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
 
   vimHugeX = vim_configurable;
 
@@ -8456,8 +8673,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 {
@@ -8498,6 +8715,8 @@ let
     };
   };
 
+  windowmaker = callPackage ../applications/window-managers/windowmaker { };
+
   winswitch = callPackage ../tools/X11/winswitch { };
 
   wings = callPackage ../applications/graphics/wings {
@@ -8507,6 +8726,8 @@ let
 
   wmname = callPackage ../applications/misc/wmname { };
 
+  wmctrl = callPackage ../tools/X11/wmctrl { };
+
   # I'm keen on wmiimenu only  >wmii-3.5 no longer has it...
   wmiimenu = import ../applications/window-managers/wmii31 {
     libixp = libixp_for_wmii;
@@ -8578,6 +8799,8 @@ let
 
   xcalib = callPackage ../tools/X11/xcalib { };
 
+  xcape = callPackage ../tools/X11/xcape { };
+
   xchainkeys = callPackage ../tools/X11/xchainkeys { };
 
   xchat = callPackage ../applications/networking/irc/xchat { };
@@ -8629,6 +8852,8 @@ let
 
   xpra = callPackage ../tools/X11/xpra { };
 
+  xrestop = callPackage ../tools/X11/xrestop { };
+
   xscreensaver = callPackage ../misc/screensavers/xscreensaver {
     inherit (gnome) libglade;
   };
@@ -8871,6 +9096,8 @@ let
 
   stardust = callPackage ../games/stardust {};
 
+  steam = callPackage_i686 ../games/steam {};
+
   stuntrally = callPackage ../games/stuntrally { };
 
   superTux = callPackage ../games/super-tux { };
@@ -8985,33 +9212,32 @@ let
     inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils;
   };
 
-  gnome3 = callPackage ../desktops/gnome-3 {
+  gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 {
     callPackage = pkgs.newScope pkgs.gnome3;
     self = pkgs.gnome3;
-  };
+  });
 
   gnome = recurseIntoAttrs gnome2;
 
-  kde4 = recurseIntoAttrs pkgs.kde48;
+  hsetroot = callPackage ../tools/X11/hsetroot { };
 
-  kde47 = kdePackagesFor (pkgs.kde47 // {
-      boost = boost149;
-      eigen = eigen2;
-      libotr = libotr_3_2;
-      libgphoto2 = libgphoto2_4;
-    }) ../desktops/kde-4.7;
+  kde4 = recurseIntoAttrs pkgs.kde410;
 
   kde48 = kdePackagesFor (pkgs.kde48 // {
       boost = boost149;
       eigen = eigen2;
       libotr = libotr_3_2;
       libgphoto2 = libgphoto2_4;
+      libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.8;
 
   kde410 = kdePackagesFor (pkgs.kde410 // {
       boost = boost149;
       eigen = eigen2;
       libotr = libotr_3_2;
+      libusb = libusb1;
+      ffmpeg = ffmpeg_1;
+      libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.10;
 
   kdePackagesFor = self: dir:
@@ -9137,6 +9363,8 @@ let
 
   oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { };
 
+  gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { };
+
   gnome_themes_standard = callPackage ../misc/themes/gnome-themes-standard { };
 
   xfce = xfce4_10;
@@ -9157,7 +9385,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 { };
@@ -9440,6 +9669,7 @@ let
   gensgs = callPackage_i686 ../misc/emulators/gens-gs { };
 
   ghostscript = callPackage ../misc/ghostscript {
+    lcms = lcms2;
     x11Support = false;
     cupsSupport = config.ghostscript.cups or true;
     gnuFork = config.ghostscript.gnu or false;
@@ -9449,6 +9679,8 @@ let
     x11Support = true;
   });
 
+  guix = callPackage ../tools/package-management/guix { };
+
   gxemul = callPackage ../misc/gxemul { };
 
   hatari = callPackage ../misc/emulators/hatari { };
@@ -9486,13 +9718,10 @@ let
     stateDir = config.nix.stateDir or "/nix/var";
   };
 
-  nixUnstable = nixStable;
-  /*
   nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
     storeDir = config.nix.storeDir or "/nix/store";
     stateDir = config.nix.stateDir or "/nix/var";
   };
-  */
 
   nixops = callPackage ../tools/package-management/nixops { };
 
@@ -9504,7 +9733,7 @@ let
 
   disnix = callPackage ../tools/package-management/disnix { };
 
-  disnix_activation_scripts = callPackage ../tools/package-management/disnix/activation-scripts {
+  dysnomia = callPackage ../tools/package-management/disnix/dysnomia {
     enableApacheWebApplication = config.disnix.enableApacheWebApplication or false;
     enableAxis2WebService = config.disnix.enableAxis2WebService or false;
     enableEjabberdDump = config.disnix.enableEjabberdDump or false;
@@ -9551,6 +9780,8 @@ let
 
   putty = callPackage ../applications/networking/remote/putty { };
 
+  retroarch = callPackage ../misc/emulators/retroarch { };
+
   rssglx = callPackage ../misc/screensavers/rss-glx { };
 
   xlockmore = callPackage ../misc/screensavers/xlockmore { };
@@ -9567,6 +9798,7 @@ let
   saneBackends = callPackage ../applications/graphics/sane/backends.nix {
     gt68xxFirmware = config.sane.gt68xxFirmware or null;
     hotplugSupport = config.sane.hotplugSupport or true;
+    libusb = libusb1;
   };
 
   saneBackendsGit = callPackage ../applications/graphics/sane/backends-git.nix {
@@ -9736,4 +9968,8 @@ let
 
   dart = callPackage ../development/interpreters/dart { };
 
+  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 4bcce23fc3b..07b4071a004 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -591,6 +591,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   binaryShared = callPackage ../development/libraries/haskell/binary-shared {};
 
+  bindingsDSL = callPackage ../development/libraries/haskell/bindings-DSL {};
+
+  bindingsPosix = callPackage ../development/libraries/haskell/bindings-posix {};
+
   bitarray = callPackage ../development/libraries/haskell/bitarray {};
 
   bitmap = callPackage ../development/libraries/haskell/bitmap {};
@@ -627,6 +631,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   boomerang = callPackage ../development/libraries/haskell/boomerang {};
 
+  byteable = callPackage ../development/libraries/haskell/byteable {};
+
   bytedump = callPackage ../development/libraries/haskell/bytedump {};
 
   byteorder = callPackage ../development/libraries/haskell/byteorder {};
@@ -641,9 +647,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; }; };
@@ -718,6 +722,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {};
 
+  concatenative = callPackage ../development/libraries/haskell/concatenative {};
+
   conduit = callPackage ../development/libraries/haskell/conduit {};
 
   ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
@@ -748,6 +754,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 {};
@@ -895,6 +905,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   elerea = callPackage ../development/libraries/haskell/elerea {};
 
+  Elm = callPackage ../development/compilers/elm/elm.nix {};
+
+  elmServer = callPackage ../development/compilers/elm/elm-server.nix {};
+
   emailValidate = callPackage ../development/libraries/haskell/email-validate {};
 
   encoding = callPackage ../development/libraries/haskell/encoding {};
@@ -1077,6 +1091,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {};
 
+  happstackLite = callPackage ../development/libraries/haskell/happstack/happstack-lite.nix {};
+
   hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {};
   hashable_1_2_0_10 = callPackage ../development/libraries/haskell/hashable/1.2.0.10.nix {};
   hashable = self.hashable_1_2_0_10;
@@ -1121,6 +1137,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {};
   HTTP = self.HTTP_4000_2_8;
 
+  httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {};
+
   httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {};
 
   hackageDb = callPackage ../development/libraries/haskell/hackage-db {};
@@ -1253,8 +1271,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ieee754 = callPackage ../development/libraries/haskell/ieee754 {};
 
+  indents = callPackage ../development/libraries/haskell/indents {};
+
   instantGenerics = callPackage ../development/libraries/haskell/instant-generics {};
 
+  intervals = callPackage ../development/libraries/haskell/intervals {};
+
   ioChoice = callPackage ../development/libraries/haskell/io-choice {};
 
   IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {};
@@ -1290,9 +1312,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 {};
 
@@ -1372,10 +1392,14 @@ 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 {};
 
+  modularArithmetic = callPackage ../development/libraries/haskell/modular-arithmetic {};
+
   MonadCatchIOMtl = callPackage ../development/libraries/haskell/MonadCatchIO-mtl {};
 
   MonadCatchIOTransformers = callPackage ../development/libraries/haskell/MonadCatchIO-transformers {};
@@ -1389,8 +1413,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   monadLogger = callPackage ../development/libraries/haskell/monad-logger {};
 
   monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {};
-  monadPar_0_3_4_2 = callPackage ../development/libraries/haskell/monad-par/0.3.4.2.nix {};
-  monadPar = self.monadPar_0_3_4_2;
+  monadPar_0_3_4_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 {};
 
@@ -1483,6 +1507,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 {};
@@ -1550,6 +1576,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   pathtype = callPackage ../development/libraries/haskell/pathtype {};
 
+  pcap = callPackage ../development/libraries/haskell/pcap {};
+
+  pcapEnumerator = callPackage ../development/libraries/haskell/pcap-enumerator {};
+
   pcreLight = callPackage ../development/libraries/haskell/pcre-light {};
 
   pem = callPackage ../development/libraries/haskell/pem {};
@@ -1589,8 +1619,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   ppm = callPackage ../development/libraries/haskell/ppm {};
 
   prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {};
-  prettyShow_1_5 = callPackage ../development/libraries/haskell/pretty-show/1.5.nix {};
-  prettyShow = self.prettyShow_1_5;
+  prettyShow_1_6_1 = callPackage ../development/libraries/haskell/pretty-show/1.6.1.nix {};
+  prettyShow = self.prettyShow_1_6_1;
 
   punycode = callPackage ../development/libraries/haskell/punycode {};
 
@@ -1637,6 +1667,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {};
 
+  qrencode = callPackage ../development/libraries/haskell/qrencode {
+    inherit (pkgs) qrencode;
+  };
+
   RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {};
 
   random_1_0_1_1 = callPackage ../development/libraries/haskell/random/1.0.1.1.nix {};
@@ -1727,6 +1761,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 {};
@@ -1931,7 +1967,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   threads = callPackage ../development/libraries/haskell/threads {};
 
   time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {};
-  time_1_4_0_2 = callPackage ../development/libraries/haskell/time/1.4.0.2.nix {};
+  time_1_4_1 = callPackage ../development/libraries/haskell/time/1.4.1.nix {};
   # time is in the core package set. It should only be necessary to
   # pass it explicitly in rare circumstances.
   time = null;
@@ -1960,10 +1996,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 {};
@@ -2041,6 +2081,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   warp = callPackage ../development/libraries/haskell/warp {};
 
+  warpTls = callPackage ../development/libraries/haskell/warp-tls {};
+
   WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix {
     parsec = self.parsec2;
   };
diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index c4a6bbb7ca6..d3477447d8c 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -1,1996 +1,12085 @@
-[
-  {
-    baseName = "abbrev";
-    version = "1.0.4";
-    fullName = "abbrev-1";
-    hash = "8dc0f480571a4a19e74f1abd4f31f6a70f94953d1ccafa16ed1a544a19a6f3a8";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "amdefine";
-    version = "0.0.5";
-    fullName = "amdefine-*";
-    hash = "7d7a691c9742d4c9aaa8036b823823e45a676dec6897f2e072b90c7d37722fc1";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "amdefine";
-    version = "0.0.5";
-    fullName = "amdefine->=0.0.4";
-    hash = "7d7a691c9742d4c9aaa8036b823823e45a676dec6897f2e072b90c7d37722fc1";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "ansi-remover";
-    version = "0.0.2";
-    fullName = "ansi-remover-*";
-    hash = "cda72261ea8d6b830892764d69eff8d926be852fc91ad3b8b5b258d606400bc7";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "ansi";
-    version = "0.1.2";
-    fullName = "ansi-~0.1.2";
-    hash = "6f2288b1db642eb822578f4ee70bf26bf97173cc7d3f10f496070fb96250006b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "asn1";
-    version = "0.1.11";
-    fullName = "asn1-0.1.11";
-    hash = "7206eadc8a9344e484bcce979e22a12c9fa64c1395aa0544b8b767808b268f43";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "assert";
-    version = "0.4.9";
-    fullName = "assert-*";
-    hash = "976a12385f7286d123734fabc7355bbeecd2532daccfada02909818b905abeeb";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "util"; range = ">= 0.4.9"; }
-    ];
-  }
-  {
-    baseName = "assert-plus";
-    version = "0.1.2";
-    fullName = "assert-plus-0.1.2";
-    hash = "bd62e853460024d1e35d3f76065f4c856a271e55ef1ce684f3033314b7377c61";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "async";
-    version = "0.2.9";
-    fullName = "async-*";
-    hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "async";
-    version = "0.2.9";
-    fullName = "async-~0.2.7";
-    hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "aws-sdk";
-    version = "1.2.0";
-    fullName = "aws-sdk-*";
-    hash = "e2d4b32fba387b8f099c4180579b67554f875895a69e4c1ddb0a28546db9ba4c";
-    patchLatest = true;
-    topLevel = true;
-    dependencies = [
-      { name = "xml2js"; range = "0.2.4"; }
-      { name = "xmlbuilder"; range = "*"; }
-    ];
-  }
-  {
-    baseName = "aws-sdk";
-    version = "1.2.0";
-    fullName = "aws-sdk->=1.2.0 <2";
-    hash = "e2d4b32fba387b8f099c4180579b67554f875895a69e4c1ddb0a28546db9ba4c";
-    patchLatest = true;
-    topLevel = false;
-    dependencies = [
-      { name = "xml2js"; range = "0.2.4"; }
-      { name = "xmlbuilder"; range = "*"; }
-    ];
-  }
-  {
-    baseName = "aws-sign";
-    version = "0.3.0";
-    fullName = "aws-sign-~0.3.0";
-    hash = "5acca27ed2b1b9f081e4dd230e03808b6a038f8a4afa698db985320efe6dda5e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "backbone";
-    version = "1.0.0";
-    fullName = "backbone-*";
-    hash = "6c66edc5134bb531b33a7f140c75c4a65cdc21711eed64c29300a84cba84f3a7";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "underscore"; range = ">=1.4.3"; }
-    ];
-  }
-  {
-    baseName = "backoff";
-    version = "2.1.0";
-    fullName = "backoff-2.1.0";
-    hash = "d1f5bf32f2f5954f6259582ead30fc8a769db35bac9900c94593b77f915cee0d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "block-stream";
-    version = "0.0.6";
-    fullName = "block-stream-*";
-    hash = "2fc365b42b8601c8ee150d453f6cc762a01054b7fb28bdfcfcbce7c97e93601b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "inherits"; range = "~1.0.0"; }
-    ];
-  }
-  {
-    baseName = "boom";
-    version = "0.4.2";
-    fullName = "boom-0.4.x";
-    hash = "294e022990269e7fa1e3015862d2d24847cc83c3e68d214dad5a2d0d3826a08f";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "hoek"; range = "0.9.x"; }
-    ];
-  }
-  {
-    baseName = "browserchannel";
-    version = "1.0.4";
-    fullName = "browserchannel-*";
-    hash = "516add6af10f887500c5eaae7347ce92c0101a6bea1a67d5221a674d07bc7999";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "hat"; range = "*"; }
-      { name = "connect"; range = "~2"; }
-      { name = "request"; range = "~2"; }
-    ];
-  }
-  {
-    baseName = "buffer-crc32";
-    version = "0.2.1";
-    fullName = "buffer-crc32-0.2.1";
-    hash = "b6ea96d57411e37c15e18fb8ca600656399912ce16355f9af3c662f765507f01";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "buffertools";
-    version = "1.1.1";
-    fullName = "buffertools-*";
-    hash = "f5962aec81246077a46ee075072d40fa533c31ada7a0ec18e1ff3600af2d8f3f";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "bunyan";
-    version = "0.21.1";
-    fullName = "bunyan-0.21.1";
-    hash = "95dca2405dcbe5b700e15d7c89b2a64fb21a097fb7ada5c274979f2057adcbef";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "mv"; range = "0.0.5"; }
-      { name = "dtrace-provider"; range = "0.2.8"; }
-    ];
-  }
-  {
-    baseName = "bytes";
-    version = "0.2.0";
-    fullName = "bytes-0.2.0";
-    hash = "e70bd4dccc886a5cf1c925092b4acd7a262a9da3e1b51ccde10a3fcd0a328465";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "cli";
-    version = "0.4.4-2";
-    fullName = "cli-0.4.x";
-    hash = "27a0db02501285da601c47495d0cd837ddeb4577bfd507c5503d2ee8cd0caffb";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "glob"; range = ">= 3.1.4"; }
-    ];
-  }
-  {
-    baseName = "clone";
-    version = "0.1.5";
-    fullName = "clone-0.1.5";
-    hash = "9fd586470ccc3fa585dcccad730b5e6fa9c471b49acdb38d724c110777a287d9";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "clone";
-    version = "0.1.6";
-    fullName = "clone-0.1.6";
-    hash = "9849c9faa2549d982106d3b43862dc4ceb308563badcd3ff59e30655d54e897a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "coffee-script";
-    version = "1.6.3";
-    fullName = "coffee-script-*";
-    hash = "642d226d4fab1a8464e54347cec919b1c8771da55d88e3ceb15d826fcee84525";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "combined-stream";
-    version = "0.0.4";
-    fullName = "combined-stream-~0.0.4";
-    hash = "2502ed7a4406db1a65b09cae3106221051d6af20d3f1d7e8cc38cfc72a36432c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "delayed-stream"; range = "0.0.5"; }
-    ];
-  }
-  {
-    baseName = "commander";
-    version = "0.5.1";
-    fullName = "commander-0.5.1";
-    hash = "91042851d0731b28a5e7c342e5cbce7723a7243d31ae378fa86c45ca9493a924";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "commander";
-    version = "0.6.1";
-    fullName = "commander-0.6.1";
-    hash = "7b7fdd1bc4d16f6776169a64f133d629efe2e3a7cd338b1d0884ee909abbd729";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "connect";
-    version = "2.7.11";
-    fullName = "connect-2.7.11";
-    hash = "8c9aaabcb7e6f0d733f82b876db59a37a6d711aab7ea2dead9f624d9282b1245";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "qs"; range = "0.6.5"; }
-      { name = "formidable"; range = "1.0.14"; }
-      { name = "cookie-signature"; range = "1.0.1"; }
-      { name = "buffer-crc32"; range = "0.2.1"; }
-      { name = "cookie"; range = "0.0.5"; }
-      { name = "send"; range = "0.1.1"; }
-      { name = "bytes"; range = "0.2.0"; }
-      { name = "fresh"; range = "0.1.0"; }
-      { name = "pause"; range = "0.0.1"; }
-      { name = "debug"; range = "*"; }
-    ];
-  }
-  {
-    baseName = "connect";
-    version = "2.7.11";
-    fullName = "connect-~2";
-    hash = "8c9aaabcb7e6f0d733f82b876db59a37a6d711aab7ea2dead9f624d9282b1245";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "qs"; range = "0.6.5"; }
-      { name = "formidable"; range = "1.0.14"; }
-      { name = "cookie-signature"; range = "1.0.1"; }
-      { name = "buffer-crc32"; range = "0.2.1"; }
-      { name = "cookie"; range = "0.0.5"; }
-      { name = "send"; range = "0.1.1"; }
-      { name = "bytes"; range = "0.2.0"; }
-      { name = "fresh"; range = "0.1.0"; }
-      { name = "pause"; range = "0.0.1"; }
-      { name = "debug"; range = "*"; }
-    ];
-  }
-  {
-    baseName = "console-browserify";
-    version = "0.1.6";
-    fullName = "console-browserify-0.1.x";
-    hash = "e774c881920562b0893e50844332f79fc5a08752d28791d942c35fcc3ef2d75d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "cookie";
-    version = "0.0.5";
-    fullName = "cookie-0.0.5";
-    hash = "17938b21dcd85f09994b85484abb5aeddc4e92c61d1b599b764bbaaa7ad6adee";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "cookie";
-    version = "0.1.0";
-    fullName = "cookie-0.1.0";
-    hash = "aff5d22a617d744319cc70e42fc4ab11bcbcf924244af565495fa799c0639650";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "cookie-jar";
-    version = "0.3.0";
-    fullName = "cookie-jar-~0.3.0";
-    hash = "c7bac7739b9ceb194f431a4a9ac1a0ba4ffd4a60492c61dd1925dbcdb9030746";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "cookie-signature";
-    version = "1.0.1";
-    fullName = "cookie-signature-1.0.1";
-    hash = "e2ea4f290fdcfe82d8fb76991fee4106d4ae1f5d5a2f8b8d91442e047c538c8e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "cryptiles";
-    version = "0.2.1";
-    fullName = "cryptiles-0.2.x";
-    hash = "a7ad8087bf6abbbfa0ae159756c04326a490f373212f6f2fd0f3a1f63f475892";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "boom"; range = "0.4.x"; }
-    ];
-  }
-  {
-    baseName = "ctype";
-    version = "0.5.0";
-    fullName = "ctype-0.5.0";
-    hash = "50157e6c5e44d1c833bfc239a7a337ee08fd6f3c5a15f7ef5cee5571a86b0378";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "ctype";
-    version = "0.5.2";
-    fullName = "ctype-0.5.2";
-    hash = "4a7224a74f19dc6a1206fa1c04ae1a4ab795cd4ba842466e2f511fa714f82c60";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "debug";
-    version = "0.7.2";
-    fullName = "debug-*";
-    hash = "f9142856b1c2652a11e50f2aca068edbad7598f50d9e6d003b8ee85b2a333d63";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "debug";
-    version = "0.7.2";
-    fullName = "debug-~0.7.0";
-    hash = "f9142856b1c2652a11e50f2aca068edbad7598f50d9e6d003b8ee85b2a333d63";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "deep-equal";
-    version = "0.0.0";
-    fullName = "deep-equal-0.0.0";
-    hash = "6a5666d4bfa5d2786a9f86ede2eaa8252f783edb9d78e69cba645f7cb6e153b8";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "delayed-stream";
-    version = "0.0.5";
-    fullName = "delayed-stream-0.0.5";
-    hash = "f40e440dac0f853577d5225d7bd4b2026ea1447a724f4ba1096e29983ee595dd";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "diff";
-    version = "1.0.2";
-    fullName = "diff-1.0.2";
-    hash = "5de1d8c3f2bfc447a7e664cadd4aca2ef4952a43256310cc51a36b30b5be3045";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "dtrace-provider";
-    version = "0.2.8";
-    fullName = "dtrace-provider-0.2.8";
-    hash = "200941239983fa0953415cf28e96d9347c50218d31280604cfc9252e448e714c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "escape-html";
-    version = "1.0.0";
-    fullName = "escape-html-*";
-    hash = "c763095c6b27fddf666f34d48a4f09f95009a76a6d16d1799175ecd0c1912456";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "events.node";
-    version = "0.4.9";
-    fullName = "events.node->= 0.4.0";
-    hash = "aedaf9faa7a33f16e2bf1754ed988a836570d00064748a8c1c8ee48805b9f0b6";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "express";
-    version = "3.2.6";
-    fullName = "express-*";
-    hash = "a0c9ee92fe1366daf166f30ae77f824aa65c2f5e121596fa2c4f439b518cde99";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "connect"; range = "2.7.11"; }
-      { name = "commander"; range = "0.6.1"; }
-      { name = "range-parser"; range = "0.0.4"; }
-      { name = "mkdirp"; range = "0.3.4"; }
-      { name = "cookie"; range = "0.1.0"; }
-      { name = "buffer-crc32"; range = "0.2.1"; }
-      { name = "fresh"; range = "0.1.0"; }
-      { name = "methods"; range = "0.0.1"; }
-      { name = "send"; range = "0.1.0"; }
-      { name = "cookie-signature"; range = "1.0.1"; }
-      { name = "debug"; range = "*"; }
-    ];
-  }
-  {
-    baseName = "extend";
-    version = "1.1.3";
-    fullName = "extend-*";
-    hash = "0b27709829110f2e84926ebe3494b82df6e79ad49a618ad3444e4edf62b57a57";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "extsprintf";
-    version = "1.0.0";
-    fullName = "extsprintf-1.0.0";
-    hash = "9cae7f1f192e5f35746e13047ab4c13e8b5b686469feeaec301ba7d370df5670";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "extsprintf";
-    version = "1.0.2";
-    fullName = "extsprintf-1.0.2";
-    hash = "ea000cf3e51cba7fac7fb1e425ddb79bf46f3ce40955955bf35fd487184a04ab";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "faye-websocket";
-    version = "0.6.0";
-    fullName = "faye-websocket-*";
-    hash = "192f09ecd1c52fc357d2ad3ae3121be35556b7b09e30ce74117d80b9dbae3f60";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "websocket-driver"; range = ">=0.2.0"; }
-    ];
-  }
-  {
-    baseName = "faye-websocket";
-    version = "0.4.4";
-    fullName = "faye-websocket-0.4.4";
-    hash = "c682f6269bcaba0667ef4ae0ecb0b662e35ea6338b075e25ebce9e13019bc3a2";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "forever-agent";
-    version = "0.5.0";
-    fullName = "forever-agent-~0.5.0";
-    hash = "0a7eda1f87f3cfa7fad8ba655a642992033b38a1929becfa0bfcab8241b7d78b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "form-data";
-    version = "0.0.8";
-    fullName = "form-data-0.0.8";
-    hash = "cf7d5669259ec4c5474b9c2100127ba065a4757ff33b878a1d99509b8e448220";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "combined-stream"; range = "~0.0.4"; }
-      { name = "mime"; range = "~1.2.2"; }
-      { name = "async"; range = "~0.2.7"; }
-    ];
-  }
-  {
-    baseName = "formidable";
-    version = "1.0.13";
-    fullName = "formidable-1.0.13";
-    hash = "c3c7c6ecdd4b1ad9ec9b1c273d8dd1db2bc12f9a699c233d3885fcded58ceec6";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "formidable";
-    version = "1.0.14";
-    fullName = "formidable-1.0.14";
-    hash = "b36e58f659fd0d7c734b4ab2c611fa6e40bd988c2237a29d25025460f18f7ea1";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "fresh";
-    version = "0.1.0";
-    fullName = "fresh-0.1.0";
-    hash = "c402fbd25e26c0167bf288e1ba791716808bfaa5de32b76ae68e8e8a3d7e2b33";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "fstream";
-    version = "0.1.22";
-    fullName = "fstream-0";
-    hash = "2ace3993d34cbf5e97bcb9c7eec3f011fa2041ce66cb688e39e747285084496a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "rimraf"; range = "2"; }
-      { name = "mkdirp"; range = "0.3"; }
-      { name = "graceful-fs"; range = "~1.2.0"; }
-      { name = "inherits"; range = "~1.0.0"; }
-    ];
-  }
-  {
-    baseName = "fstream";
-    version = "0.1.22";
-    fullName = "fstream-~0.1.8";
-    hash = "2ace3993d34cbf5e97bcb9c7eec3f011fa2041ce66cb688e39e747285084496a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "rimraf"; range = "2"; }
-      { name = "mkdirp"; range = "0.3"; }
-      { name = "graceful-fs"; range = "~1.2.0"; }
-      { name = "inherits"; range = "~1.0.0"; }
-    ];
-  }
-  {
-    baseName = "glob";
-    version = "3.2.1";
-    fullName = "glob-3";
-    hash = "a457c2115213ce2cb59582ddc3a25eb3ae7490af687e412111c0032f72966f51";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "minimatch"; range = "~0.2.11"; }
-      { name = "graceful-fs"; range = "~1.2.0"; }
-      { name = "inherits"; range = "1"; }
-    ];
-  }
-  {
-    baseName = "glob";
-    version = "3.2.1";
-    fullName = "glob-3.2.1";
-    hash = "a457c2115213ce2cb59582ddc3a25eb3ae7490af687e412111c0032f72966f51";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "minimatch"; range = "~0.2.11"; }
-      { name = "graceful-fs"; range = "~1.2.0"; }
-      { name = "inherits"; range = "1"; }
-    ];
-  }
-  {
-    baseName = "glob";
-    version = "3.2.1";
-    fullName = "glob->= 3.1.4";
-    hash = "a457c2115213ce2cb59582ddc3a25eb3ae7490af687e412111c0032f72966f51";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "minimatch"; range = "~0.2.11"; }
-      { name = "graceful-fs"; range = "~1.2.0"; }
-      { name = "inherits"; range = "1"; }
-    ];
-  }
-  {
-    baseName = "graceful-fs";
-    version = "1.2.1";
-    fullName = "graceful-fs-1";
-    hash = "eeef3c36c6a6476059a7e7a32d0b87e62133b11392c540f5c8c68c87f65c7c59";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "graceful-fs";
-    version = "1.2.1";
-    fullName = "graceful-fs-~1";
-    hash = "eeef3c36c6a6476059a7e7a32d0b87e62133b11392c540f5c8c68c87f65c7c59";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "graceful-fs";
-    version = "1.2.1";
-    fullName = "graceful-fs-~1.2.0";
-    hash = "eeef3c36c6a6476059a7e7a32d0b87e62133b11392c540f5c8c68c87f65c7c59";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "growl";
-    version = "1.7.0";
-    fullName = "growl-1.7.x";
-    hash = "52a6e9edae2fd5a66ddb87c52a398a17ee697eb0e8e1480e9506a6dcdbf3ffcf";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "hat";
-    version = "0.0.3";
-    fullName = "hat-*";
-    hash = "7bf52b3b020ca333a42eb67411090912b21abb6ac746d587022a0955b16e5f5c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "hawk";
-    version = "0.13.1";
-    fullName = "hawk-~0.13.0";
-    hash = "659e5ada1e9dc44a634e07899937d5eaeaa1c06658f181ca187f7f6faa0c592a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "hoek"; range = "0.8.x"; }
-      { name = "boom"; range = "0.4.x"; }
-      { name = "cryptiles"; range = "0.2.x"; }
-      { name = "sntp"; range = "0.2.x"; }
-    ];
-  }
-  {
-    baseName = "hoek";
-    version = "0.8.5";
-    fullName = "hoek-0.8.x";
-    hash = "637e524cd4b48b66db137d6fa93cbe254f112ce638ea9fd399bab73591ede965";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "hoek";
-    version = "0.9.1";
-    fullName = "hoek-0.9.x";
-    hash = "34480468d2e85781ecdd7134523b4d6fea978d333edd2bcb828edd33bbbe8a3f";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "htdigest";
-    version = "1.0.7";
-    fullName = "htdigest-1.0.7";
-    hash = "10fb047addf1c4f1089a26389066d5ff8f5ffa1ccce272a701bb4c2a30d90c58";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "commander"; range = "0.5.1"; }
-    ];
-  }
-  {
-    baseName = "htpasswd";
-    version = "1.1.0";
-    fullName = "htpasswd-1.1.0";
-    hash = "cee9c0a525e717e3565ba6ffea8a64c480bc8a9e7800cb9bfc385d1a8e713ec9";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "commander"; range = "0.5.1"; }
-    ];
-  }
-  {
-    baseName = "http-auth";
-    version = "1.2.7";
-    fullName = "http-auth-1.2.7";
-    hash = "874dbb5907d03602f31eae959a0927a3112da8e868231d9a2119bb50d2fe63d2";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "node-uuid"; range = "1.2.0"; }
-      { name = "htpasswd"; range = "1.1.0"; }
-      { name = "htdigest"; range = "1.0.7"; }
-    ];
-  }
-  {
-    baseName = "http-signature";
-    version = "0.9.11";
-    fullName = "http-signature-0.9.11";
-    hash = "44b89f3c1917bf02723a5720f08fbe47448e0370a5d3498d1be860eaf28beb3b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "assert-plus"; range = "0.1.2"; }
-      { name = "asn1"; range = "0.1.11"; }
-      { name = "ctype"; range = "0.5.2"; }
-    ];
-  }
-  {
-    baseName = "http-signature";
-    version = "0.9.11";
-    fullName = "http-signature-~0.9.11";
-    hash = "44b89f3c1917bf02723a5720f08fbe47448e0370a5d3498d1be860eaf28beb3b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "assert-plus"; range = "0.1.2"; }
-      { name = "asn1"; range = "0.1.11"; }
-      { name = "ctype"; range = "0.5.2"; }
-    ];
-  }
-  {
-    baseName = "inherits";
-    version = "1.0.0";
-    fullName = "inherits-1";
-    hash = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "inherits";
-    version = "1.0.0";
-    fullName = "inherits-1.x";
-    hash = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "inherits";
-    version = "1.0.0";
-    fullName = "inherits-~1.0.0";
-    hash = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "jade";
-    version = "0.26.3";
-    fullName = "jade-0.26.3";
-    hash = "ea314287eb192b6987f7bb9d7010bf2c35ff6288f125fa00796ad93bdba14d0b";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "commander"; range = "0.6.1"; }
-      { name = "mkdirp"; range = "0.3.0"; }
-    ];
-  }
-  {
-    baseName = "jayschema";
-    version = "0.1.5";
-    fullName = "jayschema-*";
-    hash = "66e17d82f0b24d882321d42da2f094ab2b14df8a3f558b88867800e672f5c80d";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "jshint";
-    version = "2.1.3";
-    fullName = "jshint-*";
-    hash = "aaad18f3e6ec6e118d2990d8e627f62125c34ed28f864c9f3b6c46d4cf5d3288";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "shelljs"; range = "0.1.x"; }
-      { name = "underscore"; range = "1.4.x"; }
-      { name = "cli"; range = "0.4.x"; }
-      { name = "minimatch"; range = "0.x.x"; }
-      { name = "console-browserify"; range = "0.1.x"; }
-    ];
-  }
-  {
-    baseName = "json-schema";
-    version = "0.2.2";
-    fullName = "json-schema-0.2.2";
-    hash = "41b873a8fb542caf337ec17ad5593761e8db5ce8e33f4074b733b34ec656f0e8";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "json-stringify-safe";
-    version = "4.0.0";
-    fullName = "json-stringify-safe-~4.0.0";
-    hash = "2461befc8dab37d1d83927ab4bf4aa68b162a35b5a85c1a90c70f86500091b60";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "jsontool";
-    version = "5.1.3";
-    fullName = "jsontool-*";
-    hash = "097889f294920e43c2a8f8d9156971860c67c61ecfe5a1e411c4d641e521985c";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "jsprim";
-    version = "0.3.0";
-    fullName = "jsprim-0.3.0";
-    hash = "0fd12872374ee55cc0c005a1590ef65def0e96de04734a753e0d1480c3ffc4bd";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "extsprintf"; range = "1.0.0"; }
-      { name = "json-schema"; range = "0.2.2"; }
-      { name = "verror"; range = "1.3.3"; }
-    ];
-  }
-  {
-    baseName = "keep-alive-agent";
-    version = "0.0.1";
-    fullName = "keep-alive-agent-0.0.1";
-    hash = "481f10eeb5b9759ad28d9556f30c1747a5e71fbbad55fb130b96eacc7ac1c7a1";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "knox";
-    version = "0.8.3";
-    fullName = "knox-*";
-    hash = "fe3cb0d94b3e85413626ffee386c751931afe200b170bd555173e413d7044c75";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "mime"; range = "*"; }
-      { name = "xml2js"; range = "0.2.x"; }
-      { name = "debug"; range = "~0.7.0"; }
-      { name = "stream-counter"; range = "~0.1.0"; }
-    ];
-  }
-  {
-    baseName = "lru-cache";
-    version = "2.3.0";
-    fullName = "lru-cache-2";
-    hash = "fbb1a14e0314095b7999a3a7489c92983f3d95b188857af697487ac8a778e942";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "lru-cache";
-    version = "2.2.0";
-    fullName = "lru-cache-2.2.0";
-    hash = "bdfb66f74cc4097f3bfd6062b2edbb7790d709f414c7d0f3419241840b1bffed";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "lru-cache";
-    version = "2.3.0";
-    fullName = "lru-cache-2.3.0";
-    hash = "fbb1a14e0314095b7999a3a7489c92983f3d95b188857af697487ac8a778e942";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "methods";
-    version = "0.0.1";
-    fullName = "methods-0.0.1";
-    hash = "2f7e32954dff5991dd8220e8f5dcdd32aeec5ec56ce9f7235872444af51b3adb";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mime";
-    version = "1.2.9";
-    fullName = "mime-*";
-    hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mime";
-    version = "1.2.6";
-    fullName = "mime-1.2.6";
-    hash = "7460134d6b4686d64fd1e7b878d34e2bdd258ad29b6665cf62e6d92659e81591";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mime";
-    version = "1.2.9";
-    fullName = "mime-1.2.9";
-    hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mime";
-    version = "1.2.9";
-    fullName = "mime-~1.2.2";
-    hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mime";
-    version = "1.2.9";
-    fullName = "mime-~1.2.9";
-    hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "minimatch";
-    version = "0.2.12";
-    fullName = "minimatch-0";
-    hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "lru-cache"; range = "2"; }
-      { name = "sigmund"; range = "~1.0.0"; }
-    ];
-  }
-  {
-    baseName = "minimatch";
-    version = "0.2.12";
-    fullName = "minimatch-0.x.x";
-    hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "lru-cache"; range = "2"; }
-      { name = "sigmund"; range = "~1.0.0"; }
-    ];
-  }
-  {
-    baseName = "minimatch";
-    version = "0.2.12";
-    fullName = "minimatch-~0.2.11";
-    hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "lru-cache"; range = "2"; }
-      { name = "sigmund"; range = "~1.0.0"; }
-    ];
-  }
-  {
-    baseName = "mkdirp";
-    version = "0.3.5";
-    fullName = "mkdirp-*";
-    hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mkdirp";
-    version = "0.3.5";
-    fullName = "mkdirp-0";
-    hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mkdirp";
-    version = "0.3.5";
-    fullName = "mkdirp-0.3";
-    hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mkdirp";
-    version = "0.3.0";
-    fullName = "mkdirp-0.3.0";
-    hash = "708366e3a89c976ae8418056f2c5f784147b9310e8093f9bb7246d2f55f7c27d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mkdirp";
-    version = "0.3.3";
-    fullName = "mkdirp-0.3.3";
-    hash = "b67a12855b7522c3cfb767e36b95f4eaaf9d423c5bd01f7f0449172259957df9";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mkdirp";
-    version = "0.3.4";
-    fullName = "mkdirp-0.3.4";
-    hash = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mocha";
-    version = "1.10.0";
-    fullName = "mocha-*";
-    hash = "d19c4fdcddb6498d0f303c3e5fd85401888a269f36ccdfcc92763dcc9e80bf97";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "commander"; range = "0.6.1"; }
-      { name = "growl"; range = "1.7.x"; }
-      { name = "jade"; range = "0.26.3"; }
-      { name = "diff"; range = "1.0.2"; }
-      { name = "debug"; range = "*"; }
-      { name = "mkdirp"; range = "0.3.3"; }
-      { name = "ms"; range = "0.3.0"; }
-      { name = "glob"; range = "3.2.1"; }
-    ];
-  }
-  {
-    baseName = "ms";
-    version = "0.3.0";
-    fullName = "ms-0.3.0";
-    hash = "f72eab0186a6dabbbea7118f83d4e2c01119e427f6671096a0c7ed522abe07f2";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "mv";
-    version = "0.0.5";
-    fullName = "mv-0.0.5";
-    hash = "6ddbf4770ffd02170a8fc492cee418ad92ce2f1e2eb4c549febac1f60e6533b9";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "negotiator";
-    version = "0.2.5";
-    fullName = "negotiator-0.2.5";
-    hash = "37f567acba03ef7748802c4f6b41ca7e57a3fb556c4435cda515028c73d76542";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "nijs";
-    version = "0.0.8";
-    fullName = "nijs-*";
-    hash = "134a4f764835280487334f5cfd5a0d271cdd784fe954ad619fad250f54c3b3b9";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "optparse"; range = ">= 1.0.3"; }
-    ];
-  }
-  {
-    baseName = "node-expat";
-    version = "2.0.0";
-    fullName = "node-expat-*";
-    hash = "9d5b7efd708fc546f5c17e98f4ee322abafaaa02fbb6c281f651d10d9523c83f";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "node-gyp";
-    version = "0.10.0";
-    fullName = "node-gyp-*";
-    hash = "9edecaa701601f07b15da7bd6e9de4fae98ef1acdd5a1fc6cc144451a68773dd";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "glob"; range = "3"; }
-      { name = "graceful-fs"; range = "1"; }
-      { name = "fstream"; range = "0"; }
-      { name = "minimatch"; range = "0"; }
-      { name = "mkdirp"; range = "0"; }
-      { name = "nopt"; range = "2"; }
-      { name = "npmlog"; range = "0"; }
-      { name = "osenv"; range = "0"; }
-      { name = "request"; range = "2"; }
-      { name = "rimraf"; range = "2"; }
-      { name = "semver"; range = "1"; }
-      { name = "tar"; range = "0"; }
-      { name = "which"; range = "1"; }
-    ];
-  }
-  {
-    baseName = "node-uuid";
-    version = "1.4.0";
-    fullName = "node-uuid-*";
-    hash = "87a1944b5334351ddd1d3e44d2e423ebfc027e858111efb72324054092cfd1bc";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "node-uuid";
-    version = "1.2.0";
-    fullName = "node-uuid-1.2.0";
-    hash = "96d3ce178ea0825d27a855630de74243a577dc988512512eea572829b208a3d2";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "node-uuid";
-    version = "1.3.3";
-    fullName = "node-uuid-1.3.3";
-    hash = "a3fbccc904944a9c8eadc59e55aaac908cc458569f539b50077d9672a84587a8";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "node-uuid";
-    version = "1.4.0";
-    fullName = "node-uuid-1.4.0";
-    hash = "87a1944b5334351ddd1d3e44d2e423ebfc027e858111efb72324054092cfd1bc";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "node-uuid";
-    version = "1.4.0";
-    fullName = "node-uuid-~1.4.0";
-    hash = "87a1944b5334351ddd1d3e44d2e423ebfc027e858111efb72324054092cfd1bc";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "nopt";
-    version = "2.1.1";
-    fullName = "nopt-2";
-    hash = "a7a84f3fe51cb8fb97c678bc73130b53d6782ee90dc0e9b15ae39630ce2fa203";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "abbrev"; range = "1"; }
-    ];
-  }
-  {
-    baseName = "nopt";
-    version = "2.0.0";
-    fullName = "nopt-2.0.0";
-    hash = "112e9bea8b745a2e5a59d239e6f6f02e720e080ab8cdca89b6b8f0143ae718b5";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "abbrev"; range = "1"; }
-    ];
-  }
-  {
-    baseName = "npm2nix";
-    version = "1.2.0";
-    fullName = "npm2nix-*";
-    hash = "b79bd319e4030704bb41078dbbec0db9eebb984966c6bd3cad55ba4c76ec622c";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "semver"; range = "1"; }
-    ];
-  }
-  {
-    baseName = "npmlog";
-    version = "0.0.2";
-    fullName = "npmlog-0";
-    hash = "ce98d4d3380390c0259695cce407e2e96d2970c5caee1461a62ecbd38e8caed4";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "ansi"; range = "~0.1.2"; }
-    ];
-  }
-  {
-    baseName = "oauth-sign";
-    version = "0.3.0";
-    fullName = "oauth-sign-~0.3.0";
-    hash = "a202acb9ea84ef53e6a82a6ee5113328cd4bfd68d6ba04d15f1da933660b087e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "once";
-    version = "1.1.1";
-    fullName = "once-1.1.1";
-    hash = "3fdc1a246f2522991fd9a6554a93c012c3192ea99918fdd893a2d4f2d546fe93";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "optimist";
-    version = "0.5.2";
-    fullName = "optimist-*";
-    hash = "838ad97b81beedb85fd0f0c4cd4740a940ddefb9a3db8e261f5fed7528693d3d";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "wordwrap"; range = "~0.0.2"; }
-    ];
-  }
-  {
-    baseName = "optparse";
-    version = "1.0.4";
-    fullName = "optparse-*";
-    hash = "8413ed6a2318ffecdb428181a6966013d1853ff62644afcbcff682c1efc9367a";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "optparse";
-    version = "1.0.4";
-    fullName = "optparse->= 1.0.3";
-    hash = "8413ed6a2318ffecdb428181a6966013d1853ff62644afcbcff682c1efc9367a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "osenv";
-    version = "0.0.3";
-    fullName = "osenv-0";
-    hash = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "pause";
-    version = "0.0.1";
-    fullName = "pause-0.0.1";
-    hash = "d37b84046db0c28c9768be649e8f02bd991ede34b276b5dba7bade23b523235e";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "posix-getopt";
-    version = "1.0.0";
-    fullName = "posix-getopt-1.0.0";
-    hash = "134cea188854422ab047db9ebfcb7e2610f0a239fe27382b55c10894c4f5ba9d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "qs";
-    version = "0.5.5";
-    fullName = "qs-0.5.5";
-    hash = "8ed820b83bf4aff299422dc406c7a52793e05f510803cc1cc2da7de1528837f1";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "qs";
-    version = "0.6.5";
-    fullName = "qs-0.6.5";
-    hash = "293e5dfd16bfe0aee8b3fe130abb951ac9c8c084d1103f7d81c4e5c312b2940d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "qs";
-    version = "0.6.5";
-    fullName = "qs-~0.6.0";
-    hash = "293e5dfd16bfe0aee8b3fe130abb951ac9c8c084d1103f7d81c4e5c312b2940d";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "range-parser";
-    version = "0.0.4";
-    fullName = "range-parser-0.0.4";
-    hash = "8e1bcce3544330b51644ea0cb4d25f0daa4b43008a75da27e285635f4ac4b1ce";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "rbytes";
-    version = "0.0.2";
-    fullName = "rbytes-*";
-    hash = "0fd4697be996ee12c65f8fb13b2edc7a554d22c31d1a344539bc611ce73b69aa";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "readable-stream";
-    version = "1.0.2";
-    fullName = "readable-stream-~1.0.2";
-    hash = "45a918b25f0799f87d7144dbbb7d2b5974dc079fcb1a2149a305d080f1155754";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "request";
-    version = "2.21.0";
-    fullName = "request-2";
-    hash = "fe31c3119bc4423f07aa7c9849cb642d5ad22bdf2a2700eab56fb83fa8ed429c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "qs"; range = "~0.6.0"; }
-      { name = "json-stringify-safe"; range = "~4.0.0"; }
-      { name = "forever-agent"; range = "~0.5.0"; }
-      { name = "tunnel-agent"; range = "~0.3.0"; }
-      { name = "http-signature"; range = "~0.9.11"; }
-      { name = "hawk"; range = "~0.13.0"; }
-      { name = "aws-sign"; range = "~0.3.0"; }
-      { name = "oauth-sign"; range = "~0.3.0"; }
-      { name = "cookie-jar"; range = "~0.3.0"; }
-      { name = "node-uuid"; range = "~1.4.0"; }
-      { name = "mime"; range = "~1.2.9"; }
-      { name = "form-data"; range = "0.0.8"; }
-    ];
-  }
-  {
-    baseName = "request";
-    version = "2.21.0";
-    fullName = "request-~2";
-    hash = "fe31c3119bc4423f07aa7c9849cb642d5ad22bdf2a2700eab56fb83fa8ed429c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "qs"; range = "~0.6.0"; }
-      { name = "json-stringify-safe"; range = "~4.0.0"; }
-      { name = "forever-agent"; range = "~0.5.0"; }
-      { name = "tunnel-agent"; range = "~0.3.0"; }
-      { name = "http-signature"; range = "~0.9.11"; }
-      { name = "hawk"; range = "~0.13.0"; }
-      { name = "aws-sign"; range = "~0.3.0"; }
-      { name = "oauth-sign"; range = "~0.3.0"; }
-      { name = "cookie-jar"; range = "~0.3.0"; }
-      { name = "node-uuid"; range = "~1.4.0"; }
-      { name = "mime"; range = "~1.2.9"; }
-      { name = "form-data"; range = "0.0.8"; }
-    ];
-  }
-  {
-    baseName = "restify";
-    version = "2.4.1";
-    fullName = "restify-2.4.1";
-    hash = "b46ed86ef17f1896a4dd961de8cc8ec96b57b7f44ef7421f3804764289f5b563";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "assert-plus"; range = "0.1.2"; }
-      { name = "backoff"; range = "2.1.0"; }
-      { name = "bunyan"; range = "0.21.1"; }
-      { name = "deep-equal"; range = "0.0.0"; }
-      { name = "formidable"; range = "1.0.13"; }
-      { name = "http-signature"; range = "0.9.11"; }
-      { name = "keep-alive-agent"; range = "0.0.1"; }
-      { name = "lru-cache"; range = "2.3.0"; }
-      { name = "mime"; range = "1.2.9"; }
-      { name = "negotiator"; range = "0.2.5"; }
-      { name = "node-uuid"; range = "1.4.0"; }
-      { name = "once"; range = "1.1.1"; }
-      { name = "qs"; range = "0.5.5"; }
-      { name = "semver"; range = "1.1.4"; }
-      { name = "spdy"; range = "1.7.1"; }
-      { name = "verror"; range = "1.3.6"; }
-      { name = "dtrace-provider"; range = "0.2.8"; }
-    ];
-  }
-  {
-    baseName = "rimraf";
-    version = "2.1.4";
-    fullName = "rimraf-2";
-    hash = "093154365aab3c09aea8e83dda7c5a7fd785c787ebbf1fcdc415cb5f74d1acac";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "graceful-fs"; range = "~1"; }
-    ];
-  }
-  {
-    baseName = "s3http";
-    version = "0.0.2";
-    fullName = "s3http-*";
-    hash = "03cbaa20c8920371c94333d6424c3d3b09824d1c6e30a9e1567805f53d1cd16d";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "aws-sdk"; range = ">=1.2.0 <2"; }
-      { name = "commander"; range = "0.5.1"; }
-      { name = "http-auth"; range = "1.2.7"; }
-    ];
-  }
-  {
-    baseName = "sax";
-    version = "0.5.2";
-    fullName = "sax-0.5.2";
-    hash = "6bb7cd44e9dfea598997d4ba9d3279dafe75bed7b45904561ca9eb4d85cfd953";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "sax";
-    version = "0.5.4";
-    fullName = "sax->=0.4.2";
-    hash = "5c4f074b559f56a7170663142e4ccbcf8cbef229ad7eb787b6c6e0b79ddb936a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "semver";
-    version = "1.1.4";
-    fullName = "semver-*";
-    hash = "59c0180521d0d4cee57caa5f6ef190500b04099bfa5786edb3e21e364ae8e989";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "semver";
-    version = "1.1.4";
-    fullName = "semver-1";
-    hash = "59c0180521d0d4cee57caa5f6ef190500b04099bfa5786edb3e21e364ae8e989";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "semver";
-    version = "1.1.4";
-    fullName = "semver-1.1.4";
-    hash = "59c0180521d0d4cee57caa5f6ef190500b04099bfa5786edb3e21e364ae8e989";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "send";
-    version = "0.1.0";
-    fullName = "send-0.1.0";
-    hash = "28b5a6ec41b5072521eb792cc901b92cdbb6b743c578d7008727dbbd3eb717de";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "debug"; range = "*"; }
-      { name = "mime"; range = "1.2.6"; }
-      { name = "fresh"; range = "0.1.0"; }
-      { name = "range-parser"; range = "0.0.4"; }
-    ];
-  }
-  {
-    baseName = "send";
-    version = "0.1.1";
-    fullName = "send-0.1.1";
-    hash = "4d237af8bc86148952d0577bed44bd41928a4422c9a6e25e45fc35103aa6e872";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "debug"; range = "*"; }
-      { name = "mime"; range = "~1.2.9"; }
-      { name = "fresh"; range = "0.1.0"; }
-      { name = "range-parser"; range = "0.0.4"; }
-    ];
-  }
-  {
-    baseName = "shelljs";
-    version = "0.1.4";
-    fullName = "shelljs-0.1.x";
-    hash = "21a6f3dc5eaeb1c10efbe62e31aeb6762241f707fb1fdcda4766c8bccde3eaf0";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "sigmund";
-    version = "1.0.0";
-    fullName = "sigmund-~1.0.0";
-    hash = "ddf823295db284ac4720b9d40f381d7375dc0b05881b98269346b33fe9835e25";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "smartdc";
-    version = "7.0.0";
-    fullName = "smartdc-*";
-    hash = "add769b05ecef4ea657d7bc473d96ee3e67b8ad8bc77077120bd5ae1efe94911";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "assert-plus"; range = "0.1.2"; }
-      { name = "lru-cache"; range = "2.2.0"; }
-      { name = "nopt"; range = "2.0.0"; }
-      { name = "restify"; range = "2.4.1"; }
-      { name = "bunyan"; range = "0.21.1"; }
-      { name = "clone"; range = "0.1.6"; }
-      { name = "smartdc-auth"; range = "1.0.0"; }
-    ];
-  }
-  {
-    baseName = "smartdc-auth";
-    version = "1.0.0";
-    fullName = "smartdc-auth-1.0.0";
-    hash = "7611510ac66507398f6e371b25068c7ad193ecd69a3031fdfca0e3c652cfdcbf";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "assert-plus"; range = "0.1.2"; }
-      { name = "clone"; range = "0.1.5"; }
-      { name = "ssh-agent"; range = "0.2.1"; }
-      { name = "once"; range = "1.1.1"; }
-      { name = "vasync"; range = "1.3.3"; }
-    ];
-  }
-  {
-    baseName = "sntp";
-    version = "0.2.4";
-    fullName = "sntp-0.2.x";
-    hash = "1f91a8d60fd48751e4b169885f530012ce2a8223ed29006abcee175f2b10d779";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "hoek"; range = "0.9.x"; }
-    ];
-  }
-  {
-    baseName = "sockjs";
-    version = "0.3.7";
-    fullName = "sockjs-*";
-    hash = "711a6c41e6a7b2a9cd0dc44abc7407f09729d400be450d94887391997b07a1a5";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "node-uuid"; range = "1.3.3"; }
-      { name = "faye-websocket"; range = "0.4.4"; }
-    ];
-  }
-  {
-    baseName = "source-map";
-    version = "0.1.22";
-    fullName = "source-map-*";
-    hash = "6ebe1b2b3c730e5e206a34a25192aa43307b84dfe3aaaafd71c5c6b6a02a4700";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "amdefine"; range = ">=0.0.4"; }
-    ];
-  }
-  {
-    baseName = "spdy";
-    version = "1.7.1";
-    fullName = "spdy-1.7.1";
-    hash = "d90516bb6b6cf39fb52face8ec332be98de116ce84d7d400fbb19529a30fa678";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "ssh-agent";
-    version = "0.2.1";
-    fullName = "ssh-agent-0.2.1";
-    hash = "b420d5816d4a8a242a8d1454f064954eab8fec9856310e867a2e7f1b2432f934";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "ctype"; range = "0.5.0"; }
-      { name = "posix-getopt"; range = "1.0.0"; }
-    ];
-  }
-  {
-    baseName = "stream-counter";
-    version = "0.1.0";
-    fullName = "stream-counter-~0.1.0";
-    hash = "8c51bd894bf905ec607654a1d7d3fe4fdc4763ccec4d37723cb8d0a0fd7cb69c";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "readable-stream"; range = "~1.0.2"; }
-    ];
-  }
-  {
-    baseName = "swig";
-    version = "0.14.0";
-    fullName = "swig-*";
-    hash = "9eeafb591606008c7ab33501ebfdb6ed80830cca5736513c6c5874ded65cfb3f";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-      { name = "underscore"; range = ">=1.1.7"; }
-    ];
-  }
-  {
-    baseName = "tar";
-    version = "0.1.17";
-    fullName = "tar-0";
-    hash = "577832975440eba0a9293244d53fa2c383e5c27ec2f68e3defde0cc23910b978";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "inherits"; range = "1.x"; }
-      { name = "block-stream"; range = "*"; }
-      { name = "fstream"; range = "~0.1.8"; }
-    ];
-  }
-  {
-    baseName = "temp";
-    version = "0.5.0";
-    fullName = "temp-*";
-    hash = "082285c060c7519b9d8a6dbc1a51e3caa7de43a807d3f7cec4eab220ad1207be";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "tunnel-agent";
-    version = "0.3.0";
-    fullName = "tunnel-agent-~0.3.0";
-    hash = "5b23c1d29e85143e213ba5aca118419ab42d25774da92e816074a73f423bcabd";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "underscore";
-    version = "1.4.4";
-    fullName = "underscore-*";
-    hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "underscore";
-    version = "1.4.4";
-    fullName = "underscore-1.4.x";
-    hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "underscore";
-    version = "1.4.4";
-    fullName = "underscore->=1.1.7";
-    hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "underscore";
-    version = "1.4.4";
-    fullName = "underscore->=1.4.3";
-    hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "util";
-    version = "0.4.9";
-    fullName = "util->= 0.4.9";
-    hash = "30ecc26c9e749650562c1ef20bc3f1a0d8d7c109134b510be34526d1ceae90e5";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "events.node"; range = ">= 0.4.0"; }
-    ];
-  }
-  {
-    baseName = "vasync";
-    version = "1.3.3";
-    fullName = "vasync-1.3.3";
-    hash = "603d15b81e25b6a634d7ff2025487b3460a60d0d7e1a1ed02e66faff5ef7b699";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "jsprim"; range = "0.3.0"; }
-      { name = "verror"; range = "1.1.0"; }
-    ];
-  }
-  {
-    baseName = "verror";
-    version = "1.1.0";
-    fullName = "verror-1.1.0";
-    hash = "ac0fc2dfbcdfc3440c281cf272d902ec74bf2abdf2f9c9eb5c0c3505dc6646d7";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "extsprintf"; range = "1.0.0"; }
-    ];
-  }
-  {
-    baseName = "verror";
-    version = "1.3.3";
-    fullName = "verror-1.3.3";
-    hash = "9b3e9307cb5a788c1a4c6706ed32582893ffcd64dc55a14a153be1ea15bb916a";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "extsprintf"; range = "1.0.0"; }
-    ];
-  }
-  {
-    baseName = "verror";
-    version = "1.3.6";
-    fullName = "verror-1.3.6";
-    hash = "96135dd5fef7b75bfe26513658ca3fc1ab38e17a9bec522fc5ec6e54b6b63f89";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "extsprintf"; range = "1.0.2"; }
-    ];
-  }
-  {
-    baseName = "websocket-driver";
-    version = "0.2.1";
-    fullName = "websocket-driver->=0.2.0";
-    hash = "8aab2b32695fecd2bca57d95bc51f0eb8a9a5bb298187a8fe3a84cd2cd8e3dc7";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "which";
-    version = "1.0.5";
-    fullName = "which-1";
-    hash = "e26f39d7b152c700636472ab4da57bfb9af17972c49a9e2a06f9ff347d8fad42";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "wordwrap";
-    version = "0.0.2";
-    fullName = "wordwrap-~0.0.2";
-    hash = "66a2fa688509738922c3ad62a6159fe3c93268bd3bca2bff24df4bc02cc31582";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "wu";
-    version = "0.1.8";
-    fullName = "wu-*";
-    hash = "2400d0ca7da862a9063a6a8d914bb4e585f81a5121b0fda8e40b1f6e782c72c6";
-    patchLatest = false;
-    topLevel = true;
-    dependencies = [
-    ];
-  }
-  {
-    baseName = "xml2js";
-    version = "0.2.4";
-    fullName = "xml2js-0.2.4";
-    hash = "8daebb075fc7c564d84221a0cef7825ac824db8e312f873daee59a6adf38da28";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "sax"; range = ">=0.4.2"; }
-    ];
-  }
-  {
-    baseName = "xml2js";
-    version = "0.2.7";
-    fullName = "xml2js-0.2.x";
-    hash = "ab3ae8402a8af36d93e1aa6e83102e365b82f03e605d1b8b8361dacc95e52397";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-      { name = "sax"; range = "0.5.2"; }
-    ];
-  }
-  {
-    baseName = "xmlbuilder";
-    version = "0.4.2";
-    fullName = "xmlbuilder-*";
-    hash = "3137e5bf9db1f114767f8ba56be753f2a9f512e38a2df64d7677ae3c9318a0fe";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
-]
+{ self, fetchurl, lib }:
+
+{
+  full."CSSselect"."0.x" = lib.makeOverridable self.buildNodePackage {
+    name = "CSSselect-0.3.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.3.1.tgz";
+        sha1 = "ad91c2821658320c5047ba899201a236922c42f9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."CSSselect"."0.x" or []);
+    deps = [
+      self.full."CSSwhat".">= 0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "CSSselect" ];
+  };
+  full."CSSwhat".">= 0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "CSSwhat-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.2.0.tgz";
+        sha1 = "c952fdc67f01c991805fd2c7f6defaedf90e992d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."CSSwhat".">= 0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "CSSwhat" ];
+  };
+  full."abbrev"."1" = lib.makeOverridable self.buildNodePackage {
+    name = "abbrev-1.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.4.tgz";
+        sha1 = "bd55ae5e413ba1722ee4caba1f6ea10414a59ecd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."abbrev"."1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "abbrev" ];
+  };
+  full."abbrev"."~1.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "abbrev-1.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.4.tgz";
+        sha1 = "bd55ae5e413ba1722ee4caba1f6ea10414a59ecd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."abbrev"."~1.0.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "abbrev" ];
+  };
+  full."active-x-obfuscator"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "active-x-obfuscator-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz";
+        sha1 = "089b89b37145ff1d9ec74af6530be5526cae1f1a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."active-x-obfuscator"."0.0.1" or []);
+    deps = [
+      self.full."zeparser"."0.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "active-x-obfuscator" ];
+  };
+  full."addressparser"."~0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "addressparser-0.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz";
+        sha1 = "9e9ab43d257e1ae784e1df5f580c9f5240f58874";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."addressparser"."~0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "addressparser" ];
+  };
+  full."adm-zip"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "adm-zip-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz";
+        sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."adm-zip"."0.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "adm-zip" ];
+  };
+  full."amdefine"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "amdefine-0.0.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.8.tgz";
+        sha1 = "34dc8c981e6acb3be1853bef8f0ec94a39d55ba0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."amdefine"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "amdefine" ];
+  };
+  "amdefine" = self.full."amdefine"."*";
+  full."amdefine".">=0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "amdefine-0.0.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.8.tgz";
+        sha1 = "34dc8c981e6acb3be1853bef8f0ec94a39d55ba0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."amdefine".">=0.0.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "amdefine" ];
+  };
+  full."ansi"."~0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "ansi-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ansi/-/ansi-0.1.2.tgz";
+        sha1 = "2627e29498f06e2a1c2ece9c21e28fd494430827";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ansi"."~0.1.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ansi" ];
+  };
+  full."ansi-remover"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "ansi-remover-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ansi-remover/-/ansi-remover-0.0.2.tgz";
+        sha1 = "7020086289f10e195d85d828de065ccdd50e6e66";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ansi-remover"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ansi-remover" ];
+  };
+  "ansi-remover" = self.full."ansi-remover"."*";
+  full."ansi-styles"."~0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "ansi-styles-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-0.1.2.tgz";
+        sha1 = "5bab27c2e0bbe944ee42057cf23adee970abc7c6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ansi-styles"."~0.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ansi-styles" ];
+  };
+  full."ansi-styles"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "ansi-styles-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-0.2.0.tgz";
+        sha1 = "359ab4b15dcd64ba6d74734b72c36360a9af2c19";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ansi-styles"."~0.2.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ansi-styles" ];
+  };
+  full."ansicolors"."~0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "ansicolors-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz";
+        sha1 = "be089599097b74a5c9c4a84a0cdbcdb62bd87aef";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ansicolors"."~0.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ansicolors" ];
+  };
+  full."apparatus".">= 0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "apparatus-0.0.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.7.tgz";
+        sha1 = "033f355507b6851ebeb1bd9475ede23c802327fe";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."apparatus".">= 0.0.4" or []);
+    deps = [
+      self.full."sylvester".">= 0.0.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "apparatus" ];
+  };
+  full."archy"."0" = lib.makeOverridable self.buildNodePackage {
+    name = "archy-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/archy/-/archy-0.0.2.tgz";
+        sha1 = "910f43bf66141fc335564597abc189df44b3d35e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."archy"."0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "archy" ];
+  };
+  full."archy"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "archy-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/archy/-/archy-0.0.2.tgz";
+        sha1 = "910f43bf66141fc335564597abc189df44b3d35e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."archy"."0.0.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "archy" ];
+  };
+  full."argparse"."0.1.15" = lib.makeOverridable self.buildNodePackage {
+    name = "argparse-0.1.15";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz";
+        sha1 = "28a1f72c43113e763220e5708414301c8840f0a1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."argparse"."0.1.15" or []);
+    deps = [
+      self.full."underscore"."~1.4.3"
+      self.full."underscore.string"."~2.3.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "argparse" ];
+  };
+  full."argparse"."~ 0.1.11" = lib.makeOverridable self.buildNodePackage {
+    name = "argparse-0.1.15";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz";
+        sha1 = "28a1f72c43113e763220e5708414301c8840f0a1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."argparse"."~ 0.1.11" or []);
+    deps = [
+      self.full."underscore"."~1.4.3"
+      self.full."underscore.string"."~2.3.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "argparse" ];
+  };
+  full."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage {
+    name = "asn1-0.1.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
+        sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."asn1"."0.1.11" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "asn1" ];
+  };
+  full."assert"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "assert-0.4.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/assert/-/assert-0.4.9.tgz";
+        sha1 = "45faff1a58f718508118873dead940c8b51db939";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."assert"."*" or []);
+    deps = [
+      self.full."util".">= 0.4.9"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "assert" ];
+  };
+  "assert" = self.full."assert"."*";
+  full."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "assert-plus-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz";
+        sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."assert-plus"."0.1.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "assert-plus" ];
+  };
+  full."async"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "async-0.2.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
+        sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
+  "async" = self.full."async"."*";
+  full."async"."0.1.15" = lib.makeOverridable self.buildNodePackage {
+    name = "async-0.1.15";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.1.15.tgz";
+        sha1 = "2180eaca2cf2a6ca5280d41c0585bec9b3e49bd3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async"."0.1.15" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
+  full."async"."0.1.22" = lib.makeOverridable self.buildNodePackage {
+    name = "async-0.1.22";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz";
+        sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async"."0.1.22" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
+  full."async"."0.1.x" = lib.makeOverridable self.buildNodePackage {
+    name = "async-0.1.22";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz";
+        sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async"."0.1.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
+  full."async"."0.2.x" = lib.makeOverridable self.buildNodePackage {
+    name = "async-0.2.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
+        sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async"."0.2.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
+  full."async"."~0.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "async-0.2.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
+        sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async"."~0.2.6" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
+  full."async"."~0.2.7" = lib.makeOverridable self.buildNodePackage {
+    name = "async-0.2.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
+        sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async"."~0.2.7" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
+  full."async"."~0.2.8" = lib.makeOverridable self.buildNodePackage {
+    name = "async-0.2.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
+        sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async"."~0.2.8" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
+  full."async"."~0.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "async-0.2.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
+        sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async"."~0.2.9" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
+  full."aws-sdk"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "aws-sdk-1.5.0";
+    src = [
+      (self.patchLatest {
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.5.0.tgz";
+        sha1 = "30081b392fcb7d093754d7dc6e8a7bb6f0dc405a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."aws-sdk"."*" or []);
+    deps = [
+      self.full."xml2js"."0.2.4"
+      self.full."xmlbuilder"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "aws-sdk" ];
+  };
+  "aws-sdk" = self.full."aws-sdk"."*";
+  full."aws-sdk".">=1.2.0 <2" = lib.makeOverridable self.buildNodePackage {
+    name = "aws-sdk-1.5.0";
+    src = [
+      (self.patchLatest {
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.5.0.tgz";
+        sha1 = "30081b392fcb7d093754d7dc6e8a7bb6f0dc405a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."aws-sdk".">=1.2.0 <2" or []);
+    deps = [
+      self.full."xml2js"."0.2.4"
+      self.full."xmlbuilder"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "aws-sdk" ];
+  };
+  full."aws-sign"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "aws-sign-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz";
+        sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."aws-sign"."~0.2.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "aws-sign" ];
+  };
+  full."aws-sign"."~0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "aws-sign-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz";
+        sha1 = "3d81ca69b474b1e16518728b51c24ff0bbedc6e9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."aws-sign"."~0.3.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "aws-sign" ];
+  };
+  full."backbone"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "backbone-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/backbone/-/backbone-1.0.0.tgz";
+        sha1 = "5e146e1efa8a5361462e578377c39ed0f16b0b4c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."backbone"."*" or []);
+    deps = [
+      self.full."underscore".">=1.4.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "backbone" ];
+  };
+  "backbone" = self.full."backbone"."*";
+  full."backoff"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "backoff-2.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/backoff/-/backoff-2.1.0.tgz";
+        sha1 = "19b4e9f9fb75c122ad7bb1c6c376d6085d43ea09";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."backoff"."2.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "backoff" ];
+  };
+  full."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "base64id-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
+        sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."base64id"."0.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "base64id" ];
+  };
+  full."bcrypt"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "bcrypt-0.7.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.6.tgz";
+        sha1 = "97eae4472baf2352699f5fd1662e77e63d0cd0aa";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bcrypt"."*" or []);
+    deps = [
+      self.full."bindings"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bcrypt" ];
+  };
+  "bcrypt" = self.full."bcrypt"."*";
+  full."binary"."~0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "binary-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/binary/-/binary-0.3.0.tgz";
+        sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."binary"."~0.3.0" or []);
+    deps = [
+      self.full."chainsaw"."~0.1.0"
+      self.full."buffers"."~0.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "binary" ];
+  };
+  full."bindings"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "bindings-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz";
+        sha1 = "951f7ae010302ffc50b265b124032017ed2bf6f3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bindings"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bindings" ];
+  };
+  full."bindings"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "bindings-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bindings/-/bindings-1.0.0.tgz";
+        sha1 = "c3ccde60e9de6807c6f1aa4ef4843af29191c828";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bindings"."1.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bindings" ];
+  };
+  full."block-stream"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "block-stream-0.0.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz";
+        sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."block-stream"."*" or []);
+    deps = [
+      self.full."inherits"."~2.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "block-stream" ];
+  };
+  full."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+    name = "block-stream-0.0.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz";
+        sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."block-stream"."0.0.7" or []);
+    deps = [
+      self.full."inherits"."~2.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "block-stream" ];
+  };
+  full."boom"."0.3.x" = lib.makeOverridable self.buildNodePackage {
+    name = "boom-0.3.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz";
+        sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."boom"."0.3.x" or []);
+    deps = [
+      self.full."hoek"."0.7.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "boom" ];
+  };
+  full."boom"."0.4.x" = lib.makeOverridable self.buildNodePackage {
+    name = "boom-0.4.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
+        sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."boom"."0.4.x" or []);
+    deps = [
+      self.full."hoek"."0.9.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "boom" ];
+  };
+  full."bower".">=0.9.0" = lib.makeOverridable self.buildNodePackage {
+    name = "bower-1.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bower/-/bower-1.2.2.tgz";
+        sha1 = "f6bc27b0a3b87d201c9223792795b6d7fd31b6c0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bower".">=0.9.0" or []);
+    deps = [
+      self.full."abbrev"."~1.0.4"
+      self.full."archy"."0.0.2"
+      self.full."bower-config"."~0.4.3"
+      self.full."bower-endpoint-parser"."~0.2.0"
+      self.full."bower-json"."~0.4.0"
+      self.full."bower-logger"."~0.2.1"
+      self.full."bower-registry-client"."~0.1.4"
+      self.full."cardinal"."~0.4.0"
+      self.full."chalk"."~0.2.0"
+      self.full."chmodr"."~0.1.0"
+      self.full."fstream"."~0.1.22"
+      self.full."fstream-ignore"."~0.0.6"
+      self.full."glob"."~3.2.1"
+      self.full."graceful-fs"."~2.0.0"
+      self.full."handlebars"."~1.0.11"
+      self.full."inquirer"."~0.2.2"
+      self.full."junk"."~0.2.0"
+      self.full."mkdirp"."~0.3.5"
+      self.full."mout"."~0.6.0"
+      self.full."nopt"."~2.1.1"
+      self.full."lru-cache"."~2.3.0"
+      self.full."open"."~0.0.3"
+      self.full."promptly"."~0.2.0"
+      self.full."q"."~0.9.2"
+      self.full."request"."~2.27.0"
+      self.full."request-progress"."~0.2.0"
+      self.full."retry"."~0.6.0"
+      self.full."rimraf"."~2.2.0"
+      self.full."semver"."~2.1.0"
+      self.full."stringify-object"."~0.1.4"
+      self.full."sudo-block"."~0.2.0"
+      self.full."tar"."~0.1.17"
+      self.full."tmp"."~0.0.20"
+      self.full."unzip"."~0.1.7"
+      self.full."update-notifier"."~0.1.3"
+      self.full."which"."~1.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bower" ];
+  };
+  full."bower-config"."~0.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "bower-config-0.4.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bower-config/-/bower-config-0.4.3.tgz";
+        sha1 = "6d3d9d31967c76daf140eca4b06924b13daccc89";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bower-config"."~0.4.3" or []);
+    deps = [
+      self.full."graceful-fs"."~2.0.0"
+      self.full."mout"."~0.6.0"
+      self.full."optimist"."~0.6.0"
+      self.full."osenv"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bower-config" ];
+  };
+  full."bower-endpoint-parser"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "bower-endpoint-parser-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.1.tgz";
+        sha1 = "8c4010a2900cdab07ea5d38f0bd03e9bbccef90f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bower-endpoint-parser"."~0.2.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bower-endpoint-parser" ];
+  };
+  full."bower-json"."~0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "bower-json-0.4.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bower-json/-/bower-json-0.4.0.tgz";
+        sha1 = "a99c3ccf416ef0590ed0ded252c760f1c6d93766";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bower-json"."~0.4.0" or []);
+    deps = [
+      self.full."deep-extend"."~0.2.5"
+      self.full."graceful-fs"."~2.0.0"
+      self.full."intersect"."~0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bower-json" ];
+  };
+  full."bower-logger"."~0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "bower-logger-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.1.tgz";
+        sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bower-logger"."~0.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bower-logger" ];
+  };
+  full."bower-registry-client"."~0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "bower-registry-client-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.1.4.tgz";
+        sha1 = "334669747ca0b60fdda24b0de1f4c3057429813c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bower-registry-client"."~0.1.4" or []);
+    deps = [
+      self.full."async"."~0.2.8"
+      self.full."bower-config"."~0.4.3"
+      self.full."graceful-fs"."~2.0.0"
+      self.full."lru-cache"."~2.3.0"
+      self.full."request"."~2.27.0"
+      self.full."request-replay"."~0.2.0"
+      self.full."rimraf"."~2.2.0"
+      self.full."mkdirp"."~0.3.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bower-registry-client" ];
+  };
+  full."broadway"."0.2.7" = lib.makeOverridable self.buildNodePackage {
+    name = "broadway-0.2.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/broadway/-/broadway-0.2.7.tgz";
+        sha1 = "3ba2f4b3de163e95e38a4950b61fd5f882a90762";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."broadway"."0.2.7" or []);
+    deps = [
+      self.full."cliff"."0.1.8"
+      self.full."eventemitter2"."0.4.11"
+      self.full."nconf"."0.6.7"
+      self.full."winston"."0.6.2"
+      self.full."utile"."0.1.7"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "broadway" ];
+  };
+  full."broadway"."0.2.x" = lib.makeOverridable self.buildNodePackage {
+    name = "broadway-0.2.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/broadway/-/broadway-0.2.7.tgz";
+        sha1 = "3ba2f4b3de163e95e38a4950b61fd5f882a90762";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."broadway"."0.2.x" or []);
+    deps = [
+      self.full."cliff"."0.1.8"
+      self.full."eventemitter2"."0.4.11"
+      self.full."nconf"."0.6.7"
+      self.full."winston"."0.6.2"
+      self.full."utile"."0.1.7"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "broadway" ];
+  };
+  full."browserchannel"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "browserchannel-1.0.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.6.tgz";
+        sha1 = "9d3b33cac45b66611c35cd84ef237ad2c1d660d9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."browserchannel"."*" or []);
+    deps = [
+      self.full."hat"."*"
+      self.full."connect"."~2"
+      self.full."request"."~2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "browserchannel" ];
+  };
+  "browserchannel" = self.full."browserchannel"."*";
+  full."bson"."0.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "bson-0.1.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bson/-/bson-0.1.8.tgz";
+        sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bson"."0.1.8" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bson" ];
+  };
+  full."bson"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "bson-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bson/-/bson-0.2.2.tgz";
+        sha1 = "3dbf984acb9d33a6878b46e6fb7afbd611856a60";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bson"."0.2.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bson" ];
+  };
+  full."buffer-crc32"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "buffer-crc32-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz";
+        sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."buffer-crc32"."0.1.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "buffer-crc32" ];
+  };
+  full."buffer-crc32"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "buffer-crc32-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz";
+        sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."buffer-crc32"."0.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "buffer-crc32" ];
+  };
+  full."buffer-crc32"."~0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "buffer-crc32-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz";
+        sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."buffer-crc32"."~0.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "buffer-crc32" ];
+  };
+  full."buffer-equal"."~0.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "buffer-equal-0.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.0.tgz";
+        sha1 = "4a68196ac33522daa17ec99858b302a636b62cf1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."buffer-equal"."~0.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "buffer-equal" ];
+  };
+  full."buffers"."~0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "buffers-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz";
+        sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."buffers"."~0.1.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "buffers" ];
+  };
+  full."buffertools"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "buffertools-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz";
+        sha1 = "1071a5f40fe76c39d7a4fe2ea030324d09d6ec9d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."buffertools"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "buffertools" ];
+  };
+  "buffertools" = self.full."buffertools"."*";
+  full."buffertools".">=1.1.1 <2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "buffertools-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz";
+        sha1 = "1071a5f40fe76c39d7a4fe2ea030324d09d6ec9d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."buffertools".">=1.1.1 <2.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "buffertools" ];
+  };
+  full."bunker"."0.1.X" = lib.makeOverridable self.buildNodePackage {
+    name = "bunker-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz";
+        sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bunker"."0.1.X" or []);
+    deps = [
+      self.full."burrito".">=0.2.5 <0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bunker" ];
+  };
+  full."bunyan"."0.21.1" = lib.makeOverridable self.buildNodePackage {
+    name = "bunyan-0.21.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bunyan/-/bunyan-0.21.1.tgz";
+        sha1 = "ea00a0d5223572e31e1e71efba2237cb1915942a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bunyan"."0.21.1" or []);
+    deps = [
+      self.full."mv"."0.0.5"
+      self.full."dtrace-provider"."0.2.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bunyan" ];
+  };
+  full."burrito".">=0.2.5 <0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "burrito-0.2.12";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz";
+        sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."burrito".">=0.2.5 <0.3" or []);
+    deps = [
+      self.full."traverse"."~0.5.1"
+      self.full."uglify-js"."~1.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "burrito" ];
+  };
+  full."bytes"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "bytes-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz";
+        sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bytes"."0.2.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bytes" ];
+  };
+  full."cardinal"."~0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "cardinal-0.4.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cardinal/-/cardinal-0.4.2.tgz";
+        sha1 = "b6563a882f58a56c1abd574baec64b5d0b7ef942";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cardinal"."~0.4.0" or []);
+    deps = [
+      self.full."redeyed"."~0.4.0"
+      self.full."ansicolors"."~0.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cardinal" ];
+  };
+  full."chainsaw"."~0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "chainsaw-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz";
+        sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."chainsaw"."~0.1.0" or []);
+    deps = [
+      self.full."traverse".">=0.3.0 <0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "chainsaw" ];
+  };
+  full."chalk"."~0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "chalk-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/chalk/-/chalk-0.1.1.tgz";
+        sha1 = "fe6d90ae2c270424720c87ed92d36490b7d36ea0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."chalk"."~0.1.0" or []);
+    deps = [
+      self.full."has-color"."~0.1.0"
+      self.full."ansi-styles"."~0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "chalk" ];
+  };
+  full."chalk"."~0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "chalk-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/chalk/-/chalk-0.1.1.tgz";
+        sha1 = "fe6d90ae2c270424720c87ed92d36490b7d36ea0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."chalk"."~0.1.1" or []);
+    deps = [
+      self.full."has-color"."~0.1.0"
+      self.full."ansi-styles"."~0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "chalk" ];
+  };
+  full."chalk"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "chalk-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/chalk/-/chalk-0.2.0.tgz";
+        sha1 = "47270e80edce0e219911af65479d17db525ff5db";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."chalk"."~0.2.0" or []);
+    deps = [
+      self.full."has-color"."~0.1.0"
+      self.full."ansi-styles"."~0.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "chalk" ];
+  };
+  full."character-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "character-parser-1.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/character-parser/-/character-parser-1.0.2.tgz";
+        sha1 = "55384d6afcf8c6b9dd483e8347646a790e4545e7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."character-parser"."1.0.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "character-parser" ];
+  };
+  full."charm"."0.1.x" = lib.makeOverridable self.buildNodePackage {
+    name = "charm-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz";
+        sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."charm"."0.1.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "charm" ];
+  };
+  full."cheerio"."~0.10.8" = lib.makeOverridable self.buildNodePackage {
+    name = "cheerio-0.10.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cheerio/-/cheerio-0.10.8.tgz";
+        sha1 = "ece5ad0c8baa9b9adc87394bbdb1c68bc4552ba0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cheerio"."~0.10.8" or []);
+    deps = [
+      self.full."cheerio-select"."*"
+      self.full."htmlparser2"."2.x"
+      self.full."underscore"."~1.4"
+      self.full."entities"."0.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cheerio" ];
+  };
+  full."cheerio"."~0.12.0" = lib.makeOverridable self.buildNodePackage {
+    name = "cheerio-0.12.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.1.tgz";
+        sha1 = "82cf2b7e9a260f216142cf3c41e94289a3ea4aa3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cheerio"."~0.12.0" or []);
+    deps = [
+      self.full."cheerio-select"."*"
+      self.full."htmlparser2"."3.1.4"
+      self.full."underscore"."~1.4"
+      self.full."entities"."0.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cheerio" ];
+  };
+  full."cheerio"."~0.12.1" = lib.makeOverridable self.buildNodePackage {
+    name = "cheerio-0.12.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.1.tgz";
+        sha1 = "82cf2b7e9a260f216142cf3c41e94289a3ea4aa3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cheerio"."~0.12.1" or []);
+    deps = [
+      self.full."cheerio-select"."*"
+      self.full."htmlparser2"."3.1.4"
+      self.full."underscore"."~1.4"
+      self.full."entities"."0.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cheerio" ];
+  };
+  full."cheerio-select"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "cheerio-select-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cheerio-select/-/cheerio-select-0.0.3.tgz";
+        sha1 = "3f2420114f3ccb0b1b075c245ccfaae5d617a388";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cheerio-select"."*" or []);
+    deps = [
+      self.full."CSSselect"."0.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cheerio-select" ];
+  };
+  full."child-process-close"."~0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "child-process-close-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz";
+        sha1 = "c153ede7a5eb65ac69e78a38973b1a286377f75f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."child-process-close"."~0.1.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "child-process-close" ];
+  };
+  full."chmodr"."~0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "chmodr-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/chmodr/-/chmodr-0.1.0.tgz";
+        sha1 = "e09215a1d51542db2a2576969765bcf6125583eb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."chmodr"."~0.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "chmodr" ];
+  };
+  full."chokidar"."~0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "chokidar-0.6.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/chokidar/-/chokidar-0.6.3.tgz";
+        sha1 = "e85968fa235f21773d388c617af085bf2104425a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."chokidar"."~0.6" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "chokidar" ];
+  };
+  full."chownr"."0" = lib.makeOverridable self.buildNodePackage {
+    name = "chownr-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/chownr/-/chownr-0.0.1.tgz";
+        sha1 = "51d18189d9092d5f8afd623f3288bfd1c6bf1a62";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."chownr"."0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "chownr" ];
+  };
+  full."cli"."0.4.x" = lib.makeOverridable self.buildNodePackage {
+    name = "cli-0.4.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz";
+        sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cli"."0.4.x" or []);
+    deps = [
+      self.full."glob".">= 3.1.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cli" ];
+  };
+  full."cli-color"."~0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "cli-color-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cli-color/-/cli-color-0.2.2.tgz";
+        sha1 = "2220dcbd5e8410e15c435946b6c8daa22e076741";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cli-color"."~0.2.2" or []);
+    deps = [
+      self.full."es5-ext"."~0.9.1"
+      self.full."memoizee"."0.2.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cli-color" ];
+  };
+  full."cli-table"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "cli-table-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cli-table/-/cli-table-0.2.0.tgz";
+        sha1 = "34c63eb532c206e9e5e4ae0cb0104bd1fd27317c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cli-table"."~0.2.0" or []);
+    deps = [
+      self.full."colors"."0.3.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cli-table" ];
+  };
+  full."cliff"."0.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "cliff-0.1.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz";
+        sha1 = "43ca8ad9fe3943489693ab62dce0cae22509d272";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cliff"."0.1.8" or []);
+    deps = [
+      self.full."colors"."0.x.x"
+      self.full."eyes"."0.1.x"
+      self.full."winston"."0.6.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cliff" ];
+  };
+  full."clone"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+    name = "clone-0.1.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/clone/-/clone-0.1.5.tgz";
+        sha1 = "46f29143d0766d663dbd7f80b7520a15783d2042";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."clone"."0.1.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "clone" ];
+  };
+  full."clone"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+    name = "clone-0.1.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/clone/-/clone-0.1.6.tgz";
+        sha1 = "4af2296d4a23a64168c2f5fb0a2aa65e80517000";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."clone"."0.1.6" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "clone" ];
+  };
+  full."cmd-shim"."~1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "cmd-shim-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.0.1.tgz";
+        sha1 = "75e917c2185240854718c686346770640083d7bc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cmd-shim"."~1.0.1" or []);
+    deps = [
+      self.full."mkdirp"."~0.3.3"
+      self.full."graceful-fs"."2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cmd-shim" ];
+  };
+  full."coffee-script"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "coffee-script-1.6.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
+        sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."coffee-script"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "coffee-script" ];
+  };
+  "coffee-script" = self.full."coffee-script"."*";
+  full."coffee-script"."1.6.3" = lib.makeOverridable self.buildNodePackage {
+    name = "coffee-script-1.6.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
+        sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."coffee-script"."1.6.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "coffee-script" ];
+  };
+  full."coffee-script".">= 0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "coffee-script-1.6.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
+        sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."coffee-script".">= 0.0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "coffee-script" ];
+  };
+  full."coffee-script".">=1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "coffee-script-1.6.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
+        sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."coffee-script".">=1.2.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "coffee-script" ];
+  };
+  full."coffee-script"."~1.6" = lib.makeOverridable self.buildNodePackage {
+    name = "coffee-script-1.6.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
+        sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."coffee-script"."~1.6" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "coffee-script" ];
+  };
+  full."colors"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "colors-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/colors/-/colors-0.3.0.tgz";
+        sha1 = "c247d64d34db0ca4dc8e43f3ecd6da98d0af94e7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."colors"."0.3.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "colors" ];
+  };
+  full."colors"."0.6.0-1" = lib.makeOverridable self.buildNodePackage {
+    name = "colors-0.6.0-1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/colors/-/colors-0.6.0-1.tgz";
+        sha1 = "6dbb68ceb8bc60f2b313dcc5ce1599f06d19e67a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."colors"."0.6.0-1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "colors" ];
+  };
+  full."colors"."0.6.x" = lib.makeOverridable self.buildNodePackage {
+    name = "colors-0.6.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/colors/-/colors-0.6.1.tgz";
+        sha1 = "59c7799f6c91e0e15802980a98ed138b3c78f4e9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."colors"."0.6.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "colors" ];
+  };
+  full."colors"."0.x.x" = lib.makeOverridable self.buildNodePackage {
+    name = "colors-0.6.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/colors/-/colors-0.6.1.tgz";
+        sha1 = "59c7799f6c91e0e15802980a98ed138b3c78f4e9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."colors"."0.x.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "colors" ];
+  };
+  full."combined-stream"."~0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "combined-stream-0.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz";
+        sha1 = "2d1a43347dbe9515a4a2796732e5b88473840b22";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."combined-stream"."~0.0.4" or []);
+    deps = [
+      self.full."delayed-stream"."0.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "combined-stream" ];
+  };
+  full."commander"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "commander-2.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz";
+        sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."commander"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "commander" ];
+  };
+  full."commander"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "commander-0.5.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/commander/-/commander-0.5.1.tgz";
+        sha1 = "08477afb326d1adf9d4ee73af7170c70caa14f95";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."commander"."0.5.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "commander" ];
+  };
+  full."commander"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+    name = "commander-0.6.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
+        sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."commander"."0.6.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "commander" ];
+  };
+  full."commander"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "commander-1.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/commander/-/commander-1.2.0.tgz";
+        sha1 = "fd5713bfa153c7d6cc599378a5ab4c45c535029e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."commander"."1.2.0" or []);
+    deps = [
+      self.full."keypress"."0.1.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "commander" ];
+  };
+  full."commander"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "commander-1.3.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz";
+        sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."commander"."1.3.2" or []);
+    deps = [
+      self.full."keypress"."0.1.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "commander" ];
+  };
+  full."commander"."~0.6.1" = lib.makeOverridable self.buildNodePackage {
+    name = "commander-0.6.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
+        sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."commander"."~0.6.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "commander" ];
+  };
+  full."config"."0.4.15" = lib.makeOverridable self.buildNodePackage {
+    name = "config-0.4.15";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/config/-/config-0.4.15.tgz";
+        sha1 = "d43ddf58b8df5637fdd1314fc816ccae7bfbcd18";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."config"."0.4.15" or []);
+    deps = [
+      self.full."js-yaml"."0.3.x"
+      self.full."coffee-script".">=1.2.0"
+      self.full."vows".">=0.5.13"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "config" ];
+  };
+  full."config-chain"."~1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "config-chain-1.1.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/config-chain/-/config-chain-1.1.7.tgz";
+        sha1 = "99fcaaaf343a557782a142d201747bb8142bbf9a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."config-chain"."~1.1.1" or []);
+    deps = [
+      self.full."proto-list"."~1.2.1"
+      self.full."ini"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "config-chain" ];
+  };
+  full."configstore"."~0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "configstore-0.1.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/configstore/-/configstore-0.1.5.tgz";
+        sha1 = "807cfd60ef69c87f4a7b60561d940190a438503e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."configstore"."~0.1.0" or []);
+    deps = [
+      self.full."lodash"."~1.3.0"
+      self.full."mkdirp"."~0.3.5"
+      self.full."js-yaml"."~2.1.0"
+      self.full."osenv"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "configstore" ];
+  };
+  full."connect"."2.7.5" = lib.makeOverridable self.buildNodePackage {
+    name = "connect-2.7.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect/-/connect-2.7.5.tgz";
+        sha1 = "139111b4b03f0533a524927a88a646ae467b2c02";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect"."2.7.5" or []);
+    deps = [
+      self.full."qs"."0.5.1"
+      self.full."formidable"."1.0.11"
+      self.full."cookie-signature"."1.0.0"
+      self.full."buffer-crc32"."0.1.1"
+      self.full."cookie"."0.0.5"
+      self.full."send"."0.1.0"
+      self.full."bytes"."0.2.0"
+      self.full."fresh"."0.1.0"
+      self.full."pause"."0.0.1"
+      self.full."debug"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connect" ];
+  };
+  full."connect"."2.7.6" = lib.makeOverridable self.buildNodePackage {
+    name = "connect-2.7.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect/-/connect-2.7.6.tgz";
+        sha1 = "b83b68fa6f245c5020e2395472cc8322b0060738";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect"."2.7.6" or []);
+    deps = [
+      self.full."qs"."0.5.1"
+      self.full."formidable"."1.0.11"
+      self.full."cookie-signature"."1.0.1"
+      self.full."buffer-crc32"."0.1.1"
+      self.full."cookie"."0.0.5"
+      self.full."send"."0.1.0"
+      self.full."bytes"."0.2.0"
+      self.full."fresh"."0.1.0"
+      self.full."pause"."0.0.1"
+      self.full."debug"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connect" ];
+  };
+  full."connect"."2.8.5" = lib.makeOverridable self.buildNodePackage {
+    name = "connect-2.8.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect/-/connect-2.8.5.tgz";
+        sha1 = "20572077ba1f626fdb740b0ad7068f9130d701b8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect"."2.8.5" or []);
+    deps = [
+      self.full."qs"."0.6.5"
+      self.full."formidable"."1.0.14"
+      self.full."cookie-signature"."1.0.1"
+      self.full."buffer-crc32"."0.2.1"
+      self.full."cookie"."0.1.0"
+      self.full."send"."0.1.4"
+      self.full."bytes"."0.2.0"
+      self.full."fresh"."0.2.0"
+      self.full."pause"."0.0.1"
+      self.full."uid2"."0.0.2"
+      self.full."debug"."*"
+      self.full."methods"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connect" ];
+  };
+  full."connect"."~2" = lib.makeOverridable self.buildNodePackage {
+    name = "connect-2.8.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect/-/connect-2.8.5.tgz";
+        sha1 = "20572077ba1f626fdb740b0ad7068f9130d701b8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect"."~2" or []);
+    deps = [
+      self.full."qs"."0.6.5"
+      self.full."formidable"."1.0.14"
+      self.full."cookie-signature"."1.0.1"
+      self.full."buffer-crc32"."0.2.1"
+      self.full."cookie"."0.1.0"
+      self.full."send"."0.1.4"
+      self.full."bytes"."0.2.0"
+      self.full."fresh"."0.2.0"
+      self.full."pause"."0.0.1"
+      self.full."uid2"."0.0.2"
+      self.full."debug"."*"
+      self.full."methods"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connect" ];
+  };
+  full."connect"."~2.8.4" = lib.makeOverridable self.buildNodePackage {
+    name = "connect-2.8.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect/-/connect-2.8.5.tgz";
+        sha1 = "20572077ba1f626fdb740b0ad7068f9130d701b8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect"."~2.8.4" or []);
+    deps = [
+      self.full."qs"."0.6.5"
+      self.full."formidable"."1.0.14"
+      self.full."cookie-signature"."1.0.1"
+      self.full."buffer-crc32"."0.2.1"
+      self.full."cookie"."0.1.0"
+      self.full."send"."0.1.4"
+      self.full."bytes"."0.2.0"
+      self.full."fresh"."0.2.0"
+      self.full."pause"."0.0.1"
+      self.full."uid2"."0.0.2"
+      self.full."debug"."*"
+      self.full."methods"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connect" ];
+  };
+  full."connect-flash"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "connect-flash-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz";
+        sha1 = "d8630f26d95a7f851f9956b1e8cc6732f3b6aa30";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect-flash"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connect-flash" ];
+  };
+  "connect-flash" = self.full."connect-flash"."*";
+  full."connect-flash"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "connect-flash-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz";
+        sha1 = "82b381d61a12b651437df1c259c1f1c841239b88";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect-flash"."0.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connect-flash" ];
+  };
+  full."connect-mongo"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "connect-mongo-0.3.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.3.3.tgz";
+        sha1 = "aeaa1ca8c947599131bd90e1a024cdb789fe0100";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect-mongo"."*" or []);
+    deps = [
+      self.full."mongodb"."1.2.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connect-mongo" ];
+  };
+  "connect-mongo" = self.full."connect-mongo"."*";
+  full."console-browserify"."0.1.x" = lib.makeOverridable self.buildNodePackage {
+    name = "console-browserify-0.1.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/console-browserify/-/console-browserify-0.1.6.tgz";
+        sha1 = "d128a3c0bb88350eb5626c6e7c71a6f0fd48983c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."console-browserify"."0.1.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "console-browserify" ];
+  };
+  full."constantinople"."~1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "constantinople-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/constantinople/-/constantinople-1.0.1.tgz";
+        sha1 = "038727385eb70567ffb5a825abc44870b56f4de9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."constantinople"."~1.0.1" or []);
+    deps = [
+      self.full."uglify-js"."~2.3.6"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "constantinople" ];
+  };
+  full."cookie"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "cookie-0.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz";
+        sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cookie"."0.0.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cookie" ];
+  };
+  full."cookie"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "cookie-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz";
+        sha1 = "90eb469ddce905c866de687efc43131d8801f9d0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cookie"."0.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cookie" ];
+  };
+  full."cookie-jar"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "cookie-jar-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz";
+        sha1 = "64ecc06ac978db795e4b5290cbe48ba3781400fa";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cookie-jar"."~0.2.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cookie-jar" ];
+  };
+  full."cookie-jar"."~0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "cookie-jar-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz";
+        sha1 = "bc9a27d4e2b97e186cd57c9e2063cb99fa68cccc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cookie-jar"."~0.3.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cookie-jar" ];
+  };
+  full."cookie-signature"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "cookie-signature-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.0.tgz";
+        sha1 = "0044f332ac623df851c914e88eacc57f0c9704fe";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cookie-signature"."1.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cookie-signature" ];
+  };
+  full."cookie-signature"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "cookie-signature-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz";
+        sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cookie-signature"."1.0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cookie-signature" ];
+  };
+  full."cookiejar"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "cookiejar-1.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.0.tgz";
+        sha1 = "dd00b35679021e99cbd4e855b9ad041913474765";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cookiejar"."1.3.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cookiejar" ];
+  };
+  full."cookies".">= 0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "cookies-0.3.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookies/-/cookies-0.3.6.tgz";
+        sha1 = "1b5e4bd66fc732ea2e8b5087a8fb3718b4ec8597";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cookies".">= 0.2.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cookies" ];
+  };
+  full."couch-login"."~0.1.15" = lib.makeOverridable self.buildNodePackage {
+    name = "couch-login-0.1.18";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.18.tgz";
+        sha1 = "a69fa40dd43d1f98d97e560f18187a578a116056";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."couch-login"."~0.1.15" or []);
+    deps = [
+      self.full."request"."2 >=2.25.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "couch-login" ];
+  };
+  full."couch-login"."~0.1.18" = lib.makeOverridable self.buildNodePackage {
+    name = "couch-login-0.1.18";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.18.tgz";
+        sha1 = "a69fa40dd43d1f98d97e560f18187a578a116056";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."couch-login"."~0.1.18" or []);
+    deps = [
+      self.full."request"."2 >=2.25.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "couch-login" ];
+  };
+  full."cryptiles"."0.1.x" = lib.makeOverridable self.buildNodePackage {
+    name = "cryptiles-0.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz";
+        sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cryptiles"."0.1.x" or []);
+    deps = [
+      self.full."boom"."0.3.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cryptiles" ];
+  };
+  full."cryptiles"."0.2.x" = lib.makeOverridable self.buildNodePackage {
+    name = "cryptiles-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
+        sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cryptiles"."0.2.x" or []);
+    deps = [
+      self.full."boom"."0.4.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cryptiles" ];
+  };
+  full."css"."~1.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "css-1.0.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/css/-/css-1.0.8.tgz";
+        sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."css"."~1.0.8" or []);
+    deps = [
+      self.full."css-parse"."1.0.4"
+      self.full."css-stringify"."1.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "css" ];
+  };
+  full."css-parse"."1.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "css-parse-1.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz";
+        sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."css-parse"."1.0.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "css-parse" ];
+  };
+  full."css-stringify"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "css-stringify-1.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz";
+        sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."css-stringify"."1.0.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "css-stringify" ];
+  };
+  full."cssom"."0.2.x" = lib.makeOverridable self.buildNodePackage {
+    name = "cssom-0.2.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cssom/-/cssom-0.2.5.tgz";
+        sha1 = "2682709b5902e7212df529116ff788cd5b254894";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cssom"."0.2.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cssom" ];
+  };
+  full."ctype"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "ctype-0.5.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ctype/-/ctype-0.5.0.tgz";
+        sha1 = "672673ec67587eb495c1ed694da1abb964ff65e3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ctype"."0.5.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ctype" ];
+  };
+  full."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+    name = "ctype-0.5.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz";
+        sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ctype"."0.5.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ctype" ];
+  };
+  full."cycle"."1.0.x" = lib.makeOverridable self.buildNodePackage {
+    name = "cycle-1.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cycle/-/cycle-1.0.2.tgz";
+        sha1 = "269aca6f1b8d2baeefc8ccbc888b459f322c4e60";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cycle"."1.0.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cycle" ];
+  };
+  full."dargs"."~0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "dargs-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/dargs/-/dargs-0.1.0.tgz";
+        sha1 = "2364ad9f441f976dcd5fe9961e21715665a5e3c3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."dargs"."~0.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "dargs" ];
+  };
+  full."debug"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "debug-0.7.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/debug/-/debug-0.7.2.tgz";
+        sha1 = "056692c86670977f115de82917918b8e8b9a10f0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."debug"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "debug" ];
+  };
+  full."debug"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "debug-0.7.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/debug/-/debug-0.7.0.tgz";
+        sha1 = "f5be05ec0434c992d79940e50b2695cfb2e01b08";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."debug"."0.7.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "debug" ];
+  };
+  full."debug"."~0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "debug-0.7.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/debug/-/debug-0.7.2.tgz";
+        sha1 = "056692c86670977f115de82917918b8e8b9a10f0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."debug"."~0.7.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "debug" ];
+  };
+  full."debug"."~0.7.2" = lib.makeOverridable self.buildNodePackage {
+    name = "debug-0.7.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/debug/-/debug-0.7.2.tgz";
+        sha1 = "056692c86670977f115de82917918b8e8b9a10f0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."debug"."~0.7.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "debug" ];
+  };
+  full."deep-equal"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "deep-equal-0.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
+        sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."deep-equal"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "deep-equal" ];
+  };
+  full."deep-equal"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "deep-equal-0.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
+        sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."deep-equal"."0.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "deep-equal" ];
+  };
+  full."deep-equal"."~0.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "deep-equal-0.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
+        sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."deep-equal"."~0.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "deep-equal" ];
+  };
+  full."deep-extend"."~0.2.5" = lib.makeOverridable self.buildNodePackage {
+    name = "deep-extend-0.2.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.5.tgz";
+        sha1 = "04471b170de4afdb150f2e8b530b2974dbfee90d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."deep-extend"."~0.2.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "deep-extend" ];
+  };
+  full."deep-is"."0.1.x" = lib.makeOverridable self.buildNodePackage {
+    name = "deep-is-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.2.tgz";
+        sha1 = "9ced65ea0bc0b09f42a6d79c1b1903f9d913cc18";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."deep-is"."0.1.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "deep-is" ];
+  };
+  full."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "delayed-stream-0.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
+        sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."delayed-stream"."0.0.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "delayed-stream" ];
+  };
+  full."dequeue"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "dequeue-1.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/dequeue/-/dequeue-1.0.3.tgz";
+        sha1 = "30b8f4da2fc240951a15d31b35283e29b2de8978";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."dequeue"."1.0.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "dequeue" ];
+  };
+  full."di"."~0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "di-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/di/-/di-0.0.1.tgz";
+        sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."di"."~0.0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "di" ];
+  };
+  full."diff"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "diff-1.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/diff/-/diff-1.0.2.tgz";
+        sha1 = "4ae73f1aee8d6fcf484f1a1ce77ce651d9b7f0c9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."diff"."1.0.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "diff" ];
+  };
+  full."diff"."~1.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "diff-1.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/diff/-/diff-1.0.5.tgz";
+        sha1 = "664b6bdb113fb3a51ced79aff621badeed29a02c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."diff"."~1.0.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "diff" ];
+  };
+  full."diff"."~1.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "diff-1.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/diff/-/diff-1.0.5.tgz";
+        sha1 = "664b6bdb113fb3a51ced79aff621badeed29a02c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."diff"."~1.0.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "diff" ];
+  };
+  full."difflet"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "difflet-0.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz";
+        sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."difflet"."~0.2.0" or []);
+    deps = [
+      self.full."traverse"."0.6.x"
+      self.full."charm"."0.1.x"
+      self.full."deep-is"."0.1.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "difflet" ];
+  };
+  full."director"."1.1.10" = lib.makeOverridable self.buildNodePackage {
+    name = "director-1.1.10";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/director/-/director-1.1.10.tgz";
+        sha1 = "e6c1d64f2f079216f19ea83b566035dde9901179";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."director"."1.1.10" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "director" ];
+  };
+  full."domelementtype"."1" = lib.makeOverridable self.buildNodePackage {
+    name = "domelementtype-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.1.tgz";
+        sha1 = "7887acbda7614bb0a3dbe1b5e394f77a8ed297cf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."domelementtype"."1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "domelementtype" ];
+  };
+  full."domhandler"."2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "domhandler-2.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/domhandler/-/domhandler-2.0.3.tgz";
+        sha1 = "889f8df626403af0788e29d66d5d5c6f7ebf0fd6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."domhandler"."2.0" or []);
+    deps = [
+      self.full."domelementtype"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "domhandler" ];
+  };
+  full."domutils"."1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "domutils-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/domutils/-/domutils-1.0.1.tgz";
+        sha1 = "58b58d774774911556c16b8b02d99c609d987869";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."domutils"."1.0" or []);
+    deps = [
+      self.full."domelementtype"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "domutils" ];
+  };
+  full."domutils"."1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "domutils-1.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/domutils/-/domutils-1.1.2.tgz";
+        sha1 = "fcf1d3596cd419818041cdaf6f7894a8d127bb07";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."domutils"."1.1" or []);
+    deps = [
+      self.full."domelementtype"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "domutils" ];
+  };
+  full."dtrace-provider"."0.2.8" = lib.makeOverridable self.buildNodePackage {
+    name = "dtrace-provider-0.2.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.8.tgz";
+        sha1 = "e243f19219aa95fbf0d8f2ffb07f5bd64e94fe20";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."dtrace-provider"."0.2.8" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "dtrace-provider" ];
+  };
+  full."editor"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "editor-0.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/editor/-/editor-0.0.4.tgz";
+        sha1 = "478920f77bca6c1c1749d5e3edde4bd5966efda8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."editor"."0.0.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "editor" ];
+  };
+  full."ejs"."0.8.3" = lib.makeOverridable self.buildNodePackage {
+    name = "ejs-0.8.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz";
+        sha1 = "db8aac47ff80a7df82b4c82c126fe8970870626f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ejs"."0.8.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ejs" ];
+  };
+  full."emitter-component"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "emitter-component-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/emitter-component/-/emitter-component-1.0.0.tgz";
+        sha1 = "f04dd18fc3dc3e9a74cbc0f310b088666e4c016f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."emitter-component"."1.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "emitter-component" ];
+  };
+  full."encoding"."~0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "encoding-0.1.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/encoding/-/encoding-0.1.6.tgz";
+        sha1 = "fec66b6d1c6b8cc554aa78c05ece35bef11a913f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."encoding"."~0.1" or []);
+    deps = [
+      self.full."iconv-lite"."0.2.7"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "encoding" ];
+  };
+  full."entities"."0.x" = lib.makeOverridable self.buildNodePackage {
+    name = "entities-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/entities/-/entities-0.3.0.tgz";
+        sha1 = "6ccead6010fee0c5a06f538d242792485cbfa256";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."entities"."0.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "entities" ];
+  };
+  full."es5-ext"."~0.9.1" = lib.makeOverridable self.buildNodePackage {
+    name = "es5-ext-0.9.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.9.2.tgz";
+        sha1 = "d2e309d1f223b0718648835acf5b8823a8061f8a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."es5-ext"."~0.9.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "es5-ext" ];
+  };
+  full."es5-ext"."~0.9.2" = lib.makeOverridable self.buildNodePackage {
+    name = "es5-ext-0.9.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.9.2.tgz";
+        sha1 = "d2e309d1f223b0718648835acf5b8823a8061f8a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."es5-ext"."~0.9.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "es5-ext" ];
+  };
+  full."escape-html"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "escape-html-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.0.tgz";
+        sha1 = "fedcd79564444ddaf2bd85b22c9961b3a3a38bf5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."escape-html"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "escape-html" ];
+  };
+  "escape-html" = self.full."escape-html"."*";
+  full."esprima"."~ 1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "esprima-1.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/esprima/-/esprima-1.0.3.tgz";
+        sha1 = "7bdb544f95526d424808654d3b8fbe928650c0fe";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."esprima"."~ 1.0.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "esprima" ];
+  };
+  full."esprima"."~1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "esprima-1.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/esprima/-/esprima-1.0.3.tgz";
+        sha1 = "7bdb544f95526d424808654d3b8fbe928650c0fe";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."esprima"."~1.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "esprima" ];
+  };
+  full."event-emitter"."~0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "event-emitter-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/event-emitter/-/event-emitter-0.2.2.tgz";
+        sha1 = "c81e3724eb55407c5a0d5ee3299411f700f54291";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."event-emitter"."~0.2.2" or []);
+    deps = [
+      self.full."es5-ext"."~0.9.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "event-emitter" ];
+  };
+  full."event-stream"."~0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "event-stream-0.5.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz";
+        sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."event-stream"."~0.5" or []);
+    deps = [
+      self.full."optimist"."0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "event-stream" ];
+  };
+  full."eventemitter2"."0.4.11" = lib.makeOverridable self.buildNodePackage {
+    name = "eventemitter2-0.4.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.11.tgz";
+        sha1 = "8bbf2b6ac7b31e2eea0c8d8f533ef41f849a9e2c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."eventemitter2"."0.4.11" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "eventemitter2" ];
+  };
+  full."eventemitter2"."~0.4.11" = lib.makeOverridable self.buildNodePackage {
+    name = "eventemitter2-0.4.13";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.13.tgz";
+        sha1 = "0a8ab97f9c1b563361b8927f9e80606277509153";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."eventemitter2"."~0.4.11" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "eventemitter2" ];
+  };
+  full."events.node".">= 0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "events.node-0.4.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz";
+        sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."events.node".">= 0.4.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "events.node" ];
+  };
+  full."express"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "express-3.3.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/express/-/express-3.3.5.tgz";
+        sha1 = "3fd077660c9ccae4710fcfb326290a01d1e72566";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."express"."*" or []);
+    deps = [
+      self.full."connect"."2.8.5"
+      self.full."commander"."1.2.0"
+      self.full."range-parser"."0.0.4"
+      self.full."mkdirp"."0.3.5"
+      self.full."cookie"."0.1.0"
+      self.full."buffer-crc32"."0.2.1"
+      self.full."fresh"."0.2.0"
+      self.full."methods"."0.0.1"
+      self.full."send"."0.1.4"
+      self.full."cookie-signature"."1.0.1"
+      self.full."debug"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "express" ];
+  };
+  "express" = self.full."express"."*";
+  full."express"."3.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "express-3.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/express/-/express-3.2.0.tgz";
+        sha1 = "7b66d6c66b038038eedf452804222b3077374ae0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."express"."3.2.0" or []);
+    deps = [
+      self.full."connect"."2.7.6"
+      self.full."commander"."0.6.1"
+      self.full."range-parser"."0.0.4"
+      self.full."mkdirp"."~0.3.4"
+      self.full."cookie"."0.0.5"
+      self.full."buffer-crc32"."~0.2.1"
+      self.full."fresh"."0.1.0"
+      self.full."methods"."0.0.1"
+      self.full."send"."0.1.0"
+      self.full."cookie-signature"."1.0.1"
+      self.full."debug"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "express" ];
+  };
+  full."express"."3.x" = lib.makeOverridable self.buildNodePackage {
+    name = "express-3.3.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/express/-/express-3.3.5.tgz";
+        sha1 = "3fd077660c9ccae4710fcfb326290a01d1e72566";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."express"."3.x" or []);
+    deps = [
+      self.full."connect"."2.8.5"
+      self.full."commander"."1.2.0"
+      self.full."range-parser"."0.0.4"
+      self.full."mkdirp"."0.3.5"
+      self.full."cookie"."0.1.0"
+      self.full."buffer-crc32"."0.2.1"
+      self.full."fresh"."0.2.0"
+      self.full."methods"."0.0.1"
+      self.full."send"."0.1.4"
+      self.full."cookie-signature"."1.0.1"
+      self.full."debug"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "express" ];
+  };
+  full."express"."~3.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "express-3.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/express/-/express-3.1.2.tgz";
+        sha1 = "52a02c8db8f22bbfa0d7478d847cd45161f985f7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."express"."~3.1.1" or []);
+    deps = [
+      self.full."connect"."2.7.5"
+      self.full."commander"."0.6.1"
+      self.full."range-parser"."0.0.4"
+      self.full."mkdirp"."~0.3.4"
+      self.full."cookie"."0.0.5"
+      self.full."buffer-crc32"."~0.2.1"
+      self.full."fresh"."0.1.0"
+      self.full."methods"."0.0.1"
+      self.full."send"."0.1.0"
+      self.full."cookie-signature"."1.0.0"
+      self.full."debug"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "express" ];
+  };
+  full."express-form"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "express-form-0.8.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/express-form/-/express-form-0.8.1.tgz";
+        sha1 = "14299158646a796fac584cb5980d63e587c02019";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."express-form"."*" or []);
+    deps = [
+      self.full."validator"."0.4.x"
+      self.full."object-additions".">= 0.5.0"
+    ];
+    peerDependencies = [
+      self.full."express"."3.x"
+    ];
+    passthru.names = [ "express-form" ];
+  };
+  "express-form" = self.full."express-form"."*";
+  full."express-partials"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "express-partials-0.0.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz";
+        sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."express-partials"."0.0.6" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "express-partials" ];
+  };
+  full."extend"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "extend-1.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/extend/-/extend-1.1.3.tgz";
+        sha1 = "5ae3d12e33009879dfb574e911a2da1e3da29ef4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."extend"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "extend" ];
+  };
+  "extend" = self.full."extend"."*";
+  full."extsprintf"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "extsprintf-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz";
+        sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."extsprintf"."1.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "extsprintf" ];
+  };
+  full."extsprintf"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "extsprintf-1.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
+        sha1 = "e1080e0658e300b06294990cc70e1502235fd550";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."extsprintf"."1.0.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "extsprintf" ];
+  };
+  full."eyes"."0.1.x" = lib.makeOverridable self.buildNodePackage {
+    name = "eyes-0.1.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
+        sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."eyes"."0.1.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "eyes" ];
+  };
+  full."eyes".">=0.1.6" = lib.makeOverridable self.buildNodePackage {
+    name = "eyes-0.1.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
+        sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."eyes".">=0.1.6" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "eyes" ];
+  };
+  full."faye-websocket"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "faye-websocket-0.6.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.6.1.tgz";
+        sha1 = "43a54b2ab807761d7ec335d12f48eb69ec4ab61c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."faye-websocket"."*" or []);
+    deps = [
+      self.full."websocket-driver".">=0.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "faye-websocket" ];
+  };
+  "faye-websocket" = self.full."faye-websocket"."*";
+  full."faye-websocket"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "faye-websocket-0.4.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz";
+        sha1 = "c14c5b3bf14d7417ffbfd990c0a7495cd9f337bc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."faye-websocket"."0.4.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "faye-websocket" ];
+  };
+  full."findup-sync"."~0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "findup-sync-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.2.tgz";
+        sha1 = "da2b96ca9f800e5a13d0a11110f490b65f62e96d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."findup-sync"."~0.1.0" or []);
+    deps = [
+      self.full."glob"."~3.1.21"
+      self.full."lodash"."~1.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "findup-sync" ];
+  };
+  full."flatiron"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "flatiron-0.3.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.8.tgz";
+        sha1 = "235d691f19154eff033610c12bcd51f304ff09c6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."flatiron"."*" or []);
+    deps = [
+      self.full."broadway"."0.2.7"
+      self.full."optimist"."0.3.5"
+      self.full."prompt"."0.2.11"
+      self.full."director"."1.1.10"
+      self.full."pkginfo"."0.3.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "flatiron" ];
+  };
+  "flatiron" = self.full."flatiron"."*";
+  full."flatiron"."0.3.5" = lib.makeOverridable self.buildNodePackage {
+    name = "flatiron-0.3.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.5.tgz";
+        sha1 = "a91fe730f6a7fc1ea655a0ca48eaa977bef64625";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."flatiron"."0.3.5" or []);
+    deps = [
+      self.full."broadway"."0.2.7"
+      self.full."optimist"."0.3.5"
+      self.full."prompt"."0.2.9"
+      self.full."director"."1.1.10"
+      self.full."pkginfo"."0.3.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "flatiron" ];
+  };
+  full."forEachAsync"."~2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "forEachAsync-2.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/forEachAsync/-/forEachAsync-2.2.0.tgz";
+        sha1 = "093b32ce868cb69f5166dcf331fae074adc71cee";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."forEachAsync"."~2.2" or []);
+    deps = [
+      self.full."sequence".">= 2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "forEachAsync" ];
+  };
+  full."forever"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "forever-0.10.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/forever/-/forever-0.10.8.tgz";
+        sha1 = "a78137a46fb8ca4adbf2f497d98816a526bb1f82";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."forever"."*" or []);
+    deps = [
+      self.full."colors"."0.6.0-1"
+      self.full."cliff"."0.1.8"
+      self.full."flatiron"."0.3.5"
+      self.full."forever-monitor"."1.2.2"
+      self.full."nconf"."0.6.7"
+      self.full."nssocket"."~0.5.1"
+      self.full."optimist"."0.4.0"
+      self.full."pkginfo"."0.3.0"
+      self.full."timespan"."2.0.1"
+      self.full."watch"."0.7.0"
+      self.full."utile"."0.1.7"
+      self.full."winston"."0.7.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "forever" ];
+  };
+  "forever" = self.full."forever"."*";
+  full."forever-agent"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "forever-agent-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz";
+        sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."forever-agent"."~0.2.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "forever-agent" ];
+  };
+  full."forever-agent"."~0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "forever-agent-0.5.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.0.tgz";
+        sha1 = "0c1647a74f3af12d76a07a99490ade7c7249c8f0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."forever-agent"."~0.5.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "forever-agent" ];
+  };
+  full."forever-monitor"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "forever-monitor-1.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.2.tgz";
+        sha1 = "c1ad6c6ab837a89fa2d47bb439727ca968235684";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."forever-monitor"."*" or []);
+    deps = [
+      self.full."broadway"."0.2.x"
+      self.full."minimatch"."0.0.x"
+      self.full."pkginfo"."0.x.x"
+      self.full."ps-tree"."0.0.x"
+      self.full."watch"."0.5.x"
+      self.full."utile"."0.1.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "forever-monitor" ];
+  };
+  "forever-monitor" = self.full."forever-monitor"."*";
+  full."forever-monitor"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "forever-monitor-1.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.2.tgz";
+        sha1 = "c1ad6c6ab837a89fa2d47bb439727ca968235684";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."forever-monitor"."1.2.2" or []);
+    deps = [
+      self.full."broadway"."0.2.x"
+      self.full."minimatch"."0.0.x"
+      self.full."pkginfo"."0.x.x"
+      self.full."ps-tree"."0.0.x"
+      self.full."watch"."0.5.x"
+      self.full."utile"."0.1.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "forever-monitor" ];
+  };
+  full."form-data"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "form-data-0.0.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/form-data/-/form-data-0.0.8.tgz";
+        sha1 = "0890cd1005c5ccecc0b9d24a88052c92442d0db5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."form-data"."0.0.8" or []);
+    deps = [
+      self.full."combined-stream"."~0.0.4"
+      self.full."mime"."~1.2.2"
+      self.full."async"."~0.2.7"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "form-data" ];
+  };
+  full."form-data"."~0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "form-data-0.0.10";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz";
+        sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."form-data"."~0.0.3" or []);
+    deps = [
+      self.full."combined-stream"."~0.0.4"
+      self.full."mime"."~1.2.2"
+      self.full."async"."~0.2.7"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "form-data" ];
+  };
+  full."form-data"."~0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "form-data-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/form-data/-/form-data-0.1.0.tgz";
+        sha1 = "d36b59baf9b292bb2e5034d7a6079b2bd1e9df83";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."form-data"."~0.1.0" or []);
+    deps = [
+      self.full."combined-stream"."~0.0.4"
+      self.full."mime"."~1.2.9"
+      self.full."async"."~0.2.9"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "form-data" ];
+  };
+  full."formidable"."1.0.11" = lib.makeOverridable self.buildNodePackage {
+    name = "formidable-1.0.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz";
+        sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."formidable"."1.0.11" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "formidable" ];
+  };
+  full."formidable"."1.0.13" = lib.makeOverridable self.buildNodePackage {
+    name = "formidable-1.0.13";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/formidable/-/formidable-1.0.13.tgz";
+        sha1 = "70caf0f9d69692a77e04021ddab4f46b01c82aea";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."formidable"."1.0.13" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "formidable" ];
+  };
+  full."formidable"."1.0.14" = lib.makeOverridable self.buildNodePackage {
+    name = "formidable-1.0.14";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz";
+        sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."formidable"."1.0.14" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "formidable" ];
+  };
+  full."formidable"."1.0.9" = lib.makeOverridable self.buildNodePackage {
+    name = "formidable-1.0.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/formidable/-/formidable-1.0.9.tgz";
+        sha1 = "419e3bccead3e8874d539f5b3e72a4c503b31a98";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."formidable"."1.0.9" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "formidable" ];
+  };
+  full."fresh"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "fresh-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
+        sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fresh"."0.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fresh" ];
+  };
+  full."fresh"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "fresh-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz";
+        sha1 = "bfd9402cf3df12c4a4c310c79f99a3dde13d34a7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fresh"."0.2.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fresh" ];
+  };
+  full."fs-walk"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "fs-walk-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fs-walk/-/fs-walk-0.0.1.tgz";
+        sha1 = "f7fc91c3ae1eead07c998bc5d0dd41f2dbebd335";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fs-walk"."*" or []);
+    deps = [
+      self.full."async"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fs-walk" ];
+  };
+  "fs-walk" = self.full."fs-walk"."*";
+  full."fstream"."0" = lib.makeOverridable self.buildNodePackage {
+    name = "fstream-0.1.24";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz";
+        sha1 = "267fe9d034f46bc99f824789d38b987ad01be884";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fstream"."0" or []);
+    deps = [
+      self.full."rimraf"."2"
+      self.full."mkdirp"."0.3"
+      self.full."graceful-fs"."~2.0.0"
+      self.full."inherits"."~2.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fstream" ];
+  };
+  full."fstream"."~0.1.17" = lib.makeOverridable self.buildNodePackage {
+    name = "fstream-0.1.24";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz";
+        sha1 = "267fe9d034f46bc99f824789d38b987ad01be884";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fstream"."~0.1.17" or []);
+    deps = [
+      self.full."rimraf"."2"
+      self.full."mkdirp"."0.3"
+      self.full."graceful-fs"."~2.0.0"
+      self.full."inherits"."~2.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fstream" ];
+  };
+  full."fstream"."~0.1.21" = lib.makeOverridable self.buildNodePackage {
+    name = "fstream-0.1.24";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz";
+        sha1 = "267fe9d034f46bc99f824789d38b987ad01be884";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fstream"."~0.1.21" or []);
+    deps = [
+      self.full."rimraf"."2"
+      self.full."mkdirp"."0.3"
+      self.full."graceful-fs"."~2.0.0"
+      self.full."inherits"."~2.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fstream" ];
+  };
+  full."fstream"."~0.1.22" = lib.makeOverridable self.buildNodePackage {
+    name = "fstream-0.1.24";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz";
+        sha1 = "267fe9d034f46bc99f824789d38b987ad01be884";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fstream"."~0.1.22" or []);
+    deps = [
+      self.full."rimraf"."2"
+      self.full."mkdirp"."0.3"
+      self.full."graceful-fs"."~2.0.0"
+      self.full."inherits"."~2.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fstream" ];
+  };
+  full."fstream"."~0.1.23" = lib.makeOverridable self.buildNodePackage {
+    name = "fstream-0.1.24";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz";
+        sha1 = "267fe9d034f46bc99f824789d38b987ad01be884";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fstream"."~0.1.23" or []);
+    deps = [
+      self.full."rimraf"."2"
+      self.full."mkdirp"."0.3"
+      self.full."graceful-fs"."~2.0.0"
+      self.full."inherits"."~2.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fstream" ];
+  };
+  full."fstream"."~0.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "fstream-0.1.24";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz";
+        sha1 = "267fe9d034f46bc99f824789d38b987ad01be884";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fstream"."~0.1.8" or []);
+    deps = [
+      self.full."rimraf"."2"
+      self.full."mkdirp"."0.3"
+      self.full."graceful-fs"."~2.0.0"
+      self.full."inherits"."~2.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fstream" ];
+  };
+  full."fstream-ignore"."~0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "fstream-ignore-0.0.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz";
+        sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fstream-ignore"."~0.0.5" or []);
+    deps = [
+      self.full."minimatch"."~0.2.0"
+      self.full."fstream"."~0.1.17"
+      self.full."inherits"."2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fstream-ignore" ];
+  };
+  full."fstream-ignore"."~0.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "fstream-ignore-0.0.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz";
+        sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fstream-ignore"."~0.0.6" or []);
+    deps = [
+      self.full."minimatch"."~0.2.0"
+      self.full."fstream"."~0.1.17"
+      self.full."inherits"."2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fstream-ignore" ];
+  };
+  full."fstream-npm"."~0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "fstream-npm-0.1.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.5.tgz";
+        sha1 = "8f9fdd38c0940f91f7b6ebda4b6611be88f97ec9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fstream-npm"."~0.1.3" or []);
+    deps = [
+      self.full."fstream-ignore"."~0.0.5"
+      self.full."inherits"."2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fstream-npm" ];
+  };
+  full."generator-angular"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "generator-angular-0.3.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.3.1.tgz";
+        sha1 = "124d8752a0252b2ba833285ee3415a455d0b4bdd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."generator-angular"."*" or []);
+    deps = [
+      self.full."yeoman-generator"."~0.12.0"
+    ];
+    peerDependencies = [
+      self.full."generator-karma"."~0.4.0"
+      self.full."yo".">=1.0.0-rc.1.1"
+    ];
+    passthru.names = [ "generator-angular" ];
+  };
+  "generator-angular" = self.full."generator-angular"."*";
+  full."generator-karma"."~0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "generator-karma-0.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.4.1.tgz";
+        sha1 = "50ee26e3e9d246d2f2a1ada72c5f4a7bf1c08a0b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."generator-karma"."~0.4.0" or []);
+    deps = [
+      self.full."yeoman-generator"."~0.12.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "generator-karma" ];
+  };
+  full."generator-mocha"."~0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "generator-mocha-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/generator-mocha/-/generator-mocha-0.1.1.tgz";
+        sha1 = "818f7028a1c149774a882a0e3c7c04ba9852d7d1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."generator-mocha"."~0.1.1" or []);
+    deps = [
+      self.full."yeoman-generator"."~0.10.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "generator-mocha" ];
+  };
+  full."generator-webapp"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "generator-webapp-0.2.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.2.7.tgz";
+        sha1 = "3d8f776719910802f4bf5156d6473f435c5fd570";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."generator-webapp"."*" or []);
+    deps = [
+      self.full."yeoman-generator"."~0.12.3"
+      self.full."cheerio"."~0.12.1"
+    ];
+    peerDependencies = [
+      self.full."generator-mocha"."~0.1.1"
+      self.full."yo".">=1.0.0-rc.1.1"
+    ];
+    passthru.names = [ "generator-webapp" ];
+  };
+  "generator-webapp" = self.full."generator-webapp"."*";
+  full."github-url-from-git"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "github-url-from-git-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz";
+        sha1 = "1f89623453123ef9623956e264c60bf4c3cf5ccf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."github-url-from-git"."1.1.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "github-url-from-git" ];
+  };
+  full."github-url-from-git"."~1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "github-url-from-git-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz";
+        sha1 = "1f89623453123ef9623956e264c60bf4c3cf5ccf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."github-url-from-git"."~1.1.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "github-url-from-git" ];
+  };
+  full."glob"."3" = lib.makeOverridable self.buildNodePackage {
+    name = "glob-3.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz";
+        sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob"."3" or []);
+    deps = [
+      self.full."minimatch"."~0.2.11"
+      self.full."inherits"."2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob" ];
+  };
+  full."glob"."3.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "glob-3.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob/-/glob-3.2.1.tgz";
+        sha1 = "57af70ec73ba2323bfe3f29a067765db64c5d758";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob"."3.2.1" or []);
+    deps = [
+      self.full."minimatch"."~0.2.11"
+      self.full."graceful-fs"."~1.2.0"
+      self.full."inherits"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob" ];
+  };
+  full."glob".">= 3.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "glob-3.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz";
+        sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob".">= 3.1.4" or []);
+    deps = [
+      self.full."minimatch"."~0.2.11"
+      self.full."inherits"."2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob" ];
+  };
+  full."glob"."~3.1.21" = lib.makeOverridable self.buildNodePackage {
+    name = "glob-3.1.21";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob/-/glob-3.1.21.tgz";
+        sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob"."~3.1.21" or []);
+    deps = [
+      self.full."minimatch"."~0.2.11"
+      self.full."graceful-fs"."~1.2.0"
+      self.full."inherits"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob" ];
+  };
+  full."glob"."~3.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "glob-3.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz";
+        sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob"."~3.2.0" or []);
+    deps = [
+      self.full."minimatch"."~0.2.11"
+      self.full."inherits"."2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob" ];
+  };
+  full."glob"."~3.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "glob-3.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz";
+        sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob"."~3.2.1" or []);
+    deps = [
+      self.full."minimatch"."~0.2.11"
+      self.full."inherits"."2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob" ];
+  };
+  full."glob"."~3.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "glob-3.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz";
+        sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob"."~3.2.6" or []);
+    deps = [
+      self.full."minimatch"."~0.2.11"
+      self.full."inherits"."2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob" ];
+  };
+  full."graceful-fs"."2" = lib.makeOverridable self.buildNodePackage {
+    name = "graceful-fs-2.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.0.tgz";
+        sha1 = "c9a206f6f5f4b94e1046dfaaccfe9e12d0ab8cef";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."graceful-fs"."2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "graceful-fs" ];
+  };
+  full."graceful-fs"."~1" = lib.makeOverridable self.buildNodePackage {
+    name = "graceful-fs-1.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+        sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."graceful-fs"."~1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "graceful-fs" ];
+  };
+  full."graceful-fs"."~1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "graceful-fs-1.1.14";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.1.14.tgz";
+        sha1 = "07078db5f6377f6321fceaaedf497de124dc9465";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."graceful-fs"."~1.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "graceful-fs" ];
+  };
+  full."graceful-fs"."~1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "graceful-fs-1.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+        sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."graceful-fs"."~1.2.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "graceful-fs" ];
+  };
+  full."graceful-fs"."~1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "graceful-fs-1.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+        sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."graceful-fs"."~1.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "graceful-fs" ];
+  };
+  full."graceful-fs"."~2" = lib.makeOverridable self.buildNodePackage {
+    name = "graceful-fs-2.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.0.tgz";
+        sha1 = "c9a206f6f5f4b94e1046dfaaccfe9e12d0ab8cef";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."graceful-fs"."~2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "graceful-fs" ];
+  };
+  full."graceful-fs"."~2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "graceful-fs-2.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.0.tgz";
+        sha1 = "c9a206f6f5f4b94e1046dfaaccfe9e12d0ab8cef";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."graceful-fs"."~2.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "graceful-fs" ];
+  };
+  full."gridfs-stream"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "gridfs-stream-0.4.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.4.0.tgz";
+        sha1 = "f76f791e0d1b22649e11beeacddf8e62bd89ca2a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."gridfs-stream"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "gridfs-stream" ];
+  };
+  "gridfs-stream" = self.full."gridfs-stream"."*";
+  full."growl"."1.7.x" = lib.makeOverridable self.buildNodePackage {
+    name = "growl-1.7.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/growl/-/growl-1.7.0.tgz";
+        sha1 = "de2d66136d002e112ba70f3f10c31cf7c350b2da";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."growl"."1.7.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "growl" ];
+  };
+  full."grunt-cli"."~0.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "grunt-cli-0.1.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.9.tgz";
+        sha1 = "3f08bfb0bef30ba33083defe53efe0575cbe4e14";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."grunt-cli"."~0.1.7" or []);
+    deps = [
+      self.full."nopt"."~1.0.10"
+      self.full."findup-sync"."~0.1.0"
+      self.full."resolve"."~0.3.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "grunt-cli" ];
+  };
+  full."guifi-earth"."https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " = lib.makeOverridable self.buildNodePackage {
+    name = "guifi-earth-0.2.1";
+    src = [
+      (fetchurl {
+        url = "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854";
+        sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."guifi-earth"."https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " or []);
+    deps = [
+      self.full."coffee-script".">= 0.0.1"
+      self.full."jade".">= 0.0.1"
+      self.full."q".">= 0.0.1"
+      self.full."xml2js".">= 0.0.1"
+      self.full."msgpack".">= 0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "guifi-earth" ];
+  };
+  "guifi-earth" = self.full."guifi-earth"."https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 ";
+  full."gzippo"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "gzippo-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/gzippo/-/gzippo-0.2.0.tgz";
+        sha1 = "ffc594c482190c56531ed2d4a5864d0b0b7d2733";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."gzippo"."*" or []);
+    deps = [
+      self.full."send"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "gzippo" ];
+  };
+  "gzippo" = self.full."gzippo"."*";
+  full."handlebars"."~1.0.11" = lib.makeOverridable self.buildNodePackage {
+    name = "handlebars-1.0.12";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/handlebars/-/handlebars-1.0.12.tgz";
+        sha1 = "18c6d3440c35e91b19b3ff582b9151ab4985d4fc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."handlebars"."~1.0.11" or []);
+    deps = [
+      self.full."optimist"."~0.3"
+      self.full."uglify-js"."~2.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "handlebars" ];
+  };
+  full."has-color"."~0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "has-color-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/has-color/-/has-color-0.1.1.tgz";
+        sha1 = "28cc90127bc5448f99e76096dc97470a94a66720";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."has-color"."~0.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "has-color" ];
+  };
+  full."hat"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "hat-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/hat/-/hat-0.0.3.tgz";
+        sha1 = "bb014a9e64b3788aed8005917413d4ff3d502d8a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."hat"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "hat" ];
+  };
+  full."hawk"."~0.10.2" = lib.makeOverridable self.buildNodePackage {
+    name = "hawk-0.10.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz";
+        sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."hawk"."~0.10.2" or []);
+    deps = [
+      self.full."hoek"."0.7.x"
+      self.full."boom"."0.3.x"
+      self.full."cryptiles"."0.1.x"
+      self.full."sntp"."0.1.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "hawk" ];
+  };
+  full."hawk"."~0.13.0" = lib.makeOverridable self.buildNodePackage {
+    name = "hawk-0.13.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/hawk/-/hawk-0.13.1.tgz";
+        sha1 = "3617958821f58311e4d7f6de291fca662b412ef4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."hawk"."~0.13.0" or []);
+    deps = [
+      self.full."hoek"."0.8.x"
+      self.full."boom"."0.4.x"
+      self.full."cryptiles"."0.2.x"
+      self.full."sntp"."0.2.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "hawk" ];
+  };
+  full."hawk"."~1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "hawk-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
+        sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."hawk"."~1.0.0" or []);
+    deps = [
+      self.full."hoek"."0.9.x"
+      self.full."boom"."0.4.x"
+      self.full."cryptiles"."0.2.x"
+      self.full."sntp"."0.2.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "hawk" ];
+  };
+  full."hiredis"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "hiredis-0.1.15";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.15.tgz";
+        sha1 = "00eb2205c85dcf50de838203e513896dc304dd49";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."hiredis"."*" or []);
+    deps = [
+      self.full."bindings"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "hiredis" ];
+  };
+  full."hoek"."0.7.x" = lib.makeOverridable self.buildNodePackage {
+    name = "hoek-0.7.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz";
+        sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."hoek"."0.7.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "hoek" ];
+  };
+  full."hoek"."0.8.x" = lib.makeOverridable self.buildNodePackage {
+    name = "hoek-0.8.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/hoek/-/hoek-0.8.5.tgz";
+        sha1 = "1e9fd770ef7ebe0274adfcb5b0806a025a5e4e9f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."hoek"."0.8.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "hoek" ];
+  };
+  full."hoek"."0.9.x" = lib.makeOverridable self.buildNodePackage {
+    name = "hoek-0.9.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
+        sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."hoek"."0.9.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "hoek" ];
+  };
+  full."hooks"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "hooks-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz";
+        sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."hooks"."0.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "hooks" ];
+  };
+  full."htdigest"."1.0.7" = lib.makeOverridable self.buildNodePackage {
+    name = "htdigest-1.0.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/htdigest/-/htdigest-1.0.7.tgz";
+        sha1 = "0c55ba3a018855e134fd82f7a4aa6235167181b2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."htdigest"."1.0.7" or []);
+    deps = [
+      self.full."commander"."0.5.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "htdigest" ];
+  };
+  full."htmlparser2"."2.x" = lib.makeOverridable self.buildNodePackage {
+    name = "htmlparser2-2.6.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-2.6.0.tgz";
+        sha1 = "b28564ea9d1ba56a104ace6a7b0fdda2f315836f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."htmlparser2"."2.x" or []);
+    deps = [
+      self.full."domhandler"."2.0"
+      self.full."domutils"."1.0"
+      self.full."domelementtype"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "htmlparser2" ];
+  };
+  full."htmlparser2"."3.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "htmlparser2-3.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.1.4.tgz";
+        sha1 = "72cbe7d5d56c01acf61fcf7b933331f4e45b36f0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."htmlparser2"."3.1.4" or []);
+    deps = [
+      self.full."domhandler"."2.0"
+      self.full."domutils"."1.1"
+      self.full."domelementtype"."1"
+      self.full."readable-stream"."1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "htmlparser2" ];
+  };
+  full."htpasswd"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "htpasswd-1.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/htpasswd/-/htpasswd-1.1.0.tgz";
+        sha1 = "4e9e6a2203405005aa1ae7dee80d3b6d6a8d93d6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."htpasswd"."1.1.0" or []);
+    deps = [
+      self.full."commander"."0.5.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "htpasswd" ];
+  };
+  full."http-auth"."1.2.7" = lib.makeOverridable self.buildNodePackage {
+    name = "http-auth-1.2.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/http-auth/-/http-auth-1.2.7.tgz";
+        sha1 = "d15b9c08646c9fdcc4f92edb9888f57cb6cf9ca7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."http-auth"."1.2.7" or []);
+    deps = [
+      self.full."node-uuid"."1.2.0"
+      self.full."htpasswd"."1.1.0"
+      self.full."htdigest"."1.0.7"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "http-auth" ];
+  };
+  full."http-proxy"."~0.10" = lib.makeOverridable self.buildNodePackage {
+    name = "http-proxy-0.10.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/http-proxy/-/http-proxy-0.10.3.tgz";
+        sha1 = "72ca9d503a75e064650084c58ca11b82e4b0196d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."http-proxy"."~0.10" or []);
+    deps = [
+      self.full."colors"."0.x.x"
+      self.full."optimist"."0.3.x"
+      self.full."pkginfo"."0.2.x"
+      self.full."utile"."~0.1.7"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "http-proxy" ];
+  };
+  full."http-signature"."0.9.11" = lib.makeOverridable self.buildNodePackage {
+    name = "http-signature-0.9.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz";
+        sha1 = "9e882714572315e6790a5d0a7955efff1f19e653";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."http-signature"."0.9.11" or []);
+    deps = [
+      self.full."assert-plus"."0.1.2"
+      self.full."asn1"."0.1.11"
+      self.full."ctype"."0.5.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "http-signature" ];
+  };
+  full."http-signature"."~0.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "http-signature-0.10.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz";
+        sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."http-signature"."~0.10.0" or []);
+    deps = [
+      self.full."assert-plus"."0.1.2"
+      self.full."asn1"."0.1.11"
+      self.full."ctype"."0.5.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "http-signature" ];
+  };
+  full."http-signature"."~0.9.11" = lib.makeOverridable self.buildNodePackage {
+    name = "http-signature-0.9.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz";
+        sha1 = "9e882714572315e6790a5d0a7955efff1f19e653";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."http-signature"."~0.9.11" or []);
+    deps = [
+      self.full."assert-plus"."0.1.2"
+      self.full."asn1"."0.1.11"
+      self.full."ctype"."0.5.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "http-signature" ];
+  };
+  full."i"."0.3.x" = lib.makeOverridable self.buildNodePackage {
+    name = "i-0.3.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/i/-/i-0.3.2.tgz";
+        sha1 = "b2e2d6ef47900bd924e281231ff4c5cc798d9ea8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."i"."0.3.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "i" ];
+  };
+  full."i18next"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "i18next-1.6.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/i18next/-/i18next-1.6.8.tgz";
+        sha1 = "9c5806d50d374d09ad76e13da4c6d7357e8c555b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."i18next"."*" or []);
+    deps = [
+      self.full."cookies".">= 0.2.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "i18next" ];
+  };
+  "i18next" = self.full."i18next"."*";
+  full."iconv-lite"."0.2.7" = lib.makeOverridable self.buildNodePackage {
+    name = "iconv-lite-0.2.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.7.tgz";
+        sha1 = "45be2390d27af4b7613aac4ee4d957e3f4cbdb54";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."iconv-lite"."0.2.7" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "iconv-lite" ];
+  };
+  full."iconv-lite"."~0.2.10" = lib.makeOverridable self.buildNodePackage {
+    name = "iconv-lite-0.2.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz";
+        sha1 = "1ce60a3a57864a292d1321ff4609ca4bb965adc8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."iconv-lite"."~0.2.10" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "iconv-lite" ];
+  };
+  full."inherits"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "inherits-2.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+        sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."inherits"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "inherits" ];
+  };
+  full."inherits"."1" = lib.makeOverridable self.buildNodePackage {
+    name = "inherits-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz";
+        sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."inherits"."1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "inherits" ];
+  };
+  full."inherits"."1.x" = lib.makeOverridable self.buildNodePackage {
+    name = "inherits-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz";
+        sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."inherits"."1.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "inherits" ];
+  };
+  full."inherits"."2" = lib.makeOverridable self.buildNodePackage {
+    name = "inherits-2.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+        sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."inherits"."2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "inherits" ];
+  };
+  full."inherits"."~1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "inherits-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz";
+        sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."inherits"."~1.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "inherits" ];
+  };
+  full."inherits"."~2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "inherits-2.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+        sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."inherits"."~2.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "inherits" ];
+  };
+  full."ini"."1" = lib.makeOverridable self.buildNodePackage {
+    name = "ini-1.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz";
+        sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ini"."1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ini" ];
+  };
+  full."ini"."1.x.x" = lib.makeOverridable self.buildNodePackage {
+    name = "ini-1.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz";
+        sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ini"."1.x.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ini" ];
+  };
+  full."ini"."~1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "ini-1.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz";
+        sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ini"."~1.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ini" ];
+  };
+  full."init-package-json"."0.0.11" = lib.makeOverridable self.buildNodePackage {
+    name = "init-package-json-0.0.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.11.tgz";
+        sha1 = "71914631d091bb1f73a4bddbe6d7985e929859ce";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."init-package-json"."0.0.11" or []);
+    deps = [
+      self.full."promzard"."~0.2.0"
+      self.full."read"."~1.0.1"
+      self.full."read-package-json"."1"
+      self.full."semver"."2.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "init-package-json" ];
+  };
+  full."inquirer"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "inquirer-0.2.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.4.tgz";
+        sha1 = "55dd181ad7826153a2bc959635a3ae8013311d64";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."inquirer"."~0.2.0" or []);
+    deps = [
+      self.full."lodash"."~1.2.1"
+      self.full."async"."~0.2.8"
+      self.full."cli-color"."~0.2.2"
+      self.full."mute-stream"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "inquirer" ];
+  };
+  full."inquirer"."~0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "inquirer-0.2.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.4.tgz";
+        sha1 = "55dd181ad7826153a2bc959635a3ae8013311d64";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."inquirer"."~0.2.2" or []);
+    deps = [
+      self.full."lodash"."~1.2.1"
+      self.full."async"."~0.2.8"
+      self.full."cli-color"."~0.2.2"
+      self.full."mute-stream"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "inquirer" ];
+  };
+  full."inquirer"."~0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "inquirer-0.2.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.4.tgz";
+        sha1 = "55dd181ad7826153a2bc959635a3ae8013311d64";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."inquirer"."~0.2.4" or []);
+    deps = [
+      self.full."lodash"."~1.2.1"
+      self.full."async"."~0.2.8"
+      self.full."cli-color"."~0.2.2"
+      self.full."mute-stream"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "inquirer" ];
+  };
+  full."insight"."~0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "insight-0.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/insight/-/insight-0.1.3.tgz";
+        sha1 = "868a1135460e48dc0603f1ba2ddd7d3c772e1c97";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."insight"."~0.1.0" or []);
+    deps = [
+      self.full."chalk"."~0.2.0"
+      self.full."request"."~2.26.0"
+      self.full."configstore"."~0.1.0"
+      self.full."async"."~0.2.9"
+      self.full."lodash"."~1.3.1"
+      self.full."inquirer"."~0.2.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "insight" ];
+  };
+  full."intersect"."~0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "intersect-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/intersect/-/intersect-0.0.3.tgz";
+        sha1 = "c1a4a5e5eac6ede4af7504cc07e0ada7bc9f4920";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."intersect"."~0.0.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "intersect" ];
+  };
+  full."ironhorse"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "ironhorse-0.0.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.6.tgz";
+        sha1 = "de774f72022630a258158acdcb590e1542a09b58";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ironhorse"."*" or []);
+    deps = [
+      self.full."winston"."*"
+      self.full."nconf"."*"
+      self.full."fs-walk"."*"
+      self.full."async"."*"
+      self.full."express"."*"
+      self.full."jade"."*"
+      self.full."passport"."*"
+      self.full."passport-http"."*"
+      self.full."libyaml"."*"
+      self.full."mongoose"."*"
+      self.full."gridfs-stream"."*"
+      self.full."temp"."*"
+      self.full."kue"."*"
+      self.full."redis"."*"
+      self.full."hiredis"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ironhorse" ];
+  };
+  "ironhorse" = self.full."ironhorse"."*";
+  full."is-promise"."~1" = lib.makeOverridable self.buildNodePackage {
+    name = "is-promise-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.0.tgz";
+        sha1 = "b998d17551f16f69f7bd4828f58f018cc81e064f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."is-promise"."~1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "is-promise" ];
+  };
+  full."isbinaryfile"."~0.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "isbinaryfile-0.1.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz";
+        sha1 = "15eece35c4ab708d8924da99fb874f2b5cc0b6c4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."isbinaryfile"."~0.1.8" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "isbinaryfile" ];
+  };
+  full."jade"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "jade-0.34.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/jade/-/jade-0.34.1.tgz";
+        sha1 = "6cb1f0928adfe9be7323d0b57e507e5c3c70f650";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."jade"."*" or []);
+    deps = [
+      self.full."commander"."1.3.2"
+      self.full."mkdirp"."0.3.x"
+      self.full."transformers"."2.1.0"
+      self.full."character-parser"."1.0.2"
+      self.full."monocle"."0.1.50"
+      self.full."with"."~1.1.0"
+      self.full."constantinople"."~1.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "jade" ];
+  };
+  "jade" = self.full."jade"."*";
+  full."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage {
+    name = "jade-0.26.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
+        sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."jade"."0.26.3" or []);
+    deps = [
+      self.full."commander"."0.6.1"
+      self.full."mkdirp"."0.3.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "jade" ];
+  };
+  full."jade".">= 0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "jade-0.34.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/jade/-/jade-0.34.1.tgz";
+        sha1 = "6cb1f0928adfe9be7323d0b57e507e5c3c70f650";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."jade".">= 0.0.1" or []);
+    deps = [
+      self.full."commander"."1.3.2"
+      self.full."mkdirp"."0.3.x"
+      self.full."transformers"."2.1.0"
+      self.full."character-parser"."1.0.2"
+      self.full."monocle"."0.1.50"
+      self.full."with"."~1.1.0"
+      self.full."constantinople"."~1.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "jade" ];
+  };
+  full."jayschema"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "jayschema-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.0.tgz";
+        sha1 = "ab250dd51224ef36ac8119ce143e0525300d99d4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."jayschema"."*" or []);
+    deps = [
+      self.full."when"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "jayschema" ];
+  };
+  "jayschema" = self.full."jayschema"."*";
+  full."js-yaml"."0.3.x" = lib.makeOverridable self.buildNodePackage {
+    name = "js-yaml-0.3.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz";
+        sha1 = "d739d8ee86461e54b354d6a7d7d1f2ad9a167f62";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."js-yaml"."0.3.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "js-yaml" ];
+  };
+  full."js-yaml"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "js-yaml-2.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz";
+        sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."js-yaml"."2.1.0" or []);
+    deps = [
+      self.full."argparse"."~ 0.1.11"
+      self.full."esprima"."~ 1.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "js-yaml" ];
+  };
+  full."js-yaml"."~2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "js-yaml-2.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz";
+        sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."js-yaml"."~2.1.0" or []);
+    deps = [
+      self.full."argparse"."~ 0.1.11"
+      self.full."esprima"."~ 1.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "js-yaml" ];
+  };
+  full."jshint"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "jshint-2.1.10";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/jshint/-/jshint-2.1.10.tgz";
+        sha1 = "0c015ec5bc5ad65c11c4b5152f221f24b7af5522";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."jshint"."*" or []);
+    deps = [
+      self.full."shelljs"."0.1.x"
+      self.full."underscore"."1.4.x"
+      self.full."cli"."0.4.x"
+      self.full."minimatch"."0.x.x"
+      self.full."console-browserify"."0.1.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "jshint" ];
+  };
+  "jshint" = self.full."jshint"."*";
+  full."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "json-schema-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz";
+        sha1 = "50354f19f603917c695f70b85afa77c3b0f23506";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."json-schema"."0.2.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "json-schema" ];
+  };
+  full."json-stringify-safe"."~3.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "json-stringify-safe-3.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz";
+        sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."json-stringify-safe"."~3.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "json-stringify-safe" ];
+  };
+  full."json-stringify-safe"."~4.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "json-stringify-safe-4.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-4.0.0.tgz";
+        sha1 = "77c271aaea54302e68efeaccb56abbf06a9b1a54";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."json-stringify-safe"."~4.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "json-stringify-safe" ];
+  };
+  full."json-stringify-safe"."~5.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "json-stringify-safe-5.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
+        sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."json-stringify-safe"."~5.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "json-stringify-safe" ];
+  };
+  full."jsontool"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "jsontool-6.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/jsontool/-/jsontool-6.0.0.tgz";
+        sha1 = "dc2a535b2aa8a10b0b7359c76fa8920cdb92ce6d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."jsontool"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "jsontool" ];
+  };
+  "jsontool" = self.full."jsontool"."*";
+  full."jsprim"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "jsprim-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz";
+        sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."jsprim"."0.3.0" or []);
+    deps = [
+      self.full."extsprintf"."1.0.0"
+      self.full."json-schema"."0.2.2"
+      self.full."verror"."1.3.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "jsprim" ];
+  };
+  full."junk"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "junk-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/junk/-/junk-0.2.1.tgz";
+        sha1 = "e8a4c42c421746da34b354d0510507cb79f3c583";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."junk"."~0.2.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "junk" ];
+  };
+  full."karma"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-0.10.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma/-/karma-0.10.1.tgz";
+        sha1 = "eaa70b63dc67edb4883809c9be4e47e8b334e704";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.0.tgz";
+        sha1 = "94c805915c90a7cd8c32cb0829984865e27246fa";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz";
+        sha1 = "d9554aa0f11f2c0ff2e933ab5043a633b1305622";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-coffee-preprocessor/-/karma-coffee-preprocessor-0.1.0.tgz";
+        sha1 = "713affc9990707e43eb6f64afdaf312072b73aab";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-html2js-preprocessor/-/karma-html2js-preprocessor-0.1.0.tgz";
+        sha1 = "2f7cf881f54a5d0b72154cc6ee1241c44292c7fe";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.0.tgz";
+        sha1 = "d29f42911358a640ba4a13f1d2110819ae2e5cea";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.0.tgz";
+        sha1 = "e5517590eea029d10d500b5f82ae423aafe069d4";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-0.1.0.tgz";
+        sha1 = "9ef8243751524e32e67b97e3f8a321ee68a3fa2f";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-0.1.0.tgz";
+        sha1 = "b643e7c2faead1a52cdb2eeaadcf7a245f0d772a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."karma"."*" or [])
+      ++ (self.nativeDeps."karma-jasmine"."*" or [])
+      ++ (self.nativeDeps."karma-requirejs"."*" or [])
+      ++ (self.nativeDeps."karma-coffee-preprocessor"."*" or [])
+      ++ (self.nativeDeps."karma-html2js-preprocessor"."*" or [])
+      ++ (self.nativeDeps."karma-chrome-launcher"."*" or [])
+      ++ (self.nativeDeps."karma-firefox-launcher"."*" or [])
+      ++ (self.nativeDeps."karma-phantomjs-launcher"."*" or [])
+      ++ (self.nativeDeps."karma-script-launcher"."*" or []);
+    deps = [
+      self.full."di"."~0.0.1"
+      self.full."socket.io"."~0.9.13"
+      self.full."chokidar"."~0.6"
+      self.full."glob"."~3.1.21"
+      self.full."minimatch"."~0.2"
+      self.full."http-proxy"."~0.10"
+      self.full."optimist"."~0.3"
+      self.full."coffee-script"."~1.6"
+      self.full."rimraf"."~2.1"
+      self.full."q"."~0.9"
+      self.full."colors"."0.6.0-1"
+      self.full."lodash"."~1.1"
+      self.full."mime"."~1.2"
+      self.full."log4js"."~0.6.3"
+      self.full."useragent"."~2.0.4"
+      self.full."graceful-fs"."~1.2.1"
+      self.full."connect"."~2.8.4"
+      self.full."phantomjs"."~1.9"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "karma" "karma-jasmine" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ];
+  };
+  "karma" = self.full."karma"."*";
+  full."karma".">=0.9" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-0.10.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma/-/karma-0.10.1.tgz";
+        sha1 = "eaa70b63dc67edb4883809c9be4e47e8b334e704";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.0.tgz";
+        sha1 = "94c805915c90a7cd8c32cb0829984865e27246fa";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz";
+        sha1 = "d9554aa0f11f2c0ff2e933ab5043a633b1305622";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-coffee-preprocessor/-/karma-coffee-preprocessor-0.1.0.tgz";
+        sha1 = "713affc9990707e43eb6f64afdaf312072b73aab";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-html2js-preprocessor/-/karma-html2js-preprocessor-0.1.0.tgz";
+        sha1 = "2f7cf881f54a5d0b72154cc6ee1241c44292c7fe";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.0.tgz";
+        sha1 = "d29f42911358a640ba4a13f1d2110819ae2e5cea";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.0.tgz";
+        sha1 = "e5517590eea029d10d500b5f82ae423aafe069d4";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-0.1.0.tgz";
+        sha1 = "9ef8243751524e32e67b97e3f8a321ee68a3fa2f";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-0.1.0.tgz";
+        sha1 = "b643e7c2faead1a52cdb2eeaadcf7a245f0d772a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."karma".">=0.9" or [])
+      ++ (self.nativeDeps."karma-jasmine"."*" or [])
+      ++ (self.nativeDeps."karma-requirejs"."*" or [])
+      ++ (self.nativeDeps."karma-coffee-preprocessor"."*" or [])
+      ++ (self.nativeDeps."karma-html2js-preprocessor"."*" or [])
+      ++ (self.nativeDeps."karma-chrome-launcher"."*" or [])
+      ++ (self.nativeDeps."karma-firefox-launcher"."*" or [])
+      ++ (self.nativeDeps."karma-phantomjs-launcher"."*" or [])
+      ++ (self.nativeDeps."karma-script-launcher"."*" or []);
+    deps = [
+      self.full."di"."~0.0.1"
+      self.full."socket.io"."~0.9.13"
+      self.full."chokidar"."~0.6"
+      self.full."glob"."~3.1.21"
+      self.full."minimatch"."~0.2"
+      self.full."http-proxy"."~0.10"
+      self.full."optimist"."~0.3"
+      self.full."coffee-script"."~1.6"
+      self.full."rimraf"."~2.1"
+      self.full."q"."~0.9"
+      self.full."colors"."0.6.0-1"
+      self.full."lodash"."~1.1"
+      self.full."mime"."~1.2"
+      self.full."log4js"."~0.6.3"
+      self.full."useragent"."~2.0.4"
+      self.full."graceful-fs"."~1.2.1"
+      self.full."connect"."~2.8.4"
+      self.full."phantomjs"."~1.9"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "karma" "karma-jasmine" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ];
+  };
+  full."karma".">=0.9.3" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-0.10.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma/-/karma-0.10.1.tgz";
+        sha1 = "eaa70b63dc67edb4883809c9be4e47e8b334e704";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.0.tgz";
+        sha1 = "94c805915c90a7cd8c32cb0829984865e27246fa";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz";
+        sha1 = "d9554aa0f11f2c0ff2e933ab5043a633b1305622";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-coffee-preprocessor/-/karma-coffee-preprocessor-0.1.0.tgz";
+        sha1 = "713affc9990707e43eb6f64afdaf312072b73aab";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-html2js-preprocessor/-/karma-html2js-preprocessor-0.1.0.tgz";
+        sha1 = "2f7cf881f54a5d0b72154cc6ee1241c44292c7fe";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.0.tgz";
+        sha1 = "d29f42911358a640ba4a13f1d2110819ae2e5cea";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.0.tgz";
+        sha1 = "e5517590eea029d10d500b5f82ae423aafe069d4";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-0.1.0.tgz";
+        sha1 = "9ef8243751524e32e67b97e3f8a321ee68a3fa2f";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-0.1.0.tgz";
+        sha1 = "b643e7c2faead1a52cdb2eeaadcf7a245f0d772a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."karma".">=0.9.3" or [])
+      ++ (self.nativeDeps."karma-jasmine"."*" or [])
+      ++ (self.nativeDeps."karma-requirejs"."*" or [])
+      ++ (self.nativeDeps."karma-coffee-preprocessor"."*" or [])
+      ++ (self.nativeDeps."karma-html2js-preprocessor"."*" or [])
+      ++ (self.nativeDeps."karma-chrome-launcher"."*" or [])
+      ++ (self.nativeDeps."karma-firefox-launcher"."*" or [])
+      ++ (self.nativeDeps."karma-phantomjs-launcher"."*" or [])
+      ++ (self.nativeDeps."karma-script-launcher"."*" or []);
+    deps = [
+      self.full."di"."~0.0.1"
+      self.full."socket.io"."~0.9.13"
+      self.full."chokidar"."~0.6"
+      self.full."glob"."~3.1.21"
+      self.full."minimatch"."~0.2"
+      self.full."http-proxy"."~0.10"
+      self.full."optimist"."~0.3"
+      self.full."coffee-script"."~1.6"
+      self.full."rimraf"."~2.1"
+      self.full."q"."~0.9"
+      self.full."colors"."0.6.0-1"
+      self.full."lodash"."~1.1"
+      self.full."mime"."~1.2"
+      self.full."log4js"."~0.6.3"
+      self.full."useragent"."~2.0.4"
+      self.full."graceful-fs"."~1.2.1"
+      self.full."connect"."~2.8.4"
+      self.full."phantomjs"."~1.9"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "karma" "karma-jasmine" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ];
+  };
+  full."karma-chrome-launcher"."*" = self.full."karma".">=0.9.3";
+  full."karma-coffee-preprocessor"."*" = self.full."karma".">=0.9.3";
+  full."karma-firefox-launcher"."*" = self.full."karma".">=0.9.3";
+  full."karma-html2js-preprocessor"."*" = self.full."karma".">=0.9.3";
+  full."karma-jasmine"."*" = self.full."karma".">=0.9.3";
+  full."karma-phantomjs-launcher"."*" = self.full."karma".">=0.9.3";
+  full."karma-requirejs"."*" = self.full."karma".">=0.9.3";
+  full."karma-script-launcher"."*" = self.full."karma".">=0.9.3";
+  full."keep-alive-agent"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "keep-alive-agent-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz";
+        sha1 = "44847ca394ce8d6b521ae85816bd64509942b385";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."keep-alive-agent"."0.0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "keep-alive-agent" ];
+  };
+  full."kerberos"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "kerberos-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.3.tgz";
+        sha1 = "4285d92a0748db2784062f5adcec9f5956cb818a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."kerberos"."0.0.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "kerberos" ];
+  };
+  full."kew"."~0.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "kew-0.1.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/kew/-/kew-0.1.7.tgz";
+        sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."kew"."~0.1.7" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "kew" ];
+  };
+  full."keypress"."0.1.x" = lib.makeOverridable self.buildNodePackage {
+    name = "keypress-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
+        sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."keypress"."0.1.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "keypress" ];
+  };
+  full."knox"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "knox-0.8.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/knox/-/knox-0.8.6.tgz";
+        sha1 = "244e7c643c4c9ea2eb37e215dd02b07c8e138e3a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."knox"."*" or []);
+    deps = [
+      self.full."mime"."*"
+      self.full."xml2js"."0.2.x"
+      self.full."debug"."~0.7.0"
+      self.full."stream-counter"."~0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "knox" ];
+  };
+  "knox" = self.full."knox"."*";
+  full."kue"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "kue-0.6.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/kue/-/kue-0.6.2.tgz";
+        sha1 = "9a6a95081842cf4ee3da5c61770bc23616a943f2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."kue"."*" or []);
+    deps = [
+      self.full."redis"."0.7.2"
+      self.full."express"."~3.1.1"
+      self.full."jade"."0.26.3"
+      self.full."stylus"."0.27.2"
+      self.full."nib"."0.5.0"
+      self.full."reds"."0.1.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "kue" ];
+  };
+  "kue" = self.full."kue"."*";
+  full."lazy"."~1.0.11" = lib.makeOverridable self.buildNodePackage {
+    name = "lazy-1.0.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz";
+        sha1 = "daa068206282542c088288e975c297c1ae77b690";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lazy"."~1.0.11" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lazy" ];
+  };
+  full."libyaml"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "libyaml-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.2.tgz";
+        sha1 = "a22d5f699911b6b622d6dc323fb62320c877c9c8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."libyaml"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "libyaml" ];
+  };
+  "libyaml" = self.full."libyaml"."*";
+  full."lockfile"."~0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "lockfile-0.4.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lockfile/-/lockfile-0.4.0.tgz";
+        sha1 = "0f815a7ee7c3d603ddec6fbfa8a212b5645d54c5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lockfile"."~0.4.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lockfile" ];
+  };
+  full."lodash"."~1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz";
+        sha1 = "b751fb1c141fe8bcee6fc1bad44a30f9b9ccd95e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash"."~1.0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash" ];
+  };
+  full."lodash"."~1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash/-/lodash-1.1.1.tgz";
+        sha1 = "7b7384521f12bef886368a9450162ebec14fa394";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash"."~1.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash" ];
+  };
+  full."lodash"."~1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash/-/lodash-1.1.1.tgz";
+        sha1 = "7b7384521f12bef886368a9450162ebec14fa394";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash"."~1.1.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash" ];
+  };
+  full."lodash"."~1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash-1.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash/-/lodash-1.2.1.tgz";
+        sha1 = "fc16f434d3a5c2afd0be336262dacda6b14237b8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash"."~1.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash" ];
+  };
+  full."lodash"."~1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash-1.3.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz";
+        sha1 = "8a5f251d744f2f33d81931e04d60a5a1610b7827";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash"."~1.3.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash" ];
+  };
+  full."lodash"."~1.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash-1.3.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz";
+        sha1 = "8a5f251d744f2f33d81931e04d60a5a1610b7827";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash"."~1.3.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash" ];
+  };
+  full."log4js"."~0.6.3" = lib.makeOverridable self.buildNodePackage {
+    name = "log4js-0.6.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.7.tgz";
+        sha1 = "9a9eaa28ee056071c7a628e629dde2e57362bb6f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."log4js"."~0.6.3" or []);
+    deps = [
+      self.full."async"."0.1.15"
+      self.full."dequeue"."1.0.3"
+      self.full."semver"."~1.1.4"
+      self.full."readable-stream"."~1.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "log4js" ];
+  };
+  full."lru-cache"."2" = lib.makeOverridable self.buildNodePackage {
+    name = "lru-cache-2.3.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz";
+        sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lru-cache"."2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lru-cache" ];
+  };
+  full."lru-cache"."2.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "lru-cache-2.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz";
+        sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lru-cache"."2.2.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lru-cache" ];
+  };
+  full."lru-cache"."2.2.x" = lib.makeOverridable self.buildNodePackage {
+    name = "lru-cache-2.2.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz";
+        sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lru-cache"."2.2.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lru-cache" ];
+  };
+  full."lru-cache"."2.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "lru-cache-2.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz";
+        sha1 = "1cee12d5a9f28ed1ee37e9c332b8888e6b85412a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lru-cache"."2.3.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lru-cache" ];
+  };
+  full."lru-cache"."~1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "lru-cache-1.0.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz";
+        sha1 = "aa50f97047422ac72543bda177a9c9d018d98452";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lru-cache"."~1.0.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lru-cache" ];
+  };
+  full."lru-cache"."~2.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "lru-cache-2.3.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz";
+        sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lru-cache"."~2.3.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lru-cache" ];
+  };
+  full."mailcomposer".">= 0.1.27" = lib.makeOverridable self.buildNodePackage {
+    name = "mailcomposer-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.1.tgz";
+        sha1 = "89e1326147fb2c222feb931b40e98b6be133f14a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mailcomposer".">= 0.1.27" or []);
+    deps = [
+      self.full."mimelib"."~0.2"
+      self.full."mime"."1.2.9"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mailcomposer" ];
+  };
+  full."match-stream"."~0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "match-stream-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz";
+        sha1 = "99eb050093b34dffade421b9ac0b410a9cfa17cf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."match-stream"."~0.0.2" or []);
+    deps = [
+      self.full."buffers"."~0.1.1"
+      self.full."readable-stream"."~1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "match-stream" ];
+  };
+  full."memoizee"."0.2.x" = lib.makeOverridable self.buildNodePackage {
+    name = "memoizee-0.2.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/memoizee/-/memoizee-0.2.5.tgz";
+        sha1 = "44ad0ce73439705f3954a58dbf5f792cd496c01c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."memoizee"."0.2.x" or []);
+    deps = [
+      self.full."es5-ext"."~0.9.2"
+      self.full."event-emitter"."~0.2.2"
+      self.full."next-tick"."0.1.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "memoizee" ];
+  };
+  full."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "methods-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
+        sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."methods"."0.0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "methods" ];
+  };
+  full."mime"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "mime-1.2.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+        sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mime"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mime" ];
+  };
+  full."mime"."1.2.5" = lib.makeOverridable self.buildNodePackage {
+    name = "mime-1.2.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mime/-/mime-1.2.5.tgz";
+        sha1 = "9eed073022a8bf5e16c8566c6867b8832bfbfa13";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mime"."1.2.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mime" ];
+  };
+  full."mime"."1.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "mime-1.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
+        sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mime"."1.2.6" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mime" ];
+  };
+  full."mime"."1.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "mime-1.2.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz";
+        sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mime"."1.2.9" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mime" ];
+  };
+  full."mime"."~1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "mime-1.2.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+        sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mime"."~1.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mime" ];
+  };
+  full."mime"."~1.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "mime-1.2.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+        sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mime"."~1.2.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mime" ];
+  };
+  full."mime"."~1.2.7" = lib.makeOverridable self.buildNodePackage {
+    name = "mime-1.2.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+        sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mime"."~1.2.7" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mime" ];
+  };
+  full."mime"."~1.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "mime-1.2.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+        sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mime"."~1.2.9" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mime" ];
+  };
+  full."mimelib"."~0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "mimelib-0.2.12";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.12.tgz";
+        sha1 = "5dcbb99c7369e5d62d7e12e71fa334179aebd748";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mimelib"."~0.2" or []);
+    deps = [
+      self.full."encoding"."~0.1"
+      self.full."addressparser"."~0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mimelib" ];
+  };
+  full."minimatch"."0" = lib.makeOverridable self.buildNodePackage {
+    name = "minimatch-0.2.12";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz";
+        sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimatch"."0" or []);
+    deps = [
+      self.full."lru-cache"."2"
+      self.full."sigmund"."~1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
+  full."minimatch"."0.0.x" = lib.makeOverridable self.buildNodePackage {
+    name = "minimatch-0.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz";
+        sha1 = "96bb490bbd3ba6836bbfac111adf75301b1584de";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimatch"."0.0.x" or []);
+    deps = [
+      self.full."lru-cache"."~1.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
+  full."minimatch"."0.x.x" = lib.makeOverridable self.buildNodePackage {
+    name = "minimatch-0.2.12";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz";
+        sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimatch"."0.x.x" or []);
+    deps = [
+      self.full."lru-cache"."2"
+      self.full."sigmund"."~1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
+  full."minimatch".">=0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "minimatch-0.2.12";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz";
+        sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimatch".">=0.2.4" or []);
+    deps = [
+      self.full."lru-cache"."2"
+      self.full."sigmund"."~1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
+  full."minimatch"."~0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "minimatch-0.2.12";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz";
+        sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimatch"."~0.2" or []);
+    deps = [
+      self.full."lru-cache"."2"
+      self.full."sigmund"."~1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
+  full."minimatch"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "minimatch-0.2.12";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz";
+        sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimatch"."~0.2.0" or []);
+    deps = [
+      self.full."lru-cache"."2"
+      self.full."sigmund"."~1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
+  full."minimatch"."~0.2.11" = lib.makeOverridable self.buildNodePackage {
+    name = "minimatch-0.2.12";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz";
+        sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimatch"."~0.2.11" or []);
+    deps = [
+      self.full."lru-cache"."2"
+      self.full."sigmund"."~1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
+  full."minimatch"."~0.2.12" = lib.makeOverridable self.buildNodePackage {
+    name = "minimatch-0.2.12";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz";
+        sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimatch"."~0.2.12" or []);
+    deps = [
+      self.full."lru-cache"."2"
+      self.full."sigmund"."~1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
+  full."minimist"."~0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "minimist-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.1.tgz";
+        sha1 = "fa2439fbf7da8525c51b2a74e2815b380abc8ab6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimist"."~0.0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimist" ];
+  };
+  full."mkdirp"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-0.3.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
+  "mkdirp" = self.full."mkdirp"."*";
+  full."mkdirp"."0" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-0.3.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp"."0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
+  full."mkdirp"."0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-0.3.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp"."0.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
+  full."mkdirp"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
+        sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp"."0.3.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
+  full."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-0.3.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp"."0.3.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
+  full."mkdirp"."0.3.x" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-0.3.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp"."0.3.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
+  full."mkdirp"."0.x.x" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-0.3.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp"."0.x.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
+  full."mkdirp"."~0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-0.3.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp"."~0.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
+  full."mkdirp"."~0.3.3" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-0.3.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp"."~0.3.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
+  full."mkdirp"."~0.3.4" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-0.3.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp"."~0.3.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
+  full."mkdirp"."~0.3.5" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-0.3.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp"."~0.3.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
+  full."mocha"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "mocha-1.12.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mocha/-/mocha-1.12.0.tgz";
+        sha1 = "95fc936622ce156b8b19ff8def466ac2f3a3f29e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mocha"."*" or []);
+    deps = [
+      self.full."commander"."0.6.1"
+      self.full."growl"."1.7.x"
+      self.full."jade"."0.26.3"
+      self.full."diff"."1.0.2"
+      self.full."debug"."*"
+      self.full."mkdirp"."0.3.5"
+      self.full."ms"."0.3.0"
+      self.full."glob"."3.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mocha" ];
+  };
+  "mocha" = self.full."mocha"."*";
+  full."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "moment-2.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz";
+        sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."moment"."2.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "moment" ];
+  };
+  full."mongodb"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "mongodb-1.3.18";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.18.tgz";
+        sha1 = "9dd1ba4f6c2c04c014a9aabb8f194c1c0ee7da5d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mongodb"."*" or []);
+    deps = [
+      self.full."bson"."0.2.2"
+      self.full."kerberos"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mongodb" ];
+  };
+  "mongodb" = self.full."mongodb"."*";
+  full."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage {
+    name = "mongodb-1.2.14";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz";
+        sha1 = "269665552066437308d0942036646e6795c3a9a3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mongodb"."1.2.14" or []);
+    deps = [
+      self.full."bson"."0.1.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mongodb" ];
+  };
+  full."mongodb"."1.2.x" = lib.makeOverridable self.buildNodePackage {
+    name = "mongodb-1.2.14";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz";
+        sha1 = "269665552066437308d0942036646e6795c3a9a3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mongodb"."1.2.x" or []);
+    deps = [
+      self.full."bson"."0.1.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mongodb" ];
+  };
+  full."mongodb"."1.3.18" = lib.makeOverridable self.buildNodePackage {
+    name = "mongodb-1.3.18";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.18.tgz";
+        sha1 = "9dd1ba4f6c2c04c014a9aabb8f194c1c0ee7da5d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mongodb"."1.3.18" or []);
+    deps = [
+      self.full."bson"."0.2.2"
+      self.full."kerberos"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mongodb" ];
+  };
+  full."mongoose"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "mongoose-3.7.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.7.2.tgz";
+        sha1 = "e7550bb44ce1eaa9fc78223360d43b2722caa258";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mongoose"."*" or []);
+    deps = [
+      self.full."hooks"."0.2.1"
+      self.full."mongodb"."1.3.18"
+      self.full."ms"."0.1.0"
+      self.full."sliced"."0.0.5"
+      self.full."muri"."0.3.1"
+      self.full."mpromise"."0.3.0"
+      self.full."mpath"."0.1.1"
+      self.full."regexp-clone"."0.0.1"
+      self.full."mquery"."0.2.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mongoose" ];
+  };
+  full."mongoose"."3.6.7" = lib.makeOverridable self.buildNodePackage {
+    name = "mongoose-3.6.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz";
+        sha1 = "aa6c9f4dfb740c7721dbe734fbb97714e5ab0ebc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mongoose"."3.6.7" or []);
+    deps = [
+      self.full."hooks"."0.2.1"
+      self.full."mongodb"."1.2.14"
+      self.full."ms"."0.1.0"
+      self.full."sliced"."0.0.3"
+      self.full."muri"."0.3.1"
+      self.full."mpromise"."0.2.1"
+      self.full."mpath"."0.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mongoose" ];
+  };
+  full."mongoose"."3.6.x" = lib.makeOverridable self.buildNodePackage {
+    name = "mongoose-3.6.17";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.17.tgz";
+        sha1 = "2f53a041fe28974f3e536aabd81dd4bb31e2abd0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mongoose"."3.6.x" or []);
+    deps = [
+      self.full."hooks"."0.2.1"
+      self.full."mongodb"."1.3.18"
+      self.full."ms"."0.1.0"
+      self.full."sliced"."0.0.5"
+      self.full."muri"."0.3.1"
+      self.full."mpromise"."0.2.1"
+      self.full."mpath"."0.1.1"
+      self.full."regexp-clone"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mongoose" ];
+  };
+  "mongoose" = self.full."mongoose"."3.6.x";
+  full."mongoose-lifecycle"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "mongoose-lifecycle-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz";
+        sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mongoose-lifecycle"."1.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mongoose-lifecycle" ];
+  };
+  full."mongoose-schema-extend"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "mongoose-schema-extend-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.4.tgz";
+        sha1 = "9f61b2abba5352fcd3d7b1193ee4b4d9f2a83804";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mongoose-schema-extend"."*" or []);
+    deps = [
+      self.full."owl-deepcopy"."~0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mongoose-schema-extend" ];
+  };
+  "mongoose-schema-extend" = self.full."mongoose-schema-extend"."*";
+  full."monocle"."0.1.50" = lib.makeOverridable self.buildNodePackage {
+    name = "monocle-0.1.50";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/monocle/-/monocle-0.1.50.tgz";
+        sha1 = "9a7cbd0ccc10de95fd78a04b9beb2482ae4940b7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."monocle"."0.1.50" or []);
+    deps = [
+      self.full."readdirp"."~0.2.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "monocle" ];
+  };
+  full."mout"."~0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "mout-0.6.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mout/-/mout-0.6.0.tgz";
+        sha1 = "ce7abad8130d796b09d7fb509bcc73b09be024a6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mout"."~0.6.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mout" ];
+  };
+  full."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "mpath-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz";
+        sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mpath"."0.1.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mpath" ];
+  };
+  full."mpromise"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "mpromise-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz";
+        sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mpromise"."0.2.1" or []);
+    deps = [
+      self.full."sliced"."0.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mpromise" ];
+  };
+  full."mpromise"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "mpromise-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mpromise/-/mpromise-0.3.0.tgz";
+        sha1 = "cb864c2f642eb2192765087e3692e1dc152afe4b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mpromise"."0.3.0" or []);
+    deps = [
+      self.full."sliced"."0.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mpromise" ];
+  };
+  full."mquery"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "mquery-0.2.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mquery/-/mquery-0.2.4.tgz";
+        sha1 = "5d6e7f7f5129aa334e7e754d3f6a93cf304b7778";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mquery"."0.2.4" or []);
+    deps = [
+      self.full."sliced"."0.0.5"
+      self.full."debug"."0.7.0"
+      self.full."regexp-clone"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mquery" ];
+  };
+  full."ms"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "ms-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ms/-/ms-0.1.0.tgz";
+        sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ms"."0.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ms" ];
+  };
+  full."ms"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "ms-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ms/-/ms-0.3.0.tgz";
+        sha1 = "03edc348d613e66a56486cfdac53bcbe899cbd61";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ms"."0.3.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ms" ];
+  };
+  full."msgpack".">= 0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "msgpack-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.0.tgz";
+        sha1 = "d022af5c7db98eff5c01dd48942bc5354e167817";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."msgpack".">= 0.0.1" or []);
+    deps = [
+      self.full."nodeunit"."https://github.com/godsflaw/nodeunit/tarball/master"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "msgpack" ];
+  };
+  full."muri"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "muri-0.3.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/muri/-/muri-0.3.1.tgz";
+        sha1 = "861889c5c857f1a43700bee85d50731f61727c9a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."muri"."0.3.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "muri" ];
+  };
+  full."mute-stream"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "mute-stream-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.3.tgz";
+        sha1 = "f09c090d333b3063f615cbbcca71b349893f0152";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mute-stream"."0.0.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mute-stream" ];
+  };
+  full."mute-stream"."~0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "mute-stream-0.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz";
+        sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mute-stream"."~0.0.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mute-stream" ];
+  };
+  full."mv"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "mv-0.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mv/-/mv-0.0.5.tgz";
+        sha1 = "15eac759479884df1131d6de56bce20b654f5391";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mv"."0.0.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mv" ];
+  };
+  full."natural"."0.0.69" = lib.makeOverridable self.buildNodePackage {
+    name = "natural-0.0.69";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/natural/-/natural-0.0.69.tgz";
+        sha1 = "60d9ce23797a54ec211600eb721cc66779b954d3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."natural"."0.0.69" or []);
+    deps = [
+      self.full."sylvester".">= 0.0.12"
+      self.full."apparatus".">= 0.0.4"
+      self.full."underscore"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "natural" ];
+  };
+  full."nconf"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "nconf-0.6.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nconf/-/nconf-0.6.7.tgz";
+        sha1 = "f2ffce75f4573857429c719d9f6ed0a9a231a47c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nconf"."*" or []);
+    deps = [
+      self.full."async"."0.1.x"
+      self.full."ini"."1.x.x"
+      self.full."optimist"."0.3.x"
+      self.full."pkginfo"."0.2.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nconf" ];
+  };
+  "nconf" = self.full."nconf"."*";
+  full."nconf"."0.6.7" = lib.makeOverridable self.buildNodePackage {
+    name = "nconf-0.6.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nconf/-/nconf-0.6.7.tgz";
+        sha1 = "f2ffce75f4573857429c719d9f6ed0a9a231a47c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nconf"."0.6.7" or []);
+    deps = [
+      self.full."async"."0.1.x"
+      self.full."ini"."1.x.x"
+      self.full."optimist"."0.3.x"
+      self.full."pkginfo"."0.2.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nconf" ];
+  };
+  full."ncp"."0.2.x" = lib.makeOverridable self.buildNodePackage {
+    name = "ncp-0.2.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz";
+        sha1 = "46fac2b7dda2560a4cb7e628677bd5f64eac5be1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ncp"."0.2.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ncp" ];
+  };
+  full."ncp"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "ncp-0.4.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
+        sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ncp"."0.4.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ncp" ];
+  };
+  full."negotiator"."0.2.5" = lib.makeOverridable self.buildNodePackage {
+    name = "negotiator-0.2.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/negotiator/-/negotiator-0.2.5.tgz";
+        sha1 = "12ec7b4a9f3b4c894c31d8c4ec015925ba547eec";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."negotiator"."0.2.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "negotiator" ];
+  };
+  full."net-ping"."1.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "net-ping-1.1.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz";
+        sha1 = "49f5bca55a30a3726d69253557f231135a637075";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."net-ping"."1.1.7" or []);
+    deps = [
+      self.full."raw-socket"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "net-ping" ];
+  };
+  full."next-tick"."0.1.x" = lib.makeOverridable self.buildNodePackage {
+    name = "next-tick-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/next-tick/-/next-tick-0.1.0.tgz";
+        sha1 = "1912cce8eb9b697d640fbba94f8f00dec3b94259";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."next-tick"."0.1.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "next-tick" ];
+  };
+  full."nib"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "nib-0.5.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nib/-/nib-0.5.0.tgz";
+        sha1 = "ad0a7dfa2bca8680c8cb8adaa6ab68c80e5221e5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nib"."0.5.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nib" ];
+  };
+  full."nijs"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "nijs-0.0.10";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nijs/-/nijs-0.0.10.tgz";
+        sha1 = "79d09c5c9a2f1f3e96708c9dc6b4547b89cf8177";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nijs"."*" or []);
+    deps = [
+      self.full."optparse".">= 1.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nijs" ];
+  };
+  "nijs" = self.full."nijs"."*";
+  full."node-expat"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "node-expat-2.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/node-expat/-/node-expat-2.0.0.tgz";
+        sha1 = "a10271b3463484fa4b59895df61693a1de4ac735";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."node-expat"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "node-expat" ];
+  };
+  "node-expat" = self.full."node-expat"."*";
+  full."node-gyp"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "node-gyp-0.10.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz";
+        sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."node-gyp"."*" or []);
+    deps = [
+      self.full."glob"."3"
+      self.full."graceful-fs"."2"
+      self.full."fstream"."0"
+      self.full."minimatch"."0"
+      self.full."mkdirp"."0"
+      self.full."nopt"."2"
+      self.full."npmlog"."0"
+      self.full."osenv"."0"
+      self.full."request"."2"
+      self.full."rimraf"."2"
+      self.full."semver"."~2.1"
+      self.full."tar"."0"
+      self.full."which"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "node-gyp" ];
+  };
+  "node-gyp" = self.full."node-gyp"."*";
+  full."node-gyp"."~0.10.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-gyp-0.10.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz";
+        sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."node-gyp"."~0.10.9" or []);
+    deps = [
+      self.full."glob"."3"
+      self.full."graceful-fs"."2"
+      self.full."fstream"."0"
+      self.full."minimatch"."0"
+      self.full."mkdirp"."0"
+      self.full."nopt"."2"
+      self.full."npmlog"."0"
+      self.full."osenv"."0"
+      self.full."request"."2"
+      self.full."rimraf"."2"
+      self.full."semver"."~2.1"
+      self.full."tar"."0"
+      self.full."which"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "node-gyp" ];
+  };
+  full."node-syslog"."1.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-syslog-1.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.3.tgz";
+        sha1 = "dce11e3091d39889a2af166501e67e0098a0bb64";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."node-syslog"."1.1.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "node-syslog" ];
+  };
+  full."node-uptime"."https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-uptime-3.2.0";
+    src = [
+      (fetchurl {
+        url = "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7";
+        sha256 = "46424d7f9553ce7313cc09995ab11d237dd02257c29f260cfb38d2799e7c7746";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."node-uptime"."https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" or []);
+    deps = [
+      self.full."mongoose"."3.6.7"
+      self.full."mongoose-lifecycle"."1.0.0"
+      self.full."express"."3.2.0"
+      self.full."express-partials"."0.0.6"
+      self.full."connect-flash"."0.1.0"
+      self.full."ejs"."0.8.3"
+      self.full."config"."0.4.15"
+      self.full."async"."0.1.22"
+      self.full."socket.io"."0.9.14"
+      self.full."semver"."1.1.0"
+      self.full."moment"."2.1.0"
+      self.full."nodemailer"."0.3.35"
+      self.full."net-ping"."1.1.7"
+      self.full."js-yaml"."2.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "node-uptime" ];
+  };
+  "node-uptime" = self.full."node-uptime"."https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7";
+  full."node-uuid"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "node-uuid-1.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz";
+        sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."node-uuid"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "node-uuid" ];
+  };
+  "node-uuid" = self.full."node-uuid"."*";
+  full."node-uuid"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-uuid-1.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.2.0.tgz";
+        sha1 = "81a9fe32934719852499b58b2523d2cd5fdfd65b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."node-uuid"."1.2.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "node-uuid" ];
+  };
+  full."node-uuid"."1.3.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-uuid-1.3.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz";
+        sha1 = "d3db4d7b56810d9e4032342766282af07391729b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."node-uuid"."1.3.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "node-uuid" ];
+  };
+  full."node-uuid"."1.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-uuid-1.4.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz";
+        sha1 = "07f9b2337572ff6275c775e1d48513f3a45d7a65";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."node-uuid"."1.4.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "node-uuid" ];
+  };
+  full."node-uuid"."~1.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-uuid-1.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz";
+        sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."node-uuid"."~1.4.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "node-uuid" ];
+  };
+  full."nodemailer"."0.3.35" = lib.makeOverridable self.buildNodePackage {
+    name = "nodemailer-0.3.35";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz";
+        sha1 = "4d38cdc0ad230bdf88cc27d1256ef49fcb422e19";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nodemailer"."0.3.35" or []);
+    deps = [
+      self.full."mailcomposer".">= 0.1.27"
+      self.full."simplesmtp".">= 0.1.22"
+      self.full."optimist"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nodemailer" ];
+  };
+  full."nodemon"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "nodemon-0.7.10";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nodemon/-/nodemon-0.7.10.tgz";
+        sha1 = "695a01b9458b115b03bbe01696d361bd50b4fb9b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nodemon"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nodemon" ];
+  };
+  "nodemon" = self.full."nodemon"."*";
+  full."nodeunit"."https://github.com/godsflaw/nodeunit/tarball/master" = lib.makeOverridable self.buildNodePackage {
+    name = "nodeunit-0.7.4";
+    src = [
+      (fetchurl {
+        url = "https://github.com/godsflaw/nodeunit/tarball/master";
+        sha256 = "c79333b5b54ca3b9eb42e42d6ea48d261aa9e015c0ad9cf340abacb528d0ee3a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nodeunit"."https://github.com/godsflaw/nodeunit/tarball/master" or []);
+    deps = [
+      self.full."tap".">=0.2.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nodeunit" ];
+  };
+  full."nopt"."2" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-2.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
+        sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nopt"."2" or []);
+    deps = [
+      self.full."abbrev"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nopt" ];
+  };
+  full."nopt"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-2.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz";
+        sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nopt"."2.0.0" or []);
+    deps = [
+      self.full."abbrev"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nopt" ];
+  };
+  full."nopt"."~1.0.10" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-1.0.10";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
+        sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nopt"."~1.0.10" or []);
+    deps = [
+      self.full."abbrev"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nopt" ];
+  };
+  full."nopt"."~2" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-2.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
+        sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nopt"."~2" or []);
+    deps = [
+      self.full."abbrev"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nopt" ];
+  };
+  full."nopt"."~2.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-2.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
+        sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nopt"."~2.1.1" or []);
+    deps = [
+      self.full."abbrev"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nopt" ];
+  };
+  full."nopt"."~2.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-2.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
+        sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nopt"."~2.1.2" or []);
+    deps = [
+      self.full."abbrev"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nopt" ];
+  };
+  full."normalize-package-data"."~0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "normalize-package-data-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.1.tgz";
+        sha1 = "6c13a4b7ab1bca0323265418d354666da2e5ad43";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."normalize-package-data"."~0.2" or []);
+    deps = [
+      self.full."semver"."2"
+      self.full."github-url-from-git"."~1.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "normalize-package-data" ];
+  };
+  full."npm"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-1.3.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npm/-/npm-1.3.8.tgz";
+        sha1 = "fe271a4ca2b7077d6e45c1ce2a29e905327dc4d8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npm"."*" or []);
+    deps = [
+      self.full."semver"."~2.1.0"
+      self.full."ini"."~1.1.0"
+      self.full."slide"."~1.1.4"
+      self.full."abbrev"."~1.0.4"
+      self.full."graceful-fs"."~2.0.0"
+      self.full."minimatch"."~0.2.12"
+      self.full."nopt"."~2.1.2"
+      self.full."rimraf"."~2.2.0"
+      self.full."request"."~2.25.0"
+      self.full."which"."1"
+      self.full."tar"."~0.1.18"
+      self.full."fstream"."~0.1.23"
+      self.full."block-stream"."0.0.7"
+      self.full."mkdirp"."~0.3.3"
+      self.full."read"."~1.0.4"
+      self.full."lru-cache"."~2.3.0"
+      self.full."node-gyp"."~0.10.9"
+      self.full."fstream-npm"."~0.1.3"
+      self.full."uid-number"."0"
+      self.full."archy"."0"
+      self.full."chownr"."0"
+      self.full."npmlog"."0.0.4"
+      self.full."ansi"."~0.1.2"
+      self.full."npm-registry-client"."~0.2.28"
+      self.full."read-package-json"."~1.1.0"
+      self.full."read-installed"."~0.2.2"
+      self.full."glob"."~3.2.6"
+      self.full."init-package-json"."0.0.11"
+      self.full."osenv"."0"
+      self.full."lockfile"."~0.4.0"
+      self.full."retry"."~0.6.0"
+      self.full."once"."~1.1.1"
+      self.full."npmconf"."~0.1.2"
+      self.full."opener"."~1.3.0"
+      self.full."chmodr"."~0.1.0"
+      self.full."cmd-shim"."~1.0.1"
+      self.full."sha"."~1.2.1"
+      self.full."editor"."0.0.4"
+      self.full."child-process-close"."~0.1.1"
+      self.full."npm-user-validate"."0.0.3"
+      self.full."github-url-from-git"."1.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npm" ];
+  };
+  "npm" = self.full."npm"."*";
+  full."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-registry-client-0.2.27";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz";
+        sha1 = "8f338189d32769267886a07ad7b7fd2267446adf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npm-registry-client"."0.2.27" or []);
+    deps = [
+      self.full."request"."2 >=2.20.0"
+      self.full."graceful-fs"."~2.0.0"
+      self.full."semver"."~2.0.5"
+      self.full."slide"."~1.1.3"
+      self.full."chownr"."0"
+      self.full."mkdirp"."~0.3.3"
+      self.full."rimraf"."~2"
+      self.full."retry"."0.6.0"
+      self.full."couch-login"."~0.1.15"
+      self.full."npmlog"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npm-registry-client" ];
+  };
+  full."npm-registry-client"."~0.2.28" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-registry-client-0.2.28";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.28.tgz";
+        sha1 = "959141fc0180d7b1ad089e87015a8a2142a8bffc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npm-registry-client"."~0.2.28" or []);
+    deps = [
+      self.full."request"."2 >=2.25.0"
+      self.full."graceful-fs"."~2.0.0"
+      self.full."semver"."~2.1.0"
+      self.full."slide"."~1.1.3"
+      self.full."chownr"."0"
+      self.full."mkdirp"."~0.3.3"
+      self.full."rimraf"."~2"
+      self.full."retry"."0.6.0"
+      self.full."couch-login"."~0.1.18"
+      self.full."npmlog"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npm-registry-client" ];
+  };
+  full."npm-user-validate"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-user-validate-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz";
+        sha1 = "818eca4312d13da648f9bc1d7f80bb4f151e0c2e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npm-user-validate"."0.0.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npm-user-validate" ];
+  };
+  full."npm2nix"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "npm2nix-5.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.1.0.tgz";
+        sha1 = "a6b21174d57fdc31cf67849ffc72083bcae0e2ed";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npm2nix"."*" or []);
+    deps = [
+      self.full."semver".">=2.0.10 <3.0.0"
+      self.full."argparse"."0.1.15"
+      self.full."npm-registry-client"."0.2.27"
+      self.full."npmconf"."0.1.1"
+      self.full."tar"."0.1.17"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npm2nix" ];
+  };
+  "npm2nix" = self.full."npm2nix"."*";
+  full."npmconf"."0.0.24" = lib.makeOverridable self.buildNodePackage {
+    name = "npmconf-0.0.24";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz";
+        sha1 = "b78875b088ccc3c0afa3eceb3ce3244b1b52390c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npmconf"."0.0.24" or []);
+    deps = [
+      self.full."config-chain"."~1.1.1"
+      self.full."inherits"."~1.0.0"
+      self.full."once"."~1.1.1"
+      self.full."mkdirp"."~0.3.3"
+      self.full."osenv"."0.0.3"
+      self.full."nopt"."2"
+      self.full."semver"."~1.1.0"
+      self.full."ini"."~1.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npmconf" ];
+  };
+  full."npmconf"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "npmconf-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz";
+        sha1 = "7a254182591ca22d77b2faecc0d17e0f9bdf25a1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npmconf"."0.1.1" or []);
+    deps = [
+      self.full."config-chain"."~1.1.1"
+      self.full."inherits"."~1.0.0"
+      self.full."once"."~1.1.1"
+      self.full."mkdirp"."~0.3.3"
+      self.full."osenv"."0.0.3"
+      self.full."nopt"."2"
+      self.full."semver"."2"
+      self.full."ini"."~1.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npmconf" ];
+  };
+  full."npmconf"."~0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "npmconf-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.2.tgz";
+        sha1 = "99af8122f0067802436a5b71dbf8c3539697e62c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npmconf"."~0.1.2" or []);
+    deps = [
+      self.full."config-chain"."~1.1.1"
+      self.full."inherits"."~2.0.0"
+      self.full."once"."~1.1.1"
+      self.full."mkdirp"."~0.3.3"
+      self.full."osenv"."0.0.3"
+      self.full."nopt"."2"
+      self.full."semver"."2"
+      self.full."ini"."~1.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npmconf" ];
+  };
+  full."npmlog"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "npmlog-0.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.4.tgz";
+        sha1 = "a12a7418606b7e0183a2851d97a8729b9a0f3837";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npmlog"."*" or []);
+    deps = [
+      self.full."ansi"."~0.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npmlog" ];
+  };
+  full."npmlog"."0" = lib.makeOverridable self.buildNodePackage {
+    name = "npmlog-0.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.4.tgz";
+        sha1 = "a12a7418606b7e0183a2851d97a8729b9a0f3837";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npmlog"."0" or []);
+    deps = [
+      self.full."ansi"."~0.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npmlog" ];
+  };
+  full."npmlog"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "npmlog-0.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.4.tgz";
+        sha1 = "a12a7418606b7e0183a2851d97a8729b9a0f3837";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npmlog"."0.0.4" or []);
+    deps = [
+      self.full."ansi"."~0.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npmlog" ];
+  };
+  full."nssocket"."~0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "nssocket-0.5.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.1.tgz";
+        sha1 = "11f0428335ad8d89ff9cf96ab2852a23b1b33b71";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nssocket"."~0.5.1" or []);
+    deps = [
+      self.full."eventemitter2"."~0.4.11"
+      self.full."lazy"."~1.0.11"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nssocket" ];
+  };
+  full."oauth-sign"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "oauth-sign-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz";
+        sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."oauth-sign"."~0.2.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "oauth-sign" ];
+  };
+  full."oauth-sign"."~0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "oauth-sign-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
+        sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."oauth-sign"."~0.3.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "oauth-sign" ];
+  };
+  full."object-additions".">= 0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "object-additions-0.5.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/object-additions/-/object-additions-0.5.1.tgz";
+        sha1 = "ac624e0995e696c94cc69b41f316462b16a3bda4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."object-additions".">= 0.5.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "object-additions" ];
+  };
+  full."once"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "once-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz";
+        sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."once"."1.1.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "once" ];
+  };
+  full."once"."~1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "once-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz";
+        sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."once"."~1.1.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "once" ];
+  };
+  full."open"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "open-0.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/open/-/open-0.0.4.tgz";
+        sha1 = "5de46a0858b9f49f9f211aa8f26628550657f262";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."open"."0.0.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "open" ];
+  };
+  full."open"."~0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "open-0.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/open/-/open-0.0.4.tgz";
+        sha1 = "5de46a0858b9f49f9f211aa8f26628550657f262";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."open"."~0.0.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "open" ];
+  };
+  full."opener"."~1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "opener-1.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/opener/-/opener-1.3.0.tgz";
+        sha1 = "130ba662213fa842edb4cd0361d31a15301a43e2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."opener"."~1.3.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "opener" ];
+  };
+  full."optimist"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "optimist-0.6.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
+        sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optimist"."*" or []);
+    deps = [
+      self.full."wordwrap"."~0.0.2"
+      self.full."minimist"."~0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "optimist" ];
+  };
+  "optimist" = self.full."optimist"."*";
+  full."optimist"."0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "optimist-0.2.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz";
+        sha1 = "e981ab7e268b457948593b55674c099a815cac31";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optimist"."0.2" or []);
+    deps = [
+      self.full."wordwrap".">=0.0.1 <0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "optimist" ];
+  };
+  full."optimist"."0.3.5" = lib.makeOverridable self.buildNodePackage {
+    name = "optimist-0.3.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optimist/-/optimist-0.3.5.tgz";
+        sha1 = "03654b52417030312d109f39b159825b60309304";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optimist"."0.3.5" or []);
+    deps = [
+      self.full."wordwrap"."~0.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "optimist" ];
+  };
+  full."optimist"."0.3.x" = lib.makeOverridable self.buildNodePackage {
+    name = "optimist-0.3.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
+        sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optimist"."0.3.x" or []);
+    deps = [
+      self.full."wordwrap"."~0.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "optimist" ];
+  };
+  full."optimist"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "optimist-0.4.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optimist/-/optimist-0.4.0.tgz";
+        sha1 = "cb8ec37f2fe3aa9864cb67a275250e7e19620a25";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optimist"."0.4.0" or []);
+    deps = [
+      self.full."wordwrap"."~0.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "optimist" ];
+  };
+  full."optimist"."~0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "optimist-0.3.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
+        sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optimist"."~0.3" or []);
+    deps = [
+      self.full."wordwrap"."~0.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "optimist" ];
+  };
+  full."optimist"."~0.3.5" = lib.makeOverridable self.buildNodePackage {
+    name = "optimist-0.3.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
+        sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optimist"."~0.3.5" or []);
+    deps = [
+      self.full."wordwrap"."~0.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "optimist" ];
+  };
+  full."optimist"."~0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "optimist-0.6.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
+        sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optimist"."~0.6.0" or []);
+    deps = [
+      self.full."wordwrap"."~0.0.2"
+      self.full."minimist"."~0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "optimist" ];
+  };
+  full."options".">=0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "options-0.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/options/-/options-0.0.5.tgz";
+        sha1 = "9a3806378f316536d79038038ba90ccb724816c3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."options".">=0.0.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "options" ];
+  };
+  full."optparse"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "optparse-1.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optparse/-/optparse-1.0.4.tgz";
+        sha1 = "c062579d2d05d243c221a304a71e0c979623ccf1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optparse"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "optparse" ];
+  };
+  "optparse" = self.full."optparse"."*";
+  full."optparse".">= 1.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "optparse-1.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optparse/-/optparse-1.0.4.tgz";
+        sha1 = "c062579d2d05d243c221a304a71e0c979623ccf1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optparse".">= 1.0.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "optparse" ];
+  };
+  full."osenv"."0" = lib.makeOverridable self.buildNodePackage {
+    name = "osenv-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz";
+        sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."osenv"."0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "osenv" ];
+  };
+  full."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "osenv-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz";
+        sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."osenv"."0.0.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "osenv" ];
+  };
+  full."over"."~0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "over-0.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/over/-/over-0.0.5.tgz";
+        sha1 = "f29852e70fd7e25f360e013a8ec44c82aedb5708";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."over"."~0.0.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "over" ];
+  };
+  full."owl-deepcopy"."~0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "owl-deepcopy-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.2.tgz";
+        sha1 = "056c40e1af73dff6e2c7afae983d2a7760fdff88";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."owl-deepcopy"."~0.0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "owl-deepcopy" ];
+  };
+  full."passport"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "passport-0.1.17";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz";
+        sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."passport"."*" or []);
+    deps = [
+      self.full."pkginfo"."0.2.x"
+      self.full."pause"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "passport" ];
+  };
+  "passport" = self.full."passport"."*";
+  full."passport"."~0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "passport-0.1.17";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz";
+        sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."passport"."~0.1.1" or []);
+    deps = [
+      self.full."pkginfo"."0.2.x"
+      self.full."pause"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "passport" ];
+  };
+  full."passport"."~0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "passport-0.1.17";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz";
+        sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."passport"."~0.1.3" or []);
+    deps = [
+      self.full."pkginfo"."0.2.x"
+      self.full."pause"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "passport" ];
+  };
+  full."passport-http"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "passport-http-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/passport-http/-/passport-http-0.2.2.tgz";
+        sha1 = "2501314c0ff4a831e8a51ccfdb1b68f5c7cbc9f6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."passport-http"."*" or []);
+    deps = [
+      self.full."pkginfo"."0.2.x"
+      self.full."passport"."~0.1.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "passport-http" ];
+  };
+  "passport-http" = self.full."passport-http"."*";
+  full."passport-local"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "passport-local-0.1.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/passport-local/-/passport-local-0.1.6.tgz";
+        sha1 = "fb0cf828048db931b67d19985c7aa06dd377a9db";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."passport-local"."*" or []);
+    deps = [
+      self.full."pkginfo"."0.2.x"
+      self.full."passport"."~0.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "passport-local" ];
+  };
+  "passport-local" = self.full."passport-local"."*";
+  full."pause"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "pause-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
+        sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."pause"."0.0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "pause" ];
+  };
+  full."phantomjs"."~1.9" = lib.makeOverridable self.buildNodePackage {
+    name = "phantomjs-1.9.1-8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.1-8.tgz";
+        sha1 = "1fb7a800b403474974a696afebfbaa20b616e040";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."phantomjs"."~1.9" or []);
+    deps = [
+      self.full."adm-zip"."0.2.1"
+      self.full."kew"."~0.1.7"
+      self.full."ncp"."0.4.2"
+      self.full."npmconf"."0.0.24"
+      self.full."mkdirp"."0.3.5"
+      self.full."rimraf"."~2.0.2"
+      self.full."which"."~1.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "phantomjs" ];
+  };
+  full."pkginfo"."0.2.x" = lib.makeOverridable self.buildNodePackage {
+    name = "pkginfo-0.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz";
+        sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."pkginfo"."0.2.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "pkginfo" ];
+  };
+  full."pkginfo"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "pkginfo-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
+        sha1 = "726411401039fe9b009eea86614295d5f3a54276";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."pkginfo"."0.3.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "pkginfo" ];
+  };
+  full."pkginfo"."0.3.x" = lib.makeOverridable self.buildNodePackage {
+    name = "pkginfo-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
+        sha1 = "726411401039fe9b009eea86614295d5f3a54276";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."pkginfo"."0.3.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "pkginfo" ];
+  };
+  full."pkginfo"."0.x.x" = lib.makeOverridable self.buildNodePackage {
+    name = "pkginfo-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
+        sha1 = "726411401039fe9b009eea86614295d5f3a54276";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."pkginfo"."0.x.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "pkginfo" ];
+  };
+  full."policyfile"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "policyfile-0.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz";
+        sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."policyfile"."0.0.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "policyfile" ];
+  };
+  full."posix-getopt"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "posix-getopt-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.0.0.tgz";
+        sha1 = "42a90eca6119014c78bc4b9b70463d294db1aa87";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."posix-getopt"."1.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "posix-getopt" ];
+  };
+  full."promise"."~2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "promise-2.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz";
+        sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."promise"."~2.0" or []);
+    deps = [
+      self.full."is-promise"."~1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "promise" ];
+  };
+  full."prompt"."0.2.11" = lib.makeOverridable self.buildNodePackage {
+    name = "prompt-0.2.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/prompt/-/prompt-0.2.11.tgz";
+        sha1 = "26d455af4b7fac15291dfcdddf2400328c1fa446";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."prompt"."0.2.11" or []);
+    deps = [
+      self.full."pkginfo"."0.x.x"
+      self.full."read"."1.0.x"
+      self.full."revalidator"."0.1.x"
+      self.full."utile"."0.2.x"
+      self.full."winston"."0.6.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "prompt" ];
+  };
+  full."prompt"."0.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "prompt-0.2.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/prompt/-/prompt-0.2.9.tgz";
+        sha1 = "fdd01e3f9654d0c44fbb8671f8d3f6ca009e3c16";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."prompt"."0.2.9" or []);
+    deps = [
+      self.full."pkginfo"."0.x.x"
+      self.full."read"."1.0.x"
+      self.full."revalidator"."0.1.x"
+      self.full."utile"."0.1.x"
+      self.full."winston"."0.6.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "prompt" ];
+  };
+  full."promptly"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "promptly-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/promptly/-/promptly-0.2.0.tgz";
+        sha1 = "73ef200fa8329d5d3a8df41798950b8646ca46d9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."promptly"."~0.2.0" or []);
+    deps = [
+      self.full."read"."~1.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "promptly" ];
+  };
+  full."promzard"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "promzard-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/promzard/-/promzard-0.2.0.tgz";
+        sha1 = "766f33807faadeeecacf8057024fe5f753cfa3c1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."promzard"."~0.2.0" or []);
+    deps = [
+      self.full."read"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "promzard" ];
+  };
+  full."proto-list"."~1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "proto-list-1.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.2.tgz";
+        sha1 = "48b88798261ec2c4a785720cdfec6200d57d3326";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."proto-list"."~1.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "proto-list" ];
+  };
+  full."ps-tree"."0.0.x" = lib.makeOverridable self.buildNodePackage {
+    name = "ps-tree-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz";
+        sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ps-tree"."0.0.x" or []);
+    deps = [
+      self.full."event-stream"."~0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ps-tree" ];
+  };
+  full."pullstream"."~0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "pullstream-0.4.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/pullstream/-/pullstream-0.4.0.tgz";
+        sha1 = "919f15ef376433b331351f116565dc17c6fcda77";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."pullstream"."~0.4.0" or []);
+    deps = [
+      self.full."over"."~0.0.5"
+      self.full."readable-stream"."~1.0.0"
+      self.full."setimmediate"."~1.0.1"
+      self.full."slice-stream"."0.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "pullstream" ];
+  };
+  full."q".">= 0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "q-0.9.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/q/-/q-0.9.6.tgz";
+        sha1 = "5884b2154bdb3b6d5765e0fafddcb1506e133619";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."q".">= 0.0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "q" ];
+  };
+  full."q"."~0.9" = lib.makeOverridable self.buildNodePackage {
+    name = "q-0.9.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/q/-/q-0.9.6.tgz";
+        sha1 = "5884b2154bdb3b6d5765e0fafddcb1506e133619";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."q"."~0.9" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "q" ];
+  };
+  full."q"."~0.9.2" = lib.makeOverridable self.buildNodePackage {
+    name = "q-0.9.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/q/-/q-0.9.6.tgz";
+        sha1 = "5884b2154bdb3b6d5765e0fafddcb1506e133619";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."q"."~0.9.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "q" ];
+  };
+  full."qs"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "qs-0.5.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/qs/-/qs-0.5.1.tgz";
+        sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."qs"."0.5.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "qs" ];
+  };
+  full."qs"."0.5.5" = lib.makeOverridable self.buildNodePackage {
+    name = "qs-0.5.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/qs/-/qs-0.5.5.tgz";
+        sha1 = "b07f0d7ffe3efc6fc2fcde6c66a20775641423f3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."qs"."0.5.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "qs" ];
+  };
+  full."qs"."0.6.5" = lib.makeOverridable self.buildNodePackage {
+    name = "qs-0.6.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz";
+        sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."qs"."0.6.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "qs" ];
+  };
+  full."qs"."~0.5.4" = lib.makeOverridable self.buildNodePackage {
+    name = "qs-0.5.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz";
+        sha1 = "31b1ad058567651c526921506b9a8793911a0384";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."qs"."~0.5.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "qs" ];
+  };
+  full."qs"."~0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "qs-0.6.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz";
+        sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."qs"."~0.6.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "qs" ];
+  };
+  full."rai"."~0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "rai-0.1.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rai/-/rai-0.1.7.tgz";
+        sha1 = "1b50f1dcb4a493a67ef7a0a8c72167d789df52a0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rai"."~0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "rai" ];
+  };
+  full."range-parser"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "range-parser-0.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
+        sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."range-parser"."0.0.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "range-parser" ];
+  };
+  full."raw-socket"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "raw-socket-1.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/raw-socket/-/raw-socket-1.2.1.tgz";
+        sha1 = "3ca811bd4bf173b7b4e2304d5e680fd458da3963";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."raw-socket"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "raw-socket" ];
+  };
+  full."rbytes"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "rbytes-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rbytes/-/rbytes-1.0.0.tgz";
+        sha1 = "4eeb85c457f710d8147329d5eed5cd02c798fa4d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rbytes"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "rbytes" ];
+  };
+  "rbytes" = self.full."rbytes"."*";
+  full."read"."1" = lib.makeOverridable self.buildNodePackage {
+    name = "read-1.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz";
+        sha1 = "007a3d169478aa710a491727e453effb92e76203";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."read"."1" or []);
+    deps = [
+      self.full."mute-stream"."~0.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "read" ];
+  };
+  full."read"."1.0.x" = lib.makeOverridable self.buildNodePackage {
+    name = "read-1.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz";
+        sha1 = "007a3d169478aa710a491727e453effb92e76203";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."read"."1.0.x" or []);
+    deps = [
+      self.full."mute-stream"."~0.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "read" ];
+  };
+  full."read"."~1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "read-1.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz";
+        sha1 = "007a3d169478aa710a491727e453effb92e76203";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."read"."~1.0.1" or []);
+    deps = [
+      self.full."mute-stream"."~0.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "read" ];
+  };
+  full."read"."~1.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "read-1.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz";
+        sha1 = "007a3d169478aa710a491727e453effb92e76203";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."read"."~1.0.4" or []);
+    deps = [
+      self.full."mute-stream"."~0.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "read" ];
+  };
+  full."read-installed"."~0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "read-installed-0.2.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.4.tgz";
+        sha1 = "9a45ca0a8ae1ecdb05972f362b63bc59450b572d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."read-installed"."~0.2.2" or []);
+    deps = [
+      self.full."semver"."2"
+      self.full."slide"."~1.1.3"
+      self.full."read-package-json"."1"
+      self.full."graceful-fs"."~2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "read-installed" ];
+  };
+  full."read-package-json"."1" = lib.makeOverridable self.buildNodePackage {
+    name = "read-package-json-1.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.3.tgz";
+        sha1 = "a361ab3da88f6f78998df223ad8186a4b7e1f391";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."read-package-json"."1" or []);
+    deps = [
+      self.full."glob"."~3.2.1"
+      self.full."lru-cache"."2"
+      self.full."normalize-package-data"."~0.2"
+      self.full."graceful-fs"."2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "read-package-json" ];
+  };
+  full."read-package-json"."~1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "read-package-json-1.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.3.tgz";
+        sha1 = "a361ab3da88f6f78998df223ad8186a4b7e1f391";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."read-package-json"."~1.1.0" or []);
+    deps = [
+      self.full."glob"."~3.2.1"
+      self.full."lru-cache"."2"
+      self.full."normalize-package-data"."~0.2"
+      self.full."graceful-fs"."2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "read-package-json" ];
+  };
+  full."readable-stream"."1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "readable-stream-1.0.15";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.15.tgz";
+        sha1 = "a2c160237235951da985a1572d0a3af585e4be95";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."readable-stream"."1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "readable-stream" ];
+  };
+  full."readable-stream"."~1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "readable-stream-1.0.15";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.15.tgz";
+        sha1 = "a2c160237235951da985a1572d0a3af585e4be95";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."readable-stream"."~1.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "readable-stream" ];
+  };
+  full."readable-stream"."~1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "readable-stream-1.0.15";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.15.tgz";
+        sha1 = "a2c160237235951da985a1572d0a3af585e4be95";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."readable-stream"."~1.0.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "readable-stream" ];
+  };
+  full."readdirp"."~0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "readdirp-0.2.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz";
+        sha1 = "c4c276e52977ae25db5191fe51d008550f15d9bb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."readdirp"."~0.2.3" or []);
+    deps = [
+      self.full."minimatch".">=0.2.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "readdirp" ];
+  };
+  full."redeyed"."~0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "redeyed-0.4.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.2.tgz";
+        sha1 = "f0133b990cb972bdbcf2d2dce0aec36595f419bc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."redeyed"."~0.4.0" or []);
+    deps = [
+      self.full."esprima"."~1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "redeyed" ];
+  };
+  full."redis"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "redis-0.8.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/redis/-/redis-0.8.4.tgz";
+        sha1 = "14609f26414e211c31e3cd07dc79b04bf9ff1980";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."redis"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "redis" ];
+  };
+  "redis" = self.full."redis"."*";
+  full."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage {
+    name = "redis-0.7.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/redis/-/redis-0.7.2.tgz";
+        sha1 = "fa557fef4985ab3e3384fdc5be6e2541a0bb49af";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."redis"."0.7.2" or []);
+    deps = [
+      self.full."hiredis"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "redis" ];
+  };
+  full."redis"."0.7.3" = lib.makeOverridable self.buildNodePackage {
+    name = "redis-0.7.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/redis/-/redis-0.7.3.tgz";
+        sha1 = "ee57b7a44d25ec1594e44365d8165fa7d1d4811a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."redis"."0.7.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "redis" ];
+  };
+  full."redis".">= 0.6.6" = lib.makeOverridable self.buildNodePackage {
+    name = "redis-0.8.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/redis/-/redis-0.8.4.tgz";
+        sha1 = "14609f26414e211c31e3cd07dc79b04bf9ff1980";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."redis".">= 0.6.6" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "redis" ];
+  };
+  full."reds"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "reds-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/reds/-/reds-0.1.4.tgz";
+        sha1 = "a97819180c30f6ecd01cad03cecb574eaabb4bee";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."reds"."0.1.4" or []);
+    deps = [
+      self.full."natural"."0.0.69"
+      self.full."redis".">= 0.6.6"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "reds" ];
+  };
+  full."regexp-clone"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "regexp-clone-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz";
+        sha1 = "a7c2e09891fdbf38fbb10d376fb73003e68ac589";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."regexp-clone"."0.0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "regexp-clone" ];
+  };
+  full."request"."2" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.27.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz";
+        sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request"."2" or []);
+    deps = [
+      self.full."qs"."~0.6.0"
+      self.full."json-stringify-safe"."~5.0.0"
+      self.full."forever-agent"."~0.5.0"
+      self.full."tunnel-agent"."~0.3.0"
+      self.full."http-signature"."~0.10.0"
+      self.full."hawk"."~1.0.0"
+      self.full."aws-sign"."~0.3.0"
+      self.full."oauth-sign"."~0.3.0"
+      self.full."cookie-jar"."~0.3.0"
+      self.full."node-uuid"."~1.4.0"
+      self.full."mime"."~1.2.9"
+      self.full."form-data"."~0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
+  full."request"."2 >=2.20.0" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.27.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz";
+        sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request"."2 >=2.20.0" or []);
+    deps = [
+      self.full."qs"."~0.6.0"
+      self.full."json-stringify-safe"."~5.0.0"
+      self.full."forever-agent"."~0.5.0"
+      self.full."tunnel-agent"."~0.3.0"
+      self.full."http-signature"."~0.10.0"
+      self.full."hawk"."~1.0.0"
+      self.full."aws-sign"."~0.3.0"
+      self.full."oauth-sign"."~0.3.0"
+      self.full."cookie-jar"."~0.3.0"
+      self.full."node-uuid"."~1.4.0"
+      self.full."mime"."~1.2.9"
+      self.full."form-data"."~0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
+  full."request"."2 >=2.25.0" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.27.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz";
+        sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request"."2 >=2.25.0" or []);
+    deps = [
+      self.full."qs"."~0.6.0"
+      self.full."json-stringify-safe"."~5.0.0"
+      self.full."forever-agent"."~0.5.0"
+      self.full."tunnel-agent"."~0.3.0"
+      self.full."http-signature"."~0.10.0"
+      self.full."hawk"."~1.0.0"
+      self.full."aws-sign"."~0.3.0"
+      self.full."oauth-sign"."~0.3.0"
+      self.full."cookie-jar"."~0.3.0"
+      self.full."node-uuid"."~1.4.0"
+      self.full."mime"."~1.2.9"
+      self.full."form-data"."~0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
+  full."request"."2.16.x" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.16.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz";
+        sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request"."2.16.x" or []);
+    deps = [
+      self.full."form-data"."~0.0.3"
+      self.full."mime"."~1.2.7"
+      self.full."hawk"."~0.10.2"
+      self.full."node-uuid"."~1.4.0"
+      self.full."cookie-jar"."~0.2.0"
+      self.full."aws-sign"."~0.2.0"
+      self.full."oauth-sign"."~0.2.0"
+      self.full."forever-agent"."~0.2.0"
+      self.full."tunnel-agent"."~0.2.0"
+      self.full."json-stringify-safe"."~3.0.0"
+      self.full."qs"."~0.5.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
+  full."request"."2.9.x" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.9.203";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz";
+        sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request"."2.9.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
+  full."request"."~2" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.27.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz";
+        sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request"."~2" or []);
+    deps = [
+      self.full."qs"."~0.6.0"
+      self.full."json-stringify-safe"."~5.0.0"
+      self.full."forever-agent"."~0.5.0"
+      self.full."tunnel-agent"."~0.3.0"
+      self.full."http-signature"."~0.10.0"
+      self.full."hawk"."~1.0.0"
+      self.full."aws-sign"."~0.3.0"
+      self.full."oauth-sign"."~0.3.0"
+      self.full."cookie-jar"."~0.3.0"
+      self.full."node-uuid"."~1.4.0"
+      self.full."mime"."~1.2.9"
+      self.full."form-data"."~0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
+  full."request"."~2.16.6" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.16.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz";
+        sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request"."~2.16.6" or []);
+    deps = [
+      self.full."form-data"."~0.0.3"
+      self.full."mime"."~1.2.7"
+      self.full."hawk"."~0.10.2"
+      self.full."node-uuid"."~1.4.0"
+      self.full."cookie-jar"."~0.2.0"
+      self.full."aws-sign"."~0.2.0"
+      self.full."oauth-sign"."~0.2.0"
+      self.full."forever-agent"."~0.2.0"
+      self.full."tunnel-agent"."~0.2.0"
+      self.full."json-stringify-safe"."~3.0.0"
+      self.full."qs"."~0.5.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
+  full."request"."~2.21.0" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.21.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.21.0.tgz";
+        sha1 = "5728ab9c45e5a87c99daccd530298b6673a868d7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request"."~2.21.0" or []);
+    deps = [
+      self.full."qs"."~0.6.0"
+      self.full."json-stringify-safe"."~4.0.0"
+      self.full."forever-agent"."~0.5.0"
+      self.full."tunnel-agent"."~0.3.0"
+      self.full."http-signature"."~0.9.11"
+      self.full."hawk"."~0.13.0"
+      self.full."aws-sign"."~0.3.0"
+      self.full."oauth-sign"."~0.3.0"
+      self.full."cookie-jar"."~0.3.0"
+      self.full."node-uuid"."~1.4.0"
+      self.full."mime"."~1.2.9"
+      self.full."form-data"."0.0.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
+  full."request"."~2.22.0" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.22.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.22.0.tgz";
+        sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request"."~2.22.0" or []);
+    deps = [
+      self.full."qs"."~0.6.0"
+      self.full."json-stringify-safe"."~4.0.0"
+      self.full."forever-agent"."~0.5.0"
+      self.full."tunnel-agent"."~0.3.0"
+      self.full."http-signature"."~0.10.0"
+      self.full."hawk"."~0.13.0"
+      self.full."aws-sign"."~0.3.0"
+      self.full."oauth-sign"."~0.3.0"
+      self.full."cookie-jar"."~0.3.0"
+      self.full."node-uuid"."~1.4.0"
+      self.full."mime"."~1.2.9"
+      self.full."form-data"."0.0.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
+  full."request"."~2.25.0" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.25.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
+        sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request"."~2.25.0" or []);
+    deps = [
+      self.full."qs"."~0.6.0"
+      self.full."json-stringify-safe"."~5.0.0"
+      self.full."forever-agent"."~0.5.0"
+      self.full."tunnel-agent"."~0.3.0"
+      self.full."http-signature"."~0.10.0"
+      self.full."hawk"."~1.0.0"
+      self.full."aws-sign"."~0.3.0"
+      self.full."oauth-sign"."~0.3.0"
+      self.full."cookie-jar"."~0.3.0"
+      self.full."node-uuid"."~1.4.0"
+      self.full."mime"."~1.2.9"
+      self.full."form-data"."~0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
+  full."request"."~2.26.0" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.26.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.26.0.tgz";
+        sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request"."~2.26.0" or []);
+    deps = [
+      self.full."qs"."~0.6.0"
+      self.full."json-stringify-safe"."~5.0.0"
+      self.full."forever-agent"."~0.5.0"
+      self.full."tunnel-agent"."~0.3.0"
+      self.full."http-signature"."~0.10.0"
+      self.full."hawk"."~1.0.0"
+      self.full."aws-sign"."~0.3.0"
+      self.full."oauth-sign"."~0.3.0"
+      self.full."cookie-jar"."~0.3.0"
+      self.full."node-uuid"."~1.4.0"
+      self.full."mime"."~1.2.9"
+      self.full."form-data"."~0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
+  full."request"."~2.27.0" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.27.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz";
+        sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request"."~2.27.0" or []);
+    deps = [
+      self.full."qs"."~0.6.0"
+      self.full."json-stringify-safe"."~5.0.0"
+      self.full."forever-agent"."~0.5.0"
+      self.full."tunnel-agent"."~0.3.0"
+      self.full."http-signature"."~0.10.0"
+      self.full."hawk"."~1.0.0"
+      self.full."aws-sign"."~0.3.0"
+      self.full."oauth-sign"."~0.3.0"
+      self.full."cookie-jar"."~0.3.0"
+      self.full."node-uuid"."~1.4.0"
+      self.full."mime"."~1.2.9"
+      self.full."form-data"."~0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
+  full."request-progress"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "request-progress-0.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request-progress/-/request-progress-0.2.3.tgz";
+        sha1 = "5be7088f66642e2739e9058a07cceef0c2868b8b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request-progress"."~0.2.0" or []);
+    deps = [
+      self.full."throttleit"."~0.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request-progress" ];
+  };
+  full."request-replay"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "request-replay-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request-replay/-/request-replay-0.2.0.tgz";
+        sha1 = "9b693a5d118b39f5c596ead5ed91a26444057f60";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request-replay"."~0.2.0" or []);
+    deps = [
+      self.full."retry"."~0.6.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request-replay" ];
+  };
+  full."resolve"."~0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "resolve-0.3.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz";
+        sha1 = "34c63447c664c70598d1c9b126fc43b2a24310a4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."resolve"."~0.3.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "resolve" ];
+  };
+  full."restify"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "restify-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/restify/-/restify-2.4.1.tgz";
+        sha1 = "35790a052bd0927e7f6a06cc3d079e56fabc9371";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."restify"."2.4.1" or []);
+    deps = [
+      self.full."assert-plus"."0.1.2"
+      self.full."backoff"."2.1.0"
+      self.full."bunyan"."0.21.1"
+      self.full."deep-equal"."0.0.0"
+      self.full."formidable"."1.0.13"
+      self.full."http-signature"."0.9.11"
+      self.full."keep-alive-agent"."0.0.1"
+      self.full."lru-cache"."2.3.0"
+      self.full."mime"."1.2.9"
+      self.full."negotiator"."0.2.5"
+      self.full."node-uuid"."1.4.0"
+      self.full."once"."1.1.1"
+      self.full."qs"."0.5.5"
+      self.full."semver"."1.1.4"
+      self.full."spdy"."1.7.1"
+      self.full."verror"."1.3.6"
+      self.full."dtrace-provider"."0.2.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "restify" ];
+  };
+  full."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "retry-0.6.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz";
+        sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."retry"."0.6.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "retry" ];
+  };
+  full."retry"."~0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "retry-0.6.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz";
+        sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."retry"."~0.6.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "retry" ];
+  };
+  full."revalidator"."0.1.x" = lib.makeOverridable self.buildNodePackage {
+    name = "revalidator-0.1.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.5.tgz";
+        sha1 = "205bc02e4186e63e82a0837498f29ba287be3861";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."revalidator"."0.1.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "revalidator" ];
+  };
+  full."rimraf"."1.x.x" = lib.makeOverridable self.buildNodePackage {
+    name = "rimraf-1.0.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz";
+        sha1 = "be4801ff76c2ba6f1c50c78e9700eb1d21f239f1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rimraf"."1.x.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "rimraf" ];
+  };
+  full."rimraf"."2" = lib.makeOverridable self.buildNodePackage {
+    name = "rimraf-2.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.2.tgz";
+        sha1 = "d99ec41dc646e55bf7a7a44a255c28bef33a8abf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rimraf"."2" or []);
+    deps = [
+      self.full."graceful-fs"."~2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "rimraf" ];
+  };
+  full."rimraf"."2.x.x" = lib.makeOverridable self.buildNodePackage {
+    name = "rimraf-2.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.2.tgz";
+        sha1 = "d99ec41dc646e55bf7a7a44a255c28bef33a8abf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rimraf"."2.x.x" or []);
+    deps = [
+      self.full."graceful-fs"."~2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "rimraf" ];
+  };
+  full."rimraf"."~2" = lib.makeOverridable self.buildNodePackage {
+    name = "rimraf-2.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.2.tgz";
+        sha1 = "d99ec41dc646e55bf7a7a44a255c28bef33a8abf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rimraf"."~2" or []);
+    deps = [
+      self.full."graceful-fs"."~2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "rimraf" ];
+  };
+  full."rimraf"."~2.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "rimraf-2.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.0.3.tgz";
+        sha1 = "f50a2965e7144e9afd998982f15df706730f56a9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rimraf"."~2.0.2" or []);
+    deps = [
+      self.full."graceful-fs"."~1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "rimraf" ];
+  };
+  full."rimraf"."~2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "rimraf-2.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
+        sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rimraf"."~2.1" or []);
+    deps = [
+      self.full."graceful-fs"."~1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "rimraf" ];
+  };
+  full."rimraf"."~2.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "rimraf-2.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
+        sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rimraf"."~2.1.4" or []);
+    deps = [
+      self.full."graceful-fs"."~1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "rimraf" ];
+  };
+  full."rimraf"."~2.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "rimraf-2.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.2.tgz";
+        sha1 = "d99ec41dc646e55bf7a7a44a255c28bef33a8abf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rimraf"."~2.2.0" or []);
+    deps = [
+      self.full."graceful-fs"."~2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "rimraf" ];
+  };
+  full."runforcover"."~0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "runforcover-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz";
+        sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."runforcover"."~0.0.2" or []);
+    deps = [
+      self.full."bunker"."0.1.X"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "runforcover" ];
+  };
+  full."s3http"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "s3http-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/s3http/-/s3http-0.0.2.tgz";
+        sha1 = "e0c8bdee66981c6ddef2dfc41bb1fe51765984e5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."s3http"."*" or []);
+    deps = [
+      self.full."aws-sdk".">=1.2.0 <2"
+      self.full."commander"."0.5.1"
+      self.full."http-auth"."1.2.7"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "s3http" ];
+  };
+  "s3http" = self.full."s3http"."*";
+  full."sax"."0.5.x" = lib.makeOverridable self.buildNodePackage {
+    name = "sax-0.5.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sax/-/sax-0.5.4.tgz";
+        sha1 = "a3a4e1a9cf182bb547156c5232a49a1c3732ff7d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sax"."0.5.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sax" ];
+  };
+  full."sax".">=0.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "sax-0.5.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sax/-/sax-0.5.4.tgz";
+        sha1 = "a3a4e1a9cf182bb547156c5232a49a1c3732ff7d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sax".">=0.4.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sax" ];
+  };
+  full."semver"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-2.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
+        sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
+  "semver" = self.full."semver"."*";
+  full."semver"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-1.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-1.1.0.tgz";
+        sha1 = "da9b9c837e31550a7c928622bc2381de7dd7a53e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver"."1.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
+  full."semver"."1.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-1.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-1.1.4.tgz";
+        sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver"."1.1.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
+  full."semver"."2" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-2.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
+        sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver"."2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
+  full."semver"."2.x" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-2.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
+        sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver"."2.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
+  full."semver".">=2.0.10 <3.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-2.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
+        sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver".">=2.0.10 <3.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
+  full."semver"."~1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-1.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-1.1.4.tgz";
+        sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver"."~1.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
+  full."semver"."~1.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-1.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-1.1.4.tgz";
+        sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver"."~1.1.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
+  full."semver"."~2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-2.0.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
+        sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver"."~2.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
+  full."semver"."~2.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-2.0.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
+        sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver"."~2.0.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
+  full."semver"."~2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-2.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
+        sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver"."~2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
+  full."semver"."~2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-2.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
+        sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver"."~2.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
+  full."send"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "send-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz";
+        sha1 = "be70d8d1be01de61821af13780b50345a4f71abd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."send"."*" or []);
+    deps = [
+      self.full."debug"."*"
+      self.full."mime"."~1.2.9"
+      self.full."fresh"."0.2.0"
+      self.full."range-parser"."0.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "send" ];
+  };
+  full."send"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "send-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/send/-/send-0.1.0.tgz";
+        sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."send"."0.1.0" or []);
+    deps = [
+      self.full."debug"."*"
+      self.full."mime"."1.2.6"
+      self.full."fresh"."0.1.0"
+      self.full."range-parser"."0.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "send" ];
+  };
+  full."send"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "send-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz";
+        sha1 = "be70d8d1be01de61821af13780b50345a4f71abd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."send"."0.1.4" or []);
+    deps = [
+      self.full."debug"."*"
+      self.full."mime"."~1.2.9"
+      self.full."fresh"."0.2.0"
+      self.full."range-parser"."0.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "send" ];
+  };
+  full."sequence"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "sequence-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
+        sha1 = "7f5617895d44351c0a047e764467690490a16b03";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sequence"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sequence" ];
+  };
+  full."sequence".">= 2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "sequence-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
+        sha1 = "7f5617895d44351c0a047e764467690490a16b03";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sequence".">= 2.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sequence" ];
+  };
+  full."setimmediate"."~1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "setimmediate-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz";
+        sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."setimmediate"."~1.0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "setimmediate" ];
+  };
+  full."sha"."~1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "sha-1.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sha/-/sha-1.2.2.tgz";
+        sha1 = "f2aa387e8182631fd5f462bd80250d37a8920e62";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sha"."~1.2.1" or []);
+    deps = [
+      self.full."graceful-fs"."2"
+      self.full."readable-stream"."1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sha" ];
+  };
+  full."shelljs"."0.1.x" = lib.makeOverridable self.buildNodePackage {
+    name = "shelljs-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/shelljs/-/shelljs-0.1.4.tgz";
+        sha1 = "dfbbe78d56c3c0168d2fb79e10ecd1dbcb07ec0e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."shelljs"."0.1.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "shelljs" ];
+  };
+  full."shelljs"."~0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "shelljs-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/shelljs/-/shelljs-0.1.4.tgz";
+        sha1 = "dfbbe78d56c3c0168d2fb79e10ecd1dbcb07ec0e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."shelljs"."~0.1.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "shelljs" ];
+  };
+  full."should"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "should-1.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/should/-/should-1.2.2.tgz";
+        sha1 = "0f03f775066d9ea2632690c917b12824fcc1d582";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."should"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "should" ];
+  };
+  "should" = self.full."should"."*";
+  full."sigmund"."~1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "sigmund-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz";
+        sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sigmund"."~1.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sigmund" ];
+  };
+  full."simplesmtp".">= 0.1.22" = lib.makeOverridable self.buildNodePackage {
+    name = "simplesmtp-0.3.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.7.tgz";
+        sha1 = "2e5319c5dea8824be88d5dba9a6dc85551cad76b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."simplesmtp".">= 0.1.22" or []);
+    deps = [
+      self.full."rai"."~0.1"
+      self.full."xoauth2"."~0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "simplesmtp" ];
+  };
+  full."slice-stream"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "slice-stream-0.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/slice-stream/-/slice-stream-0.0.0.tgz";
+        sha1 = "8183df87ad44ae0b48c0625134eac6e349747860";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."slice-stream"."0.0.0" or []);
+    deps = [
+      self.full."readable-stream"."~1.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "slice-stream" ];
+  };
+  full."sliced"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "sliced-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz";
+        sha1 = "4f0bac2171eb17162c3ba6df81f5cf040f7c7e50";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sliced"."0.0.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sliced" ];
+  };
+  full."sliced"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "sliced-0.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz";
+        sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sliced"."0.0.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sliced" ];
+  };
+  full."sliced"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "sliced-0.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz";
+        sha1 = "5edc044ca4eb6f7816d50ba2fc63e25d8fe4707f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sliced"."0.0.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sliced" ];
+  };
+  full."slide"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "slide-1.1.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/slide/-/slide-1.1.5.tgz";
+        sha1 = "31732adeae78f1d2d60a29b63baf6a032df7c25d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."slide"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "slide" ];
+  };
+  full."slide"."~1.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "slide-1.1.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/slide/-/slide-1.1.5.tgz";
+        sha1 = "31732adeae78f1d2d60a29b63baf6a032df7c25d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."slide"."~1.1.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "slide" ];
+  };
+  full."slide"."~1.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "slide-1.1.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/slide/-/slide-1.1.5.tgz";
+        sha1 = "31732adeae78f1d2d60a29b63baf6a032df7c25d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."slide"."~1.1.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "slide" ];
+  };
+  full."smartdc"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "smartdc-7.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/smartdc/-/smartdc-7.0.0.tgz";
+        sha1 = "367ce274e10e3400e19ec62697f9b5ecb3f25c39";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."smartdc"."*" or []);
+    deps = [
+      self.full."assert-plus"."0.1.2"
+      self.full."lru-cache"."2.2.0"
+      self.full."nopt"."2.0.0"
+      self.full."restify"."2.4.1"
+      self.full."bunyan"."0.21.1"
+      self.full."clone"."0.1.6"
+      self.full."smartdc-auth"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "smartdc" ];
+  };
+  "smartdc" = self.full."smartdc"."*";
+  full."smartdc-auth"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "smartdc-auth-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/smartdc-auth/-/smartdc-auth-1.0.0.tgz";
+        sha1 = "9b8569b914f25da53816fe158f80b6571470f270";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."smartdc-auth"."1.0.0" or []);
+    deps = [
+      self.full."assert-plus"."0.1.2"
+      self.full."clone"."0.1.5"
+      self.full."ssh-agent"."0.2.1"
+      self.full."once"."1.1.1"
+      self.full."vasync"."1.3.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "smartdc-auth" ];
+  };
+  full."sntp"."0.1.x" = lib.makeOverridable self.buildNodePackage {
+    name = "sntp-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz";
+        sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sntp"."0.1.x" or []);
+    deps = [
+      self.full."hoek"."0.7.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sntp" ];
+  };
+  full."sntp"."0.2.x" = lib.makeOverridable self.buildNodePackage {
+    name = "sntp-0.2.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
+        sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sntp"."0.2.x" or []);
+    deps = [
+      self.full."hoek"."0.9.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sntp" ];
+  };
+  full."socket.io"."0.9.14" = lib.makeOverridable self.buildNodePackage {
+    name = "socket.io-0.9.14";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz";
+        sha1 = "81af80ebf3ee8f7f6e71b1495db91f8fa53ff667";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."socket.io"."0.9.14" or []);
+    deps = [
+      self.full."socket.io-client"."0.9.11"
+      self.full."policyfile"."0.0.4"
+      self.full."base64id"."0.1.0"
+      self.full."redis"."0.7.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "socket.io" ];
+  };
+  full."socket.io"."~0.9.13" = lib.makeOverridable self.buildNodePackage {
+    name = "socket.io-0.9.16";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz";
+        sha1 = "3bab0444e49b55fbbc157424dbd41aa375a51a76";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."socket.io"."~0.9.13" or []);
+    deps = [
+      self.full."socket.io-client"."0.9.16"
+      self.full."policyfile"."0.0.4"
+      self.full."base64id"."0.1.0"
+      self.full."redis"."0.7.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "socket.io" ];
+  };
+  full."socket.io-client"."0.9.11" = lib.makeOverridable self.buildNodePackage {
+    name = "socket.io-client-0.9.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz";
+        sha1 = "94defc1b29e0d8a8fe958c1cf33300f68d8a19c7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."socket.io-client"."0.9.11" or []);
+    deps = [
+      self.full."uglify-js"."1.2.5"
+      self.full."ws"."0.4.x"
+      self.full."xmlhttprequest"."1.4.2"
+      self.full."active-x-obfuscator"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "socket.io-client" ];
+  };
+  full."socket.io-client"."0.9.16" = lib.makeOverridable self.buildNodePackage {
+    name = "socket.io-client-0.9.16";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz";
+        sha1 = "4da7515c5e773041d1b423970415bcc430f35fc6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."socket.io-client"."0.9.16" or []);
+    deps = [
+      self.full."uglify-js"."1.2.5"
+      self.full."ws"."0.4.x"
+      self.full."xmlhttprequest"."1.4.2"
+      self.full."active-x-obfuscator"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "socket.io-client" ];
+  };
+  full."sockjs"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "sockjs-0.3.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.7.tgz";
+        sha1 = "2950e0586d8a9d3044958a831ade68db197749cb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sockjs"."*" or []);
+    deps = [
+      self.full."node-uuid"."1.3.3"
+      self.full."faye-websocket"."0.4.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sockjs" ];
+  };
+  "sockjs" = self.full."sockjs"."*";
+  full."source-map"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "source-map-0.1.28";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.28.tgz";
+        sha1 = "9cae9d9b8352fb030f77c4e12226cc28cb251f39";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."source-map"."*" or []);
+    deps = [
+      self.full."amdefine".">=0.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "source-map" ];
+  };
+  "source-map" = self.full."source-map"."*";
+  full."source-map"."~0.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "source-map-0.1.28";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.28.tgz";
+        sha1 = "9cae9d9b8352fb030f77c4e12226cc28cb251f39";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."source-map"."~0.1.7" or []);
+    deps = [
+      self.full."amdefine".">=0.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "source-map" ];
+  };
+  full."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage {
+    name = "spdy-1.7.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/spdy/-/spdy-1.7.1.tgz";
+        sha1 = "4fde77e602b20c4ecc39ee8619373dd9bf669152";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."spdy"."1.7.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "spdy" ];
+  };
+  full."ssh-agent"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "ssh-agent-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ssh-agent/-/ssh-agent-0.2.1.tgz";
+        sha1 = "3044e9eaeca88a9e6971dd7deb19bdcc20012929";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ssh-agent"."0.2.1" or []);
+    deps = [
+      self.full."ctype"."0.5.0"
+      self.full."posix-getopt"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ssh-agent" ];
+  };
+  full."stack-trace"."0.0.x" = lib.makeOverridable self.buildNodePackage {
+    name = "stack-trace-0.0.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz";
+        sha1 = "c72e089744fc3659f508cdce3621af5634ec0fff";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."stack-trace"."0.0.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "stack-trace" ];
+  };
+  full."statsd"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "statsd-0.6.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/statsd/-/statsd-0.6.0.tgz";
+        sha1 = "9902dba319c46726f0348ced9b7b3e20184de1c4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."statsd"."*" or []);
+    deps = [
+      self.full."node-syslog"."1.1.3"
+      self.full."winser"."=0.0.11"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "statsd" ];
+  };
+  "statsd" = self.full."statsd"."*";
+  full."stream-counter"."~0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "stream-counter-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.1.0.tgz";
+        sha1 = "a035e429361fb57f361606e17fcd8a8b9677327b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."stream-counter"."~0.1.0" or []);
+    deps = [
+      self.full."readable-stream"."~1.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "stream-counter" ];
+  };
+  full."stream-splitter-transform"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "stream-splitter-transform-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/stream-splitter-transform/-/stream-splitter-transform-0.0.3.tgz";
+        sha1 = "5ccd3bd497ffee4c2fc7c1cc9d7b697b54c42eef";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."stream-splitter-transform"."*" or []);
+    deps = [
+      self.full."buffertools".">=1.1.1 <2.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "stream-splitter-transform" ];
+  };
+  "stream-splitter-transform" = self.full."stream-splitter-transform"."*";
+  full."stringify-object"."~0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "stringify-object-0.1.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.1.5.tgz";
+        sha1 = "87d8b63a3e5dfb189370622f241beeedf706ab3b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."stringify-object"."~0.1.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "stringify-object" ];
+  };
+  full."stylus"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "stylus-0.37.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/stylus/-/stylus-0.37.0.tgz";
+        sha1 = "3f18ba693960e3408e2951b4a22e337c33d239d8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."stylus"."*" or []);
+    deps = [
+      self.full."cssom"."0.2.x"
+      self.full."mkdirp"."0.3.x"
+      self.full."debug"."*"
+      self.full."sax"."0.5.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "stylus" ];
+  };
+  "stylus" = self.full."stylus"."*";
+  full."stylus"."0.27.2" = lib.makeOverridable self.buildNodePackage {
+    name = "stylus-0.27.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/stylus/-/stylus-0.27.2.tgz";
+        sha1 = "1121f7f8cd152b0f8a4aa6a24a9adea10c825117";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."stylus"."0.27.2" or []);
+    deps = [
+      self.full."cssom"."0.2.x"
+      self.full."mkdirp"."0.3.x"
+      self.full."debug"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "stylus" ];
+  };
+  full."sudo-block"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "sudo-block-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sudo-block/-/sudo-block-0.2.1.tgz";
+        sha1 = "b394820741b66c0fe06f97b334f0674036837ba5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sudo-block"."~0.2.0" or []);
+    deps = [
+      self.full."chalk"."~0.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sudo-block" ];
+  };
+  full."superagent"."0.15.1" = lib.makeOverridable self.buildNodePackage {
+    name = "superagent-0.15.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/superagent/-/superagent-0.15.1.tgz";
+        sha1 = "f0df9954c2b90f29e4ae54ad308e4a2b432cc56a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."superagent"."0.15.1" or []);
+    deps = [
+      self.full."qs"."0.6.5"
+      self.full."formidable"."1.0.9"
+      self.full."mime"."1.2.5"
+      self.full."emitter-component"."1.0.0"
+      self.full."methods"."0.0.1"
+      self.full."cookiejar"."1.3.0"
+      self.full."debug"."~0.7.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "superagent" ];
+  };
+  full."supertest"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "supertest-0.7.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/supertest/-/supertest-0.7.1.tgz";
+        sha1 = "349a65a8bfb5207250658f71761279ad3a671d88";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."supertest"."*" or []);
+    deps = [
+      self.full."superagent"."0.15.1"
+      self.full."methods"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "supertest" ];
+  };
+  "supertest" = self.full."supertest"."*";
+  full."swig"."0.14.x" = lib.makeOverridable self.buildNodePackage {
+    name = "swig-0.14.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/swig/-/swig-0.14.0.tgz";
+        sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."swig"."0.14.x" or []);
+    deps = [
+      self.full."underscore".">=1.1.7"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "swig" ];
+  };
+  "swig" = self.full."swig"."0.14.x";
+  full."sylvester".">= 0.0.12" = lib.makeOverridable self.buildNodePackage {
+    name = "sylvester-0.0.21";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz";
+        sha1 = "2987b1ce2bd2f38b0dce2a34388884bfa4400ea7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sylvester".">= 0.0.12" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sylvester" ];
+  };
+  full."sylvester".">= 0.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "sylvester-0.0.21";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz";
+        sha1 = "2987b1ce2bd2f38b0dce2a34388884bfa4400ea7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sylvester".">= 0.0.8" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sylvester" ];
+  };
+  full."tap".">=0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "tap-0.4.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tap/-/tap-0.4.4.tgz";
+        sha1 = "122ee7afee3fc7f327660a4fda1e5ac9db2b7714";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tap".">=0.2.3" or []);
+    deps = [
+      self.full."inherits"."*"
+      self.full."yamlish"."*"
+      self.full."slide"."*"
+      self.full."runforcover"."~0.0.2"
+      self.full."nopt"."~2"
+      self.full."mkdirp"."~0.3"
+      self.full."difflet"."~0.2.0"
+      self.full."deep-equal"."~0.0.0"
+      self.full."buffer-equal"."~0.0.0"
+      self.full."glob"."~3.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tap" ];
+  };
+  full."tar"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "tar-0.1.18";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tar/-/tar-0.1.18.tgz";
+        sha1 = "b76c3b23c5e90f9e3e344462f537047c695ba635";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tar"."*" or []);
+    deps = [
+      self.full."inherits"."2"
+      self.full."block-stream"."*"
+      self.full."fstream"."~0.1.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tar" ];
+  };
+  "tar" = self.full."tar"."*";
+  full."tar"."0" = lib.makeOverridable self.buildNodePackage {
+    name = "tar-0.1.18";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tar/-/tar-0.1.18.tgz";
+        sha1 = "b76c3b23c5e90f9e3e344462f537047c695ba635";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tar"."0" or []);
+    deps = [
+      self.full."inherits"."2"
+      self.full."block-stream"."*"
+      self.full."fstream"."~0.1.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tar" ];
+  };
+  full."tar"."0.1.17" = lib.makeOverridable self.buildNodePackage {
+    name = "tar-0.1.17";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
+        sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tar"."0.1.17" or []);
+    deps = [
+      self.full."inherits"."1.x"
+      self.full."block-stream"."*"
+      self.full."fstream"."~0.1.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tar" ];
+  };
+  full."tar"."~0.1.17" = lib.makeOverridable self.buildNodePackage {
+    name = "tar-0.1.18";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tar/-/tar-0.1.18.tgz";
+        sha1 = "b76c3b23c5e90f9e3e344462f537047c695ba635";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tar"."~0.1.17" or []);
+    deps = [
+      self.full."inherits"."2"
+      self.full."block-stream"."*"
+      self.full."fstream"."~0.1.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tar" ];
+  };
+  full."tar"."~0.1.18" = lib.makeOverridable self.buildNodePackage {
+    name = "tar-0.1.18";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tar/-/tar-0.1.18.tgz";
+        sha1 = "b76c3b23c5e90f9e3e344462f537047c695ba635";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tar"."~0.1.18" or []);
+    deps = [
+      self.full."inherits"."2"
+      self.full."block-stream"."*"
+      self.full."fstream"."~0.1.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tar" ];
+  };
+  full."temp"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "temp-0.5.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/temp/-/temp-0.5.1.tgz";
+        sha1 = "77ab19c79aa7b593cbe4fac2441768cad987b8df";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."temp"."*" or []);
+    deps = [
+      self.full."rimraf"."~2.1.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "temp" ];
+  };
+  "temp" = self.full."temp"."*";
+  full."throttleit"."~0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "throttleit-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz";
+        sha1 = "cfedf88e60c00dd9697b61fdd2a8343a9b680eaf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."throttleit"."~0.0.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "throttleit" ];
+  };
+  full."timespan"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "timespan-2.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/timespan/-/timespan-2.0.1.tgz";
+        sha1 = "479b45875937e14d0f4be1625f2abd08d801f68a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."timespan"."2.0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "timespan" ];
+  };
+  full."timezone"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "timezone-0.0.23";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/timezone/-/timezone-0.0.23.tgz";
+        sha1 = "5e89359e0c01c92b495c725e81ecce6ddbdb9bac";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."timezone"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "timezone" ];
+  };
+  "timezone" = self.full."timezone"."*";
+  full."tinycolor"."0.x" = lib.makeOverridable self.buildNodePackage {
+    name = "tinycolor-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
+        sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tinycolor"."0.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tinycolor" ];
+  };
+  full."tmp"."~0.0.20" = lib.makeOverridable self.buildNodePackage {
+    name = "tmp-0.0.21";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tmp/-/tmp-0.0.21.tgz";
+        sha1 = "6d263fede6570dc4d4510ffcc2efc640223b1153";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tmp"."~0.0.20" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tmp" ];
+  };
+  full."transformers"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "transformers-2.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz";
+        sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."transformers"."2.1.0" or []);
+    deps = [
+      self.full."promise"."~2.0"
+      self.full."css"."~1.0.8"
+      self.full."uglify-js"."~2.2.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "transformers" ];
+  };
+  full."traverse"."0.6.x" = lib.makeOverridable self.buildNodePackage {
+    name = "traverse-0.6.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/traverse/-/traverse-0.6.3.tgz";
+        sha1 = "a053ffa1b6179b9240ea16d74bfd604bd6b6e41b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."traverse"."0.6.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "traverse" ];
+  };
+  full."traverse".">=0.3.0 <0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "traverse-0.3.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz";
+        sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."traverse".">=0.3.0 <0.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "traverse" ];
+  };
+  full."traverse"."~0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "traverse-0.5.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz";
+        sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."traverse"."~0.5.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "traverse" ];
+  };
+  full."tunnel-agent"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "tunnel-agent-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz";
+        sha1 = "6853c2afb1b2109e45629e492bde35f459ea69e8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tunnel-agent"."~0.2.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tunnel-agent" ];
+  };
+  full."tunnel-agent"."~0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "tunnel-agent-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
+        sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tunnel-agent"."~0.3.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tunnel-agent" ];
+  };
+  full."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-1.2.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz";
+        sha1 = "b542c2c76f78efb34b200b20177634330ff702b6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."uglify-js"."1.2.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "uglify-js" ];
+  };
+  full."uglify-js"."2.3.6" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-2.3.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
+        sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."uglify-js"."2.3.6" or []);
+    deps = [
+      self.full."async"."~0.2.6"
+      self.full."source-map"."~0.1.7"
+      self.full."optimist"."~0.3.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "uglify-js" ];
+  };
+  full."uglify-js"."~1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz";
+        sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."uglify-js"."~1.1.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "uglify-js" ];
+  };
+  full."uglify-js"."~2.2.5" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-2.2.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz";
+        sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."uglify-js"."~2.2.5" or []);
+    deps = [
+      self.full."source-map"."~0.1.7"
+      self.full."optimist"."~0.3.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "uglify-js" ];
+  };
+  full."uglify-js"."~2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-2.3.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
+        sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."uglify-js"."~2.3" or []);
+    deps = [
+      self.full."async"."~0.2.6"
+      self.full."source-map"."~0.1.7"
+      self.full."optimist"."~0.3.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "uglify-js" ];
+  };
+  full."uglify-js"."~2.3.6" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-2.3.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
+        sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."uglify-js"."~2.3.6" or []);
+    deps = [
+      self.full."async"."~0.2.6"
+      self.full."source-map"."~0.1.7"
+      self.full."optimist"."~0.3.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "uglify-js" ];
+  };
+  full."uid-number"."0" = lib.makeOverridable self.buildNodePackage {
+    name = "uid-number-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz";
+        sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."uid-number"."0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "uid-number" ];
+  };
+  full."uid2"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "uid2-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/uid2/-/uid2-0.0.2.tgz";
+        sha1 = "107fb155c82c1136620797ed4c88cf2b08f6aab8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."uid2"."0.0.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "uid2" ];
+  };
+  full."underscore"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "underscore-1.5.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.5.1.tgz";
+        sha1 = "d2bde817d176ffade894ab71458e682a14b86dc9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."underscore"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "underscore" ];
+  };
+  "underscore" = self.full."underscore"."*";
+  full."underscore"."1.4.x" = lib.makeOverridable self.buildNodePackage {
+    name = "underscore-1.4.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
+        sha1 = "61a6a32010622afa07963bf325203cf12239d604";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."underscore"."1.4.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "underscore" ];
+  };
+  full."underscore".">=1.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "underscore-1.5.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.5.1.tgz";
+        sha1 = "d2bde817d176ffade894ab71458e682a14b86dc9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."underscore".">=1.1.7" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "underscore" ];
+  };
+  full."underscore".">=1.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "underscore-1.5.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.5.1.tgz";
+        sha1 = "d2bde817d176ffade894ab71458e682a14b86dc9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."underscore".">=1.4.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "underscore" ];
+  };
+  full."underscore"."~1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "underscore-1.4.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
+        sha1 = "61a6a32010622afa07963bf325203cf12239d604";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."underscore"."~1.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "underscore" ];
+  };
+  full."underscore"."~1.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "underscore-1.4.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
+        sha1 = "61a6a32010622afa07963bf325203cf12239d604";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."underscore"."~1.4.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "underscore" ];
+  };
+  full."underscore.string"."~2.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "underscore.string-2.3.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
+        sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."underscore.string"."~2.3.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "underscore.string" ];
+  };
+  full."unzip"."~0.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "unzip-0.1.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/unzip/-/unzip-0.1.8.tgz";
+        sha1 = "b6ca171798242150b06fca320544592231aeb158";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."unzip"."~0.1.7" or []);
+    deps = [
+      self.full."fstream"."~0.1.21"
+      self.full."pullstream"."~0.4.0"
+      self.full."binary"."~0.3.0"
+      self.full."readable-stream"."~1.0.0"
+      self.full."setimmediate"."~1.0.1"
+      self.full."match-stream"."~0.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "unzip" ];
+  };
+  full."update-notifier"."~0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "update-notifier-0.1.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.5.tgz";
+        sha1 = "adf98004c29bf521f242c2970c471f310b353b44";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."update-notifier"."~0.1.3" or []);
+    deps = [
+      self.full."request"."~2.22.0"
+      self.full."configstore"."~0.1.0"
+      self.full."semver"."~2.0.0"
+      self.full."chalk"."~0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "update-notifier" ];
+  };
+  full."useragent"."~2.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "useragent-2.0.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/useragent/-/useragent-2.0.7.tgz";
+        sha1 = "a44c07d157a15e13d73d4af4ece6aab70f298224";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."useragent"."~2.0.4" or []);
+    deps = [
+      self.full."lru-cache"."2.2.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "useragent" ];
+  };
+  full."util".">= 0.4.9" = lib.makeOverridable self.buildNodePackage {
+    name = "util-0.4.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/util/-/util-0.4.9.tgz";
+        sha1 = "d95d5830d2328ec17dee3c80bfc50c33562b75a3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."util".">= 0.4.9" or []);
+    deps = [
+      self.full."events.node".">= 0.4.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "util" ];
+  };
+  full."utile"."0.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "utile-0.1.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz";
+        sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."utile"."0.1.7" or []);
+    deps = [
+      self.full."async"."0.1.x"
+      self.full."deep-equal"."*"
+      self.full."i"."0.3.x"
+      self.full."mkdirp"."0.x.x"
+      self.full."ncp"."0.2.x"
+      self.full."rimraf"."1.x.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "utile" ];
+  };
+  full."utile"."0.1.x" = lib.makeOverridable self.buildNodePackage {
+    name = "utile-0.1.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz";
+        sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."utile"."0.1.x" or []);
+    deps = [
+      self.full."async"."0.1.x"
+      self.full."deep-equal"."*"
+      self.full."i"."0.3.x"
+      self.full."mkdirp"."0.x.x"
+      self.full."ncp"."0.2.x"
+      self.full."rimraf"."1.x.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "utile" ];
+  };
+  full."utile"."0.2.x" = lib.makeOverridable self.buildNodePackage {
+    name = "utile-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/utile/-/utile-0.2.0.tgz";
+        sha1 = "91a2423ca2eb3322390e211ee3d71cf4fa193aea";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."utile"."0.2.x" or []);
+    deps = [
+      self.full."async"."0.1.x"
+      self.full."deep-equal"."*"
+      self.full."i"."0.3.x"
+      self.full."mkdirp"."0.x.x"
+      self.full."ncp"."0.2.x"
+      self.full."rimraf"."2.x.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "utile" ];
+  };
+  full."utile"."~0.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "utile-0.1.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz";
+        sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."utile"."~0.1.7" or []);
+    deps = [
+      self.full."async"."0.1.x"
+      self.full."deep-equal"."*"
+      self.full."i"."0.3.x"
+      self.full."mkdirp"."0.x.x"
+      self.full."ncp"."0.2.x"
+      self.full."rimraf"."1.x.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "utile" ];
+  };
+  full."validator"."0.4.x" = lib.makeOverridable self.buildNodePackage {
+    name = "validator-0.4.28";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/validator/-/validator-0.4.28.tgz";
+        sha1 = "311d439ae6cf3fbe6f85da6ebaccd0c7007986f4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."validator"."0.4.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "validator" ];
+  };
+  full."vasync"."1.3.3" = lib.makeOverridable self.buildNodePackage {
+    name = "vasync-1.3.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/vasync/-/vasync-1.3.3.tgz";
+        sha1 = "84917680717020b67e043902e63bc143174c8728";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."vasync"."1.3.3" or []);
+    deps = [
+      self.full."jsprim"."0.3.0"
+      self.full."verror"."1.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "vasync" ];
+  };
+  full."verror"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "verror-1.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/verror/-/verror-1.1.0.tgz";
+        sha1 = "2a4b4eb14a207051e75a6f94ee51315bf173a1b0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."verror"."1.1.0" or []);
+    deps = [
+      self.full."extsprintf"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "verror" ];
+  };
+  full."verror"."1.3.3" = lib.makeOverridable self.buildNodePackage {
+    name = "verror-1.3.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/verror/-/verror-1.3.3.tgz";
+        sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."verror"."1.3.3" or []);
+    deps = [
+      self.full."extsprintf"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "verror" ];
+  };
+  full."verror"."1.3.6" = lib.makeOverridable self.buildNodePackage {
+    name = "verror-1.3.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
+        sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."verror"."1.3.6" or []);
+    deps = [
+      self.full."extsprintf"."1.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "verror" ];
+  };
+  full."view-helpers"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "view-helpers-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.2.tgz";
+        sha1 = "20643e9f50d00cf46da754dc934d791d4f6e3bb2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."view-helpers"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "view-helpers" ];
+  };
+  "view-helpers" = self.full."view-helpers"."*";
+  full."vows".">=0.5.13" = lib.makeOverridable self.buildNodePackage {
+    name = "vows-0.7.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/vows/-/vows-0.7.0.tgz";
+        sha1 = "dd0065f110ba0c0a6d63e844851c3208176d5867";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."vows".">=0.5.13" or []);
+    deps = [
+      self.full."eyes".">=0.1.6"
+      self.full."diff"."~1.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "vows" ];
+  };
+  full."walk"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "walk-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/walk/-/walk-2.2.1.tgz";
+        sha1 = "5ada1f8e49e47d4b7445d8be7a2e1e631ab43016";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."walk"."*" or []);
+    deps = [
+      self.full."forEachAsync"."~2.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "walk" ];
+  };
+  "walk" = self.full."walk"."*";
+  full."watch"."0.5.x" = lib.makeOverridable self.buildNodePackage {
+    name = "watch-0.5.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/watch/-/watch-0.5.1.tgz";
+        sha1 = "50ea3a056358c98073e0bca59956de4afd20b213";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."watch"."0.5.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "watch" ];
+  };
+  full."watch"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "watch-0.7.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/watch/-/watch-0.7.0.tgz";
+        sha1 = "3d6e715648af867ec7f1149302b526479e726856";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."watch"."0.7.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "watch" ];
+  };
+  full."websocket-driver".">=0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "websocket-driver-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.2.2.tgz";
+        sha1 = "998bc1855d8cd0d1e9aa8f8056b83b46ac3e81ef";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."websocket-driver".">=0.2.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "websocket-driver" ];
+  };
+  full."when"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "when-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/when/-/when-2.2.1.tgz";
+        sha1 = "b1def994017350b8087f6e9a7596ab2833bdc712";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."when"."~2.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "when" ];
+  };
+  full."which"."1" = lib.makeOverridable self.buildNodePackage {
+    name = "which-1.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/which/-/which-1.0.5.tgz";
+        sha1 = "5630d6819dda692f1464462e7956cb42c0842739";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."which"."1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "which" ];
+  };
+  full."which"."~1.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "which-1.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/which/-/which-1.0.5.tgz";
+        sha1 = "5630d6819dda692f1464462e7956cb42c0842739";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."which"."~1.0.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "which" ];
+  };
+  full."winser"."=0.0.11" = lib.makeOverridable self.buildNodePackage {
+    name = "winser-0.0.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/winser/-/winser-0.0.11.tgz";
+        sha1 = "38474086a89ac72f90f9c6762e23375d12046c7c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."winser"."=0.0.11" or []);
+    deps = [
+      self.full."sequence"."*"
+      self.full."commander"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "winser" ];
+  };
+  full."winston"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "winston-0.7.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/winston/-/winston-0.7.2.tgz";
+        sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."winston"."*" or []);
+    deps = [
+      self.full."async"."0.2.x"
+      self.full."colors"."0.6.x"
+      self.full."cycle"."1.0.x"
+      self.full."eyes"."0.1.x"
+      self.full."pkginfo"."0.3.x"
+      self.full."request"."2.16.x"
+      self.full."stack-trace"."0.0.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "winston" ];
+  };
+  "winston" = self.full."winston"."*";
+  full."winston"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+    name = "winston-0.6.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
+        sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."winston"."0.6.2" or []);
+    deps = [
+      self.full."async"."0.1.x"
+      self.full."colors"."0.x.x"
+      self.full."cycle"."1.0.x"
+      self.full."eyes"."0.1.x"
+      self.full."pkginfo"."0.2.x"
+      self.full."request"."2.9.x"
+      self.full."stack-trace"."0.0.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "winston" ];
+  };
+  full."winston"."0.6.x" = lib.makeOverridable self.buildNodePackage {
+    name = "winston-0.6.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
+        sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."winston"."0.6.x" or []);
+    deps = [
+      self.full."async"."0.1.x"
+      self.full."colors"."0.x.x"
+      self.full."cycle"."1.0.x"
+      self.full."eyes"."0.1.x"
+      self.full."pkginfo"."0.2.x"
+      self.full."request"."2.9.x"
+      self.full."stack-trace"."0.0.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "winston" ];
+  };
+  full."winston"."0.7.1" = lib.makeOverridable self.buildNodePackage {
+    name = "winston-0.7.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/winston/-/winston-0.7.1.tgz";
+        sha1 = "e291ab24eddbf79ea40ff532619277a0d30b0eb3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."winston"."0.7.1" or []);
+    deps = [
+      self.full."async"."0.2.x"
+      self.full."colors"."0.6.x"
+      self.full."cycle"."1.0.x"
+      self.full."eyes"."0.1.x"
+      self.full."pkginfo"."0.3.x"
+      self.full."request"."2.16.x"
+      self.full."stack-trace"."0.0.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "winston" ];
+  };
+  full."with"."~1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "with-1.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/with/-/with-1.1.0.tgz";
+        sha1 = "7f722ce4050ab55310777327b014194c544c66dd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."with"."~1.1.0" or []);
+    deps = [
+      self.full."uglify-js"."2.3.6"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "with" ];
+  };
+  full."wordwrap".">=0.0.1 <0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "wordwrap-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."wordwrap".">=0.0.1 <0.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "wordwrap" ];
+  };
+  full."wordwrap"."~0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "wordwrap-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."wordwrap"."~0.0.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "wordwrap" ];
+  };
+  full."ws"."0.4.x" = lib.makeOverridable self.buildNodePackage {
+    name = "ws-0.4.28";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ws/-/ws-0.4.28.tgz";
+        sha1 = "03bcea020195847d1184c6c08f45baaf12322eee";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ws"."0.4.x" or []);
+    deps = [
+      self.full."commander"."~0.6.1"
+      self.full."tinycolor"."0.x"
+      self.full."options".">=0.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ws" ];
+  };
+  full."wu"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "wu-0.1.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/wu/-/wu-0.1.8.tgz";
+        sha1 = "619bcdf64974a487894a25755ae095c5208b4a22";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."wu"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "wu" ];
+  };
+  "wu" = self.full."wu"."*";
+  full."xml2js"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "xml2js-0.2.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz";
+        sha1 = "9a5b577fa1e6cdf8923d5e1372f7a3188436e44d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."xml2js"."0.2.4" or []);
+    deps = [
+      self.full."sax".">=0.4.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "xml2js" ];
+  };
+  full."xml2js"."0.2.x" = lib.makeOverridable self.buildNodePackage {
+    name = "xml2js-0.2.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz";
+        sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."xml2js"."0.2.x" or []);
+    deps = [
+      self.full."sax"."0.5.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "xml2js" ];
+  };
+  full."xml2js".">= 0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "xml2js-0.2.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz";
+        sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."xml2js".">= 0.0.1" or []);
+    deps = [
+      self.full."sax"."0.5.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "xml2js" ];
+  };
+  full."xmlbuilder"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "xmlbuilder-0.4.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz";
+        sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."xmlbuilder"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "xmlbuilder" ];
+  };
+  full."xmlhttprequest"."1.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "xmlhttprequest-1.4.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz";
+        sha1 = "01453a1d9bed1e8f172f6495bbf4c8c426321500";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."xmlhttprequest"."1.4.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "xmlhttprequest" ];
+  };
+  full."xoauth2"."~0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "xoauth2-0.1.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz";
+        sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."xoauth2"."~0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "xoauth2" ];
+  };
+  full."yamlish"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "yamlish-0.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.5.tgz";
+        sha1 = "86c6c8e6b28b0827416dcc86f7419bba5610b57d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."yamlish"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "yamlish" ];
+  };
+  full."yeoman-generator"."~0.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "yeoman-generator-0.10.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.10.5.tgz";
+        sha1 = "67b28a6c453addc785e43180236df65e2f93554a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."yeoman-generator"."~0.10.0" or []);
+    deps = [
+      self.full."cheerio"."~0.10.8"
+      self.full."request"."~2.16.6"
+      self.full."rimraf"."~2.1.4"
+      self.full."tar"."~0.1.17"
+      self.full."diff"."~1.0.4"
+      self.full."mime"."~1.2.9"
+      self.full."underscore.string"."~2.3.1"
+      self.full."lodash"."~1.1.1"
+      self.full."mkdirp"."~0.3.5"
+      self.full."read"."~1.0.4"
+      self.full."glob"."~3.1.21"
+      self.full."nopt"."~2.1.1"
+      self.full."cli-table"."~0.2.0"
+      self.full."debug"."~0.7.2"
+      self.full."isbinaryfile"."~0.1.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "yeoman-generator" ];
+  };
+  full."yeoman-generator"."~0.12.0" = lib.makeOverridable self.buildNodePackage {
+    name = "yeoman-generator-0.12.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.12.3.tgz";
+        sha1 = "a11288e7ed11c46efd816b268eeea96acd960d1f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."yeoman-generator"."~0.12.0" or []);
+    deps = [
+      self.full."cheerio"."~0.12.0"
+      self.full."request"."~2.21.0"
+      self.full."rimraf"."~2.1.4"
+      self.full."tar"."~0.1.17"
+      self.full."diff"."~1.0.4"
+      self.full."mime"."~1.2.9"
+      self.full."underscore.string"."~2.3.1"
+      self.full."lodash"."~1.3.0"
+      self.full."mkdirp"."~0.3.5"
+      self.full."glob"."~3.2.0"
+      self.full."nopt"."~2.1.1"
+      self.full."cli-table"."~0.2.0"
+      self.full."debug"."~0.7.2"
+      self.full."isbinaryfile"."~0.1.8"
+      self.full."dargs"."~0.1.0"
+      self.full."async"."~0.2.8"
+      self.full."inquirer"."~0.2.0"
+      self.full."iconv-lite"."~0.2.10"
+      self.full."shelljs"."~0.1.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "yeoman-generator" ];
+  };
+  full."yeoman-generator"."~0.12.3" = lib.makeOverridable self.buildNodePackage {
+    name = "yeoman-generator-0.12.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.12.3.tgz";
+        sha1 = "a11288e7ed11c46efd816b268eeea96acd960d1f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."yeoman-generator"."~0.12.3" or []);
+    deps = [
+      self.full."cheerio"."~0.12.0"
+      self.full."request"."~2.21.0"
+      self.full."rimraf"."~2.1.4"
+      self.full."tar"."~0.1.17"
+      self.full."diff"."~1.0.4"
+      self.full."mime"."~1.2.9"
+      self.full."underscore.string"."~2.3.1"
+      self.full."lodash"."~1.3.0"
+      self.full."mkdirp"."~0.3.5"
+      self.full."glob"."~3.2.0"
+      self.full."nopt"."~2.1.1"
+      self.full."cli-table"."~0.2.0"
+      self.full."debug"."~0.7.2"
+      self.full."isbinaryfile"."~0.1.8"
+      self.full."dargs"."~0.1.0"
+      self.full."async"."~0.2.8"
+      self.full."inquirer"."~0.2.0"
+      self.full."iconv-lite"."~0.2.10"
+      self.full."shelljs"."~0.1.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "yeoman-generator" ];
+  };
+  full."yo"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "yo-1.0.0-rc.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/yo/-/yo-1.0.0-rc.1.4.tgz";
+        sha1 = "9c416c7006e94e756eb52a7a6884127b41f62ca6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."yo"."*" or []);
+    deps = [
+      self.full."yeoman-generator"."~0.12.3"
+      self.full."nopt"."~2.1.1"
+      self.full."lodash"."~1.3.1"
+      self.full."update-notifier"."~0.1.3"
+      self.full."insight"."~0.1.0"
+      self.full."sudo-block"."~0.2.0"
+      self.full."async"."~0.2.9"
+      self.full."open"."0.0.4"
+      self.full."chalk"."~0.1.0"
+    ];
+    peerDependencies = [
+      self.full."grunt-cli"."~0.1.7"
+      self.full."bower".">=0.9.0"
+    ];
+    passthru.names = [ "yo" ];
+  };
+  "yo" = self.full."yo"."*";
+  full."yo".">=1.0.0-rc.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "yo-1.0.0-rc.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/yo/-/yo-1.0.0-rc.1.4.tgz";
+        sha1 = "9c416c7006e94e756eb52a7a6884127b41f62ca6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."yo".">=1.0.0-rc.1.1" or []);
+    deps = [
+      self.full."yeoman-generator"."~0.12.3"
+      self.full."nopt"."~2.1.1"
+      self.full."lodash"."~1.3.1"
+      self.full."update-notifier"."~0.1.3"
+      self.full."insight"."~0.1.0"
+      self.full."sudo-block"."~0.2.0"
+      self.full."async"."~0.2.9"
+      self.full."open"."0.0.4"
+      self.full."chalk"."~0.1.0"
+    ];
+    peerDependencies = [
+      self.full."grunt-cli"."~0.1.7"
+      self.full."bower".">=0.9.0"
+    ];
+    passthru.names = [ "yo" ];
+  };
+  full."zeparser"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "zeparser-0.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz";
+        sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."zeparser"."0.0.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "zeparser" ];
+  };
+}
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 8116f769654..3e21fd62865 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"
@@ -13,7 +14,7 @@
 , "smartdc"
 , "optparse"
 , "jsontool"
-, "swig"
+, { "swig": "0.14.x" }
 , "coffee-script"
 , "escape-html"
 , "buffertools"
@@ -35,4 +36,44 @@
 , "ansi-remover"
 , "mkdirp"
 , "jshint"
+, "stream-splitter-transform"
+, "bcrypt"
+, "nconf"
+, "winston"
+, "jade"
+, "view-helpers"
+, "redis"
+, "mongodb"
+, { "mongoose": "3.6.x" }
+, "mongoose-schema-extend"
+, "connect-mongo"
+, "connect-flash"
+, "passport"
+, "passport-local"
+, "passport-http"
+, "gzippo"
+, "walk"
+, "forever"
+, "forever-monitor"
+, "kue"
+, "supertest"
+, "should"
+, "nodemon"
+, "timezone"
+, "libyaml"
+, "i18next"
+, "stylus"
+, "npm"
+, "gridfs-stream"
+, "tar"
+, "flatiron"
+, "ironhorse"
+, "fs-walk"
+, "yo"
+, "generator-webapp"
+, "generator-angular"
+, "statsd"
+, "karma"
+, { "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/node-packages.nix b/pkgs/top-level/node-packages.nix
index a23b776d112..2c663c99dd0 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -1,35 +1,10 @@
 { pkgs, stdenv, nodejs, fetchurl, neededNatives, self }:
 
-let
-  inherit (self) buildNodePackage patchLatest;
-
-  importGeneratedPackages = generated: nativeDeps: self:
-    let
-      all = pkgs.lib.fold (pkg: { top-level, full }: {
-        top-level = top-level ++ pkgs.lib.optional pkg.topLevel {
-          name = pkg.baseName;
-          value = builtins.getAttr pkg.fullName self.full;
-        };
-        full = [ {
-          name = pkg.fullName;
-          value = pkgs.lib.makeOverridable buildNodePackage rec {
-            name = "${pkg.baseName}-${pkg.version}";
-            src = (if pkg.patchLatest then patchLatest else fetchurl) {
-              url = "http://registry.npmjs.org/${pkg.baseName}/-/${name}.tgz";
-              sha256 = pkg.hash;
-            };
-            deps = map (dep: builtins.getAttr "${dep.name}-${dep.range}" self.full) pkg.dependencies;
-            buildInputs = if builtins.hasAttr name nativeDeps then builtins.getAttr name nativeDeps else [];
-          };
-        } ] ++ full;
-      } ) { top-level = []; full = []; } generated;
-    in builtins.listToAttrs all.top-level // { full = builtins.listToAttrs all.full; };
-in {
-  inherit importGeneratedPackages;
-
+{
   nativeDeps = {
-    "node-expat-*" = [ pkgs.expat ];
-    "rbytes-0.0.2" = [ pkgs.openssl ];
+    "node-expat"."*" = [ pkgs.expat ];
+    "rbytes"."0.0.2" = [ pkgs.openssl ];
+    "phantomjs"."~1.9" = [ pkgs.phantomjs ];
   };
 
   buildNodePackage = import ../development/web/nodejs/build-node-package.nix {
@@ -48,4 +23,4 @@ in {
     '';
 
   /* Put manual packages below here (ideally eventually managed by npm2nix */
-} // importGeneratedPackages (import ./node-packages-generated.nix) self.nativeDeps self
+} // import ./node-packages-generated.nix { inherit self fetchurl; inherit (pkgs) lib; }
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c4fc6a1767a..f7d316a7514 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -98,6 +98,28 @@ rec {
     propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ];
   };
 
+  AnyEvent = buildPerlPackage {
+    name = "AnyEvent-7.04";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.04.tar.gz;
+      sha256 = "6a9d94fa61c7f5dc515c834eb224dbc6ce4123da8fd5bfa0cf3815f3f3e908b2";
+    };
+  };
+
+  AnyEventRabbitMQ = buildPerlPackage {
+    name = "AnyEvent-RabbitMQ-1.15";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BO/BOBTFISH/AnyEvent-RabbitMQ-1.15.tar.gz;
+      sha256 = "fda292dfaae10f6d99aafc46831ce507153b58368e3eb2617bbb3f749605805a";
+    };
+    buildInputs = [ TestException ];
+    propagatedBuildInputs = [ AnyEvent DevelGlobalDestruction FileShareDir ListMoreUtils NetAMQP Readonly namespaceclean ];
+    meta = {
+      description = "An asynchronous and multi channel Perl AMQP client";
+      license = "perl";
+    };
+  };
+
   AnyMoose = buildPerlPackage rec {
     name = "Any-Moose-0.10";
     src = fetchurl {
@@ -130,6 +152,21 @@ rec {
     propagatedBuildInputs = [LocaleMaketextSimple];
   };
 
+  AppCmd = buildPerlPackage {
+    name = "App-Cmd-0.320";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.320.tar.gz;
+      sha256 = "ca6174f634bbe5b73c5f5ad6e0f3b3385568934282f4e848da8e78025b2b185e";
+    };
+    buildInputs = [ TestFatal ];
+    propagatedBuildInputs = [ CaptureTiny ClassLoad DataOptList GetoptLongDescriptive IOTieCombine StringRewritePrefix SubExporter SubInstall ];
+    meta = {
+      homepage = https://github.com/rjbs/app-cmd;
+      description = "Write command line apps with less suffering";
+      license = "perl";
+    };
+  };
+
   AppConfig = buildPerlPackage {
     name = "AppConfig-1.66";
     src = fetchurl {
@@ -229,7 +266,19 @@ rec {
       homepage = http://www.aarontrevena.co.uk/opensource/autodia/;
       license = "GPLv2+";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
+    };
+  };
+
+  autodie = buildPerlPackage {
+    name = "autodie-2.20";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PJ/PJF/autodie-2.20.tar.gz;
+      sha256 = "346763c582cd8066b4e5d07e4013202f9f9296d32b42343e117dbfb13ea6e4f0";
+    };
+    meta = {
+      description = "Replace functions with ones that succeed or die with lexical scope";
+      license = "perl";
     };
   };
 
@@ -268,7 +317,7 @@ rec {
   BitVector = buildPerlPackage {
     name = "Bit-Vector-7.3";
     src = fetchurl {
-      url = http://cpan.metacpan.org/authors/id/S/ST/STBEY/Bit-Vector-7.3.tar.gz;
+      url = mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-7.3.tar.gz;
       sha256 = "0gcg1173i1bsx2qvyw77kw90xbf03b861jc42hvq744vzc5k6xjs";
     };
     propagatedBuildInputs = [CarpClan];
@@ -296,10 +345,10 @@ rec {
   };
 
   BoostGeometryUtils = buildPerlModule rec {
-    name = "Boost-Geometry-Utils-0.09";
+    name = "Boost-Geometry-Utils-0.12";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AA/AAR/${name}.tar.gz";
-      sha256 = "0wgd36rxd5lj0vlkp7l9zgx8bgbv0nj4kia83ipb7p64xpyysghg";
+      sha256 = "1pywbxjf05qpcixshblhd2cham601zwa9w7c3k5waz4cdild6g1m";
     };
     propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsTypemapsDefault ];
   };
@@ -365,7 +414,7 @@ rec {
   CaptchaReCAPTCHA = buildPerlPackage rec {
     name = "Captcha-reCAPTCHA-0.97";
     src = fetchurl {
-      url = http://cpan.metacpan.org/authors/id/P/PH/PHRED/Captcha-reCAPTCHA-0.97.tar.gz;
+      url = mirror://cpan/authors/id/P/PH/PHRED/Captcha-reCAPTCHA-0.97.tar.gz;
       sha256 = "12f2yh89aji6mnkrqxjcllws5dlg545wvz0j7wamy149xyqi12wq";
     };
     propagatedBuildInputs = [HTMLTiny LWP];
@@ -464,7 +513,7 @@ rec {
       url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz";
       sha256 = "09mn0wjwfvnfi28y47g816nx50zdpvwvbxp0nrpsap0ir1m80wi3";
     };
-    buildInputs = [ TestWWWMechanizeCatalyst TestUseOk ];
+    buildInputs = [ TestWWWMechanizeCatalyst Testuseok ];
     propagatedBuildInputs =
       [ CatalystPluginAuthentication ClassAccessor CryptPasswdMD5 AuthenHtpasswd HTMLForm ];
   };
@@ -666,7 +715,7 @@ rec {
       url = mirror://cpan/authors/id/G/GR/GRAF/Catalyst-Plugin-Cache-HTTP-0.001000.tar.gz;
       sha256 = "0v5iphbq4csc4r6wkvxnqlh97p8g0yhjky9qqmsdyqczn87agbba";
     };
-    buildInputs = [ CatalystRuntime TestUseOk TestWWWMechanizeCatalyst ];
+    buildInputs = [ CatalystRuntime Testuseok TestWWWMechanizeCatalyst ];
     propagatedBuildInputs = [ ClassAccessorFast HTTPMessage MROCompat ];
     meta = {
       description = "HTTP/1.1 cache validators for Catalyst";
@@ -785,7 +834,7 @@ rec {
       url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz";
       sha256 = "1c6k4x6az0fkany16zlyaqhlp7bcx922vl4qzd3z707vs6pc06rz";
     };
-    buildInputs = [  TestWWWMechanizeCatalyst TestUseOk ];
+    buildInputs = [  TestWWWMechanizeCatalyst Testuseok ];
     propagatedBuildInputs = [ CatalystRuntime TextCSV XMLSimple ];
   };
 
@@ -1307,7 +1356,7 @@ rec {
       url = "mirror://cpan/authors/id/J/JR/JROCKWAY/${name}.tar.gz";
       sha256 = "0gssillawjknqks81x7fg7w2x94bnyklgd8ry2pr1k6ifkjhwz46";
     };
-    buildInputs = [ TestException TestUseOk ];
+    buildInputs = [ TestException Testuseok ];
   };
 
   CookieXS = buildPerlPackage rec {
@@ -1320,6 +1369,15 @@ rec {
     propagatedBuildInputs = [ CGICookieXS ];
   };
 
+  Coro = buildPerlPackage {
+    name = "Coro-6.31";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.31.tar.gz;
+      sha256 = "a73ace48d940b28e3dfb32d2f3507205d3ddfdc6610075ecc72e19476bb6de44";
+    };
+    propagatedBuildInputs = [ AnyEvent Guard CommonSense ];
+  };
+
   CPANMeta = buildPerlPackage {
     name = "CPAN-Meta-2.120921";
     src = fetchurl {
@@ -1427,7 +1485,7 @@ rec {
       url = mirror://cpan/authors/id/N/NU/NUFFIN/Crypt-Random-Source-0.07.tar.gz;
       sha256 = "0kxcqcpknh9hhfnpiymxrjg74yj7nfr7k4fgrfmd9s2cw9p9mqdv";
     };
-    buildInputs = [ TestUseOk TestException ];
+    buildInputs = [ Testuseok TestException ];
     propagatedBuildInputs = [ AnyMoose CaptureTiny ModuleFind namespaceclean SubExporter ];
     meta = {
       homepage = http://search.cpan.org/dist/Crypt-Random-Source;
@@ -1687,7 +1745,7 @@ rec {
   DateCalc = buildPerlPackage {
     name = "Date-Calc-6.3";
     src = fetchurl {
-      url = http://cpan.metacpan.org/authors/id/S/ST/STBEY/Date-Calc-6.3.tar.gz;
+      url = mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-6.3.tar.gz;
       sha256 = "14yvbgy9n8icwlm5zi86lskvxd6nsl42i1g9f5dwdaw9my463diy";
     };
     propagatedBuildInputs = [CarpClan BitVector];
@@ -2071,6 +2129,18 @@ rec {
     };
   };
 
+  DBIxSimple = buildPerlPackage {
+    name = "DBIx-Simple-1.35";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.35.tar.gz;
+      sha256 = "445535b3dfab88140c7a0d2776b1e78f254dc7e9c81072d5a01afc95a5db499a";
+    };
+    propagatedBuildInputs = [ DBI ];
+    meta = {
+      description = "Very complete easy-to-use OO interface to DBI";
+    };
+  };
+
   DevelCycle = buildPerlPackage {
     name = "Devel-Cycle-1.11";
     src = fetchurl {
@@ -2123,7 +2193,7 @@ rec {
       url = mirror://cpan/authors/id/F/FL/FLORA/Devel-PartialDump-0.15.tar.gz;
       sha256 = "0xm42030qlbimay5x72sjj0na43ciniai2xdcdx8zf191jw5dz7n";
     };
-    propagatedBuildInputs = [ Moose namespaceclean SubExporter TestUseOk TestWarn ];
+    propagatedBuildInputs = [ Moose namespaceclean SubExporter Testuseok TestWarn ];
   };
 
   DevelStackTrace = buildPerlPackage {
@@ -2425,7 +2495,7 @@ rec {
   ExceptionBase = buildPerlPackage {
     name = "Exception-Base-0.25";
     src = fetchurl {
-      url = http://cpan.metacpan.org/authors/id/D/DE/DEXTER/Exception-Base-0.25.tar.gz;
+      url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.25.tar.gz;
       sha256 = "1s2is862xba2yy633wn2nklrya36yrlwxlbpqjrv8m31xj2c8khw";
     };
     buildInputs = [ TestUnitLite ];
@@ -2460,6 +2530,21 @@ rec {
     propagatedBuildInputs = [ ExceptionBase ];
   };
 
+  ExporterDeclare = buildPerlModule {
+    name = "Exporter-Declare-0.113";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/EX/EXODIST/Exporter-Declare-0.113.tar.gz;
+      sha256 = "724de5e982c8477df14a360c82233f9e0c26b4af9191647f750f5e465ea42dce";
+    };
+    buildInputs = [ FennecLite TestException ];
+    propagatedBuildInputs = [ MetaBuilder aliased ];
+    meta = {
+      homepage = http://open-exodus.net/projects/Exporter-Declare;
+      description = "Exporting done right";
+      license = "perl";
+    };
+  };
+
   ExporterLite = buildPerlPackage {
     name = "Exporter-Lite-0.02";
     src = fetchurl {
@@ -2472,11 +2557,12 @@ rec {
   };
 
   ExtUtilsCBuilder = buildPerlPackage rec {
-    name = "ExtUtils-CBuilder-0.280202";
+    name = "ExtUtils-CBuilder-0.280205";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
-      sha256 = "13qjdz1kmrp5mp404by94cdsyydjadg974ykinqga450djjaqpbq";
+      sha256 = "0nfrr3zd71gnsbp5xacdb70n17slrzj421s4nyr11zg5cqsj3ngs";
     };
+    buildInputs = [ PerlOSType ];
   };
 
   ExtUtilsConfig = buildPerlPackage {
@@ -2569,19 +2655,40 @@ rec {
   };
 
   ExtUtilsParseXS = buildPerlPackage rec {
-    name = "ExtUtils-ParseXS-3.15";
+    name = "ExtUtils-ParseXS-3.18";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
-      sha256 = "06baf0nsmdkfk50p4x9kss4ncm8h49gkzy8hl5cxbxdsab65gmrb";
+      sha256 = "0kvbx66vncgk2c72994z31bgh2w3rsrlnx0z7cmxqa7w3hlc4741";
     };
   };
 
+  # From CPAN[1]:
+  #   This module exists merely as a compatibility wrapper around
+  #   ExtUtils::Typemaps. In a nutshell, ExtUtils::Typemap was renamed to
+  #   ExtUtils::Typemaps because the Typemap directory in lib/ could collide with
+  #   the typemap file on case-insensitive file systems.
+  #
+  #   The ExtUtils::Typemaps module is part of the ExtUtils::ParseXS distribution
+  #   and ships with the standard library of perl starting with perl version
+  #   5.16.
+  #
+  # [1] http://search.cpan.org/~smueller/ExtUtils-Typemap-1.00/lib/ExtUtils/Typemap.pm:
+  ExtUtilsTypemap = buildPerlPackage rec {
+    name = "ExtUtils-Typemap-1.00";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
+      sha256 = "1iqz0xlscg655gnwb2h1wrjj70llblps1zznl29qn1mv5mvibc5i";
+    };
+    buildInputs = [ ExtUtilsParseXS ];
+  };
+
   ExtUtilsTypemapsDefault = buildPerlModule rec {
     name = "ExtUtils-Typemaps-Default-1.01";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
       sha256 = "0k03rr7bmhnn6j0505w9id5apss85yvqnx76hxf3javn3klj1m5z";
     };
+    propagatedBuildInputs = [ ExtUtilsTypemap ExtUtilsParseXS ];
   };
 
   ExtUtilsXSpp = buildPerlModule rec {
@@ -2612,6 +2719,19 @@ rec {
     buildInputs = [ ];
   };
 
+  FennecLite = buildPerlModule {
+    name = "Fennec-Lite-0.004";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/EX/EXODIST/Fennec-Lite-0.004.tar.gz;
+      sha256 = "dce28e3932762c2ff92aa52d90405c06e898e81cb7b164ccae8966ae77f1dcab";
+    };
+    meta = {
+      homepage = http://open-exodus.net/projects/Fennec-Lite;
+      description = "Minimalist Fennec, the commonly used bits";
+      license = "perl";
+    };
+  };
+
   FileChangeNotify = buildPerlModule rec {
     name = "File-ChangeNotify-0.20";
     src = fetchurl {
@@ -2710,6 +2830,19 @@ rec {
     };
   };
 
+  Filepushd = buildPerlPackage {
+    name = "File-pushd-1.005";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.005.tar.gz;
+      sha256 = "50fdcc33e69a50bab1e32d1a7c96753938f6d95a06015e34e662958c58687842";
+    };
+    meta = {
+      homepage = https://metacpan.org/release/File-pushd;
+      description = "Change directory temporarily for a limited scope";
+      license = "apache";
+    };
+  };
+
   FileRemove = buildPerlPackage rec {
     name = "File-Remove-1.42";
     src = fetchurl {
@@ -2718,6 +2851,20 @@ rec {
     };
   };
 
+  FileShare = buildPerlPackage {
+    name = "File-Share-0.02";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/I/IN/INGY/File-Share-0.02.tar.gz;
+      sha256 = "1vdgyf3m08s4pwj70bgbb31jsj8hixdl940m15phyx2hpy8dkabw";
+    };
+    propagatedBuildInputs = [ FileShareDir ];
+    meta = {
+      homepage = http://github.com/ingydotnet/file-share-pm/tree;
+      description = "Extend File::ShareDir to Local Libraries";
+      license = "perl";
+    };
+  };
+
   FileShareDir = buildPerlPackage {
     name = "File-ShareDir-1.03";
     src = fetchurl {
@@ -2800,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";
@@ -2924,7 +3072,7 @@ rec {
     meta = {
       description = "Perl interface to the GraphViz graphing tool";
       license = [ "Artistic" ];
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
     };
   };
 
@@ -2937,6 +3085,14 @@ rec {
     buildInputs = [ DataUUID CryptCBC ];
   };
 
+  Guard = buildPerlPackage {
+    name = "Guard-1.022";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/ML/MLEHMANN/Guard-1.022.tar.gz;
+      sha256 = "0saq9949d13mdvpnls7mw1cy74lm4ncl7agbs7n2jl4sy6bvmw9m";
+    };
+  };
+
   HashFlatten = buildPerlPackage rec {
     name = "Hash-Flatten-1.19";
     src = fetchurl {
@@ -2976,7 +3132,7 @@ rec {
       url = mirror://cpan/authors/id/N/NU/NUFFIN/Hash-Util-FieldHash-Compat-0.03.tar.gz;
       sha256 = "0pmai98a89j82fjksfax87brmpimjn74kr7bl874lc1k40dfhx47";
     };
-    propagatedBuildInputs = [ TestUseOk ];
+    propagatedBuildInputs = [ Testuseok ];
   };  
 
   HeapFibonacci = buildPerlPackage {
@@ -2996,6 +3152,17 @@ rec {
     buildInputs = [ pkgs.unzip ];
   };
 
+  HTMLFromANSI = buildPerlPackage {
+    name = "HTML-FromANSI-2.03";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/N/NU/NUFFIN/HTML-FromANSI-2.03.tar.gz;
+      sha256 = "21776345ed701b2c04c7b09380af943f9984cc7f99624087aea45db5fc09c359";
+    };
+    propagatedBuildInputs = [ HTMLParser TermVT102Boundless Testuseok ];
+    meta = {
+    };
+  };
+
   HTMLForm = buildPerlPackage {
     name = "HTML-Form-6.03";
     src = fetchurl {
@@ -3372,7 +3539,7 @@ rec {
   };
 
   IOPager = buildPerlPackage {
-    name = "IO-Pager-0.06.tgz";
+    name = "IO-Pager-0.06";
     src = fetchurl {
       url = mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-0.06.tgz;
       sha256 = "0r3af4gyjpy0f7bhs7hy5s7900w0yhbckb2dl3a1x5wpv7hcbkjb";
@@ -3418,6 +3585,19 @@ rec {
     };
   };
 
+  IOTieCombine = buildPerlPackage {
+    name = "IO-TieCombine-1.002";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/IO-TieCombine-1.002.tar.gz;
+      sha256 = "fd4f59e82852fd8b868dd1642cb6ec9caf32a597803fdce2cbe8d580c3b41d44";
+    };
+    meta = {
+      homepage = https://github.com/rjbs/io-tiecombine;
+      description = "Produce tied (and other) separate but combined variables";
+      license = "perl";
+    };
+  };
+
   IOTty = buildPerlPackage rec {
     name = "IO-Tty-1.10";
     src = fetchurl {
@@ -3482,7 +3662,7 @@ rec {
 
       licenses = [ "GPLv1+" /* or */ "Artistic" ];
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
       platforms = stdenv.lib.platforms.unix;
     };
   };
@@ -3509,7 +3689,7 @@ rec {
 
       license = "Artistic";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
     };
   };
 
@@ -3541,7 +3721,7 @@ rec {
 
       license = "Artistic";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
     };
   };
 
@@ -3605,8 +3785,8 @@ rec {
   libintl_perl = buildPerlPackage rec {
     name = "libintl-perl-1.23";
     src = fetchurl {
-        url = http://cpan.metacpan.org/authors/id/G/GU/GUIDO/libintl-perl-1.23.tar.gz;
-        sha256 = "1ylz6yhjifblhmnva0k05ch12a4cdii5v0icah69ma1gdhsidnk0";
+      url = mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.23.tar.gz;
+      sha256 = "1ylz6yhjifblhmnva0k05ch12a4cdii5v0icah69ma1gdhsidnk0";
     };
   };
 
@@ -3709,8 +3889,8 @@ rec {
   ListUtilsBy = buildPerlPackage rec {
     name = "List-UtilsBy-0.09";
     src = fetchurl {
-        url = http://cpan.metacpan.org/authors/id/P/PE/PEVANS/List-UtilsBy-0.09.tar.gz;
-        sha256 = "1xcsgz8898h670zmwqd8azfn3a2y9nq7z8cva9dsyhzkk8ajmra1";
+      url = mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.09.tar.gz;
+      sha256 = "1xcsgz8898h670zmwqd8azfn3a2y9nq7z8cva9dsyhzkk8ajmra1";
     };
   };
 
@@ -3756,6 +3936,20 @@ rec {
     };
   };
 
+  LogContextual = buildPerlPackage {
+    name = "Log-Contextual-0.005003";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FR/FREW/Log-Contextual-0.005003.tar.gz;
+      sha256 = "8519ae92bd8685d003460f99151996e94f38c3c8f12b90634857558605d13719";
+    };
+    buildInputs = [ TestFatal ];
+    propagatedBuildInputs = [ DataDumperConcise ExporterDeclare Moo ];
+    meta = {
+      description = "Simple logging interface with a contextual log";
+      license = "perl";
+    };
+  };
+
   LogDispatch = buildPerlPackage {
     name = "Log-Dispatch-2.39";
     src = fetchurl {
@@ -3912,10 +4106,10 @@ rec {
   };
 
   MathClipper = buildPerlModule rec {
-    name = "Math-Clipper-1.19";
+    name = "Math-Clipper-1.22";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz";
-      sha256 = "1hrdand4i937bgsr3f3yma5ckkdwkprdwmkyyl37v1vqcjdrjr7j";
+      sha256 = "0p5iblg979v3pb6a8kyhjdv33yadr5997nhz9asjksgvww328nfa";
     };
     propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsXSpp ExtUtilsTypemapsDefault TestDeep ];
   };
@@ -3995,6 +4189,19 @@ rec {
     };
   };
 
+  MetaBuilder = buildPerlModule {
+    name = "Meta-Builder-0.003";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/EX/EXODIST/Meta-Builder-0.003.tar.gz;
+      sha256 = "e7ac289b88d1662e87708d716877ac66a1a8414660996fe58c1db96d834a5375";
+    };
+    buildInputs = [ FennecLite TestException ];
+    meta = {
+      description = "Tools for creating Meta objects to track custom metrics";
+      license = "perl";
+    };
+  };
+
   MethodSignaturesSimple = buildPerlPackage {
     name = "Method-Signatures-Simple-1.07";
     src = fetchurl {
@@ -4043,6 +4250,7 @@ rec {
       url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4005.tar.gz;
       sha256 = "eb2522507251550f459c11223ea6d86b34f1dee9b3e3928d0d6a0497505cb7ef";
     };
+    buildInputs = [ CPANMeta ExtUtilsCBuilder ];
     meta = {
       description = "Build and install Perl modules";
       license = "perl";
@@ -4113,6 +4321,32 @@ rec {
     };
   };
 
+  ModuleInstallAuthorRequires = buildPerlPackage {
+    name = "Module-Install-AuthorRequires-0.02";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FL/FLORA/Module-Install-AuthorRequires-0.02.tar.gz;
+      sha256 = "1v2ciw75dj5y8lh10d1vrhwmjx266gpqavr8m21jlpblgm9j2qyc";
+    };
+    propagatedBuildInputs = [ ModuleInstall ];
+    meta = {
+      description = "Declare author-only dependencies";
+      license = "perl";
+    };
+  };
+
+  ModuleInstallAuthorTests = buildPerlPackage {
+    name = "Module-Install-AuthorTests-0.002";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Module-Install-AuthorTests-0.002.tar.gz;
+      sha256 = "121dyggy38316xss06v1zkwx4b59gl7b00c5q99xyzimwqnp49a0";
+    };
+    propagatedBuildInputs = [ ModuleInstall ];
+    meta = {
+      description = "Designate tests only run by module authors";
+      license = "perl";
+    };
+  };
+
   ModuleMetadata = buildPerlPackage rec {
     name = "Module-Metadata-1.000005";
     src = fetchurl {
@@ -4188,7 +4422,7 @@ rec {
   ModuleVersions = buildPerlPackage {
     name = "Module-Versions-0.02";
     src = fetchurl {
-      url = http://cpan.metacpan.org/authors/id/T/TH/THW/Module-Versions-0.02.zip;
+      url = mirror://cpan/authors/id/T/TH/THW/Module-Versions-0.02.zip;
       sha256 = "0g7qs6vqg91xpwg1cdy91m3kh9m1zbkzyz1qsy453b572xdscf0d";
     };
     buildInputs = [ pkgs.unzip ];
@@ -4257,6 +4491,21 @@ rec {
     propagatedBuildInputs = [ Moose ];
   };
 
+  MooseXAppCmd = buildPerlPackage {
+    name = "MooseX-App-Cmd-0.10";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MJ/MJGARDNER/MooseX-App-Cmd-0.10.tar.gz;
+      sha256 = "6d2d8fdc4f3f7fa76dc82c10d71b099f1572c054a72f373e5a9fa6237e48634a";
+    };
+    buildInputs = [ MooseXConfigFromFile TestOutput YAML ];
+    propagatedBuildInputs = [ AppCmd GetoptLongDescriptive Moose MooseXConfigFromFile MooseXGetopt MooseXHasOptions MooseXMarkAsMethods Testuseok ];
+    meta = {
+      homepage = http://metacpan.org/release/MooseX-App-Cmd;
+      description = "Mashes up MooseX::Getopt and App::Cmd";
+      license = "perl";
+    };
+  };
+
   MooseXAttributeChained = buildPerlModule rec {
     name = "MooseX-Attribute-Chained-1.0.1";
     src = fetchurl {
@@ -4266,13 +4515,41 @@ rec {
     propagatedBuildInputs = [ Moose TryTiny ];
   };
 
+  MooseXAttributeHelpers = buildPerlPackage {
+    name = "MooseX-AttributeHelpers-0.23";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-AttributeHelpers-0.23.tar.gz;
+      sha256 = "3f63f60d94d840a309d9137f78605e15f07c977fd15a4f4b55bd47b65ed52be1";
+    };
+    buildInputs = [ Moose TestException ];
+    propagatedBuildInputs = [ Moose ];
+    meta = {
+      description = "Extend your attribute interfaces (deprecated)";
+      license = "perl";
+    };
+  };
+
   MooseXClone = buildPerlPackage {
     name = "MooseX-Clone-0.05";
     src = fetchurl {
       url = mirror://cpan/authors/id/N/NU/NUFFIN/MooseX-Clone-0.05.tar.gz;
       sha256 = "11pbw3zdbcn54hrj6z74qisnmj9k4qliy6yjj9d71qndq3xg3x0f";
     };
-    propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat Moose namespaceclean TestUseOk ];
+    propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat Moose namespaceclean Testuseok ];
+  };
+
+  MooseXConfigFromFile = buildPerlPackage {
+    name = "MooseX-ConfigFromFile-0.11";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-ConfigFromFile-0.11.tar.gz;
+      sha256 = "963e7dbb2bc7ca18995db903c64b0841c4e8d3877009bff5475125673c3b02b4";
+    };
+    buildInputs = [ Moose TestCheckDeps TestDeep TestFatal TestNoWarnings TestRequires TestWithoutModule ];
+    propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathTiny TryTiny namespaceautoclean ];
+    meta = {
+      description = "An abstract Moose role for setting attributes from a configfile";
+      license = "perl";
+    };
   };
 
   MooseXDaemonize = buildPerlPackage {
@@ -4318,6 +4595,21 @@ rec {
     };
   };
 
+  MooseXHasOptions = buildPerlPackage {
+    name = "MooseX-Has-Options-0.003";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PS/PSHANGOV/MooseX-Has-Options-0.003.tar.gz;
+      sha256 = "07c21cf8ed500b272020ff8da19f194728bb414e0012a2f0cc54ef2ef6222a68";
+    };
+    buildInputs = [ Moose TestMost namespaceautoclean ];
+    propagatedBuildInputs = [ ClassLoad ListMoreUtils PackageStash StringRewritePrefix ];
+    meta = {
+      homepage = https://github.com/pshangov/moosex-has-options;
+      description = "Succinct options for Moose";
+      license = "perl";
+    };
+  };
+
   MooseXMarkAsMethods = buildPerlPackage {
     name = "MooseX-MarkAsMethods-0.15";
     src = fetchurl {
@@ -4422,7 +4714,7 @@ rec {
       url = mirror://cpan/authors/id/J/JR/JROCKWAY/MooseX-Runnable-0.03.tar.gz;
       sha256 = "1hl3pnldjlbyj6gm3bzwj827qp54di14hp4zhypmrmbg1lscfdwc";
     };
-    buildInputs = [ TestUseOk TestTableDriven ];
+    buildInputs = [ Testuseok TestTableDriven ];
     propagatedBuildInputs = [ ListMoreUtils Moose MooseXGetopt MooseXTypes MooseXTypesPathClass namespaceautoclean ParamsUtil ];
   };
 
@@ -4448,8 +4740,8 @@ rec {
   MooseXSingleton = buildPerlPackage rec {
     name = "MooseX-Singleton-0.29";
     src = fetchurl {
-        url = http://cpan.metacpan.org/authors/id/K/KA/KAARE/MooseX-Singleton-0.29.tar.gz;
-        sha256 = "0103f0hi7fp3mc0y0ydnz4ghcnag5gwgn2160y2zp6rnydx2p2sc";
+      url = mirror://cpan/authors/id/K/KA/KAARE/MooseX-Singleton-0.29.tar.gz;
+      sha256 = "0103f0hi7fp3mc0y0ydnz4ghcnag5gwgn2160y2zp6rnydx2p2sc";
     };
     buildInputs = [ Moose TestFatal TestRequires ];
   };
@@ -4474,7 +4766,7 @@ rec {
       url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";
       sha256 = "0sqmpf2kw25847fwrrwpcfhrq694bgs8jbix7qxp9qyjm769np6n";
     };
-    buildInputs = [ TestException TestUseOk ];
+    buildInputs = [ TestException Testuseok ];
     propagatedBuildInputs = [ ClassMOP Moose namespaceautoclean ];
   };
 
@@ -4520,7 +4812,7 @@ rec {
       url = mirror://cpan/authors/id/I/IL/ILMARI/MooseX-Types-DateTime-0.08.tar.gz;
       sha256 = "0q0d1dd8737rc3k3jb22wvybf03hg3lp1iyda0ivkd8020cib996";
     };
-    propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone Moose MooseXTypes namespaceclean TestException TestUseOk ];
+    propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone Moose MooseXTypes namespaceclean TestException Testuseok ];
   };
 
   MooseXTypesDateTimeMoreCoercions = buildPerlPackage {
@@ -4529,7 +4821,7 @@ rec {
       url = mirror://cpan/authors/id/I/IL/ILMARI/MooseX-Types-DateTime-MoreCoercions-0.11.tar.gz;
       sha256 = "c746a9284b7db49ce9acb2fbce26629fa816e6636e883d2ed6c62e336cfc52cb";
     };
-    buildInputs = [ TestException TestUseOk ];
+    buildInputs = [ TestException Testuseok ];
     propagatedBuildInputs = [ DateTime DateTimeXEasy Moose MooseXTypes MooseXTypesDateTime TimeDurationParse namespaceclean ];
     meta = {
       description = "Extensions to MooseX::Types::DateTime";
@@ -4540,7 +4832,7 @@ rec {
   MooseXTypesLoadableClass = buildPerlPackage rec {
     name = "MooseX-Types-LoadableClass-0.008";
     src = fetchurl {
-      url = http://cpan.metacpan.org/authors/id/B/BO/BOBTFISH/MooseX-Types-LoadableClass-0.008.tar.gz;
+      url = mirror://cpan/authors/id/B/BO/BOBTFISH/MooseX-Types-LoadableClass-0.008.tar.gz;
       sha256 = "0wh4zxknqv98nrmsp6yg6mazjyl3vacrgywarzjg5gks78c84i8g";
     };
     propagatedBuildInputs = [ ClassLoad Moose MooseXTypes namespaceclean ];
@@ -4559,6 +4851,36 @@ rec {
     };
   };
 
+  MooseXTypesPathTiny = buildPerlModule {
+    name = "MooseX-Types-Path-Tiny-0.006";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Tiny-0.006.tar.gz;
+      sha256 = "0260c6fbbf84d411b145238ffd92a73f754bd92434448d9f78798fba0a2dfdd6";
+    };
+    buildInputs = [ Filepushd ModuleBuildTiny TestCheckDeps TestFatal ];
+    propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesStringlike PathTiny ];
+    meta = {
+      homepage = https://github.com/karenetheridge/moosex-types-path-tiny;
+      description = "Path::Tiny types and coercions for Moose";
+      license = "apache";
+    };
+  };
+
+  MooseXTypesStringlike = buildPerlPackage {
+    name = "MooseX-Types-Stringlike-0.001";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/MooseX-Types-Stringlike-0.001.tar.gz;
+      sha256 = "2ba71fff105d851ea6aee85bef5d6629726138a2b005b77a163a8bfb403cea03";
+    };
+    buildInputs = [ Moose ];
+    propagatedBuildInputs = [ MooseXTypes ];
+    meta = {
+      homepage = https://github.com/dagolden/moosex-types-stringlike;
+      description = "Moose type constraints for strings or string-like objects";
+      license = "apache";
+    };
+  };
+
   MooseXTypesStructured = buildPerlPackage {
     name = "MooseX-Types-Structured-0.28";
     src = fetchurl {
@@ -4580,7 +4902,7 @@ rec {
       url = mirror://cpan/authors/id/F/FL/FLORA/MooseX-Types-URI-0.03.tar.gz;
       sha256 = "056v08kzcd93h8l69iqdxbr05h85bgz6jvp6iwc0vv68dacr299s";
     };
-    propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathClass namespaceclean TestUseOk URI URIFromHash ];
+    propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathClass namespaceclean Testuseok URI URIFromHash ];
   };
 
   Mouse = buildPerlPackage rec {
@@ -4727,7 +5049,7 @@ rec {
   };
 
   NetAmazonS3Policy = buildPerlPackage {
-    name = "Net-Amazon-S3-Policy-0.001002";
+    name = "Net-Amazon-S3-Policy-0.1.2";
     src = fetchurl {
       url = mirror://cpan/authors/id/P/PO/POLETTIX/Net-Amazon-S3-Policy-0.1.2.tar.gz;
       sha256 = "1kkzimvxwxx0mypf75dalksxmvwsb8b575yx2nzmvjkvjg3j9na0";
@@ -4739,6 +5061,27 @@ rec {
     };
   };
 
+  NetAMQP = buildPerlPackage {
+    name = "Net-AMQP-0.06";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CH/CHIPS/Net-AMQP-0.06.tar.gz;
+      sha256 = "0b2ba7de2cd7ddd5fe102a2e2ae7aeba21eaab1078bf3bfd3c5a722937256380";
+    };
+    buildInputs = [ TestDeep ];
+    propagatedBuildInputs = [ ClassAccessor ClassDataInheritable XMLLibXML ];
+    meta = {
+      description = "Advanced Message Queue Protocol (de)serialization and representation";
+      license = "perl";
+    };
+    preConfigure =
+      ''
+        substituteInPlace META.json \
+          '"Module::Build" : "0.40"' '"Module::Build" : "0.39"'
+        substituteInPlace META.yml \
+          'Module::Build: 0.40' 'Module::Build: 0.39'
+      '';
+  };
+
   NetCoverArtArchive = buildPerlPackage {
     name = "Net-CoverArtArchive-1.02";
     src = fetchurl {
@@ -4819,6 +5162,20 @@ rec {
     };
   };
 
+  NetRabbitFoot = buildPerlPackage {
+    name = "Net-RabbitFoot-1.03";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/I/IK/IKUTA/Net-RabbitFoot-1.03.tar.gz;
+      sha256 = "0544b1914e7847b32b60a643abc6f0b1fdc6d4a816afd84bcd3eee0c28b001ac";
+    };
+    buildInputs = [ TestException ];
+    propagatedBuildInputs = [ AnyEventRabbitMQ ConfigAny Coro JSONXS ListMoreUtils Moose MooseXAppCmd MooseXAttributeHelpers MooseXConfigFromFile ];
+    meta = {
+      description = "An Asynchronous and multi channel Perl AMQP client";
+      license = "perl";
+    };
+  };
+
   NetServer = buildPerlPackage {
     name = "Net-Server-2.007";
     src = fetchurl {
@@ -5089,6 +5446,29 @@ rec {
     };
   };
 
+  PathTiny = buildPerlPackage {
+    name = "Path-Tiny-0.026";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.026.tar.gz;
+      sha256 = "e79ee187bbf7fdef387886a8c929bd0a1171fb54db1984d79f4e04d90f733cc6";
+    };
+    buildInputs = [ DevelHide Filepushd TestDeep TestFailWarnings TestFatal perl ];
+    propagatedBuildInputs = [ autodie ];
+    meta = {
+      homepage = https://metacpan.org/release/Path-Tiny;
+      description = "File path utility";
+      license = "apache";
+    };
+    preConfigure =
+      ''
+        substituteInPlace lib/Path/Tiny.pm --replace 'use File::Spec 3.40' \
+          'use File::Spec 3.39'
+      '';
+    # This appears to be currently failing tests, though I don't know why.
+    # -- ocharles
+    doCheck = false;
+  };
+
   Perl5lib = buildPerlPackage rec {
     name = "perl5lib-1.02";
     src = fetchurl {
@@ -5437,7 +5817,7 @@ rec {
   RSSParserLite = buildPerlPackage {
     name = "RSS-Parser-Lite-0.10";
     src = fetchurl {
-      url = http://cpan.metacpan.org/authors/id/E/EB/EBOSRUP/RSS-Parser-Lite-0.10.tar.gz;
+      url = mirror://cpan/authors/id/E/EB/EBOSRUP/RSS-Parser-Lite-0.10.tar.gz;
       sha256 = "1spvi0z62saz2cam8kwk2k561aavw2w42g3ykj38w1kmydvsk8z6";
     };
     propagatedBuildInputs = [ SOAPLite ];
@@ -5661,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";
     };
   };
 
@@ -5775,10 +6160,10 @@ rec {
   };
 
   StringToIdentifierEN = buildPerlPackage rec {
-    name = "String-ToIdentifier-EN-0.06";
+    name = "String-ToIdentifier-EN-0.10";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/String/${name}.tar.gz";
-      sha256 = "1rmldr7jf4jvkhzlv8hgp48lrmybvinmhv8kcnrpa8las0ijm4vm";
+      sha256 = "1xm0v1cq9hdgx4mswa9wdr2lqk7z9kh1bwjkx4wb5xljd0lxhas6";
     };
     propagatedBuildInputs =
       [ LinguaENInflectPhrase TextUnidecode namespaceclean ];
@@ -5790,7 +6175,7 @@ rec {
       url = mirror://cpan/authors/id/B/BO/BOBTFISH/String-TT-0.03.tar.gz;
       sha256 = "1asjr79wqcl9wk96afxrm1yhpj8lk9bk8kyz78yi5ypr0h55yq7p";
     };
-    buildInputs = [ TestUseOk TestException TestTableDriven ];
+    buildInputs = [ Testuseok TestException TestTableDriven ];
     propagatedBuildInputs = [ PadWalker SubExporter TemplateToolkit ];
     meta = {
       description = "Use TT to interpolate lexical variables";
@@ -6137,6 +6522,28 @@ rec {
     doCheck = false;
   };
 
+  TermVT102 = buildPerlPackage {
+    name = "Term-VT102-0.91";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AJ/AJWOOD/Term-VT102-0.91.tar.gz;
+      sha256 = "f954e0310941d45c0fc3eb4a40f5d3a00d68119e277d303a1e6af11ded6fbd94";
+    };
+    meta = {
+    };
+  };
+
+  TermVT102Boundless = buildPerlPackage {
+    name = "Term-VT102-Boundless-0.04";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/N/NU/NUFFIN/Term-VT102-Boundless-0.04.tar.gz;
+      sha256 = "5bb88b5aecb44ebf56d3ac7240be80cd26def9dcf1ebeb4e77d9983dfc7a8f19";
+    };
+    propagatedBuildInputs = [ TermVT102 Testuseok ];
+    meta = {
+      license = "unknown";
+    };
+  };
+
   TestAssert = buildPerlPackage {
     name = "Test-Assert-0.0504";
     src = fetchurl {
@@ -6204,6 +6611,19 @@ rec {
     };
   };
 
+  TestEOL = buildPerlPackage {
+    name = "Test-EOL-1.5";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BO/BOBTFISH/Test-EOL-1.5.tar.gz;
+      sha256 = "0qfdn71562xzmgnhmkkdbpp3vj851ldl1zlmxvharxsr16gjh6s3";
+    };
+    meta = {
+      homepage = http://metacpan.org/release/Test-EOL;
+      description = "Check the correct line endings in your project";
+      license = "perl5";
+    };
+  };
+
   TestException = buildPerlPackage rec {
     name = "Test-Exception-0.31";
     src = fetchurl {
@@ -6213,6 +6633,20 @@ rec {
     propagatedBuildInputs = [ SubUplevel ];
   };
 
+  TestFailWarnings = buildPerlPackage {
+    name = "Test-FailWarnings-0.005";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-0.005.tar.gz;
+      sha256 = "014f909e6c171f77b811139c49c1dca9d0f1e2d1c41b5dca332b6b55b3eb0b4e";
+    };
+    buildInputs = [ CaptureTiny ];
+    meta = {
+      homepage = https://metacpan.org/release/Test-FailWarnings;
+      description = "Add test failures if warnings are caught";
+      license = "apache";
+    };
+  };
+
   TestFatal = buildPerlPackage {
     name = "Test-Fatal-0.010";
     src = fetchurl {
@@ -6333,6 +6767,18 @@ rec {
     };
   };
 
+  TestNoTabs = buildPerlPackage {
+    name = "Test-NoTabs-1.3";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BO/BOBTFISH/Test-NoTabs-1.3.tar.gz;
+      sha256 = "06gvj0pgljc7n9rxhvwb0gq9wk51i3ks41lgh7a5ycqfkh9d0glw";
+    };
+    meta = {
+      description = "Check the presence of tabs in your project";
+      license = "perl";
+    };
+  };
+
   TestNoWarnings = buildPerlPackage {
     name = "Test-NoWarnings-1.04";
     src = fetchurl {
@@ -6496,7 +6942,7 @@ rec {
     };
   };
 
-  TestUseOk = buildPerlPackage {
+  Testuseok = buildPerlPackage {
     name = "Test-use-ok-0.11";
     src = fetchurl {
       url = mirror://cpan/authors/id/A/AU/AUDREYT/Test-use-ok-0.11.tar.gz;
@@ -6523,6 +6969,18 @@ rec {
     };
   };
 
+  TestWithoutModule = buildPerlPackage {
+    name = "Test-Without-Module-0.17";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.17.tar.gz;
+      sha256 = "a691b0bf6d92dedbacfd547551021389ebc79c51937de2b914e792457da56ff7";
+    };
+    meta = {
+      description = "Test fallback behaviour in absence of modules";
+      license = "perl";
+    };
+  };
+
   TestWWWMechanize = buildPerlPackage {
     name = "Test-WWW-Mechanize-1.44";
     src = fetchurl {
@@ -6576,7 +7034,7 @@ rec {
   TestXPath = buildPerlModule {
     name = "Test-XPath-0.16";
     src = fetchurl {
-      url = http://cpan.metacpan.org/authors/id/D/DW/DWHEELER/Test-XPath-0.16.tar.gz;
+      url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-XPath-0.16.tar.gz;
       sha256 = "09s47d5jcrx35dz623gjiqn0qmjrv0wb54czr7h01wffw1w8akxi";
     };
     propagatedBuildInputs = [ XMLLibXML ];
@@ -6778,10 +7236,6 @@ rec {
       sha256 = "0i1mg3ivxhx09x0w06k15izc92bknwqwh0ghpmhlq9s9iw12mmry";
     };
     propagatedBuildInputs = [ URI ];
-    meta = {
-      description = "Unknown";
-      license = "unknown";
-    };
   };
 
   Throwable = buildPerlPackage rec {
@@ -6811,7 +7265,7 @@ rec {
       url = mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz;
       sha256 = "1x1smn1kw383xc5h9wajxk9dlx92bgrbf7gk4abga57y6120s6m3";
     };
-    propagatedBuildInputs = [TestUseOk];
+    propagatedBuildInputs = [Testuseok];
   };
 
   TimeDate = buildPerlPackage {
@@ -6947,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 {
@@ -6996,7 +7458,7 @@ rec {
   };
 
   URIURL = buildPerlPackage {
-    name = "URI-URL-5.04";
+    name = "URI-URL-1.60";
     src = fetchurl {
       url = mirror://cpan/authors/id/G/GA/GAAS/URI-1.60.tar.gz;
       sha256 = "0xr31mf7lfrwhyvlx4pzp6p7alls5gi4bj8pk5g89f5cckfd74hz";
diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index 3c53be875e3..d6408286581 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -10,18 +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...).
-        PARAVIRT_GUEST y
-        KVM_CLOCK? y #Part of KVM_GUEST since linux 3.7
-        KVM_GUEST y
-        XEN y
-        KSM y
-
-        # We need 64 GB (PAE) support for Xen guest support.
-        HIGHMEM64G? y
-      '';
   };
 
   pc_simplekernel = pc // {
@@ -52,6 +40,11 @@ rec {
 
         # mv cesa requires this sw fallback, for mv-sha1
         CRYPTO_SHA1 y
+        # Fast crypto
+        CRYPTO_TWOFISH y
+        CRYPTO_TWOFISH_COMMON y
+        CRYPTO_BLOWFISH y
+        CRYPTO_BLOWFISH_COMMON y
 
         IP_PNP y
         IP_PNP_DHCP y
diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
new file mode 100644
index 00000000000..6a8f080ccac
--- /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 00000000000..cc345d5c5bc
--- /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 f0e74a0277f..903f48b2fa4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5,14 +5,21 @@ 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; crypt = null; };
 
-pythonPackages = python.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;
 
   # helpers
 
+  callPackage = pkgs.lib.callPackageWith (pkgs // pythonPackages);
+
   buildPythonPackage = import ../development/python-modules/generic {
     inherit (pkgs) lib;
     inherit python wrapPython setuptools recursivePthLoader offlineDistutils;
@@ -21,7 +28,7 @@ pythonPackages = python.modules // rec {
   wrapPython = pkgs.makeSetupHook
     { deps = pkgs.makeWrapper;
       substitutions.libPrefix = python.libPrefix;
-    } 
+    }
    ../development/python-modules/generic/wrap.sh;
 
   # specials
@@ -48,6 +55,8 @@ pythonPackages = python.modules // rec {
 
   # packages defined elsewhere
 
+  blivet = callPackage ../development/python-modules/blivet { };
+
   ipython = import ../shells/ipython {
     inherit (pkgs) stdenv fetchurl sip pyqt4;
     inherit buildPythonPackage pythonPackages;
@@ -61,6 +70,12 @@ pythonPackages = python.modules // rec {
     pylabQtSupport = false;
   });
 
+  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;
@@ -159,7 +174,7 @@ pythonPackages = python.modules // rec {
       pythonPackages.webtest
     ];
 
-    propagatedBuildInputs = [ 
+    propagatedBuildInputs = [
       pkgs.makeWrapper
       pkgs.bacula
       pythonPackages.colander
@@ -197,13 +212,13 @@ pythonPackages = python.modules // rec {
 
 
   alot = buildPythonPackage rec {
-    rev = "d3c1880a60ddd8ded397d92cddf310a948b97fdc";
+    rev = "0711cf8efaf1a4cca24617c3406210a415006457";
     name = "alot-0.3.4_${rev}";
 
     src = fetchurl {
       url = "https://github.com/pazz/alot/tarball/${rev}";
       name = "${name}.tar.bz";
-      sha256 = "049fzxs83zry5xr3al5wjvh7bcjq63wilf9wxh2c6sjmg96kpvvl";
+      sha256 = "1rxkx9cjajsv9x1dl4xp1r3vr0kb66sglxaqzjiwaknqzahmmji5";
     };
 
     # error: invalid command 'test'
@@ -290,13 +305,11 @@ pythonPackages = python.modules // rec {
     name = "area53-b2c9cdcabd";
 
     src = fetchgit {
-      url = git://github.com/mariusv/Area53.git;
+      url = git://github.com/bigmlcom/Area53.git;
       rev = "b2c9cdcabd";
       sha256 = "b0c12b8c48ed9180c7475fab18de50d63e1b517cfb46da4d2c66fc406fe902bc";
     };
 
-    installCommand = "python setup.py install --prefix=$out";
-
     # error: invalid command 'test'
     doCheck = false;
 
@@ -336,24 +349,6 @@ pythonPackages = python.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";
 
@@ -438,8 +433,8 @@ pythonPackages = python.modules // rec {
         pythonPackages.mutagen
         pythonPackages.munkres
         pythonPackages.musicbrainzngs
-        python.modules.sqlite3
-        python.modules.readline
+        modules.sqlite3
+        modules.readline
       ];
 
     meta = {
@@ -451,44 +446,68 @@ pythonPackages = python.modules // rec {
   };
 
 
-  blivet = buildPythonPackage rec {
-    name = "blivet-${version}";
-    version = "0.16-1";
+  bitbucket_api = buildPythonPackage rec {
+    name = "bitbucket-api-0.4.4";
 
     src = fetchurl {
-      url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/"
-          + "${name}.tar.bz2";
-      sha256 = "0gfxf86sc0mkpqjcainch6gqh3r7brgma85pbl4nfpzmylhzj5sg";
+      url = "http://pypi.python.org/packages/source/b/bitbucket-api/${name}.tar.gz";
+      md5 = "6f3cee3586c4aad9c0b2e04fce9704fb";
     };
 
-    postPatch = ''
-      sed -i -e '/find_library/,/find_library/ {
-        c libudev = "${pkgs.udev}/lib/libudev.so.1"
-      }' blivet/pyudev.py
-      sed -i -e 's|"multipath"|"${pkgs.multipath_tools}/sbin/multipath"|' \
-        blivet/devicelibs/mpath.py blivet/devices.py
-    '';
+    propagatedBuildInputs = [ requests_oauth2 nose sh ];
 
-    propagatedBuildInputs = let
-      pyenable = { enablePython = true; };
-      selinuxWithPython = pkgs.libselinux.override pyenable;
-      cryptsetupWithPython = pkgs.cryptsetup.override pyenable;
-    in [
-      pykickstart pyparted pkgs.udev pyblock
-      selinuxWithPython cryptsetupWithPython
-    ];
-
-    # tests are currently _heavily_ broken upstream
     doCheck = false;
 
     meta = {
-      homepage = "https://fedoraproject.org/wiki/Blivet";
-      description = "Module for management of a system's storage configuration";
-      license = [ "GPLv2+" "LGPLv2.1+" ];
+      homepage = https://github.com/Sheeprider/BitBucket-api;
+      description = "Python library to interact with BitBucket REST API";
+      license = pkgs.lib.licenses.mit;
     };
   };
 
 
+  bitstring = buildPythonPackage rec {
+    name = "bitstring-3.1.2";
+
+    src = fetchurl {
+      url = "https://python-bitstring.googlecode.com/files/${name}.zip";
+      sha256 = "1i1p3rkj4ad108f23xyib34r4rcy571gy65paml6fk77knh0k66p";
+    };
+
+    buildInputs = [ pkgs.unzip ];
+
+    # error: invalid command 'test'
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "Module for binary data manipulation";
+      homepage = https://code.google.com/p/python-bitstring/;
+      license = licenses.mit;
+      platforms = platforms.linux;
+      maintainers = [ maintainers.bjornfor ];
+    };
+  };
+
+  bpython = buildPythonPackage rec {
+     name = "bpython-0.12";
+     src = fetchurl {
+       url = "http://www.bpython-interpreter.org/releases/bpython-0.12.tar.gz";
+       sha256 = "1ilf58qq7sazmcgg4f1wswbhcn2gb8qbbrpgm6gf0j2lbm60gabl";
+     };
+
+     propagatedBuildInputs = [ modules.curses pygments ];
+     doCheck = false;
+
+     meta = {
+       description = "UNKNOWN";
+       homepage = "UNKNOWN";
+       maintainers = [
+         stdenv.lib.maintainers.iElectric
+       ];
+     };
+   };
+
+
   # euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work.
   boto_1_9 = buildPythonPackage (rec {
     name = "boto-1.9b";
@@ -517,11 +536,12 @@ pythonPackages = python.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.
@@ -544,11 +564,12 @@ pythonPackages = python.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 =
@@ -576,7 +597,7 @@ pythonPackages = python.modules // rec {
   #     rev = "refs/tags/0.9.3";
   #   };
   #
-  #   propagatedBuildInputs = [ pythonPackages.argparse python.modules.ssl ];
+  #   propagatedBuildInputs = [ pythonPackages.argparse modules.ssl ];
   #
   #   doCheck = false;
   #
@@ -725,8 +746,30 @@ pythonPackages = python.modules // rec {
   });
 
 
+  cogapp = buildPythonPackage rec {
+    version = "2.3";
+    name    = "cogapp-${version}";
+
+    src = fetchurl {
+      url    = "https://pypi.python.org/packages/source/c/cogapp/${name}.tar.gz";
+      sha256 = "0gzmzbsk54r1qa6wd0yg4zzdxvn2f19ciprr2acldxaknzrpllnn";
+    };
+
+    # there are no tests
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "A code generator for executing Python snippets in source files";
+      homepage    = http://nedbatchelder.com/code/cog;
+      license     = licenses.mit;
+      maintainers = with maintainers; [ lovek323 ];
+      platforms   = platforms.unix;
+    };
+  };
+
+
   colorama = buildPythonPackage rec {
-    name = "clientform-0.2.10";
+    name = "colorama-0.2.5";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/c/colorama/colorama-0.2.5.tar.gz";
@@ -770,11 +813,11 @@ pythonPackages = python.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 ];
@@ -807,6 +850,27 @@ pythonPackages = python.modules // rec {
     };
   });
 
+
+  construct = buildPythonPackage rec {
+    name = "construct-2.5.1";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/c/construct/${name}.tar.gz";
+      sha256 = "08qksl87vr6g2wjxwsyrjh4w6v8bfmcgrcgln7irqvw5vv7qgqss";
+    };
+
+    propagatedBuildInputs = [ six ];
+
+    meta = with stdenv.lib; {
+      description = "Powerful declarative parser (and builder) for binary data";
+      homepage = http://construct.readthedocs.org/;
+      license = licenses.mit;
+      platforms = platforms.linux;
+      maintainers = [ maintainers.bjornfor ];
+    };
+  };
+
+
   coverage = buildPythonPackage rec {
     name = "coverage-3.6";
 
@@ -835,6 +899,102 @@ pythonPackages = python.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 {
@@ -946,11 +1106,11 @@ pythonPackages = python.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;
@@ -961,6 +1121,9 @@ pythonPackages = python.modules // rec {
         pythonPackages.colander
         pythonPackages.translationstring
         pythonPackages.chameleon
+        pythonPackages.zope_deprecation
+        pythonPackages.coverage
+        pythonPackages.nose
       ];
 
     meta = {
@@ -990,6 +1153,31 @@ pythonPackages = python.modules // rec {
   };
 
 
+  demjson = buildPythonPackage rec {
+    name = "demjson-1.6";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/d/demjson/${name}.tar.gz";
+      sha256 = "0abf7wqqq7rk1sycy47ayn5p93yy7gjq50cb2z69wmik1qqrr60x";
+    };
+
+    doCheck = false; # there are no tests
+
+    preFixup = ''
+      mkdir -p "$out/bin"
+      cp jsonlint "$out/bin/"
+    '';
+
+    meta = {
+      description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
+      homepage = http://deron.meranda.us/python/demjson/;
+      license = stdenv.lib.licenses.lgpl3Plus;
+      maintainers = with stdenv.lib.maintainers; [ bjornfor ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
   evdev = buildPythonPackage rec {
     version = "0.3.2";
     name = "evdev-${version}";
@@ -1013,6 +1201,41 @@ pythonPackages = python.modules // rec {
     };
   };
 
+
+  eyeD3 = buildPythonPackage rec {
+    version = "0.7.2";
+    name    = "eyeD3-${version}";
+
+    src = fetchurl {
+      url = http://eyed3.nicfit.net/releases/eyeD3-0.7.2.tgz;
+      sha256 = "1r0vxdflrj83s8jc5f2qg4p00k37pskn3djym0w73bvq167vkxar";
+    };
+
+    buildInputs = [ paver ];
+
+    postInstall = ''
+      for prog in "$out/bin/"*; do
+        wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH"
+      done
+    '';
+
+    meta = with stdenv.lib; {
+      description = "A Python module and command line program for processing ID3 tags";
+      homepage    = http://eyed3.nicfit.net/;
+      license     = licenses.gpl2;
+      maintainers = with maintainers; [ lovek323 ];
+      platforms   = platforms.unix;
+
+      longDescription = ''
+        eyeD3 is a Python module and command line program for processing ID3
+        tags. Information about mp3 files (i.e bit rate, sample frequency, play
+        time, etc.) is also provided. The formats supported are ID3 v1.0/v1.1
+        and v2.3/v2.4.
+      '';
+    };
+  };
+
+
   fabric = buildPythonPackage rec {
     name = "fabric-1.6.1";
     src = fetchurl {
@@ -1021,7 +1244,7 @@ pythonPackages = python.modules // rec {
     };
     propagatedBuildInputs = [ paramiko pycrypto ];
     buildInputs = [ fudge nose ];
-  }; 
+  };
 
   fudge = buildPythonPackage rec {
     name = "fudge-0.9.4";
@@ -1033,6 +1256,28 @@ pythonPackages = python.modules // rec {
     propagatedBuildInputs = [ sphinx ];
   };
 
+
+  googlecl = buildPythonPackage rec {
+    version = "0.9.14";
+    name    = "googlecl-${version}";
+
+    src = fetchurl {
+      url    = "https://googlecl.googlecode.com/files/${name}.tar.gz";
+      sha256 = "0nnf7xkr780wivr5xnchfcrahlzy9bi2dxcs1w1bh1014jql0iha";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Brings Google services to the command line.";
+      homepage    = "https://code.google.com/p/googlecl/";
+      license     = licenses.asl20;
+      maintainers = with maintainers; [ lovek323 ];
+      platforms   = platforms.unix;
+    };
+
+    propagatedBuildInputs = [ gdata ];
+  };
+
+
   logilab_astng = buildPythonPackage rec {
     name = "logilab-astng-0.24.1";
 
@@ -1045,6 +1290,31 @@ pythonPackages = python.modules // rec {
   };
 
 
+  paver = buildPythonPackage rec {
+    version = "1.2.1";
+    name    = "Paver-${version}";
+
+    src = fetchurl {
+      url    = "https://pypi.python.org/packages/source/P/Paver/Paver-${version}.tar.gz";
+      sha256 = "1b1023jks1gi1rwphdy3y2zx7dh4bvwk2050kclp95j7xym1ya0y";
+    };
+
+    buildInputs = [ cogapp mock virtualenv ];
+
+    propagatedBuildInputs = [ nose ];
+
+    # the tests do not pass
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "A Python-based build/distribution/deployment scripting tool";
+      homepage    = http://github.com/paver/paver;
+      matinainers = with maintainers; [ lovek323 ];
+      platforms   = platforms.unix;
+    };
+  };
+
+
   peppercorn = buildPythonPackage rec {
     name = "peppercorn-0.4";
 
@@ -1082,19 +1352,19 @@ pythonPackages = python.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 = [ 
-      docutils 
-      virtualenv 
-      webtest 
-      zope_component 
-      zope_interface 
+    buildInputs = [
+      docutils
+      virtualenv
+      webtest
+      zope_component
+      zope_interface
     ] ++ optional isPy26 unittest2;
 
     propagatedBuildInputs = [
@@ -1194,6 +1464,176 @@ pythonPackages = python.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";
 
@@ -1250,6 +1690,8 @@ pythonPackages = python.modules // rec {
   };
 
 
+
+
   zope_deprecation = buildPythonPackage rec {
     name = "zope.deprecation-3.5.0";
 
@@ -1332,7 +1774,7 @@ pythonPackages = python.modules // rec {
       PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
       export PYTHONPATH="$dst:$PYTHONPATH"
 
-      python setup.py install --prefix="$out"
+      ${python}/bin/${python.executable} setup.py install --prefix="$out"
 
       eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth
       if [ -e "$eapth" ]; then
@@ -1353,29 +1795,6 @@ pythonPackages = python.modules // rec {
   };
 
 
-  distutils2  = buildPythonPackage rec {
-    name = "distutils2-${version}";
-    version = "1.0a4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/D/Distutils2/Distutils2-${version}.tar.gz";
-      md5 = "52bc9dffb394970c27e02853ae3a3241";
-    };
-
-    patchPhase = ''
-      sed -e "s#html.entities#htmlentitydefs#g" -i distutils2/pypi/simple.py
-    '';
-
-    doCheck = false;
-
-    meta = {
-      description = "A Python Packaging Library";
-      homepage = http://pypi.python.org/pypi/Distutils2;
-      license = "PSF";
-    };
-  };
-
-
   distutils_extra = buildPythonPackage rec {
     name = "distutils-extra-2.26";
 
@@ -1401,7 +1820,7 @@ pythonPackages = python.modules // rec {
     propagatedBuildInputs = with pkgs; [
       pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl
     ];
- 
+
     postInstall = ''
        cp -R deluge/data/share $out/share
        cp -R deluge/data/pixmaps $out/share/
@@ -1506,6 +1925,26 @@ pythonPackages = python.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";
 
@@ -1533,7 +1972,7 @@ pythonPackages = python.modules // rec {
 
     buildPhase = "make build";
     installCommand = ''
-      python setup.py install --prefix="$out" --root=/ --record="$out/lib/${python.libPrefix}/site-packages/dulwich/list.txt" --single-version-externally-managed
+      ${python}/bin/${python.executable} setup.py install --prefix="$out" --root=/ --record="$out/lib/${python.libPrefix}/site-packages/dulwich/list.txt" --single-version-externally-managed
     '';
 
     # For some reason "python setup.py test" doesn't work with Python 2.6.
@@ -1808,7 +2247,7 @@ pythonPackages = python.modules // rec {
       # See http://foolscap.lothar.com/trac/browser/LICENSE.
       license = "MIT";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
     };
   });
 
@@ -1818,7 +2257,7 @@ pythonPackages = python.modules // rec {
     name = "${baseName}-${version}";
 
     src = fetchurl {
-      url = "http://downloads.sourceforge.net/sourceforge/fuse/fuse-python-${version}.tar.gz";
+      url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz";
       sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi";
     };
 
@@ -1845,11 +2284,11 @@ pythonPackages = python.modules // rec {
   };
 
   genshi = buildPythonPackage {
-    name = "genshi-0.6";
+    name = "genshi-0.7";
 
     src = fetchurl {
-      url = http://ftp.edgewall.com/pub/genshi/Genshi-0.6.tar.gz;
-      sha256 = "0jrajyppdzb3swcxv3w1mpp88vcy7400gy1v2h2gm3pq0dmggaij";
+      url = http://ftp.edgewall.com/pub/genshi/Genshi-0.7.tar.gz;
+      sha256 = "0lkkbp6fbwzv0zda5iqc21rr7rdldkwh3hfabfjl9i4bwq14858x";
     };
 
     # FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase)
@@ -1871,12 +2310,33 @@ pythonPackages = python.modules // rec {
     };
   };
 
-  genzshcomp = buildPythonPackage {
-    name = "genzshcomp-0.2.2";
+  gevent = buildPythonPackage rec {
+    name = "gevent-0.13.8";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/g/genzshcomp/genzshcomp-0.2.2.tar.gz";
-      sha256 = "0bhiyx41kilvy04cgjbvjy2r4b6l7zz31fbrg3l6lvnqm26nihb0";
+      url = "https://pypi.python.org/packages/source/g/gevent/${name}.tar.gz";
+      sha256 = "0plmxnb53qbxxf6macq84dvclsiyrpv3xrm32q4qqh6f01ix5f2l";
+    };
+
+    buildInputs = [ pkgs.libevent ];
+    propagatedBuildInputs = [ greenlet ];
+
+    meta = with stdenv.lib; {
+      description = "Coroutine-based networking library";
+      homepage = http://www.gevent.org/;
+      license = licenses.mit;
+      platforms = platforms.linux;
+      maintainers = [ maintainers.bjornfor ];
+    };
+  };
+
+
+  genzshcomp = buildPythonPackage {
+    name = "genzshcomp-0.5.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/g/genzshcomp/genzshcomp-0.5.1.tar.gz";
+      md5 = "7a954f1835875002e9044fe55ed1b488";
     };
 
     buildInputs = [ pkgs.setuptools ] ++ (optional isPy26 argparse);
@@ -1884,7 +2344,6 @@ pythonPackages = python.modules // rec {
     meta = {
       description = "automatically generated zsh completion function for Python's option parser modules";
       license = "BSD";
-      maintainers = [ stdenv.lib.maintainers.simons ];
     };
   };
 
@@ -1966,6 +2425,29 @@ pythonPackages = python.modules // rec {
     };
   };
 
+
+  hetzner = buildPythonPackage rec {
+    name = "hetzner-${version}";
+    version = "0.5.0";
+
+    src = fetchurl {
+      url = "https://github.com/RedMoonStudios/hetzner/archive/"
+          + "v${version}.tar.gz";
+      sha256 = "0i8b2nx4mf87qn4zz7kz321cl1bxlvjdwm7yh8md5hrhqbya4jw5";
+    };
+
+    # not there yet, but coming soon.
+    doCheck = false;
+
+    meta = {
+      homepage = "https://github.com/RedMoonStudios/hetzner";
+      description = "High-level Python API for accessing the Hetzner robot";
+      license = stdenv.lib.licenses.bsd3;
+      maintainers = [ stdenv.lib.maintainers.aszlig ];
+    };
+  };
+
+
   html5lib = buildPythonPackage (rec {
     name = "html5lib-0.95";
 
@@ -2093,14 +2575,16 @@ pythonPackages = python.modules // rec {
     };
   });
 
-  jinja2 = buildPythonPackage {
-    name = "jinja2-2.6";
+  jinja2 = buildPythonPackage rec {
+    name = "Jinja2-2.7";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.6.tar.gz";
-      md5 = "1c49a8825c993bfdcf55bb36897d28a2";
+      url = "http://pypi.python.org/packages/source/J/Jinja2/${name}.tar.gz";
+      sha256 = "0kgsd7h27jl2jpqa1ks88h93z50bsg0yr7qkicqpxbl9s4c1aks7";
     };
 
+    propagatedBuildInputs = [ pythonPackages.markupsafe ];
+
     meta = {
       homepage = http://jinja.pocoo.org/;
       description = "Stand-alone template engine";
@@ -2115,11 +2599,11 @@ pythonPackages = python.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 ];
@@ -2178,12 +2662,13 @@ pythonPackages = python.modules // rec {
     name = "limnoria-20130327";
 
     src = fetchurl {
-      url = https://pypi.python.org/packages/source/l/limnoria/limnoria-2013-03-27T16:32:26+0100.tar.gz;
-      name = "limnoria-2013-03-27.tar.gz";
-      sha256 = "0xfaa6h8css3yhsmx5vcffizrz6mvmgm46q7449z3hq7g3793184";
+      url = https://pypi.python.org/packages/source/l/limnoria/limnoria-2013-06-01T10:32:51+0200.tar.gz;
+      name = "limnoria-2013-06-01.tar.gz";
+      sha256 = "1i8q9zzf43sr3n1q4h6h1z8nz31g4aa8dq94ywvfbh7hklmchq6n";
     };
 
-    propagatedBuildInputs = [ python.modules.sqlite3 ];
+    buildInputs = [ pkgs.git ];
+    propagatedBuildInputs = [ modules.sqlite3 ];
 
     doCheck = false;
 
@@ -2262,6 +2747,31 @@ pythonPackages = python.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}";
 
@@ -2272,10 +2782,10 @@ pythonPackages = python.modules // rec {
 
     configurePhase = "cd python";
 
-    buildPhase = "python setup.py build";
+    buildPhase = "${python}/bin/${python.executable} setup.py build";
 
     installPhase = ''
-      python setup.py install --prefix=$out
+      ${python}/bin/${python.executable} setup.py install --prefix=$out
     '';
 
     meta = {
@@ -2296,7 +2806,7 @@ pythonPackages = python.modules // rec {
 
     buildInputs = [ pkgs.swig pkgs.openssl ];
 
-    buildPhase = "python setup.py build_ext --openssl=${pkgs.openssl}";
+    buildPhase = "${python}/bin/${python.executable} setup.py build_ext --openssl=${pkgs.openssl}";
 
     doCheck = false; # another test that depends on the network.
 
@@ -2308,15 +2818,15 @@ pythonPackages = python.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 ];
-    propagatedBuildInputs = [ MarkupSafe ];
+    buildInputs = [ markupsafe nose ];
+    propagatedBuildInputs = [ markupsafe ];
 
     meta = {
       description = "Super-fast templating language.";
@@ -2327,8 +2837,8 @@ pythonPackages = python.modules // rec {
   };
 
 
-  MarkupSafe = buildPythonPackage rec {
-    name = "MarkupSafe-0.15";
+  markupsafe = buildPythonPackage rec {
+    name = "markupsafe-0.15";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/M/MarkupSafe/${name}.tar.gz";
@@ -2362,12 +2872,12 @@ pythonPackages = python.modules // rec {
   };
 
   markdown = buildPythonPackage rec {
-    version = "2.0.3";
+    version = "2.3.1";
     name = "markdown-${version}";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.3.tar.gz";
-      md5 = "751e8055be2433dfd1a82e0fb1b12f13";
+      url = "http://pypi.python.org/packages/source/M/Markdown/Markdown-${version}.tar.gz";
+      sha256 = "147j9hznv2r187a86d28glmg3pckfrdp0nz9yh7s1aqpawwdkszz";
     };
 
     # error: invalid command 'test'
@@ -2379,33 +2889,48 @@ pythonPackages = python.modules // rec {
   };
 
 
-  matplotlib = buildPythonPackage ( rec {
-    name = "matplotlib-1.1.0";
+  # not sure if this is the best way to accomplish this -- needed to provide
+  # objective-c compiler on darwin
+  matplotlibStdenv = if stdenv.isDarwin
+    then pkgs.clangStdenv
+    else pkgs.stdenv;
+
+  matplotlib = matplotlibStdenv.mkDerivation (rec {
+    name = "matplotlib-1.2.1";
+
     src = fetchurl {
       url = "http://downloads.sourceforge.net/matplotlib/${name}.tar.gz";
-      sha256 = "be37e1d86c65ecacae6683f8805e051e9904e5f2e02bf2b7a34262c46a6d06a7";
+      sha256 = "16x2ksdxx5p92v98qngh29hdz1bnqy77fhggbjq30pyqmrr8kqaj";
     };
 
     # error: invalid command 'test'
     doCheck = false;
 
-    propagatedBuildInputs = [ dateutil numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ];
+    buildInputs = [ python pkgs.which pkgs.ghostscript ];
 
-    meta = {
+    propagatedBuildInputs =
+      [ dateutil numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl
+        pkgs.tk pkgs.xlibs.libX11 ];
+
+    buildPhase = "python setup.py build";
+
+    installPhase = "python setup.py install --prefix=$out";
+
+    meta = with stdenv.lib; {
       description = "python plotting library, making publication quality plots";
-      homepage = "http://matplotlib.sourceforge.net/";
-      platforms = stdenv.lib.platforms.linux;
-      maintainers = [ stdenv.lib.maintainers.simons ];
+      homepage    = "http://matplotlib.sourceforge.net/";
+      maintainers = with maintainers; [ lovek323 ];
+      platforms   = platforms.unix;
     };
   });
 
 
   mccabe = buildPythonPackage (rec {
-    name = "mccabe-0.2";
+    name = "mccabe-0.2.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/m/mccabe/${name}.tar.gz";
-      md5 = "c1012c7c24081471f45aab864d4e3805";
+      md5 = "5a3f3fa6a4bad126c88aaaa7dab682f5";
     };
 
     buildInputs = [ ];
@@ -2479,7 +3004,7 @@ pythonPackages = python.modules // rec {
       url = "${meta.homepage}/download/${name}.tar.gz";
       sha256 = "1ddqni6d4kc8ypl6yig4nc00izvbk359sz6hykb9g0lfcpfqlngj";
     };
-    
+
     buildInputs = [
       pkgs.pyopenssl pyasn1 urwid pil lxml flask protobuf netlib
     ];
@@ -2487,7 +3012,7 @@ pythonPackages = python.modules // rec {
     doCheck = false;
 
     postInstall = ''
-      for prog in $out/bin/*; do
+      for prog in "$out/bin/"*; do
         wrapProgram "$prog" \
           --prefix PYTHONPATH : "$PYTHONPATH"
       done
@@ -2541,16 +3066,17 @@ pythonPackages = python.modules // rec {
 
   mrbob = buildPythonPackage rec {
     name = "mrbob-${version}";
-    version = "0.1a6";
+    version = "0.1a9";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/m/mr.bob/mr.bob-${version}.zip";
-      md5 = "361c8ac7a31953ab94a95cf34d9a0b2b";
+      md5 = "2d27d9bd1fc6269a3ecfd1a1ae47cd8a";
     };
 
-    buildInputs = [ pkgs.unzip six ] ++ (optionals isPy26 [ importlib ordereddict ]);
+    buildInputs = [ pkgs.unzip ];
 
-    propagatedBuildInputs = [ argparse jinja2 ];
+    propagatedBuildInputs = [ argparse jinja2 six modules.readline ] ++
+                            (optionals isPy26 [ importlib ordereddict ]);
 
     meta = {
       homepage = https://github.com/iElectric/mr.bob.git;
@@ -2705,6 +3231,21 @@ pythonPackages = python.modules // rec {
     };
   };
 
+  netifaces = buildPythonPackage rec {
+    version = "0.8";
+    name = "netifaces-${version}";
+
+    src = fetchurl {
+      url = "http://alastairs-place.net/projects/netifaces/${name}.tar.gz";
+      sha256 = "1v5i39kx4yz1pwgjfbzi63w55l2z318zgmi9f77ybmmkil1i39sk";
+    };
+
+    meta = {
+      homepage = http://alastairs-place.net/projects/netifaces/;
+      description = "Portable access to network interfaces from Python";
+    };
+  };
+
   netlib = buildPythonPackage rec {
     baseName = "netlib";
     name = "${baseName}-${meta.version}";
@@ -2714,7 +3255,7 @@ pythonPackages = python.modules // rec {
       name = "${name}.tar.gz";
       sha256 = "1y8lx2j1jrr93mqfb06zg1x5jm9lllw744sb61ib8dagw43nnq3v";
     };
-    
+
     buildInputs = [
       pkgs.pyopenssl pyasn1
     ];
@@ -2739,43 +3280,43 @@ pythonPackages = python.modules // rec {
       name = "${name}.tar.gz";
     };
 
-   propagatedBuildInputs = [ twisted ];
+    propagatedBuildInputs = [ twisted ];
 
-   postInstall = "twistd --help > /dev/null";
+    postInstall = "twistd --help > /dev/null";
 
-   meta = {
-     description = "Nevow, a web application construction kit for Python";
+    meta = {
+      description = "Nevow, a web application construction kit for Python";
 
-     longDescription = ''
-       Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow
-       is a web application construction kit written in Python.  It is
-       designed to allow the programmer to express as much of the view
-       logic as desired in Python, and includes a pure Python XML
-       expression syntax named stan to facilitate this.  However it
-       also provides rich support for designer-edited templates, using
-       a very small XML attribute language to provide bi-directional
-       template manipulation capability.
+      longDescription = ''
+        Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow
+        is a web application construction kit written in Python.  It is
+        designed to allow the programmer to express as much of the view
+        logic as desired in Python, and includes a pure Python XML
+        expression syntax named stan to facilitate this.  However it
+        also provides rich support for designer-edited templates, using
+        a very small XML attribute language to provide bi-directional
+        template manipulation capability.
 
-       Nevow also includes formless, a declarative syntax for
-       specifying the types of method parameters and exposing these
-       methods to the web.  Forms can be rendered automatically, and
-       form posts will be validated and input coerced, rendering error
-       pages if appropriate.  Once a form post has validated
-       successfully, the method will be called with the coerced values.
-     '';
+        Nevow also includes formless, a declarative syntax for
+        specifying the types of method parameters and exposing these
+        methods to the web.  Forms can be rendered automatically, and
+        form posts will be validated and input coerced, rendering error
+        pages if appropriate.  Once a form post has validated
+        successfully, the method will be called with the coerced values.
+      '';
 
-     homepage = http://divmod.org/trac/wiki/DivmodNevow;
+      homepage = http://divmod.org/trac/wiki/DivmodNevow;
 
-     license = "BSD-style";
-   };
- });
+      license = "BSD-style";
+    };
+  });
 
   nose = buildPythonPackage rec {
-    name = "nose-1.2.1";
+    name = "nose-1.3.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz";
-      md5 = "735e3f1ce8b07e70ee1b742a8a53585a";
+      sha256 = "0q2j9zz39h3liwbp6lb94kl3sxb9z9rbwh5dzyccyxfy4lrwqqsf";
     };
 
     meta = {
@@ -2785,6 +3326,11 @@ pythonPackages = python.modules // rec {
     buildInputs = [ coverage ];
 
     doCheck = ! stdenv.isDarwin;
+    checkPhase = if python.is_py3k or false then ''
+      ${python}/bin/${python.executable} setup.py build_tests
+    '' else "" + ''
+      ${python}/bin/${python.executable} selftest.py
+    '';
   };
 
   nose2 = if isPy26 then null else (buildPythonPackage rec {
@@ -2822,6 +3368,22 @@ pythonPackages = python.modules // rec {
     buildInputs = [ nose ];
   };
 
+  nose-cprof = buildPythonPackage rec {
+    name = "nose-cprof-0.1-0";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/n/nose-cprof/${name}.tar.gz";
+      md5 = "5db27c3b8f01915335ae6fc5fd3afd44";
+    };
+
+    meta = {
+      description = "A python nose plugin to profile using cProfile rather than the default Hotshot profiler.";
+    };
+
+    buildInputs = [ nose ];
+  };
+
+
   notify = pkgs.stdenv.mkDerivation (rec {
     name = "python-notify-0.1.1";
 
@@ -2874,18 +3436,22 @@ pythonPackages = python.modules // rec {
   };
 
   numpy = buildPythonPackage ( rec {
-    name = "numpy-1.6.1";
+    name = "numpy-1.7.1";
 
     src = fetchurl {
       url = "mirror://sourceforge/numpy/${name}.tar.gz";
-      sha256 = "1pawfmf7j7pd3mjzhmmw9hkglc2qdirrkvv29m5nsmpf2b3ip2vq";
+      sha256 = "0jh832j439jj2b7m1z5a4rv5cpdn1yiw1r6gwrhdihw562d029am";
     };
 
+    preConfigure = ''
+      sed -i 's/-faltivec//' numpy/distutils/system_info.py
+    '';
+
     # TODO: add ATLAS=${pkgs.atlas}
     installCommand = ''
       export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack}
-      python setup.py build --fcompiler="gnu95"
-      python setup.py install --prefix=$out
+      ${python}/bin/${python.executable} setup.py build --fcompiler="gnu95"
+      ${python}/bin/${python.executable} setup.py install --prefix=$out
     '';
 
     # error: invalid command 'test'
@@ -2924,6 +3490,26 @@ pythonPackages = python.modules // rec {
     };
   });
 
+
+  oauthlib = buildPythonPackage rec {
+    name = "oauthlib-0.5.0";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/o/oauthlib/${name}.tar.gz";
+      md5 = "d12c507de33403ebdf290fbffdb98213";
+    };
+
+    buildInputs = [ mock nose unittest2 ];
+
+    propagatedBuildInputs = [ pycrypto ];
+
+    meta = {
+      homepage = https://github.com/idan/oauthlib;
+      description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic";
+    };
+  };
+
+
   obfsproxy = buildPythonPackage ( rec {
     name = "obfsproxy-0.2.2";
     src = fetchgit {
@@ -3000,7 +3586,7 @@ pythonPackages = python.modules // rec {
 
       license = "revised-BSD";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
     };
   });
 
@@ -3013,7 +3599,7 @@ pythonPackages = python.modules // rec {
     };
 
     buildInputs = [ nose ];
-    propagatedBuildInputs = [ dateutil numpy pytz python.modules.sqlite3 ];
+    propagatedBuildInputs = [ dateutil numpy pytz modules.sqlite3 ];
 
     # Tests require networking to pass
     doCheck = false;
@@ -3028,14 +3614,16 @@ pythonPackages = python.modules // rec {
   };
 
   paramiko = buildPythonPackage rec {
-    name = "paramiko-1.10";
+    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/";
@@ -3097,11 +3685,11 @@ pythonPackages = python.modules // rec {
 
   pep8 = buildPythonPackage rec {
     name = "pep8-${version}";
-    version = "1.4.5";
+    version = "1.4.6";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz";
-      md5 = "055dbd22ac5669232fdba752612e9686";
+      md5 = "a03bb494859e87b42601b61b1b043a0c";
     };
 
     #======================================================================
@@ -3131,7 +3719,7 @@ pythonPackages = python.modules // rec {
     name = "pexpect-2.3";
 
     src = fetchurl {
-      url = "http://pexpect.sourceforge.net/pexpect-2.3.tar.gz";
+      url = "mirror://sourceforge/pexpect/pexpect-2.3.tar.gz";
       sha256 = "0x8bfjjqygriry1iyygm5048ykl5qpbpzqfp6i8dhkslm3ryf5fk";
     };
 
@@ -3158,8 +3746,6 @@ pythonPackages = python.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 ];
     };
   };
 
@@ -3210,20 +3796,23 @@ pythonPackages = python.modules // rec {
 
 
   pillow = buildPythonPackage rec {
-    name = "Pillow-1.7.8";
+    name = "Pillow-2.1.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/P/Pillow/${name}.zip";
-      md5 = "41d8688d4db72673069a6dc63b5289d6";
+      md5 = "ec630d8ae15d4a3c4ae7b7efdeac8200";
     };
 
-    buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.unzip pkgs.zlib ];
+    buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.unzip pkgs.zlib pkgs.libtiff pkgs.libwebp ];
 
+    # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.
     configurePhase = ''
       sed -i "setup.py" \
           -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ;
               s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ;
-              s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ;'
+              s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ;
+              s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ;
+              s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;'
     '';
 
     doCheck = true;
@@ -3246,6 +3835,17 @@ pythonPackages = python.modules // rec {
     };
   };
 
+  plumbum = buildPythonPackage rec {
+    name = "plumbum-1.2.0";
+
+    buildInputs = [ pythonPackages.six ];
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/p/plumbum/plumbum-1.2.0.tar.gz";
+      md5 = "18b7f888dfaf62a48df937abffe07897";
+    };
+  };
+
 
   polib = buildPythonPackage rec {
     name = "polib-${version}";
@@ -3302,7 +3902,7 @@ pythonPackages = python.modules // rec {
       homepage = https://github.com/Lokaltog/powerline;
       description = "The ultimate statusline/prompt utility.";
       license = with stdenv.lib.licenses; mit;
-      platforms = with stdenv.lib.platforms; all; 
+      platforms = with stdenv.lib.platforms; all;
     };
   };
 
@@ -3351,14 +3951,14 @@ pythonPackages = python.modules // rec {
 
 
   psycopg2 = buildPythonPackage rec {
-    name = "psycopg2-2.0.13";
+    name = "psycopg2-2.5.1";
 
     # error: invalid command 'test'
     doCheck = false;
 
     src = fetchurl {
-      url = "http://initd.org/pub/software/psycopg/PSYCOPG-2-0/${name}.tar.gz";
-      sha256 = "0arkaa1nbbd3pyn4l1bc75wi7nff3vxxh4s8sj5al5hv20p64pm1";
+      url = "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.1.tar.gz";
+      sha256 = "1v7glzzzykbaqj7dhpr0qds9cf4maxmn7f5aazpqnbg0ly40r9v5";
     };
 
     propagatedBuildInputs = [ pkgs.postgresql ];
@@ -3428,10 +4028,14 @@ pythonPackages = python.modules // rec {
 
     buildInputs = [ python pkgs.portaudio ];
 
-    installPhase = ''
-      python setup.py install --prefix=$out
+    buildPhase = if stdenv.isDarwin then ''
+      PORTAUDIO_PATH="${pkgs.portaudio}" ${python}/bin/${python.executable} setup.py build --static-link
+    '' else ''
+      ${python}/bin/${python.executable} setup.py build
     '';
 
+    installPhase = "${python}/bin/${python.executable} setup.py install --prefix=$out";
+
     meta = {
       description = "Python bindings for PortAudio";
       homepage = "http://people.csail.mit.edu/hubert/pyaudio/";
@@ -3533,7 +4137,7 @@ pythonPackages = python.modules // rec {
 
       license = "GPLv2+";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
       platforms = stdenv.lib.platforms.linux;
     };
   });
@@ -3563,6 +4167,26 @@ pythonPackages = python.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";
 
@@ -3596,11 +4220,11 @@ pythonPackages = python.modules // rec {
   };
 
   pyflakes = buildPythonPackage rec {
-    name = "pyflakes-0.6.1";
+    name = "pyflakes-0.7.3";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pyflakes/${name}.tar.gz";
-      md5 = "00debd2280b962e915dfee552a675915";
+      md5 = "ec94ac11cb110e6e72cca23c104b66b1";
     };
 
     buildInputs = [ unittest2 ];
@@ -3686,7 +4310,7 @@ pythonPackages = python.modules // rec {
     buildInputs = [ python ];
 
     installPhase = ''
-      python setup.py install --prefix=$out
+      ${python}/bin/${python.executable} setup.py install --prefix=$out
     '';
 
     meta = {
@@ -3715,7 +4339,7 @@ pythonPackages = python.modules // rec {
     propagatedBuildInputs = [ urlgrabber ];
 
     checkPhase = ''
-      python tests/baseclass.py -vv
+      ${python}/bin/${python.executable} tests/baseclass.py -vv
     '';
 
     meta = {
@@ -3726,6 +4350,26 @@ pythonPackages = python.modules // rec {
   };
 
 
+  pyodbc = buildPythonPackage rec {
+    name = "pyodbc-3.0.6";
+
+    src = fetchurl {
+      url = "https://pyodbc.googlecode.com/files/${name}.zip";
+      sha256 = "0v9nymllw5zq5294rqp8ip3l0g6l3l3mljwhxn5jajyzxlnz39z5";
+    };
+
+    buildInputs = [ pkgs.unzip pkgs.libiodbc ];
+
+    meta = with stdenv.lib; {
+      description = "Python ODBC module to connect to almost any database";
+      homepage = https://code.google.com/p/pyodbc/;
+      license = licenses.mit;
+      platforms = platforms.linux;
+      maintainers = [ maintainers.bjornfor ];
+    };
+  };
+
+
   pyparsing = buildPythonPackage rec {
     name = "pyparsing-1.5.6";
 
@@ -3773,7 +4417,7 @@ pythonPackages = python.modules // rec {
     propagatedBuildInputs = [ pkgs.parted ];
 
     checkPhase = ''
-      python -m unittest discover -v
+      ${python}/bin/${python.executable} -m unittest discover -v
     '';
 
     meta = {
@@ -3875,8 +4519,7 @@ pythonPackages = python.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";
@@ -3909,24 +4552,6 @@ pythonPackages = python.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 ];
-
-    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}";
@@ -4079,7 +4704,7 @@ pythonPackages = python.modules // rec {
 
       license = "revised BSD";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
     };
   });
 
@@ -4217,19 +4842,6 @@ pythonPackages = python.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";
 
@@ -4266,6 +4878,7 @@ pythonPackages = python.modules // rec {
     };
   };
 
+
   requests = buildPythonPackage rec {
     name = "requests-1.2.0";
 
@@ -4281,6 +4894,40 @@ pythonPackages = python.modules // rec {
   };
 
 
+  requests_oauthlib = buildPythonPackage rec {
+    name = "requests-oauthlib-0.3.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/r/requests-oauthlib/${name}.tar.gz";
+      md5 = "35b3b750493c231145c39db0216813e7";
+    };
+
+    propagatedBuildInputs = [ oauthlib requests ];
+
+    meta = {
+      description = "OAuthlib authentication support for Requests";
+      homepage = https://github.com/requests/requests-oauthlib;
+    };
+  };
+
+
+  requests_oauth2 = buildPythonPackage rec {
+    name = "requests-oauth2-0.1.1";
+
+    src = fetchurl {
+      url = https://github.com/maraujop/requests-oauth2/archive/0.1.1.tar.gz;
+      sha256 = "1aij66qg9j5j4vzyh64nbg72y7pcafgjddxsi865racsay43xfqg";
+    };
+
+    propagatedBuildInputs = [ requests_oauthlib ];
+
+    meta = {
+      description = "Python's Requests OAuth2 (Open Authentication) plugin";
+      homepage = https://github.com/maraujop/requests-oauth2;
+    };
+  };
+
+
   reviewboard = buildPythonPackage rec {
     name = "ReviewBoard-1.6.16";
 
@@ -4291,7 +4938,7 @@ pythonPackages = python.modules // rec {
 
     propagatedBuildInputs =
       [ recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments
-        djblets django_1_3 django_evolution pycrypto python.modules.sqlite3
+        djblets django_1_3 django_evolution pycrypto modules.sqlite3
         pysvn pil psycopg2
       ];
   };
@@ -4405,8 +5052,8 @@ pythonPackages = python.modules // rec {
     # TODO: add ATLAS=${pkgs.atlas}
     installCommand = ''
       export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack}
-      python setup.py build --fcompiler="gnu95"
-      python setup.py install --prefix=$out
+      ${python}/bin/${python.executable} setup.py build --fcompiler="gnu95"
+      ${python}/bin/${python.executable} setup.py install --prefix=$out
     '';
 
     meta = {
@@ -4453,7 +5100,7 @@ pythonPackages = python.modules // rec {
         };
 
       preInstall = ''
-        cp ${x_ignore_nofocus}/* .
+        cp "${x_ignore_nofocus}/"* .
         sed -i 's|dlopen(library,|dlopen("libX11.so.6",|' x_ignore_nofocus.c
         gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o
         gcc -shared -Wl,-soname,x_ignore_nofocus.so -o x_ignore_nofocus.so  x_ignore_nofocus.o
@@ -4504,11 +5151,11 @@ pythonPackages = python.modules // rec {
 
 
   simplejson = buildPythonPackage (rec {
-    name = "simplejson-2.1.3";
+    name = "simplejson-3.3.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/s/simplejson/${name}.tar.gz";
-      md5 = "58d9b1d8fa17ea4ce205cea088607e02";
+      md5 = "0e29b393bceac8081fa4e93ff9f6a001";
     };
 
     meta = {
@@ -4545,12 +5192,29 @@ pythonPackages = python.modules // rec {
   };
 
 
+  sh = buildPythonPackage rec {
+    name = "sh-1.08";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/s/sh/${name}.tar.gz";
+      md5 = "4028bcba85daa0aef579ed24261e88a3";
+    };
+
+    doCheck = false;
+
+    meta = {
+      description = "Python subprocess interface";
+      homepage = http://pypi.python.org/pypi/sh/;
+    };
+  };
+
+
   six = buildPythonPackage rec {
-    name = "six-1.1.0";
+    name = "six-1.3.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/s/six/${name}.tar.gz";
-      md5 = "9e8099b57cd27493a6988e9c9b313e23";
+      md5 = "ec47fe6070a8a64c802363d2c2b1e2ee";
     };
 
     # error: invalid command 'test'
@@ -4613,11 +5277,11 @@ pythonPackages = python.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 ];
@@ -4650,17 +5314,24 @@ pythonPackages = python.modules // rec {
   });
 
 
-  sqlalchemy = buildPythonPackage {
-    name = "sqlalchemy-0.7.9";
+  sqlalchemy = buildPythonPackage rec {
+    name = "sqlalchemy-${version}";
+    version = "0.7.10";
 
     src = fetchurl {
-      url = mirror://sourceforge/sqlalchemy/0.7.9/SQLAlchemy-0.7.9.tar.gz;
-      md5 = "c4852d586d95a59fbc9358f4467875d5";
+      url = "http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz";
+      sha256 = "0rhxgr85xdhjn467qfs0dkyj8x46zxcv6ad3dfx3w14xbkb3kakp";
     };
 
+    patches = [
+      # see https://groups.google.com/forum/#!searchin/sqlalchemy/module$20logging$20handlers/sqlalchemy/ukuGhmQ2p6g/2_dOpBEYdDYJ
+      # waiting for 0.7.11 release
+      ../development/python-modules/sqlalchemy-0.7.10-test-failures.patch
+    ];
+
     buildInputs = [ nose ];
 
-    propagatedBuildInputs = [ python.modules.sqlite3 ];
+    propagatedBuildInputs = [ modules.sqlite3 ];
 
     meta = {
       homepage = http://www.sqlalchemy.org/;
@@ -4717,11 +5388,11 @@ pythonPackages = python.modules // rec {
 
   subunit = buildPythonPackage rec {
     name = "subunit-${version}";
-    version = "0.0.9";
+    version = "0.0.13";
 
     src = fetchurl {
-      url = "https://launchpad.net/subunit/trunk/0.0.9/+download/python-${name}.tar.gz";
-      sha256 = "0g3bk8lfd52zjzg43h47h2kckchm3xyv1gcr85nca2i50rcrpj56";
+      url = "https://launchpad.net/subunit/trunk/${version}/+download/python-${name}.tar.gz";
+      sha256 = "0f3xni4z1hbmg4dqxak85ibpf9pajxn6qzw1xj79gwnr8xxb66zj";
     };
 
     propagatedBuildInputs = [ testtools ];
@@ -4796,13 +5467,15 @@ pythonPackages = python.modules // rec {
 
   testtools = buildPythonPackage rec {
     name = "testtools-${version}";
-    version = "0.9.24";
+    version = "0.9.32";
 
     src = fetchurl {
-      url = "https://launchpad.net/testtools/0.9/0.9.24/+download/${name}.tar.gz";
-      sha256 = "0mgkvd7c1aw34nlnz2nmll5k01aqhixxiikbs2nfyk3xfa4221x7";
+      url = "https://pypi.python.org/packages/source/t/testtools/${name}.tar.gz";
+      sha256 = "1smgk3y7xfzh5xk5wydb6n5lx4g5i6y4w8ajrdnskx1jqr67wyyq";
     };
 
+    propagatedBuildInputs = [ pythonPackages.python_mimeparse pythonPackages.extras ];
+
     meta = {
       description = "A set of extensions to the Python standard library's unit testing framework";
       homepage = http://pypi.python.org/pypi/testtools;
@@ -4811,6 +5484,46 @@ pythonPackages = python.modules // rec {
   };
 
 
+  python_mimeparse = buildPythonPackage rec {
+    name = "python-mimeparse-${version}";
+    version = "0.1.4";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/p/python-mimeparse/${name}.tar.gz";
+      sha256 = "1hyxg09kaj02ri0rmwjqi86wk4nd1akvv7n0dx77azz76wga4s9w";
+    };
+
+    # error: invalid command 'test'
+    doCheck = false;
+
+    meta = {
+      description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges.";
+      homepage = https://code.google.com/p/mimeparse/;
+      license = pkgs.lib.licenses.mit;
+    };
+  };
+
+
+  extras = buildPythonPackage rec {
+    name = "extras-${version}";
+    version = "0.0.3";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/e/extras/extras-${version}.tar.gz";
+      sha256 = "1h7zx4dfyclalg0fqnfjijpn0f793a9mx8sy3b27gd31nr6dhq3s";
+    };
+
+    # error: invalid command 'test'
+    doCheck = false;
+
+    meta = {
+      description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges.";
+      homepage = https://code.google.com/p/mimeparse/;
+      license = pkgs.lib.licenses.mit;
+    };
+  };
+
+
   # TODO
   # py.error.EACCES: [Permission denied]: mkdir('/homeless-shelter',)
   # builder for `/nix/store/0czwg0n3pfkmpjphqv1jxfjlgkbziwsx-python-tox-1.4.3.drv' failed with exit code 1
@@ -4839,7 +5552,7 @@ pythonPackages = python.modules // rec {
 
     PYTHON_EGG_CACHE = "`pwd`/.egg-cache";
 
-    propagatedBuildInputs = [ genshi pkgs.setuptools python.modules.sqlite3 ];
+    propagatedBuildInputs = [ genshi pkgs.setuptools modules.sqlite3 ];
 
     meta = {
       description = "Enhanced wiki and issue tracking system for software development projects";
@@ -4927,7 +5640,7 @@ pythonPackages = python.modules // rec {
   });
 
   twisted = buildPythonPackage rec {
-    name = "twisted-12.3.0";
+    name = "twisted-10.2.0";
 
     src = fetchurl {
       url = http://tmrc.mit.edu/mirror/twisted/Twisted/10.2/Twisted-10.2.0.tar.bz2;
@@ -4954,18 +5667,24 @@ pythonPackages = python.modules // rec {
 
       license = "MIT";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
     };
   };
 
 
   unittest2 = buildPythonPackage rec {
-    name = "unittest2-0.5.1";
+    version = "0.5.1";
+    name = "unittest2-${version}";
 
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/u/unittest2/${name}.tar.gz";
-      md5 = "a0af5cac92bbbfa0c3b0e99571390e0f";
-    };
+    src = if python.is_py3k or false
+       then fetchurl {
+           url = "http://pypi.python.org/packages/source/u/unittest2py3k/unittest2py3k-${version}.tar.gz";
+           sha256 = "00yl6lskygcrddx5zspkhr0ibgvpknl4678kkm6s626539grq93q";
+         }
+       else fetchurl {
+           url = "http://pypi.python.org/packages/source/u/unittest2/unittest2-${version}.tar.gz";
+           md5 = "a0af5cac92bbbfa0c3b0e99571390e0f";
+         };
 
     meta = {
       description = "A backport of the new features added to the unittest testing framework in Python 2.7";
@@ -5016,15 +5735,18 @@ pythonPackages = python.modules // rec {
   });
 
   virtualenv = buildPythonPackage rec {
-    name = "virtualenv-1.9.1";
+    name = "virtualenv-1.10";
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz";
-      md5 = "07e09df0adfca0b2d487e39a4bf2270a";
+      md5 = "9745c28256c70c76d36adb3767a00212";
     };
 
+    inherit recursivePthLoader;
+    pythonPath = [ recursivePthLoader ];
+
     patches = [ ../development/python-modules/virtualenv-change-prefix.patch ];
 
-    propagatedBuildInputs = [ python.modules.readline python.modules.sqlite3 ];
+    propagatedBuildInputs = [ modules.readline modules.sqlite3 modules.curses ];
 
     buildInputs = [ mock nose ];
 
@@ -5038,24 +5760,6 @@ pythonPackages = python.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";
 
@@ -5064,6 +5768,8 @@ pythonPackages = python.modules // rec {
       md5 = "7a3094d812c0dffb948d1334ef5fd56f";
     };
 
+    doCheck = false;
+
     meta = {
        maintainers = [
          stdenv.lib.maintainers.garbas
@@ -5082,7 +5788,7 @@ pythonPackages = python.modules // rec {
       md5 = "11825b7074ba7043e157805e4e6e0f55";
     };
 
-    propagatedBuildInputs = [ nose python.modules.ssl ];
+    propagatedBuildInputs = [ nose modules.ssl ];
 
     meta = {
       description = "WSGI request and response object";
@@ -5736,13 +6442,14 @@ pythonPackages = python.modules // rec {
 
   zope_testing = buildPythonPackage rec {
     name = "zope.testing-${version}";
-    version = "4.1.1";
+    version = "4.1.2";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz";
-      md5 = "2e3829841090d6adff718b8b73c87b6b";
+      url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.zip";
+      md5 = "01c30c342c6a18002a762bd5d320a6e9";
     };
 
+    buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ];
 
     meta = {
@@ -5756,16 +6463,16 @@ pythonPackages = python.modules // rec {
 
   zope_testrunner = buildPythonPackage rec {
     name = "zope.testrunner-${version}";
-    version = "4.0.4";
+    version = "4.4.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.testrunner/${name}.zip";
-      md5 = "cd648fc865a79aa0950e73342836dd4c";
+      md5 = "1d689abad000419891494b30dd7d8190";
     };
 
     buildInputs = [ pkgs.unzip ];
 
-    propagatedBuildInputs = [ subunit zope_interface zope_exceptions zope_testing ];
+    propagatedBuildInputs = [ subunit zope_interface zope_exceptions zope_testing six ];
 
     meta = {
       description = "A flexible test runner with layer support";
@@ -5873,7 +6580,7 @@ pythonPackages = python.modules // rec {
     };
 
     buildInputs = [ pkgs.unzip unittest2 nose mock ];
-    propagatedBuildInputs = [ python.modules.curses libarchive ];
+    propagatedBuildInputs = [ modules.curses libarchive ];
 
     # two tests fail
     doCheck = false;
@@ -5946,11 +6653,11 @@ pythonPackages = python.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 = {
@@ -6015,7 +6722,7 @@ pythonPackages = python.modules // rec {
       md5 = "32749ffadfc40fea51075a7def32588b";
     };
 
-    buildInputs = [ routes MarkupSafe webob nose ];
+    buildInputs = [ routes markupsafe webob nose ];
 
     # TODO: failing tests https://bitbucket.org/bbangert/webhelpers/pull-request/1/fix-error-on-webob-123/diff
     doCheck = false;
@@ -6057,8 +6764,7 @@ pythonPackages = python.modules // rec {
       sha256 = "0wjhd87pvpcpvaj3wql2d92g8lpp33iwmxdkp7npic5mjl2y0dsg";
     };
 
-    buildInputs = [ txamqp zope_interface twisted ];
-    propagatedBuildInputs = [ whisper ];
+    propagatedBuildInputs = [ whisper txamqp zope_interface twisted ];
 
     # error: invalid command 'test'
     doCheck = false;
@@ -6107,14 +6813,26 @@ pythonPackages = python.modules // rec {
 
   graphite_web = buildPythonPackage rec {
     name = "graphite-web-${version}";
-    version = "0.9.10";
+    version = "0.9.11";
 
     src = fetchurl rec {
-      url = "https://launchpad.net/graphite/0.9/${version}/+download/${name}.tar.gz";
-      sha256 = "1gj8i6j2i172cldqw98395235bn78ciagw6v17fgv01rmind3lag";
+      url = "https://pypi.python.org/packages/source/g/graphite-web/${name}.tar.gz";
+      md5 = "1499b5dded3d1054d598760fd450a6f9";
     };
 
-    buildInputs = [ django pkgs.pycairo ldap memcached python.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;
@@ -6128,51 +6846,61 @@ pythonPackages = python.modules // rec {
 
   pyspotify = buildPythonPackage rec {
     name = "pyspotify-${version}";
-  
-    version = "1.10";
-  
-    src = fetchgit {
-      url = "https://github.com/mopidy/pyspotify.git";
-      rev = "refs/tags/v${version}";
-      sha256 = "1rvgrviwn6f037m8vq395chz6a1119dbsdhfwdbv5ambi0bak6ll";
+
+    version = "1.11";
+
+    src = fetchurl {
+      url = "https://github.com/mopidy/pyspotify/archive/v1.11.tar.gz";
+      sha256 = "089ml6pqr3f2d15n70jpzbaqjp5pjgqlyv4algkxw92xscjw2izg";
     };
-  
-    buildInputs = [ pkgs.libspotify ];
-  
+
+    buildInputs = [ pkgs.libspotify ]
+      ++ stdenv.lib.optional stdenv.isDarwin pkgs.install_name_tool;
+
     # python zip complains about old timestamps
     preConfigure = ''
       find -print0 | xargs -0 touch
     '';
-  
+
+    postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+      find "$out" -name _spotify.so -exec \
+          install_name_tool -change \
+          @loader_path/../Frameworks/libspotify.framework/libspotify \
+          ${pkgs.libspotify}/lib/libspotify.dylib \
+          {} \;
+    '';
+
     # There are no tests
     doCheck = false;
-  
-    meta = {
-      homepage = http://pyspotify.mopidy.com;
+
+    meta = with stdenv.lib; {
+      homepage    = http://pyspotify.mopidy.com;
       description = "A Python interface to Spotify’s online music streaming service";
-      maintainers = [ stdenv.lib.maintainers.rickynils ];
+      license     = licenses.unfree;
+      maintainers = with maintainers; [ lovek323 rickynils ];
+      platforms   = platforms.unix;
     };
   };
 
   pykka = buildPythonPackage rec {
     name = "pykka-${version}";
-  
+
     version = "1.1.0";
-  
+
     src = fetchgit {
       url = "https://github.com/jodal/pykka.git";
       rev = "refs/tags/v${version}";
       sha256 = "0w6bcaqkzwmd9habszlgjkp3kkhkna08s9aivnmna5hddsghfqmz";
     };
-  
+
     # python zip complains about old timestamps
     preConfigure = ''
       find -print0 | xargs -0 touch
     '';
-  
+
     # There are no tests
     doCheck = false;
-  
+
     meta = {
       homepage = http://www.pykka.org;
       description = "A Python implementation of the actor model";
@@ -6182,23 +6910,23 @@ pythonPackages = python.modules // rec {
 
   ws4py = buildPythonPackage rec {
     name = "ws4py-${version}";
-  
+
     version = "git-20130303";
-  
+
     src = fetchgit {
       url = "https://github.com/Lawouach/WebSocket-for-Python.git";
       rev = "ace276500ca7e4c357595e3773be151d37bcd6e2";
       sha256 = "04m4m3ncn7g4rb81xg5n28imns7rsq8d2w98gjpaib6vlmyly3g1";
     };
-  
+
     # python zip complains about old timestamps
     preConfigure = ''
       find -print0 | xargs -0 touch
     '';
-  
+
     # Tests depend on other packages
     doCheck = false;
-  
+
     meta = {
       homepage = https://ws4py.readthedocs.org;
       description = "A WebSocket package for Python";
@@ -6248,12 +6976,12 @@ pythonPackages = python.modules // rec {
 
   Logbook = buildPythonPackage rec {
     name = "Logbook-${version}";
-    version = "0.4.1";
+    version = "0.4.2";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/L/Logbook/${name}.tar.gz";
       # md5 = "143cb15af4c4a784ca785a1546ad1b93";
-      sha256 = "0iim9pcyl57c6z9i1kfw5nz92qrnpz2l0bz4lir2xrqi8m03q3d7";
+      sha256 = "1g2pnhxh7m64qsrs0ifwcmpfk7gqjvrawd8z66i001rsdnq778v0";
     };
 
     meta = {
@@ -6263,4 +6991,27 @@ pythonPackages = python.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 ad2f8e901c1..770a434c8d7 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -1,13 +1,15 @@
 /*
-  This file will be evaluated by hydra with a call like this:
-  hydra_eval_jobs --gc-roots-dir \
-    /nix/var/nix/gcroots/per-user/hydra/hydra-roots --argstr \
-    system i686-linux --argstr system x86_64-linux --arg \
-    nixpkgs "{outPath = ./}" .... release.nix
-
-  Hydra can be installed with "nix-env -i hydra".
+   test for example like this
+   $ nix-build pkgs/top-level/release-python.nix
 */
-with (import ./release-lib.nix);
+
+{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
+, officialRelease ? false
+, # The platforms for which we build Nixpkgs.
+  supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ]
+}:
+
+with import ./release-lib.nix {inherit supportedSystems; };
 
 let
   jobsForDerivations = attrset: pkgs.lib.attrsets.listToAttrs
@@ -19,12 +21,13 @@ let
           (n: v: (v.type or null) == "derivation")
           attrset)));
 
-in
-{
 
-  tarball = import ./make-tarball.nix;
+  jobs =
+    {
 
-} // (mapTestOn rec {
+   # } // (mapTestOn ((packagesWithMetaPlatform pkgs) // rec {
+
+    } // (mapTestOn rec {
 
   a2jmidid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   aacskeys = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@@ -1093,7 +1096,6 @@ in
     iscsitarget = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     iwlwifi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     klibc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-    kqemu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     ndiswrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     nvidia_x11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
     nvidia_x11_legacy173 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@@ -1522,7 +1524,7 @@ in
   rhpl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   rigsofrods = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   rili = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  rLang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
+  R = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   rockbox_utility = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   rpm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   rrdtool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@@ -1739,7 +1741,6 @@ in
   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; };
@@ -1993,4 +1994,6 @@ in
   zsnes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   zynaddsubfx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   zziplib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-})
+});
+
+in jobs
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 3d69fc25ee0..d03e3e7ea3b 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -52,7 +52,6 @@ with import ./release-lib.nix { supportedSystems = [ "x86_64-linux" ]; };
   gcc33 = linux;
   gcc34 = linux;
   gcc42 = linux;
-  gcc43_multi = ["x86_64-linux"];
   gcc44 = linux;
   gcj44 = linux;
   ghdl = linux;
@@ -94,6 +93,7 @@ with import ./release-lib.nix { supportedSystems = [ "x86_64-linux" ]; };
   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 ffe054ee674..1aae2ce4ee2 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
@@ -115,7 +115,6 @@ let
       gcc33 = linux;
       gcc34 = linux;
       gcc42 = linux;
-      gcc43_multi = ["x86_64-linux"];
       gcc44 = linux;
       gcj44 = linux;
       ghdl = linux;
@@ -359,7 +358,7 @@ let
       };
 
       firefox36Pkgs.firefox = linux;
-      firefox21Pkgs.firefox = linux;
+      firefoxPkgs.firefox = linux;
 
       gnome = {
         gnome_panel = linux;