Merge staging-next into staging

2018-10-17 08:36:28 +02:00
parent 7b2ed00ef6 18fcc337af
commit 89349fdae9
347 changed files with 8824 additions and 5155 deletions
@@ -1,9 +1,9 @@
 { stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl
 , coreutils, findutils, gnugrep, gawk, icu, pcre
+, withLDAP ? true, openldap
 , withPgSQL ? false, postgresql
 , withMySQL ? false, mysql
 , withSQLite ? false, sqlite
-, withLDAP ? false, openldap
 }:

 let