Merge remote-tracking branch 'origin/master' into glibc-2.19

22 files changed, 101 insertions, 222 deletions

diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix
index bd160940b573..2db0d1721735 100644
--- a/pkgs/tools/X11/winswitch/default.nix
+++ b/pkgs/tools/X11/winswitch/default.nix
@@ -29,12 +29,10 @@ let
       }' winswitch/util/distro_packaging_util.py
     '';
 
-    buildPhase = ''
-      python setup.py build
-    '';
-
-    installCommand = ''
-      PREFIX="$out" python ./setup.py install --prefix="$out"
+    preInstall = ''
+      # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix
+      python setup.py install_data --install-dir=$out --root=$out
+      sed -i '/data_files = data_files/d' setup.py
     '';
 
     doCheck = false;
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 35370ae21280..f96fa5773230 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   };
 
   buildInputs = [
-    python cython pkgconfig
+    cython pkgconfig
 
     xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto
     xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto
@@ -33,9 +33,15 @@ buildPythonPackage rec {
   # they don't have automated testing out of the box? http://xpra.org/trac/ticket/177
   doCheck = false;
 
-  buildPhase = ''
-    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"
-    python ./setup.py build --enable-Xdummy
+  preBuild = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"
+  '';
+  setupPyBuildFlags = ["--enable-Xdummy"];
+
+  preInstall = ''
+    # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix
+    ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out
+    sed -i '/ = data_files/d' setup.py
   '';
 
   meta = {
diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index 44a421e2ba3d..d4c45b7ba964 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -1,62 +1,41 @@
-x@{builderDefsPackage
-  , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
-  , libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs
-  , kbproto, libX11, libXext, xextproto, pygobject, libgcrypt
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    ["perlPackages" "firefoxPkgs"];
-
-  buildInputs = (map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames)))
-    ++ [perlPackages.TextCSV firefoxPkgs.xulrunner ];
-  sourceInfo = rec {
-    baseName="gtk-vnc";
-    majorVersion="0.4";
-    minorVersion="2";
-    version="${majorVersion}.${minorVersion}";
-    name="${baseName}-${version}";
-    url="mirror://gnome/sources/${baseName}/${majorVersion}/${name}.tar.gz";
-    hash="1fkhzwpw50rnwp51lsbny16p2ckzx5rkcaiaqvkd90vwnm2cccls";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+{ stdenv, fetchurl
+, python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
+, libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs, pulseaudio
+, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt }:
+
+
+stdenv.mkDerivation rec {
+  name = "gtk-vnc-${version}";
+  version = "0.5.3";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtk-vnc/0.5/${name}.tar.xz";
+    sha256 = "1bww2ihxb3zzvifdrcsy1lifr664pvikq17hmr1hsm8fyk4ad46l";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [
+    python gtk pygtk gnutls cairo libtool pkgconfig glib libffi libgcrypt
+    intltool cyrus_sasl pulseaudio pygobject perl perlPackages.TextCSV
+  ];
 
+  NIX_CFLAGS_COMPILE = "-fstack-protector-all";
   configureFlags = [
     "--with-python"
     "--with-examples"
   ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["fixMakefiles" "doConfigure" "doMakeInstall"];
+  makeFlags = "CODEGENDIR=${pygobject}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/";
 
-  fixMakefiles = a.fullDepEntry ''
-    find . -name 'Makefile*' -exec sed -i '{}' -e 's@=codegendir pygtk-2.0@=codegendir pygobject-2.0@' ';'
-  '' ["minInit" "doUnpack"];
-      
-  meta = {
+  meta = with stdenv.lib; {
     description = "A GTK VNC widget";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.lgpl21;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
+    license = licenses.lgpl21;
   };
+
   passthru = {
     updateInfo = {
       downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/gtk-vnc";
     };
   };
-}) x
-
+}
diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix
new file mode 100644
index 000000000000..fc5b984bd905
--- /dev/null
+++ b/pkgs/tools/archivers/xarchiver/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, gtk2, pkgconfig, intltool }:
+
+stdenv.mkDerivation rec {
+  version = "0.5.3";
+  name = "xarchiver-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/xarchiver/${name}.tar.bz2";
+    sha256 = "10bdq406xkl2q6rl6qvvipdr3ini5lnh1sjykgw66fp8jns9r2f5";
+  };
+
+  buildInputs = [ gtk2 pkgconfig intltool ];
+
+  meta = {
+    description = "GTK+2 only frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";
+    homepage = http://sourceforge.net/projects/xarchiver/;
+    mainatainers = [ stdenv.lib.maintainers.iElectric ];
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 48f2757db867..ec4c00880d4d 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper }:
 
 let
-  version = "0.6.22";
+  version = "0.6.23";
 in
 stdenv.mkDerivation {
   name = "duplicity-${version}";
 
   src = fetchurl {
     url = "http://code.launchpad.net/duplicity/0.6-series/${version}/+download/duplicity-${version}.tar.gz";
-    sha256 = "04jskh1j85s35vfzm9gylpl7ysn5njbl0gcg92bhc7v88l29nj3g";
+    sha256 = "0q0ckkmyq9z7xfbb1jajflmbzjwxpcjkkiab43rxrplm0ghz25vs";
   };
 
   installPhase = ''
diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix
index b184dff11cd2..91718fc02f7b 100644
--- a/pkgs/tools/backup/duply/default.nix
+++ b/pkgs/tools/backup/duply/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "duply-1.5.11";
+  name = "duply-1.6.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.5.x/duply_1.5.11.tgz";
-    sha256 = "07z4wl75z227v8y9xwc2pfdp307a5jzx4sif598vprqync0g6mmk";
+    url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.6.x/duply_1.6.0.tgz";
+    sha256 = "1i1yy4z6fcf3lq2k72cqcyqspm7pa1m949f8l9yscjm47bwp5g8f";
   };
 
   buildInputs = [ txt2man makeWrapper ];
diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix
index f5c07b031b80..0b666f389420 100644
--- a/pkgs/tools/filesystems/mtools/default.nix
+++ b/pkgs/tools/filesystems/mtools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mtools-4.0.17";
+  name = "mtools-4.0.18";
 
   src = fetchurl {
     url = "mirror://gnu/mtools/${name}.tar.bz2";
-    sha256 = "1dpch2wsiwhyg7xhsdvmc1pws8biwqkmnqjc3mdj2bd76273bk0f";
+    sha256 = "119gdfnsxc6hzicnsf718k0fxgy2q14pxn7557rc96aki20czsar";
   };
 
   doCheck = true;
diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix
index 26ffc9d50c25..850e16812488 100644
--- a/pkgs/tools/filesystems/netatalk/default.nix
+++ b/pkgs/tools/filesystems/netatalk/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, db4, libgcrypt, avahi, libiconv, pam, openssl }:
+{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl }:
 
 stdenv.mkDerivation rec {
   name = "netatalk-3.1.0";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq";
   };
 
-  buildInputs = [ pkgconfig db4 libgcrypt avahi libiconv pam openssl ];
+  buildInputs = [ pkgconfig db libgcrypt avahi libiconv pam openssl ];
 
   configureFlags = [
-    "--with-bdb=${db4}"
+    "--with-bdb=${db}"
     "--with-openssl=${openssl}"
   ];
 
diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix
index 2abc84e78e41..e5c7fbeb0d7c 100644
--- a/pkgs/tools/graphics/pngcrush/default.nix
+++ b/pkgs/tools/graphics/pngcrush/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "pngcrush-1.7.70";
+  name = "pngcrush-1.7.71";
 
   src = fetchurl {
     url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
-    sha256 = "04zgnqdfq7mcsgml719wb552v8cfg52d8knbhqv55kwgw7y822jh";
+    sha256 = "095al1l86h55aiig3y1aqlwkxcwwf215lq3f29z1hdgz4a0sbcyd";
   };
 
   configurePhase = ''
diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix
index 09d8e888837e..f7c121d825e2 100644
--- a/pkgs/tools/misc/bogofilter/default.nix
+++ b/pkgs/tools/misc/bogofilter/default.nix
@@ -1,4 +1,4 @@
-{fetchurl, stdenv, flex, db4}:
+{fetchurl, stdenv, flex, db}:
 
 stdenv.mkDerivation rec {
   name = "bogofilter-1.2.4";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   # FIXME: We would need `pax' as a "propagated build input" (for use
   # by the `bf_tar' script) but we don't have it currently.
 
-  buildInputs = [ flex db4 ];
+  buildInputs = [ flex db ];
 
   meta = {
     homepage = http://bogofilter.sourceforge.net/;
diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix
index cb12cb33c76d..08e012128c24 100644
--- a/pkgs/tools/misc/i3minator/default.nix
+++ b/pkgs/tools/misc/i3minator/default.nix
@@ -15,11 +15,11 @@ let
   };
 in buildPythonPackage rec {
   name = "i3minator-${version}";
-  version = "0.0.3";
+  version = "0.0.4";
 
   src = fetchurl {
-    url = "https://github.com/carlesso/i3minator/archive/v${version}.tar.gz";
-    sha256 = "0ksb0frrhq10k5rjzk72kj5rjzak1irr9q4x4f22w2vylxq19xxa";
+    url = "https://github.com/carlesso/i3minator/archive/${version}.tar.gz";
+    sha256 = "11dn062788kwfs8k2ry4v8zr2gn40r6lsw770s9g2gvhl5n469dw";
   };
 
   propagatedBuildInputs = [ pythonPackages.pyyaml i3-py ];
diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index 5374cb743618..f664bcc6917d 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -1,32 +1,23 @@
-{stdenv, fetchurl, db4, groff}:
+{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff }:
  
-stdenv.mkDerivation {
-  name = "man-db-2.5.1";
+stdenv.mkDerivation rec {
+  name = "man-db-2.6.6";
   
   src = fetchurl {
-    url = mirror://savannah/man-db/man-db-2.5.1.tar.gz;
-    sha256 = "178w1fk23ffh8vabj29cn0yyg5ps7bwy1zrrrcsw8aypbh3sfjy3";
+    url = "mirror://savannah/man-db/${name}.tar.xz";
+    sha256 = "1hv6byj6sg6cp3jyf08gbmdm4pwhvd5hzmb94xl0w7prin6hzabx";
   };
   
-  buildInputs = [db4 groff];
+  buildInputs = [ pkgconfig libpipeline db groff ];
   
   configureFlags = ''
     --disable-setuid
-    --with-nroff=${groff}/bin/nroff
-    --with-tbl=${groff}/bin/tbl
-    --with-eqn=${groff}/bin/eqn
-    --with-neqn=${groff}/bin/neqn
   '';
 
-  troff = "${groff}/bin/troff";
-  
-  patches = [
-    # Search in "share/man" relative to each path in $PATH (in addition to "man").
-    ./share.patch
-  ];
-
-  meta = {
-    homepage = http://www.nongnu.org/man-db/;
+  meta = with stdenv.lib; {
+    homepage = "http://man-db.nongnu.org";
     description = "An implementation of the standard Unix documentation system accessed using the man command";
+    license = licenses.gpl2;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/misc/man-db/share.patch b/pkgs/tools/misc/man-db/share.patch
deleted file mode 100644
index 95582a50269d..000000000000
--- a/pkgs/tools/misc/man-db/share.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -rc man-db-2.5.1-orig/src/manp.c man-db-2.5.1/src/manp.c
-*** man-db-2.5.1-orig/src/manp.c	2008-01-07 03:23:11.000000000 +0100
---- man-db-2.5.1/src/manp.c	2008-02-07 14:20:20.000000000 +0100
-***************
-*** 96,102 ****
-  
-  static void mkcatdirs (const char *mandir, const char *catdir);
-  static inline char *get_manpath_from_path (const char *path);
-! static inline char *has_mandir (const char *p);
-  static inline char *fsstnd (const char *path);
-  static char *def_path (int flag);
-  static void add_dir_to_list (char **lp, const char *dir);
---- 96,102 ----
-  
-  static void mkcatdirs (const char *mandir, const char *catdir);
-  static inline char *get_manpath_from_path (const char *path);
-! static inline char *has_mandir (const char *p, const char *mandir);
-  static inline char *fsstnd (const char *path);
-  static char *def_path (int flag);
-  static void add_dir_to_list (char **lp, const char *dir);
-***************
-*** 928,934 ****
-  		} else {
-  			debug ("is not in the config file\n");
-  
-! 		 	t = has_mandir (p);
-  		 	if (t) {
-  				debug ("but does have a ../man or man "
-  				       "subdirectory\n");
---- 928,934 ----
-  		} else {
-  			debug ("is not in the config file\n");
-  
-! 		 	t = has_mandir (p, "man");
-  		 	if (t) {
-  				debug ("but does have a ../man or man "
-  				       "subdirectory\n");
-***************
-*** 938,943 ****
---- 938,952 ----
-  		 	} else
-  				debug ("and doesn't have ../man or man "
-  				       "subdirectories\n");
-+  
-+  		 	t = has_mandir (p, "share/man");
-+  		 	if (t) {
-+                                 debug ("but does have a ../share/man or share/man subdirectory\n");
-+  	
-+  				add_dir_to_list (tmplist, t);
-+  				free (t);
-+  		 	} else
-+  				debug ("and doesn't have ../share/man or share/man subdirectories\n");
-  		}
-  	}
-  
-***************
-*** 1013,1019 ****
-  
-  /* path does not exist in config file: check to see if path/../man or 
-     path/man exist.  If so return it, if not return NULL. */
-! static inline char *has_mandir (const char *path)
-  {
-  	char *newpath = NULL;
-  
---- 1022,1028 ----
-  
-  /* path does not exist in config file: check to see if path/../man or 
-     path/man exist.  If so return it, if not return NULL. */
-! static inline char *has_mandir (const char *path, const char *mandir)
-  {
-  	char *newpath = NULL;
-  
-***************
-*** 1023,1031 ****
-  	char *subdir = strrchr (path, '/');
-  	if (subdir) {
-  		const int prefix_len = subdir + 1 - path;
-! 		newpath = xmalloc (prefix_len + sizeof ("man") + 1);
-  		strncpy (newpath, path, prefix_len);
-! 		strcpy (newpath + prefix_len, "man");
-  
-  		if (is_directory (newpath) == 1)
-  			return newpath;
---- 1032,1040 ----
-  	char *subdir = strrchr (path, '/');
-  	if (subdir) {
-  		const int prefix_len = subdir + 1 - path;
-! 		newpath = xmalloc (prefix_len + strlen (mandir) + 2);
-  		strncpy (newpath, path, prefix_len);
-! 		strcpy (newpath + prefix_len, mandir);
-  
-  		if (is_directory (newpath) == 1)
-  			return newpath;
-***************
-*** 1033,1039 ****
-  			*newpath = '\0';
-  	}
-  
-! 	newpath = appendstr (newpath, path, "/man", NULL);
-  
-  	if (is_directory (newpath) == 1)
-  		return newpath;
---- 1042,1048 ----
-  			*newpath = '\0';
-  	}
-  
-! 	newpath = appendstr (newpath, path, "/", mandir, NULL);
-  
-  	if (is_directory (newpath) == 1)
-  		return newpath;
diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix
index 978bb2729f84..ebf0a89a7075 100644
--- a/pkgs/tools/misc/memtest86/default.nix
+++ b/pkgs/tools/misc/memtest86/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "memtest86-4.1.0";
+  name = "memtest86-4.3.3";
   
   src = fetchurl {
-    url = http://www.memtest86.com/downloads/memtest86-4.1.0-src.tar.gz;
-    sha256 = "1kdvq16s8hvk7plprws33mfh7cnhmfl1m32sfgbmzygbhk5wqxxq";
+    url = http://www.memtest86.com/downloads/memtest86-4.3.3-src.tar.gz;
+    sha256 = "1fzpk0s97lx8h1wbv2bgr6m8v4ag8i58kzr8fa25bvwyl8hks9sl";
   };
 
   preBuild = ''
diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 10886e969a2c..6ba3d9a4f59f 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, jre, graphviz }:
 
 stdenv.mkDerivation rec {
-  version = "7982";
+  version = "7991";
   name = "plantuml-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/plantuml.${version}.jar";
-    sha256 = "0hxs0whjgx36j5azdcna40rw2c7smhg0qm3kzld9vx88m0c51dgl";
+    sha256 = "0afhgiq2165ahj8ww0pmk69nqgpibllp9nhpk8wapg3zknh2hx5r";
   };
 
   # It's only a .jar file and a shell wrapper
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index a8863da40380..ef4bc68b1c80 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.02.10";
+  version = "2014.02.19.1";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0grxdbvzjnxd26c80rr22mjp89y4i6bghmqyp5bpzd53sgkpl0zs";
+    sha256 = "0bilardg46xikw4gl4n50bg9wrmarmnzhrhhwhdcyrx0p0idl4fn";
   };
 
   buildInputs = [ python ];
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index ffe22a93d0d4..b42f202099b1 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -4,7 +4,7 @@ let
   rev = "f7b02ac0cc";
 in
 stdenv.mkDerivation {
-  name = "cjdns-git-20130620-${stdenv.lib.strings.substring 0 7 rev}";
+  name = "cjdns-20130620-${stdenv.lib.strings.substring 0 7 rev}";
 
   src = fetchgit {
     url = "https://github.com/cjdelisle/cjdns.git";
diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 80d29835da53..6d9666506b88 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -11,8 +11,6 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  installCommand = "python setup.py install --prefix=\"\$prefix\"";
-  
   meta = {
     description = "A program for retrieving mail";
     maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.iElectric ];
diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix
index 30ee63f257a4..86986ed9b954 100644
--- a/pkgs/tools/networking/isync/default.nix
+++ b/pkgs/tools/networking/isync/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, openssl, pkgconfig, db4 }:
+{ fetchurl, stdenv, openssl, pkgconfig, db }:
 
 stdenv.mkDerivation rec {
   name = "isync-1.0.6";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [ ./isync-recursice-imap.patch ]; # usefull patch to enable subfolders listing
-  buildInputs = [ openssl pkgconfig db4 ];
+  buildInputs = [ openssl pkgconfig db ];
 
   meta = {
     homepage = http://isync.sourceforge.net/;
diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
index 26b4b680a6e9..4f54404b713a 100644
--- a/pkgs/tools/networking/speedtest-cli/default.nix
+++ b/pkgs/tools/networking/speedtest-cli/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "speedtest-cli-${version}";
-  version = "0.2.4";
+  version = "0.2.5";
   
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-${version}.tar.gz";
-    sha256 = "1mz9lx0sdgjz5w3w2lrfh4g7mdyas0ywqfvwh7hwmmpg0fvqiq5q";
+    sha256 = "0a19kyn6064jbxda4yq1rfrlqlh8ha40fgwkj4rckdzk9bnxkhdn";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix
index efa29e814073..99fde3871290 100644
--- a/pkgs/tools/networking/webalizer/default.nix
+++ b/pkgs/tools/networking/webalizer/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib, libpng, gd, geoip, db4}:
+{stdenv, fetchurl, zlib, libpng, gd, geoip, db}:
 
 stdenv.mkDerivation {
   name = "webalizer-2.23-05";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
         --replace "--static" "" 
     '';
 
-  buildInputs = [zlib libpng gd geoip db4]; 
+  buildInputs = [zlib libpng gd geoip db]; 
 
   configureFlags = "--enable-dns --enable-geoip --disable-static --enable-shared";
 }
diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index aa387eff3e72..b28c761ec2cf 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -39,10 +39,6 @@ pythonPackages.buildPythonPackage {
 
   doCheck = false;
 
-  installCommand = ''
-    python setup.py install --prefix=$out
-  '';
-
   meta = with stdenv.lib; {
     homepage    = http://www.fail2ban.org/;
     description = "A program that scans log files for repeated failing login attempts and bans IP addresses";