Merge master into closure-size

The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.

pkgs/tools/system/amtterm/default.nix

@@ -0,0 +1,27 @@
+{ fetchurl, stdenv, makeWrapper, perl, perlPackages }:
+
+let version = "1.4"; in
+stdenv.mkDerivation {
+  name = "amtterm-"+version;
+
+  buildInputs = with perlPackages; [ perl SOAPLite ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  src = fetchurl {
+    url = "https://www.kraxel.org/cgit/amtterm/snapshot/amtterm-a75e48e010e92dc5540e2142efc445ccb0ab1a42.tar.gz";
+    sha256 = "0i4ny5dyf3fy3sd65zw9v4xxw3rc3qyn8r8y8gwwgankj6iqkqp4";
+  };
+
+  makeFlags = [ "prefix=$(out)" ];
+
+  postInstall =
+    "wrapProgram $out/bin/amttool --prefix PERL5LIB : $PERL5LIB";
+
+  meta = with stdenv.lib;
+    { description = "Intel AMT® SoL client + tools";
+      homepage = "https://www.kraxel.org/cgit/amtterm/";
+      license = licenses.gpl2;
+      maintainers = [ maintainers.ehmry ];
+      platforms = platforms.linux;
+    };
+}

pkgs/tools/system/collectd/default.nix

@@ -19,7 +19,7 @@
 , libtool ? null
 , lm_sensors ? null
 , lvm2 ? null
-, mysql ? null
+, libmysql ? null
 , postgresql ? null
 , protobufc ? null
 , python ? null
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached
     cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
-    lm_sensors libxml2 lvm2 mysql.lib postgresql protobufc rabbitmq-c rrdtool
+    lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool
     varnish yajl jdk libtool python udev
   ];
 

pkgs/tools/system/honcho/default.nix

@@ -1,6 +1,6 @@
-{ stdenv, fetchzip, pythonPackages, buildPythonPackage }:
+{ stdenv, fetchzip, pythonPackages, buildPythonApplication }:
 
-let honcho = buildPythonPackage rec {
+let honcho = buildPythonApplication rec {
   name = "honcho-${version}";
   version = "0.6.6";
   namePrefix = "";

pkgs/tools/system/proot/default.nix

@@ -1,31 +1,44 @@
-{ stdenv, fetchgit, talloc, enableStatic ? false }:
+{ stdenv, fetchFromGitHub, talloc, docutils
+, enableStatic ? false }:
 
 stdenv.mkDerivation rec {
   name = "proot-${version}";
-  version = "4.0.3";
+  version = "5.1.0";
 
-  src = fetchgit {
-    url = "git://github.com/cedric-vincent/proot.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "95a52b2fa47b2891eb2c6b6b0e14d42f6d48f6fd5181e359b007831f1a046e84";
+  src = fetchFromGitHub {
+    sha256 = "0azsqis99gxldmbcg43girch85ysg4hwzf0h1b44bmapnsm89fbz";
+    rev = "v${version}";
+    repo = "proot";
+    owner = "cedric-vincent";
   };
 
   buildInputs = [ talloc ];
+  nativeBuildInputs = [ docutils ];
+
+  enableParallelBuilding = true;
 
   preBuild = stdenv.lib.optionalString enableStatic ''
     export LDFLAGS="-static -L${talloc}/lib"
-  '' + ''
-    substituteInPlace GNUmakefile --replace "/usr/local" "$out"
   '';
 
-  sourceRoot = "proot/src";
+  makeFlags = [ "-C src" ];
+
+  postBuild = ''
+    make -C doc proot/man.1
+  '';
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    install -Dm644 doc/proot/man.1 $out/share/man/man1/proot.1
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://proot.me;
     description = "User-space implementation of chroot, mount --bind and binfmt_misc";
     platforms = platforms.linux;
     license = licenses.gpl2;
-    maintainers = [ maintainers.ianwookim ];
+    maintainers = with maintainers; [ ianwookim nckx ];
   };
 }