Merge master into stdenv-updates

Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix

52 files changed, 195 insertions, 162 deletions

diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix
index 23233861a06..0b1d889d700 100644
--- a/pkgs/tools/X11/vdpauinfo/default.nix
+++ b/pkgs/tools/X11/vdpauinfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, xlibs, libvdpau }:
 
 stdenv.mkDerivation rec {
-  name = "vdpauinfo-0.0.6";
-  
+  name = "vdpauinfo-0.1";
+
   src = fetchurl {
     url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
-    sha256 = "0m2llqjnwh3x6y56hik3znym2mfk1haq81a15p54m60ngf0mvfsj";
+    sha256 = "17q1spsrd5i4jzhpacbs0bb4blf74j8s45rpg0znyc1yjfk5dj5h";
   };
 
   buildInputs = [ pkgconfig xlibs.libX11 libvdpau ];
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index 8acb11833da..a8c249116c0 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A VNC server connected to a real X11 screen";
     homepage = http://www.karlrunge.com/x11vnc/;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index b8995430f92..d7d1533b3be 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, buildPythonPackage
 , python, cython, pkgconfig
 , xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo
-, ffmpeg_1, x264, libvpx, pil, libwebp }:
+, ffmpeg, x264, libvpx, pil, libwebp }:
 
 buildPythonPackage rec {
   name = "xpra-0.9.5";
-  
+
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.bz2";
     sha256 = "1qr9gxmfnkays9hrw2qki1jdkyxhbbkjx71gy23x423cfsxsjmiw";
   };
 
