Merge branch 'master' into staging

pkgs/development/libraries/libdwarf/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libelf }:
 
 stdenv.mkDerivation rec {
-  name = "libdwarf-20161001";
+  name = "libdwarf-20161021";
 
   src = fetchurl {
     url = "http://www.prevanders.net/${name}.tar.gz";
-    sha512 = "2c522ae0b6e2afffd09e2e79562987fd819b197c9bce4900b6a4fd176b5ff229e88c6b755cfbae7831e7160ddeb3bfe2afbf39d756d7e75ec31ace0668554048";
+    sha512 = "733523fd5c58f878d65949c1812b2f46b40c4cc3177bc780c703ec71f83675d4b84e81bc1bcca42adf69b5e122562e4ce8e9a8743af29cc6fafe78ed9f8213fd";
   };
 
   configureFlags = " --enable-shared --disable-nonshared";

pkgs/development/libraries/libspatialite/default.nix

@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos, libiconv }:
+{ stdenv, lib, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos, libiconv }:
+
+with lib;
 
 stdenv.mkDerivation rec {
   name = "libspatialite-4.2.0";
@@ -14,7 +16,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  postInstall = "" + optionalString stdenv.isDarwin ''
+    ln -s $out/lib/mod_spatialite.{so,dylib}
+  '';
+
+  meta = {
     description = "Extensible spatial index library in C++";
     homepage = https://www.gaia-gis.it/fossil/libspatialite;
     # They allow any of these

pkgs/development/libraries/lmdb/default.nix

@@ -3,11 +3,11 @@
 let optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "lmdb-${version}";
-  version = "0.9.16";
+  version = "0.9.18";
 
   src = fetchzip {
     url = "https://github.com/LMDB/lmdb/archive/LMDB_${version}.tar.gz";
-    sha256 = "1lkmngscijwiz09gdkqygdp87x55vp8gb4fh4vq7s34k4jv0327l";
+    sha256 = "01j384kxg36kym060pybr5p6mjw0xv33bqbb8arncdkdq57xk8wg";
   };
 
   postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";

pkgs/development/libraries/openldap/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, cyrus_sasl, db, groff }:
+{ stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }:
 
 stdenv.mkDerivation rec {
   name = "openldap-2.4.44";
@@ -13,11 +13,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ openssl cyrus_sasl db groff ];
+  buildInputs = [ openssl cyrus_sasl db groff libtool ];
 
   configureFlags =
     [ "--enable-overlays"
       "--disable-dependency-tracking"   # speeds up one-time build
+      "--enable-modules"
     ] ++ stdenv.lib.optional (openssl == null) "--without-tls"
       ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"
       ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
@@ -36,6 +37,10 @@ stdenv.mkDerivation rec {
     rm -r libraries/*/.libs
   '';
 
+  postInstall = ''
+    chmod +x $out/lib/*.so
+  '';
+
   meta = with stdenv.lib; {
     homepage    = http://www.openldap.org/;
     description = "An open source implementation of the Lightweight Directory Access Protocol";

pkgs/development/libraries/tinyxml/2.6.2.nix

@@ -63,6 +63,8 @@ in stdenv.mkDerivation {
     cp -v tinyxml.pc $out/lib/pkgconfig/
 
     cp -v docs/* $out/share/doc/tinyxml/
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    install_name_tool -id $out/lib/libtinyxml.dylib $out/lib/libtinyxml.dylib
   '';
 
   meta = {

pkgs/development/libraries/webkitgtk/2.14.nix

@@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.14.0";
+  version = "2.14.1";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -26,14 +26,14 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "02paj0anbnqn1z3hn5c4csmq9nga995rzagiplj3sjk2dj1ss4q5";
+    sha256 = "1dffnz20psgc604azhbzn9a6cdhafar9dw74w3bbwrfy531pcb9f";
   };
 
   # see if we can clean this up....
 
   patches = [ ./finding-harfbuzz-icu.patch ];
 
-  cmakeFlags = [ 
+  cmakeFlags = [
   "-DPORT=GTK"
   "-DUSE_LIBHYPHEN=0"
   "-DENABLE_GLES2=ON"