Merge branch 'master' into staging

25 files changed, 360 insertions, 63 deletions

diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix
index 67d07d6eb3b1..098dd82eec77 100644
--- a/pkgs/tools/admin/nxproxy/default.nix
+++ b/pkgs/tools/admin/nxproxy/default.nix
@@ -1,18 +1,17 @@
-{ stdenv, fetchgit, autoconf, libxcomp }:
+{ stdenv, fetchurl, autoconf, libxcomp }:
 
-let version = "3.5.0-2015-02-18"; in
+let version = "3.5.0.30"; in
 stdenv.mkDerivation {
   name = "nxproxy-${version}";
 
-  src = fetchgit {
-    url = git://code.x2go.org/nx-libs.git;
-    rev = "2b2a02f93f552a38de8f72a971fa3f3ff42b3298";
-    sha256 = "11n7dv1cn9icjgyxmsbac115vmbaar47cmp8k76vd516f2x41dw9";
+  src = fetchurl {
+    url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-full.tar.gz";
+    sha256 = "0npwlfv9p5fwnf30fpkfw08mq11pgbvp3d2zgnhh8ykf3yj8dgv0";
   };
 
   meta = with stdenv.lib; {
     description = "NX compression proxy";
-    homepage = "http://code.x2go.org/gitweb?p=nx-libs.git;a=summary";
+    homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
     license = with licenses; gpl2;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
@@ -25,5 +24,5 @@ stdenv.mkDerivation {
     autoconf
   '';
 
-  installTargets = [ "install.bin" ];
+  makeFlags = [ "exec_prefix=$(out)" ];
 }
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index 2906e365cb6e..4583dc1ba778 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, autoreconfHook, boost, fuse, openssl, perl
 , pkgconfig, rlog }:
 
-let version = "1.8-rc1"; in
+let version = "1.8"; in
 stdenv.mkDerivation rec {
   name = "encfs-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "17a09pg7752nlbgm2nmrwhm90kv2z3dj20xs79qvvr6x7rdgzck8";
+    sha256 = "1dp3558x9v5hqnjnrlnd0glrkcc23anl2mxhjirhhw8dyh1lzl5z";
     rev = "v${version}";
     repo = "encfs";
     owner = "vgough";
diff --git a/pkgs/tools/inputmethods/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-anthy/default.nix
new file mode 100644
index 000000000000..df0790877acd
--- /dev/null
+++ b/pkgs/tools/inputmethods/ibus-anthy/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, makeWrapper, ibus, anthy, intltool, pkgconfig, glib, gobjectIntrospection, python, pythonPackages }:
+
+let version = "1.5.4";
+in stdenv.mkDerivation {
+  name = "ibus-anthy-${version}";
+
+  meta = with stdenv.lib; {
+    description = "IBus interface to the anthy input method";
+    homepace    = https://code.google.com/p/ibus/;
+    license     = licenses.gpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ gebner ];
+  };
+
+  buildInputs = [ makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection python pythonPackages.pygobject3 ];
+
+  postFixup = ''
+    for file in "$out"/libexec/*; do
+      wrapProgram "$file" \
+        --prefix PYTHONPATH : $PYTHONPATH \
+        --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH:$out/lib/girepository-1.0
+    done
+  '';
+
+  src = fetchurl {
+    url = "https://ibus.googlecode.com/files/ibus-anthy-${version}.tar.gz";
+    sha256 = "4c0a8b88a2c547e72173a7d682d82797f6c65fe712abe5f3b89495d4eec7b031";
+  };
+}
diff --git a/pkgs/tools/inputmethods/ibus-qt/default.nix b/pkgs/tools/inputmethods/ibus-qt/default.nix
new file mode 100644
index 000000000000..c538d36ec591
--- /dev/null
+++ b/pkgs/tools/inputmethods/ibus-qt/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, ibus, cmake, pkgconfig, qt4, icu, doxygen }:
+
+stdenv.mkDerivation rec {
+  name = "ibus-qt-${version}";
+  version = "1.3.2";
+
+  src = fetchurl {
+    url = "http://ibus.googlecode.com/files/${name}-Source.tar.gz";
+    sha256 = "070c8ef4e6c74eddf7ddf4385936aed730c2dfe2160162e5c56b5158d1061a76";
+  };
+
+  buildInputs = [
+    ibus cmake pkgconfig qt4 icu doxygen
+  ];
+
+  cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ];
+
+  meta = with stdenv.lib; {
+    homepage    = https://code.google.com/p/ibus/;
+    description = "Qt4 interface to the ibus input method";
+    platforms   = platforms.linux;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ gebner ];
+  };
+}
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
new file mode 100644
index 000000000000..6b426169a708
--- /dev/null
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, makeWrapper, python, intltool, pkgconfig
+, gnome3, atk, pygobject3, dbus, libnotify, isocodes, gobjectIntrospection, wayland }:
+
+stdenv.mkDerivation rec {
+  name = "ibus-${version}";
+  version = "1.5.5";
+
+  src = fetchurl {
+    url = "http://ibus.googlecode.com/files/${name}.tar.gz";
+    sha256 = "1v4a9xv2k26g6ggk4282ynfvh68j2r5hg1cdpvnryfa8c2pkdaq2";
+  };
+
+  configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library";
+
+  buildInputs = [
+    makeWrapper python gnome3.glib wayland
+    intltool pkgconfig gnome3.gtk2
+    gnome3.gtk3 dbus gnome3.dconf gnome3.gconf
+    libnotify isocodes gobjectIntrospection
+  ];
+
+  preBuild = ''
+    patchShebangs ./scripts
+    substituteInPlace data/dconf/Makefile --replace "dconf update" "echo"
+  '';
+
+  preFixup = ''
+    for f in "$out"/bin/*; do
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
+                       --prefix PYTHONPATH : "$(toPythonPath ${pygobject3})" \
+                       --prefix LD_LIBRARY_PATH : "${gnome3.gtk3}/lib:${atk}/lib:$out/lib" \
+                       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
+                       --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
+    done
+  '';
+
+  meta = {
+    homepage = https://code.google.com/p/ibus/;
+    description = "Intelligent Input Bus for Linux / Unix OS";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix
new file mode 100644
index 000000000000..2d5d10054b5b
--- /dev/null
+++ b/pkgs/tools/misc/ddccontrol/default.nix
@@ -0,0 +1,58 @@
+{ stdenv
+, fetchurl
+, intltool
+, libtool
+, autoconf
+, automake110x
+, perl
+, perlPackages
+, libxml2
+, pciutils
+, pkgconfig
+, gtk
+, ddccontrol-db
+}:
+
+let version = "0.4.2"; in
+stdenv.mkDerivation {
+  name = "ddccontrol-${version}";
+  src = fetchurl {
+    url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2";
+    sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1";
+  };
+  buildInputs =
+    [
+      intltool
+      libtool
+      autoconf
+      automake110x
+      perl
+      perlPackages.libxml_perl
+      libxml2
+      pciutils
+      pkgconfig
+      gtk
+      ddccontrol-db
+    ];
+
+  prePatch = ''
+      newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g")
+      mv configure.ac configure.ac.old
+      oldPath="\$"
+      oldPath+="{datadir}\/ddccontrol-db"
+      sed "s/$oldPath/$newPath/" <configure.ac.old >configure.ac
+      rm configure.ac.old
+  '';
+  preConfigure = ''
+      autoreconf --install
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A program used to control monitor parameters by software";
+    homepage = "http://ddccontrol.sourceforge.net/";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.pakhfn ];
+  };
+}
+
diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index b1e5e4dbd1ce..00b0c31201ac 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, autoconf, automake, buggyBiosCDSupport ? true}:
+{stdenv, fetchurl, autoconf, automake, texinfo, buggyBiosCDSupport ? true}:
 
 stdenv.mkDerivation {
   name = "grub-0.97-patch-1.12";
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   ] ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch);
 
   # Autoconf/automake required for the splashimage patch.
-  buildInputs = [autoconf automake];
+  buildInputs = [autoconf automake texinfo];
 
   prePatch = ''
     unpackFile $gentooPatches
@@ -47,6 +47,7 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     autoreconf
+    automake --add-missing
   '';
 
   passthru.grubTarget = "";
diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix
new file mode 100644
index 000000000000..3b276a7117fe
--- /dev/null
+++ b/pkgs/tools/misc/mpdscribble/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, mpd_clientlib, curl, glib, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "mpdscribble-${version}";
+  version = "0.22";
+
+  src = fetchurl {
+    url =
+    "http://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.bz2";
+    sha256 = "0hgb7xh3w455m00lpldwkyrc5spjn3q1pl2ry3kf7w3hiigjpphw";
+  };
+
+  buildInputs = [ mpd_clientlib curl glib pkgconfig ];
+
+  preConfigure = ''
+    export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.${mpd_clientlib.majorVersion}.0.${mpd_clientlib.minorVersion}
+    export LIBMPDCLIENT_CFLAGS=${mpd_clientlib}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)";
+    homepage = http://mpd.wikia.com/wiki/Client:mpdscribble;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.matthiasbeyer ];
+  };
+}
diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix
new file mode 100644
index 000000000000..767a61c2bb50
--- /dev/null
+++ b/pkgs/tools/misc/vmtouch/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchFromGitHub, perl}:
+
+stdenv.mkDerivation rec {
+  pname = "vmtouch";
+  version = "git-20150310";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "hoytech";
+    repo = "vmtouch";
+    rev = "4e1b106e59942678c1e6e490e2c7ca7df50eb7a3";
+    sha256 = "1m37gvlypyfizd33mfyfha4hhwiyfzsj8gb2h5im6wzis4j15d0y";
+  };
+
+  buildInputs = [perl];
+
+  makeFlags = "PREFIX=$(out)";
+
+  meta = {
+    description = "Portable file system cache diagnostics and control";
+    longDescription = "vmtouch is a tool for learning about and controlling the file system cache of unix and unix-like systems.";
+    homepage = "http://hoytech.com/vmtouch/vmtouch.html";
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.garrison ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index b423aa301f9d..f6332874b3ac 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, pandoc }:
 
 let
-  version = "2015.01.30.2";
+  version = "2015.03.09";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "00ymx254qgic9ka7wb41cinv1w0ijq6l0f5k2cfspi958jqql9lm";
+    sha256 = "0mxpm79xdzzckc5rysjx17pxm9bldk7s13im7l9xd4pjrhy411xz";
   };
 
   buildInputs = [ python ];
diff --git a/pkgs/tools/networking/asynk/default.nix b/pkgs/tools/networking/asynk/default.nix
index cb3e1445aa39..38514a5604be 100644
--- a/pkgs/tools/networking/asynk/default.nix
+++ b/pkgs/tools/networking/asynk/default.nix
@@ -1,28 +1,38 @@
 { stdenv, fetchurl, python2, python2Packages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.0-rc2";
+  version = "2.0.0";
   name = "ASynK-${version}";
 
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "https://github.com/skarra/ASynK/archive/v${version}.tar.gz";
-    sha256 = "14s53ijn9fpxr490ypnn92zk6h5rdadf7j3z98rah1h7l659qi1b";
+    sha256 = "1bp30437mnls0kzm0525p3bg5nw9alpqrqhw186f6zp9i4y5znp1";
   };
 
-  propagatedBuildInputs = with python2Packages; [ python2 makeWrapper tornado requests dateutil ];
+  propagatedBuildInputs = with python2Packages;
+    [ python2 makeWrapper tornado requests dateutil
+      vobject gdata caldavclientlibrary-asynk ];
 
   installPhase = ''
-    mkdir -p $out/bin
+    mkdir -p $out/bin $out/lib
     cp asynk.py $out/bin/
     cp state.init.json $out/
     cp -R config $out/
-    cp -R lib $out/
+    cp lib/*.py $out/lib # */
+    cp -R lib/s $out/lib/
     cp -R asynk $out/
 
     substituteInPlace $out/bin/asynk.py \
       --replace "ASYNK_BASE_DIR    = os.path.dirname(os.path.abspath(__file__))" "ASYNK_BASE_DIR    = \"$out\""
 
+    for file in `find $out/asynk -type f`; do
+      # Oh yeah, tab characters!
+      substituteInPlace $file \
+        --replace 'from   vobject        import vobject' 'from vobject import *' \
+        --replace 'from   vobject    import vobject' 'from vobject import *'
+    done
+
     wrapProgram "$out/bin/asynk.py" \
       --prefix PYTHONPATH : "$PYTHONPATH"
   '';
diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index 23c484e94798..6dcb6e7f317d 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz";
-    sha256 = "1wdlyklqjvslcbvyx7ch4aziwvjbpj852k59m02gakisq9bywfcd";
+    sha256 = "02r0r4lgz10ivbmgdzivj7dvry1aad75ik9vyy6irjvngjkzg5r3";
   };
 
   buildInputs = [ geoip getopt openssl perl ];
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index d4463b42ec64..55a99dd2729a 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw";
   };
 