-  buildInputs = [ 
-    python cython pkgconfig 
+  buildInputs = [
+    python cython pkgconfig
 
     xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto
     xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto
@@ -21,10 +21,10 @@ buildPythonPackage rec {
 
     pango cairo gdk_pixbuf atk gtk glib
 
-    ffmpeg_1 libvpx x264 libwebp
+    ffmpeg libvpx x264 libwebp
   ];
 
-  propagatedBuildInputs = [ 
+  propagatedBuildInputs = [
     pil pygtk pygobject
   ];
 
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     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
   '';
-  
+
   meta = {
     homepage = http://xpra.org/;
     description = "Persistent remote applications for X";
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index be42fb4d2a5..596c950b1f3 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -56,7 +56,6 @@ stdenv.mkDerivation rec {
     do
       patch -p1 < $a
     done
-    patch -p1 < ../xserver113.patch
     autoreconf -vfi
     ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx --prefix="$out"
     make TIGERVNC_SRCDIR=`pwd`/../..
diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix
index c5b45743c34..6d5dd6ffca0 100644
--- a/pkgs/tools/audio/pa-applet/default.nix
+++ b/pkgs/tools/audio/pa-applet/default.nix
@@ -17,11 +17,13 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
+  # work around a problem related to gtk3 updates
+  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
   postInstall = ''
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://projects.gnome.org/NetworkManager/;
     description = "";
     license = licenses.gpl2;
     maintainers = with maintainers; [ iElectric ];
diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index 6d550e95a9d..f6a51eb3193 100644
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "obnam-${version}";
-  version = "1.4";
+  version = "1.6";
 
   namePrefix = "";
 
   src = fetchurl rec {
     url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.gz";
-    sha256 = "0gipbhh20p9n1x1cdpcil8vg3i20f1saa0xyz2wydb9xl4l2mjff";
+    sha256 = "1vg0kppbyngvm7wi2pbg3himixy9v3h8z66lcps6pclw43s1kgpm";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];
diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix
index 514b69a1992..62a802ebab5 100644
--- a/pkgs/tools/cd-dvd/xorriso/default.nix
+++ b/pkgs/tools/cd-dvd/xorriso/default.nix
@@ -1,16 +1,16 @@
-{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl }:
+{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr }:
 
 stdenv.mkDerivation rec {
-  name = "xorriso-1.2.2";
+  name = "xorriso-1.3.4";
 
   src = fetchurl {
     url = "mirror://gnu/xorriso/${name}.tar.gz";
-    sha256 = "0kw4fiqn24vya3zhay6minzrbz10zlxm8sjs272z7l5s2kwcjypx";
+    sha256 = "0wvxbvkpdydcbmqi9xz7nv8cna6vp9726ahmmxxyx56cz4xifr4x";
   };
 
   doCheck = true;
 
-  buildInputs = [ libcdio zlib bzip2 readline ]
+  buildInputs = [ libcdio zlib bzip2 readline attr ]
     ++ stdenv.lib.optional stdenv.isLinux acl;
 
   meta = {
diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix
index 4df2947d137..2dd4d7eb794 100644
--- a/pkgs/tools/compression/upx/default.nix
+++ b/pkgs/tools/compression/upx/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, ucl, zlib}:
 
 stdenv.mkDerivation {
-  name = "upx-3.07";
+  name = "upx-3.09";
   src = fetchurl {
-    url = mirror://sourceforge/upx/upx-3.07-src.tar.bz2;
-    sha256 = "07pcgjn7x0a734mvhgqwz24qkm1rzqrkcp67pmagzz6i765cp7bs";
+    url = mirror://sourceforge/upx/upx-3.09-src.tar.bz2;
+    sha256 = "16jwynharr1silfd6vlxl9i94fs8mg79qp72dr48r3wv9mlra6pn";
   };
 
   buildInputs = [ ucl zlib ];
diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix
index 8c7593121bb..4c00252fc2a 100644
--- a/pkgs/tools/filesystems/archivemount/default.nix
+++ b/pkgs/tools/filesystems/archivemount/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, fuse, libarchive }:
 
 let
-  name = "archivemount-0.6.1";
+  name = "archivemount-0.8.3";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz";
-    sha256 = "9235d6377a70a7c25aa288dab6b0e8ef906d1d219d43e5b8fcdb8cf3ace98e01";
+    sha256 = "1zv1fvik76kpp1q5f2dz01f4fwg1m5a8rl168px47jy9nyl9k277";
   };
 
   buildInputs = [ pkgconfig fuse libarchive ];
diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix
index 21a93774758..26ffc9d50c2 100644
--- a/pkgs/tools/filesystems/netatalk/default.nix
+++ b/pkgs/tools/filesystems/netatalk/default.nix
@@ -1,17 +1,17 @@
-{ fetchurl, stdenv, pkgconfig, db48, libgcrypt, avahi, libiconv, pam, openssl }:
+{ fetchurl, stdenv, pkgconfig, db4, libgcrypt, avahi, libiconv, pam, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "netatalk-3.0.5";
+  name = "netatalk-3.1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2";
-    sha256 = "1adlcj509czxsx60r1s96qlznspp5nz7dxc5fws11danidr4fhl8";
+    sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq";
   };
 
-  buildInputs = [ pkgconfig db48 libgcrypt avahi libiconv pam openssl ];
+  buildInputs = [ pkgconfig db4 libgcrypt avahi libiconv pam openssl ];
 
   configureFlags = [
-    "--with-bdb=${db48}"
+    "--with-bdb=${db4}"
     "--with-openssl=${openssl}"
   ];
 
diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix
index 6f8ec54c4c0..d43540a8b99 100644
--- a/pkgs/tools/graphics/barcode/default.nix
+++ b/pkgs/tools/graphics/barcode/default.nix
@@ -9,11 +9,11 @@ let
   buildInputs = map (n: builtins.getAttr n x)
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
-    version="0.98";
+    version="0.99";
     baseName="barcode";
     name="${baseName}-${version}";
     url="mirror://gnu/${baseName}/${name}.tar.gz";
-    hash="0ddn17a6hz817bchgjxrjg76v64kzl5zlll8x73ply5rg69f2aa2";
+    hash="0r2b2lwg7a9i9ic5spkbnavy1ynrppmrldv46vsl44l1xgriq0vw";
   };
 in
 rec {
diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix
index 515858bd439..f3f17692df8 100644
--- a/pkgs/tools/graphics/gifsicle/default.nix
+++ b/pkgs/tools/graphics/gifsicle/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xproto, libXt, libX11 }:
 
 stdenv.mkDerivation {
-  name = "gifsicle-1.52";
+  name = "gifsicle-1.78";
 
   src = fetchurl {
-    url = http://www.lcdf.org/gifsicle/gifsicle-1.52.tar.gz;
-    sha256 = "1fp47grvk46bkj22zixrhgpgs3qbkmijicf3wkjk4y8fsx0idbgk";
+    url = http://www.lcdf.org/gifsicle/gifsicle-1.78.tar.gz;
+    sha256 = "0dzp5sg82klji4lbj1m4cyg9fb3l837gkipdx657clib97klyv53";
   };
 
   buildInputs = [ xproto libXt libX11 ];
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index 23d57f5b652..e0f9ce2a2bf 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -6,6 +6,7 @@
 , libXt ? null
 , libXpm ? null
 , libXaw ? null
+, aquaterm ? false
 , wxGTK ? null
 , pango ? null
 , cairo ? null
@@ -15,7 +16,9 @@
 , coreutils ? null }:
 
 assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null);
-
+let
+  withX = libX11 != null && !aquaterm;
+in
 stdenv.mkDerivation rec {
   name = "gnuplot-4.6.3";
 
@@ -25,14 +28,18 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw
+    [ zlib gd texinfo readline emacs lua texLive
       pango cairo pkgconfig makeWrapper ]
+    ++ stdenv.lib.optionals withX              [ libX11 libXpm libXt libXaw ]
     # 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"];
+  configureFlags =
+    (if withX then ["--with-x"] else ["--without-x"])
+    ++ (if aquaterm then ["--with-aquaterm"] else ["--without-aquaterm"])
+    ;
 
-  postInstall = stdenv.lib.optionalString (libX11 != null) ''
+  postInstall = stdenv.lib.optionalString withX ''
     wrapProgram $out/bin/gnuplot \
        --prefix PATH : '${gnused}/bin' \
        --prefix PATH : '${coreutils}/bin' \
@@ -43,7 +50,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage    = http://www.gnuplot.info;
     description = "A portable command-line driven graphing utility for many platforms";
-    platforms   = platforms.all;
+    hydraPlatforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ lovek323 ];
   };
 }
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 39e134ad906..2e3274ca0ff 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -10,6 +10,11 @@ stdenv.mkDerivation {
     sha256 = "0csx6g0ci66nx1a6z0a9dkpfp66mdvcpp5r7g6zrx4jp18r9hzb2";
   };
 
+  postPatch = /* CVE-2005-2471, from Arch */ ''
+    substituteInPlace converter/other/pstopnm.c \
+      --replace '"-DSAFER"' '"-DPARANOIDSAFER"'
+  '';
+
   NIX_CFLAGS_COMPILE = "-fPIC"; # Gentoo adds this on every platform
 
   buildInputs = [ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libX11 libtiff ];
@@ -18,9 +23,7 @@ stdenv.mkDerivation {
     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"
+        --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff}/include"
   '';
 
   preBuild = ''
diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix
index 2ec7f433596..09d8e888837 100644
--- a/pkgs/tools/misc/bogofilter/default.nix
+++ b/pkgs/tools/misc/bogofilter/default.nix
@@ -1,4 +1,4 @@
-{fetchurl, stdenv, flex, bdb}:
+{fetchurl, stdenv, flex, db4}:
 
 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 bdb ];
