Merge branch master into staging

pkgs/tools/system/collectd/default.nix

@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     pkgconfig curl iptables libcredis libdbi libgcrypt libmemcached cyrus_sasl
     libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
-    lm_sensors libxml2 lvm2 mysql postgresql protobufc rabbitmq-c rrdtool
+    lm_sensors libxml2 lvm2 mysql.lib postgresql protobufc rabbitmq-c rrdtool
     varnish yajl
   ];
 

pkgs/tools/system/proot/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, talloc }:
+{ stdenv, fetchgit, talloc, enableStatic ? false }:
 
 stdenv.mkDerivation rec {
   name = "proot-${version}";
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ talloc ];
 
-  preBuild = ''
+  preBuild = stdenv.lib.optionalString enableStatic ''
+    export LDFLAGS="-static -L${talloc}/lib"
+  '' + ''
     substituteInPlace GNUmakefile --replace "/usr/local" "$out"
   '';
 

pkgs/tools/system/rsyslog/default.nix

@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig libestr json_c zlib pythonPackages.docutils
-    krb5 jemalloc mysql postgresql libdbi net_snmp libuuid curl gnutls
+    krb5 jemalloc 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;
+  ] ++ stdenv.lib.optional stdenv.isLinux systemd ++ stdenv.lib.optional (mysql != null) mysql.lib;
 
   configureFlags = [
     "--sysconfdir=/etc"
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.rsyslog.com/";
     description = "Enhanced syslog implementation";
     license = licenses.gpl3;
-    platforms = platforms.all;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
   };
 }

pkgs/tools/system/uptimed/default.nix

@@ -1,18 +1,30 @@
-{stdenv, fetchurl, automake, autoconf, libtool}:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
+let version = "0.3.18"; in
 stdenv.mkDerivation {
-  name = "uptimed-0.3.16";
+  name = "uptimed-${version}";
   
-  src = fetchurl {
-    url = http://podgorny.cz/uptimed/releases/uptimed-0.3.16.tar.bz2;
-    sha256 = "0axi2rz4gnmzzjl7xay7y8j1mh6iqqyg0arl1jyc3fgsk1ggy27m";
+  src = fetchFromGitHub {
+    sha256 = "108h8ck8cyzvf3xv23vzyj0j8dffdmwavj6nbn9ryqhqhqmk4fhb";
+    rev = "v${version}";
+    repo = "uptimed";
+    owner = "rpodgorny";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Uptime record daemon";
+    longDescription = ''
+      An uptime record daemon keeping track of the highest uptimes a computer
+      system ever had. It uses the system boot time to keep sessions apart from
+      each other. Uptimed comes with a console front-end to parse the records,
+      which can also easily be used to show your records on a web page.
+    '';
+    homepage = https://github.com/rpodgorny/uptimed/;
+    license = with licenses; gpl2;
+    platforms = with platforms; linux;
   };
 
   patches = [ ./no-var-spool-install.patch ];
 
-  buildInputs = [automake autoconf libtool];
-
-  meta = {
-    homepage = http://podgorny.cz/uptimed/;
-  };
+  buildInputs = [ autoreconfHook ];
 }