-  buildInputs = [ python pythonPackages.Babel pythonPackages.urwid ];
+  buildInputs = [
+    python pythonPackages.Babel
+    pythonPackages.urwid pythonPackages.notify
+  ];
 
   patches = [
     ./no-var-install.patch
@@ -36,7 +39,7 @@ stdenv.mkDerivation rec {
     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 "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus}):$(toPythonPath ${pythonPackages.notify})\$\{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
     sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in
diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
index 16f90ec5ca27..4e143bed5194 100644
--- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
+++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
@@ -3,8 +3,8 @@
 stdenv.mkDerivation {
   name = "DisnixWebService-0.3";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/20213076/download/4/DisnixWebService-0.3.tar.bz2;
-    sha256 = "0m3hk8nfgfnmd503pkpb6n2z944haq2n22d44q6n6zzqnfkjm175";
+    url = http://hydra.nixos.org/build/20419315/download/4/DisnixWebService-0.3.tar.bz2;
+    sha256 = "03vm84h7div200jr5z28hiwk0fq7i45j0ki18c2h4pmbsd89479i";
   };
   buildInputs = [ apacheAnt jdk ];
   PREFIX = ''''${env.out}'';
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index ee1e70a85821..98213d9cf342 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.3pre42e23349a7b4ca84fce6293f79470647a5f5c8e7";
+  name = "disnix-0.3";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/20213001/download/4/disnix-0.3pre42e23349a7b4ca84fce6293f79470647a5f5c8e7.tar.gz;
-    sha256 = "08f16gi8dg39ll5ph6rs4wdw9dg4sdgnikpg1x40slzcrckvnkhm";
+    url = http://hydra.nixos.org/build/20419300/download/4/disnix-0.3.tar.gz;
+    sha256 = "11yh270r8mgnkz98ax3p4rlc5dh88sxykvsmcpvgaqnqjh1rwd3j";
   };
   
   buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ];
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 4e8f7cc17ec9..52312ca7191e 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, getopt }:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.2pre7a84a34a2e36dd3fbd399d3b9f27168a9d2a0add";
+  name = "disnixos-0.2";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/20213021/download/3/disnixos-0.2pre7a84a34a2e36dd3fbd399d3b9f27168a9d2a0add.tar.gz;
-    sha256 = "1dc9q8i9vhw0851w9b7giv570rly172mmqfr6khr2r88npc642xc";
+    url = http://hydra.nixos.org/build/20419306/download/3/disnixos-0.2.tar.gz;
+    sha256 = "1xysklly0gvh0np0h3f30sfs5lx6qnwj59l8caynwn46qy596gnx";
   };
   
   buildInputs = [ socat pkgconfig disnix getopt ];
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index 340a7704d7ce..6fa95f060d7b 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null;
 assert enableMongoDatabase -> mongodb != null;
 
 stdenv.mkDerivation {
-  name = "dysnomia-0.3preddaef7a1d97dbfd88369b87795d0dae536ca3d9d";
+  name = "dysnomia-0.3";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/20212674/download/1/dysnomia-0.3preddaef7a1d97dbfd88369b87795d0dae536ca3d9d.tar.gz;
-    sha256 = "0z41gxh3idlfardm5hwy65qxy7drrbcl3dndinr2qksqx4yjafi1";
+    url = http://hydra.nixos.org/build/20419293/download/1/dysnomia-0.3.tar.gz;
+    sha256 = "09z9ad72wzxjvbc3hynbj9n1y4rrxw1by1wxacjmdqyp46h4b746";
   };
   
   preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index fccaacbe04f0..db71408d12d4 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth
 , readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null
-, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, texinfo, gettext
+, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, gettext, texinfo
 , pcsclite
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     pkgconfig libgcrypt libassuan libksba npth
     readline libusb gnutls adns openldap zlib bzip2
-    autoreconfHook texinfo gettext
+    autoreconfHook gettext texinfo
   ];
 
   configureFlags =
diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/tools/security/srm/default.nix
index db14a5b0e0c7..a109e9ca6a66 100644
--- a/pkgs/tools/security/srm/default.nix
+++ b/pkgs/tools/security/srm/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "srm-" + version;
-  version = "1.2.14";
+  version = "1.2.15";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/srm/1.2.14/srm-1.2.14.tar.gz";
-    sha256 = "1irwwpb7yhmii2v4vz1fjkmmhw7w7qd1ak9arn9zfg3mgcnwl32q";
+    url = "mirror://sourceforge/project/srm/${version}/${name}.tar.gz";
+    sha256 = "10sjarhprs6s4zandndg720528rcnd4xk8dl48pjj7li1q9c30vm";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 150cb49a9c4c..750ab3708729 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -20,13 +20,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "4.0.3";
+  version = "4.0.4";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz";
     sha256 = if bits == "64" then
-      "0x2jch8v57z59inncvmq2nr12j0f5by10mgj7sv9cabysj07xb45" else
-      "07g78gh909gcg4bqdmj1ag1kkl3707qi6l4wa9cm81r364192hha";
+      "0f0a07905daaf714322bc54cf25ed0e3b8ef91aeb937ab0df2d39010c9ee7b82" else
+      "f527b85a057ae402fa1dc84e6c175071e6448300cd2ebdd0d50494e1dd605185";
   };
 
   patchPhase = ''
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index d18c2737854a..2f62ce31949d 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,23 +1,102 @@
-{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd, liblogging}:
+{ stdenv, fetchurl, pkgconfig, libestr, json_c, zlib, pythonPackages
+, krb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null
+, libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null
+, libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null
+, libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
+, libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null
+}:
 
-stdenv.mkDerivation {
-  name = "rsyslog-7.6.3";
+with stdenv.lib;
+let
+  mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
+in
+stdenv.mkDerivation rec {
+  name = "rsyslog-8.8.0";
 
   src = fetchurl {
-    url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.6.3.tar.gz;
-    sha256 = "1v7mi2jjyn3awrfxqvd3mg64m5r027dgpbzd511mlvlbbw1mjcq1";
+    url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz";
+    sha256 = "1sx0j5icp172rzcpybjpfw53aj34w8j7k3f1ga0pmbv58r3pwyhl";
   };
 
-  buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd liblogging];
+  buildInputs = [
+    pkgconfig libestr json_c zlib pythonPackages.docutils
+    krb5 jemalloc mysql postgresql libdbi net_snmp libuuid curl gnutls
+    libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka
+    libmongo-client czmq rabbitmq-c hiredis
+  ] ++ stdenv.lib.optional stdenv.isLinux systemd;
 
-  preConfigure = ''
-     export configureFlags="$configureFlags --enable-gnutls --enable-cached-man-pages --enable-imjournal --with-systemdsystemunitdir=$out/etc/systemd/system"
-  '';
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-systemdsystemunitdir=\${out}/etc/systemd/system"
+    (mkFlag true                      "largefile")
+    (mkFlag true                      "regexp")
+    (mkFlag (krb5 != null)            "gssapi-krb5")
+    (mkFlag true                      "klog")
+    (mkFlag true                      "kmsg")
+    (mkFlag (systemd != null)         "imjournal")
+    (mkFlag true                      "inet")
+    (mkFlag (jemalloc != null)        "jemalloc")
+    (mkFlag true                      "unlimited-select")
+    (mkFlag true                      "usertools")
+    (mkFlag (mysql != null)           "mysql")
+    (mkFlag (postgresql != null)      "pgsql")
+    (mkFlag (libdbi != null)          "libdbi")
+    (mkFlag (net_snmp != null)        "snmp")
+    (mkFlag (libuuid != null)         "uuid")
+    (mkFlag (curl != null)            "elasticsearch")
+    (mkFlag (gnutls != null)          "gnutls")
+    (mkFlag (libgcrypt != null)       "libgcrypt")
+    (mkFlag true                      "rsyslogrt")
+    (mkFlag true                      "rsyslogd")
+    (mkFlag true                      "mail")
+    (mkFlag (liblognorm != null)      "mmnormalize")
+    (mkFlag true                      "mmjsonparse")
+    (mkFlag true                      "mmaudit")
+    (mkFlag true                      "mmanon")
+    (mkFlag true                      "mmutf8fix")
+    (mkFlag true                      "mmcount")
+    (mkFlag true                      "mmsequence")
+    (mkFlag true                      "mmfields")
+    (mkFlag true                      "mmpstrucdata")
+    (mkFlag (openssl != null)         "mmrfc5424addhmac")
+    (mkFlag (librelp != null)         "relp")
+    (mkFlag (libgt != null)           "guardtime")
+    (mkFlag (liblogging != null)      "liblogging-stdlog")
+    (mkFlag (liblogging != null)      "rfc3195")
+    (mkFlag true                      "imfile")
+    (mkFlag false                     "imsolaris")
+    (mkFlag true                      "imptcp")
+    (mkFlag true                      "impstats")
+    (mkFlag true                      "omprog")
+    (mkFlag (libnet != null)          "omudpspoof")
+    (mkFlag true                      "omstdout")
+    (mkFlag (systemd != null)         "omjournal")
+    (mkFlag true                      "pmlastmsg")
+    (mkFlag true                      "pmcisconames")
+    (mkFlag true                      "pmciscoios")
+    (mkFlag true                      "pmaixforwardedfrom")
+    (mkFlag true                      "pmsnare")
+    (mkFlag true                      "omruleset")
+    (mkFlag true                      "omuxsock")
+    (mkFlag true                      "mmsnmptrapd")
+    (mkFlag (hadoop != null)          "omhdfs")
+    (mkFlag (rdkafka != null)         "omkafka")
+    (mkFlag (libmongo-client != null) "ommongodb")
+    (mkFlag (czmq != null)            "imzmq3")
+    (mkFlag (czmq != null)            "imczmq")
+    (mkFlag (czmq != null)            "omzmq3")
+    (mkFlag (czmq != null)            "omczmq")
+    (mkFlag (rabbitmq-c != null)      "omrabbitmq")
+    (mkFlag (hiredis != null)         "omhiredis")
+    (mkFlag true                      "generate-man-pages")
+  ];
 
   meta = {
     homepage = "http://www.rsyslog.com/";
     description = "Enhanced syslog implementation";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index cec906e1f439..4fcc0680ada6 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "syslog-ng-${version}";
 
-  version = "3.6.1";
+  version = "3.6.2";
 
   src = fetchurl {
     url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz";
-    sha256 = "1s3lsxk2pky3jkfamkw5ivpxq2kazikcvdgpmxiyn5w10dwkd0m7";
+    sha256 = "0qc21mwajk6xrra3gqy2nvaza5gq62psamq4ayphj7lqabdglizg";
   };
 
   buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc ];
diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
index f7d8f1254c55..6cf9ac3e5ce4 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
@@ -1,13 +1,13 @@
 args: with args;
 rec {
-  version = "0.7";
+  version = "0.8";
   name = "moderntimeline-${version}";
   src = fetchurl {
     urls = [
       "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip"
       "http://mirror.ctan.org/macros/latex/contrib/moderntimeline.zip"
     ];
-    sha256 = "0dxwybanj7qvbr69wgsllha1brq6qjsnjfff6nw4r3nijzvvh876";
+    sha256 = "0y2m0qd0izrfjcwrmf3nvzkqmrhkdhzbv29s4c0knksdnfgcchc8";
   };
 
   buildInputs = [texLive unzip];
diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix
index a1eee51b34d5..49fe7dc681fe 100644
--- a/pkgs/tools/typesetting/xmlto/default.nix
+++ b/pkgs/tools/typesetting/xmlto/default.nix
@@ -3,10 +3,10 @@
 , bash, getopt, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "xmlto-0.0.25";
+  name = "xmlto-0.0.26";
   src = fetchurl {
     url = "http://fedorahosted.org/releases/x/m/xmlto/${name}.tar.bz2";
-    sha256 = "0dp5nxq491gymq806za0dk4hngfmq65ysrqbn0ypajqbbl6vf71n";
+    sha256 = "1v5mahfg5k9lh3anykl482xnrgxn36zlmqsgwahw29xwncprpd7g";
   };
 
   patchPhase = ''
diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix
index 84dc7c3c0719..a87dd5683229 100644
--- a/pkgs/tools/virtualization/euca2ools/default.nix
+++ b/pkgs/tools/virtualization/euca2ools/default.nix
@@ -1,19 +1,17 @@
 { stdenv, fetchgit, which, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "euca2ools-2.1.3";
+  name = "euca2ools-2.1.4";
   namePrefix = "";
 
   src = fetchgit {
     url = https://github.com/eucalyptus/euca2ools.git;
-    rev = "8ae2ecc";
-    sha256 = "caef5a3e2c9b515fd815034b5b7304acc878a0b9777ae4208dc033b0bf39da2b";
+    rev = "19cb7eac34dd7efe3a56e4841b9692c03458bf3b";
+    sha256 = "0f52jqw3s79w391lbzlh83lp55j73clvwmn2np4fy6kxc4j49da1";
   };
 
   pythonPath = [ pythonPackages.boto pythonPackages.m2crypto ];
 
-  doCheck = false;
-
   meta = {
     homepage = http://open.eucalyptus.com/downloads;
     description = "Tools for interacting with Amazon EC2/S3-compatible cloud computing services";