+  buildInputs = [ flex db4 ];
 
   meta = {
     homepage = http://bogofilter.sourceforge.net/;
diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix
index 03b3719c9f0..909e44d9809 100644
--- a/pkgs/tools/misc/byobu/default.nix
+++ b/pkgs/tools/misc/byobu/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "byobu-5.37";
+  name = "byobu-5.68";
 
   src = fetchurl {
-    url = "https://launchpad.net/byobu/trunk/5.37/+download/byobu_5.37.orig.tar.gz";
-    sha256 = "e9fec9c03ebdfbeb42d08e8e7a7e45d873e1a5d5f7984a39793e37fe7cc30688";
+    url = "https://launchpad.net/byobu/trunk/5.68/+download/byobu_5.68.orig.tar.gz";
+    sha256 = "1xf2m18zx3075c0qvx4fzvn5afm274j5dl0jps7p2lbaq4k1lyhm";
   };
 
   doCheck = true;
diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix
index 285160e50d6..7c84d913157 100644
--- a/pkgs/tools/misc/desktop-file-utils/default.nix
+++ b/pkgs/tools/misc/desktop-file-utils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "desktop-file-utils-0.16";
+  name = "desktop-file-utils-0.22";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.bz2";
-    sha256 = "18y9am8n43rrnnldd1cy09ls39xz1gx3qczax2c4cjxayx5vwq3r";
+    url = "http://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.xz";
+    sha256 = "1ianvr2a69yjv4rpyv30w7yjsmnsb23crrka5ndqxycj4rkk4dc4";
   };
 
   buildInputs = [ pkgconfig glib ];
diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix
index b4a159745d4..777f7b48675 100644
--- a/pkgs/tools/misc/disper/default.nix
+++ b/pkgs/tools/misc/disper/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, python}:
 
 stdenv.mkDerivation rec {
-  name = "disper-0.3.0";
+  name = "disper-0.3.1";
 
   buildInputs = [python];
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   '';
 
   src = fetchurl {
-    url = http://ppa.launchpad.net/disper-dev/ppa/ubuntu/pool/main/d/disper/disper_0.3.0.tar.gz;
-    sha256 = "1mfqidm5c89nknzksabqgjygdp57xpszz7hy2dxh39hpgrsk3l58";
+    url = http://ppa.launchpad.net/disper-dev/ppa/ubuntu/pool/main/d/disper/disper_0.3.1.tar.gz;
+    sha256 = "1l8brcpfn4iascb454ym0wrv5kqyz4f0h8k6db54nc3zhfwy7vvw";
   };
 
   meta = {
diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index 90d345daa13..01b45cd6d8b 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "ethtool-3.10";
+  name = "ethtool-3.11";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
-    sha256 = "0h0wvi0s6s80v26plkh66aiyybpfyi18sjg5pl9idrd0ccdr93gq";
+    sha256 = "1m1gc2g5ym7xmbq64ysw9avp9bbsagbi7x624mzki5ba3535agym";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix
index 488f8020b63..7f22a35e8de 100644
--- a/pkgs/tools/misc/figlet/default.nix
+++ b/pkgs/tools/misc/figlet/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "figlet-2.2.4";
+  name = "figlet-2.2.5";
 
   # some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/
   src = fetchurl {
-    url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.4.tar.gz;
-    sha256 = "19qcmm9cmf78w1z7gbpyj9wmrfjzjl25sax9f2j37sijznrh263f";
+    url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz;
+    sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z";
   };
 
   installPhase = "make prefix=$out install";
diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix
index 19bebcf2823..805dbd3f17c 100644
--- a/pkgs/tools/misc/multitail/default.nix
+++ b/pkgs/tools/misc/multitail/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation {
-  name = "multitail-5.2.12";
+  name = "multitail-5.2.13";
 
   src = fetchurl {
-    url = http://www.vanheusden.com/multitail/multitail-5.2.12.tgz;
-    sha256 = "681d87cd49e11aab1d82ad7818ee639c88a3d305db8accf0859977beda6c493c";
+    url = http://www.vanheusden.com/multitail/multitail-5.2.13.tgz;
+    sha256 = "1axgbdm1xkg570j0p150492x7p3mf11shwvn6dz8g4rha7cak4l6";
   };
 
   buildInputs = [ ncurses ];
diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix
index 0eceea4a57e..54697f98414 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.6";
+  name = "parcellite-1.1.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/parcellite/${name}.tar.gz";
-    sha256 = "0nz951ykj162mfbcn3w9zk525ww6qcqn5yqdx13nx70fnn6rappi";
+    sha256 = "0pszw3yd4a08p6jsz7asayr7jir08bxbwvfb16k01cj7ya4kf3w7";
   };
 
   buildInputs = [ pkgconfig intltool gtk2 ];
diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix
index 2257fb50293..befe517c225 100644
--- a/pkgs/tools/misc/tmpwatch/default.nix
+++ b/pkgs/tools/misc/tmpwatch/default.nix
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
     description = "The tmpwatch utility recursively searches through specified directories and removes files which have not been accessed in a specified period of time.";
     licence = "GPLv2";
     maintainers = with stdenv.lib.maintainers; [ vlstill ];
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 01ef17845c4..eb6baf41fe4 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 = "2013.12.11.2";
+  version = "2013.12.20";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1ar0shbk22dfnq37z8kxd1bv7dk3vm3439f4zhgc9ylvn6n0hnkq";
+    sha256 = "0cqr0rpa247gfk5fg65sj94x4d9a1s85343gnqmc763h5h8v50zb";
   };
 
   buildInputs = [ python ];
diff --git a/pkgs/tools/networking/aria/default.nix b/pkgs/tools/networking/aria/default.nix
index f6432f8aa22..2cd3892eede 100644
--- a/pkgs/tools/networking/aria/default.nix
+++ b/pkgs/tools/networking/aria/default.nix
@@ -1,11 +1,11 @@
 
 args : with args; 
-let version="0.14.0"; in
+let version="0.16.2"; in
 rec {
   src = /* Here a fetchurl expression goes */
   fetchurl {
     url = "mirror://sourceforge/aria2/aria2c-${version}.tar.bz2";
-    sha256 = "0d6vpy7f4228byahsg4dlhalfkbscx941klhdlxd0y5c3mxxwkfr";
+    sha256 = "02qj3j7a1r477pmk969nd3aa93m33kh4101azy001i9jacpjvzrp";
   };
 
   buildInputs = [];
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 75b6492a851..87613695be7 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, openssl, libxml2, sqlite, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "aria2-1.17.1";
+  name = "aria2-1.18.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.bz2";
-    sha256 = "0v0cdbv6v7fb4870rz5s9vscsj74fzbj70gsa2y4hysai4a0im3y";
+    sha256 = "0fwm5d0i4nr9yzckmd8yc80yj4h1acrv6jca3h1vjji0rbgk49zy";
   };
 
   buildInputs = [ pkgconfig openssl libxml2 sqlite zlib ];
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 91061a457d4..ae0007c1f2d 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, python, sysstat, unzip }:
 
 stdenv.mkDerivation rec {
-    version = "3.8.0";
+    version = "4.0.1";
     name = "dd-agent-${version}";
 
     src = fetchurl {
       url = "https://github.com/DataDog/dd-agent/archive/${version}.zip";
-      sha256 = "1mh22rbja07gc7ydn357hlij0dl2rygkqsya9ckynsvmkkzn2gyx";
+      sha256 = "0gybdbjkj7qwnzic03xkypagb30zhm22gp3nkwrdhi8fdmwz3nm1";
     };
 
     buildInputs = [ python unzip ];
diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 06e7789eca3..80d29835da5 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, buildPythonPackage }:
 
 buildPythonPackage rec {
-  name = "getmail-4.42.0";
+  name = "getmail-4.43.0";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
-    sha256 = "0n6sxp8vwa19ffr7bagzwp0hvxfjiy43xpz9sa1qmsyjs7c3xdqj";
+    sha256 = "0abcj4d2jp9y56c85kq7265d8wcij91w9lpzib9q6j9lcs4la8hy";
   };
 
   doCheck = false;
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index e42dfee7cae..f959ad1d573 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, sqlite, pkgconfig, xapian, glib, gmime, texinfo, emacs, guile
-, gtk3, webkit, libsoup, icu }:
+, gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }:
 
 stdenv.mkDerivation rec {
   version = "0.9.9.5";
@@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
     sha256 = "1hwkliyb8fjrz5sw9fcisssig0jkdxzhccw0ld0l9a10q1l9mqhp";
   };
 
