diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-07-05 09:53:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-07-05 09:53:53 +0200 |
| commit | 9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274 (patch) | |
| tree | f7bda821b368d3d854d19ced09a82d21a757ebad /pkgs/servers | |
| parent | 7205dfadec4363e0846d6c65266d92a9dddfef6a (diff) | |
| parent | 5328aac7be5b7ebf794349f915a379efd04b018b (diff) | |
| download | nixpkgs-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar nixpkgs-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar.gz nixpkgs-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar.bz2 nixpkgs-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar.lz nixpkgs-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar.xz nixpkgs-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.tar.zst nixpkgs-9e1c7ddaaeeaa32cce6239ce27d4aafc4e678274.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/mail/postfix/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/unifi/default.nix | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 9c72aa01898..bfdea71c5d7 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -3,6 +3,7 @@ , withPgSQL ? false, postgresql , withMySQL ? false, libmysql , withSQLite ? false, sqlite +, withLDAP ? false, openldap }: let @@ -11,12 +12,14 @@ let "-DHAS_DB_BYPASS_MAKEDEFS_CHECK" ] ++ lib.optional withPgSQL "-DHAS_PGSQL" ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${lib.getDev libmysql}/include/mysql" ] - ++ lib.optional withSQLite "-DHAS_SQLITE"); + ++ lib.optional withSQLite "-DHAS_SQLITE" + ++ lib.optional withLDAP "-DHAS_LDAP"); auxlibs = lib.concatStringsSep " " ([ "-ldb" "-lnsl" "-lresolv" "-lsasl2" "-lcrypto" "-lssl" ] ++ lib.optional withPgSQL "-lpq" ++ lib.optional withMySQL "-lmysqlclient" - ++ lib.optional withSQLite "-lsqlite3"); + ++ lib.optional withSQLite "-lsqlite3" + ++ lib.optional withLDAP "-lldap"); in stdenv.mkDerivation rec { @@ -32,7 +35,8 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu pcre ] ++ lib.optional withPgSQL postgresql ++ lib.optional withMySQL libmysql - ++ lib.optional withSQLite sqlite; + ++ lib.optional withSQLite sqlite + ++ lib.optional withLDAP openldap; hardeningDisable = [ "format" ]; hardeningEnable = [ "pie" ]; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 2ce0ba1d5f5..7237bbdcd96 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "5.5.11"; + version = "5.5.19"; src = fetchurl { - url = "https://www.ubnt.com/downloads/unifi/5.5.11-5107276ec2/unifi_sysvinit_all.deb"; - sha256 = "1jsixz7g7h7fdwb512flcwk0vblrsxpg4i9jdz7r72bkmvnxk7mm"; + url = "https://www.ubnt.com/downloads/unifi/${version}/unifi_sysvinit_all.deb"; + sha256 = "0bsfq48xjp230ir8pm9wpa5p4dh88zfy51lbi2xwpr454371ixcl"; }; buildInputs = [ dpkg ]; |