Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-02-28 16:32:57 +00:00
parent 8615f026a4 a9d24cedeb
commit 3b4765c9e5
302 changed files with 13274 additions and 2727 deletions
@@ -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
  ];