-  buildInputs = [ sqlite pkgconfig xapian glib gmime texinfo emacs guile
-                  gtk3 webkit libsoup icu ];
+  buildInputs =
+    [ sqlite pkgconfig xapian glib gmime texinfo emacs guile libsoup icu ]
+    ++ stdenv.lib.optional withMug [ gtk3 webkit ];
 
   preBuild = ''
     # Fix mu4e-builddir (set it to $out)
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   # Install mug and msg2pdf
-  postInstall = ''
+  postInstall = stdenv.lib.optionalString withMug ''
     cp -v toys/msg2pdf/msg2pdf $out/bin/
     cp -v toys/mug/mug $out/bin/
   '';
diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix
index 1d66d30aaba..5ea6c8f6895 100644
--- a/pkgs/tools/networking/ndisc6/default.nix
+++ b/pkgs/tools/networking/ndisc6/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "ndisc6-1.0.1";
+  name = "ndisc6-1.0.2";
 
   src = fetchurl {
     url = "http://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2";
-    sha256 = "1pggc9x3zki1sv08rs8x4fm7pmd3sn1nwkan3szax19xg049xbqx";
+    sha256 = "0ynacanjhlib4japqmf7n2c0bv5f2qq6rx2nhk4kmylyrfhcikka";
   };
 
   buildInputs = [ perl ];
diff --git a/pkgs/tools/networking/oslrd/default.nix b/pkgs/tools/networking/oslrd/default.nix
index 18fdae2a44f..44f32e93474 100644
--- a/pkgs/tools/networking/oslrd/default.nix
+++ b/pkgs/tools/networking/oslrd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "olsrd-0.6.5.4";
+  name = "olsrd-0.6.6.1";
 
   src = fetchurl {
     url = "http://www.olsr.org/releases/0.6/${name}.tar.bz2";
-    sha256 = "757327b9a22b066bd0cab2a8e1cdd1c462f474bb99864a175388aa5f0c70504c";
+    sha256 = "1fphbh9x724r83gxxrd13zv487s4svnr9jdy76h4f36xxb15pnp8";
   };
 
   buildInputs = [ bison flex ];
diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
index e30192598cc..4c3ee0c4d6f 100644
--- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
+++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
@@ -2,14 +2,14 @@
 
 let
   name = "gtk-gnutella";
-  version = "0.97";
+  version = "1.0.0";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2";
-    sha256 = "0l2gdzp517hjk31318djq0sww6kzckzl9rfqvhgspihn874lm9hb";
+    sha256 = "11nri43q99zbxql9wg3pkq98vcgzvbndpzc3a1jlg3lzh7css0hc";
   };
 
   buildInputs = [pkgconfig glib gtk libxml2 bison gettext zlib];
diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
index 15ca99f47e9..26b4b680a6e 100644
--- a/pkgs/tools/networking/speedtest-cli/default.nix
+++ b/pkgs/tools/networking/speedtest-cli/default.nix
@@ -1,21 +1,14 @@
-{ stdenv, fetchgit, pythonPackages }:
+{ stdenv, fetchurl, pythonPackages }:
 
