Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2018-11-11 08:59:44 +01:00
190 changed files with 5569 additions and 1556 deletions
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig
, openssl
, odbcSupport ? false, unixODBC ? null }:
, odbcSupport ? true, unixODBC ? null }:
assert odbcSupport -> unixODBC != null;