-stdenv.mkDerivation rec {
-  name = "speedtest-cli-dev";
+pythonPackages.buildPythonPackage rec {
+  name = "speedtest-cli-${version}";
+  version = "0.2.4";
   
-  src = fetchgit {
-    url = "https://github.com/sivel/speedtest-cli.git";
-    rev = "fe0940c5744ebe74ca31ad44e6b181d82a89edab";
-    sha256 = "0iywcmgqi58bhldcf8qn1nr7mihypi5fp9s13d4vqc7797xvb28k";
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-${version}.tar.gz";
+    sha256 = "1mz9lx0sdgjz5w3w2lrfh4g7mdyas0ywqfvwh7hwmmpg0fvqiq5q";
   };
 
-  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";
diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix
index bd3a1135a84..401e252a294 100644
--- a/pkgs/tools/networking/surfraw/default.nix
+++ b/pkgs/tools/networking/surfraw/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl}:
 
 stdenv.mkDerivation rec {
-  name = "surfraw-2.2.8";
+  name = "surfraw-2.2.9";
 
   src = fetchurl {
-    url = "http://surfraw.alioth.debian.org/dist/surfraw-2.2.8.tar.gz";
-    sha256 = "925075e05637e39458b00e859193aacde306aafd9a962f44f5114f81713539ec";
+    url = "http://surfraw.alioth.debian.org/dist/surfraw-2.2.9.tar.gz";
+    sha256 = "1fy4ph5h9kp0jzj1m6pfylxnnmgdk0mmdppw76z9jhna4jndk5xa";
   };
 
   configureFlags = [
@@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
     description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power";
     homepage = "http://surfraw.alioth.debian.org";
     maintainers = [];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index f987d6fa6ba..acea2d6da6a 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpcap, enableStatic ? false }:
 
 stdenv.mkDerivation rec {
-  name = "tcpdump-4.4.0";
+  name = "tcpdump-4.5.1";
 
   src = fetchurl {
     url = "http://www.tcpdump.org/release/${name}.tar.gz";
-    sha256 = "1g9h2p31xwpdg88v7wv9hc8calq8sjs25800vzd9i45q5knln9qj";
+    sha256 = "15hb7zkzd66nag102qbv100hcnf7frglbkylmr8adwr8f5jkkaql";
   };
 
   buildInputs = [ libpcap ];
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index ea9719dd9b2..d95c5b5f6bb 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, expat, libevent, ldns }:
 
 stdenv.mkDerivation rec {
-  name = "unbound-1.4.13";
+  name = "unbound-1.4.21";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "04r379gma1ghr9zjc1fmncpw8kka4f0mpcmrzidsp264aqkxriw3";
+    sha256 = "0w09m2rbn688rsk37k5xm3vkk5h2hxhivsr374j7h7vjf9x82bsh";
   };
  
   buildInputs = [openssl expat libevent ldns];
diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix
index 13c5a5d9260..e9c102817e1 100644
--- a/pkgs/tools/networking/wavemon/default.nix
+++ b/pkgs/tools/networking/wavemon/default.nix
@@ -11,10 +11,10 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="wavemon";
-    version="0.7.2";
+    version="0.7.5";
     name="${baseName}-${version}";
     url="http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/${name}.tar.bz2";
-    hash="1w1nq082mpjkcj7q6qs80104vki9kddwqv1wch6nmwwh0l72dgma";
+    hash="0b1fx00aar2fsw49a10w5bpiyjpz8h8f4nrlwb1acfw36yi1pfkd";
   };
 in
 rec {
diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix
index 192970b5cae..362ec3a25bb 100644
--- a/pkgs/tools/security/gnupg1/default.nix
+++ b/pkgs/tools/security/gnupg1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, readline, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "gnupg-1.4.15";
+  name = "gnupg-1.4.16";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha1 = "63ebf0ab375150903c65738070e4105200197fd4";
+    sha256 = "0bsa1yqa3ybhvmc4ys73amdpcmckrlq1fsxjl2980cxada778fvv";
   };
 
   buildInputs = [ readline bzip2 ];
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 543c5d81ba1..81efd4841a6 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -6,11 +6,11 @@
 assert useGtk || useNcurses || useQt4;
 
 stdenv.mkDerivation rec {
-  name = "pinentry-0.8.2";
+  name = "pinentry-0.8.3";
 
   src = fetchurl {
     url = "mirror://gnupg/pinentry/${name}.tar.bz2";
-    sha256 = "1c9r99ck8072y7nkirddg3p372xadl95y65hyc1m6wn5mavbg12h";
+    sha256 = "1bd047crf7xb8g61mval8v6qww98rddlsw2dz6j8h8qbnl4hp2sn";
   };
 
   buildInputs = let opt = stdenv.lib.optional; in []
diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix
index 1095d702d25..cd9519590cc 100644
--- a/pkgs/tools/system/acct/default.nix
+++ b/pkgs/tools/system/acct/default.nix
@@ -1,15 +1,13 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "acct-6.5.5";
+  name = "acct-6.6.1";
 
   src = fetchurl {
     url = "mirror://gnu/acct/${name}.tar.gz";
-    sha256 = "1mbg18acrva5m7kxc9pzhaknsqm4r90nrp7ax9jkm9wjkrxwhqs1";
+    sha256 = "1jzz601cavml7894fjalw661gz28ia35002inw990agr3rhiaiam";
   };
 
-  patches = [ ./no-gets.patch ];
-
   doCheck = true;
 
   meta = {
diff --git a/pkgs/tools/system/acct/no-gets.patch b/pkgs/tools/system/acct/no-gets.patch
deleted file mode 100644
index 3478b66de9d..00000000000
--- a/pkgs/tools/system/acct/no-gets.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-hack until acct pulls a newer gnulib version
-
-From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Thu, 29 Mar 2012 13:30:41 -0600
-Subject: [PATCH] stdio: don't assume gets any more
-
-Gnulib intentionally does not have a gets module, and now that C11
-and glibc have dropped it, we should be more proactive about warning
-any user on a platform that still has a declaration of this dangerous
-interface.
-
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -125,7 +125,6 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index 82377aa92f5..2bfa77164b8 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libgcrypt, readline }:
 
 stdenv.mkDerivation rec {
-  name = "freeipmi-1.1.3";
+  name = "freeipmi-1.3.4";
 
   src = fetchurl {
     url = "mirror://gnu/freeipmi/${name}.tar.gz";
-    sha256 = "11kawxzk8cp9g3q5hdm1sqgzanprc2gagjdnm33lyz5df8xjfkmk";
+    sha256 = "0gadf3yj019y3rvgf34pxk502p0p6nrhy6nwldvvir5rknndxh63";
   };
 
   buildInputs = [ libgcrypt readline ];
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index c4e955056f4..97020ce2e42 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,16 +1,18 @@
-{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls}:
+{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd}:
 
 stdenv.mkDerivation {
-  name = "rsyslog-7.2.7";
+  name = "rsyslog-7.4.7";
 
   src = fetchurl {
-    url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.2.7.tar.gz;
-    sha256 = "0vgrbbklsvnwcy0m0kbxcj5lhpn2k9bsv0lh0vnyn6hc2hx56cs8";
+    url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.4.7.tar.gz;
+    sha256 = "5fc7f930fa748bb6a9d86a3fc831eb1a14107db81b67d79ba8f113cf2776fa21";
   };
 
-  buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls];
+  buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd];
 
-  configureFlags = "--enable-gnutls";
+  preConfigure = ''
+     export configureFlags="$configureFlags --enable-gnutls --enable-cached-man-pages --enable-imjournal --with-systemdsystemunitdir=$out/etc/systemd/system"
+  '';
 
   meta = {
     homepage = "http://www.rsyslog.com/";
diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix
index dcc4116813b..a0033771b67 100644
--- a/pkgs/tools/text/dos2unix/default.nix
+++ b/pkgs/tools/text/dos2unix/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl, gettext }:
 
 stdenv.mkDerivation {
-  name = "dos2unix-5.3.1";
+  name = "dos2unix-6.0.3";
   
   src = fetchurl {
-    url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-5.3.1.tar.gz;
-    sha256 = "0bwqw3wi0j4f1x8d39xw5v57ac0bc58j41vjx8v2qm1smg9jyci1";
+    url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.3.tar.gz;
+    sha256 = "014sxyidqmjvc5xp5dmcimxd3apl8gyv6whc44vkb65151dqq9pm";
   };
 
   configurePhase = ''
diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix
index ce1c7401a4e..23223572bb2 100644
--- a/pkgs/tools/text/enca/default.nix
+++ b/pkgs/tools/text/enca/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, libiconv ? null }:
+{ stdenv, fetchurl, libiconvOrNull, recode }:
 
 stdenv.mkDerivation rec {
-  name = "enca-1.13";
+  name = "enca-1.15";
 
   src = fetchurl {
     url = "http://dl.cihar.com/enca/${name}.tar.bz2";
-    sha256 = "6c091455d524b3ddae3533fe9bb375092f60ad6fe252e0777c873bd7869c7432";
+    sha256 = "1iibfl2s420x7bc1hvxr1ys4cpz579brg2m2ln4rp677azmrr8mv";
   };
 
-  buildInputs = (stdenv.lib.optional (libiconv != null) libiconv);
+  buildInputs = [ recode libiconvOrNull ];
 
   meta = {
     homepage = http://freecode.com/projects/enca;
diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 40a3bcf78ea..9bca0a91d4f 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, getopt, lua, boost }:
         
 stdenv.mkDerivation rec {
-  name = "highlight-3.5";
+  name = "highlight-3.9";
 
   src = fetchurl {
     url = "http://www.andre-simon.de/zip/${name}.tar.bz2";
-    sha256 = "0jpidd2fwn5mbrgzjmh53qvfmqqp6g0mah7i5zsf9bd71ga1lp28";
+    sha256 = "1vysj34zz8gk5yhlzm7g6lbphb8y6zfbd9smfgsgwkyawfargrja";
   };
 
   buildInputs = [ getopt lua boost ];
diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix
index feaf3afe52b..551d0b9f74a 100644
--- a/pkgs/tools/text/mairix/default.nix
+++ b/pkgs/tools/text/mairix/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, bzip2, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "mairix-0.22";
+  name = "mairix-0.23";
 
   src = fetchurl {
     url = "mirror://sourceforge/mairix/${name}.tar.gz";
-    sha256 = "0kwxq738nbv8ip5gkq2bw320qs1vg0pnv7wsc0p5cxwzxxrv47ql";
+    sha256 = "1yzjpmsih6c60ks0d0ia153z9g35nj7dmk98383m0crw31dj6kl0";
   };
 
   buildInputs = [ zlib bzip2 bison flex ];
diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix
index 9f019440775..21024c4aaad 100644
--- a/pkgs/tools/text/namazu/default.nix
+++ b/pkgs/tools/text/namazu/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "namazu-2.0.20";
+  name = "namazu-2.0.21";
 
   src = fetchurl {
     url = "http://namazu.org/stable/${name}.tar.gz";
-    sha256 = "1czw3l6wmz8887wfjpgds9di8hcg0hsmbc0mc6bkahj8g7lvrnyd";
+    sha256 = "1xvi7hrprdchdpzhg3fvk4yifaakzgydza5c0m50h1yvg6vay62w";
   };
 
   buildInputs = [ perl ];
diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix
index 1eae8c4d527..d5f8bb9ff35 100644
--- a/pkgs/tools/text/numdiff/default.nix
+++ b/pkgs/tools/text/numdiff/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
 let
-  version = "5.6.1";
+  version = "5.8.1";
 in
 stdenv.mkDerivation {
   name = "numdiff-${version}";
   src = fetchurl {
     url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz";
-    sha256 = "062byxp9vajj4flg1rqh0r2nwg9yx608mbsj5y25wkrzmkgcq3fx";
+    sha256 = "00zm9955gjsid0daa94sbw69klk0vrnrrh0ihijza99kysnvmblr";
   };
   meta = {
     description = ''
diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix
new file mode 100644
index 00000000000..90b2ff61f34
--- /dev/null
+++ b/pkgs/tools/typesetting/docbook2odf/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, perl, makeWrapper, zip, libxslt, PerlMagick }:
+
+stdenv.mkDerivation rec {
+  name = "docbook2odf-0.244";
+
+  src = fetchurl {
+    url = "http://open.comsultia.com/docbook2odf/dwn/${name}.tar.gz";
+    sha256 = "10k44g0qqa37k30pfj8vz95j6zdzz0nmnqjq1lyahfs2h4glzgwb";
+  };
+
+  buildInputs = [ perl makeWrapper ];
+
+  installPhase = ''
+    mkdir -p "$out/bin/"
+    mkdir -p "$out/share/docbook2odf/"
+    mkdir -p "$out/share/doc/docbook2odf/"
+    mkdir -p "$out/share/man/man1/"
+    mkdir -p "$out/share/applications/"
+
+    cp utils/docbook2odf "$out/bin/"
+    cp docs/docbook2odf.1 "$out/share/man/man1/"
+    cp -r examples/ "$out/share/doc/docbook2odf/"
+    cp -r xsl/ "$out/share/docbook2odf/"
+    cp bindings/desktop/docbook2odf.desktop "$out/share/applications/"
+
+    sed -i "s|/usr/share/docbook2odf|$out/share/docbook2odf|" "$out/bin/docbook2odf"
+
+    wrapProgram "$out/bin/docbook2odf" \
+      --prefix PATH : "${zip}/bin:${libxslt}/bin" \
+      --prefix PERL5PATH : "${stdenv.lib.makePerlPath [PerlMagick]}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Convert DocBook to OpenDocument Format (ODF)";
+    longDescription = ''
+      Docbook2odf is a toolkit that automaticaly converts DocBook to OASIS
+      OpenDocument (ODF, the ISO standardized format used for texts,
+      spreadsheets and presentations). Conversion is based on a XSLT which
+      makes it easy to convert DocBook->ODF, ODT, ODS and ODP as all these
+      documents are XML based.
+    '';
+    homepage = http://open.comsultia.com/docbook2odf/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix
index 3a8b41da660..b3c09952e43 100644
--- a/pkgs/tools/typesetting/tex/auctex/default.nix
+++ b/pkgs/tools/typesetting/tex/auctex/default.nix
@@ -2,7 +2,7 @@
  
 stdenv.mkDerivation ( rec {
   pname = "auctex";
-  version = "11.85";
+  version = "11.87";
   name = "${pname}-${version}";
 
   meta = {
@@ -12,7 +12,7 @@ stdenv.mkDerivation ( rec {
 
   src = fetchurl {
     url = "mirror://gnu/${pname}/${name}.tar.gz";
-    sha256 = "aebbea00431f8fd1e6be6519d9cc28e974942000737f956027da2c952a6d304e";
+    sha256 = "1wjwpmvhpj8q0zd78lj7vyzqhx4rbdhkflslylkzgnw5wllp5mb3";
   };
 
   buildInputs = [ emacs texLive ];
diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix
index b48cc7cddcc..8e7fbdaeaf3 100644
--- a/pkgs/tools/video/swfmill/default.nix
+++ b/pkgs/tools/video/swfmill/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "swfmill-0.3.2";
+  name = "swfmill-0.3.3";
 
   src = fetchurl {
     url = "http://swfmill.org/releases/${name}.tar.gz";
-    sha256 = "077agf62q0xz95dxj4cq9avcqwin94vldrpb80iqwjskvkwpz9gy";
+    sha256 = "15mcpql448vvgsbxs7wd0vdk1ln6rdcpnif6i2zjm5l4xng55s7r";
   };
 
   buildInputs = [ pkgconfig libxslt freetype libpng libxml2 ];