diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/mail')
27 files changed, 103 insertions, 102 deletions
diff --git a/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix b/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix index 962d5603e472..4cc612ef89a1 100644 --- a/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix +++ b/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, perl, zlib, jam }: +{ lib, stdenv, fetchurl, openssl, perl, zlib, jam }: stdenv.mkDerivation rec { version = "3.2.0"; pname = "archiveopteryx"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { mv installroot/$out $out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://archiveopteryx.org/"; description = "An advanced PostgreSQL-based IMAP/POP server"; license = licenses.postgresql; diff --git a/nixpkgs/pkgs/servers/mail/clamsmtp/default.nix b/nixpkgs/pkgs/servers/mail/clamsmtp/default.nix index 327e545adcea..fc3212453d88 100644 --- a/nixpkgs/pkgs/servers/mail/clamsmtp/default.nix +++ b/nixpkgs/pkgs/servers/mail/clamsmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "clamsmtp-" + version; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./header-order.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SMTP filter that allows to check for viruses using the ClamAV anti-virus software"; homepage = "http://thewalter.net/stef/software/clamsmtp/"; diff --git a/nixpkgs/pkgs/servers/mail/dkimproxy/default.nix b/nixpkgs/pkgs/servers/mail/dkimproxy/default.nix index 376beac7e36f..f4905ecf4d8f 100644 --- a/nixpkgs/pkgs/servers/mail/dkimproxy/default.nix +++ b/nixpkgs/pkgs/servers/mail/dkimproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, perlPackages, fetchurl }: +{ lib, stdenv, perlPackages, fetchurl }: let pkg = "dkimproxy"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ perlPackages.perl ]; propagatedBuildInputs = with perlPackages; [ Error MailDKIM MIMETools NetServer ]; - meta = with stdenv.lib; { + meta = with lib; { description = "SMTP-proxy that signs and/or verifies emails"; homepage = "http://dkimproxy.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/servers/mail/dovecot/default.nix b/nixpkgs/pkgs/servers/mail/dovecot/default.nix index 1a11e065d938..2c44094d0f70 100644 --- a/nixpkgs/pkgs/servers/mail/dovecot/default.nix +++ b/nixpkgs/pkgs/servers/mail/dovecot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl +{ stdenv, lib, fetchurl, perl, pkg-config, systemd, openssl , bzip2, zlib, lz4, inotify-tools, pam, libcap , clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl , nixosTests @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { pname = "dovecot"; - version = "2.3.11.3"; + version = "2.3.13"; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer cyrus_sasl.dev ] ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ] @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/2.3/${pname}-${version}.tar.gz"; - sha256 = "1p5gp8jbavcsaara5mfn5cbrnlxssajnchczbgmmfzr7228fmnfk"; + sha256 = "1i7ijss79a23v7b6lycfzaa8r5rh01k0h0b9h0j4a6n11sw7by53"; }; enableParallelBuilding = true; @@ -84,10 +84,11 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; - maintainers = with stdenv.lib.maintainers; [ peti fpletz globin ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ peti fpletz globin ]; + platforms = lib.platforms.unix; }; passthru.tests = { opensmtpd-interaction = nixosTests.opensmtpd; + inherit (nixosTests) dovecot; }; } diff --git a/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 8a0f2d4efab2..0b61a779c483 100644 --- a/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64, sqlite }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64, sqlite }: stdenv.mkDerivation { pname = "fts-xapian"; version = "1.3.1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { "--with-moduledir=$(out)/lib/dovecot" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/grosjo/fts-xapian"; description = "Dovecot FTS plugin based on Xapian"; license = licenses.lgpl21; diff --git a/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 5c01453cb277..e5a07aa3c278 100644 --- a/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, dovecot, openssl }: +{ lib, stdenv, fetchurl, dovecot, openssl }: stdenv.mkDerivation rec { pname = "dovecot-pigeonhole"; - version = "0.5.11"; + version = "0.5.13"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; - sha256 = "1w5mryv6izh1gv7davnl94rb0pvh5bxl2bydzbfla1b83x22m5qb"; + sha256 = "05xz2d82ck6lmv94nbc3qff09j8b60a5640i3fmqwqsvv9kfa7wi"; }; buildInputs = [ dovecot openssl ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pigeonhole.dovecot.org/"; description = "A sieve plugin for the Dovecot IMAP server"; license = licenses.lgpl21; diff --git a/nixpkgs/pkgs/servers/mail/exim/default.nix b/nixpkgs/pkgs/servers/mail/exim/default.nix index 8bd197f46c1d..9d69b0d73c2f 100644 --- a/nixpkgs/pkgs/servers/mail/exim/default.nix +++ b/nixpkgs/pkgs/servers/mail/exim/default.nix @@ -1,4 +1,4 @@ -{ coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, stdenv +{ coreutils, db, fetchurl, openssl, pcre, perl, pkg-config, lib, stdenv , enableLDAP ? false, openldap , enableMySQL ? false, libmysqlclient, zlib , enableAuthDovecot ? false, dovecot @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { sha256 = "1nsb2i5mqxfz1sl1bmbxmpb2qiaf3wffhfiw4j9vfpagy3xfhzpp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ coreutils db openssl perl pcre ] - ++ stdenv.lib.optional enableLDAP openldap - ++ stdenv.lib.optionals enableMySQL [ libmysqlclient zlib ] - ++ stdenv.lib.optional enableAuthDovecot dovecot - ++ stdenv.lib.optional enablePAM pam - ++ stdenv.lib.optional enableSPF libspf2 - ++ stdenv.lib.optional enableDMARC opendmarc; + ++ lib.optional enableLDAP openldap + ++ lib.optionals enableMySQL [ libmysqlclient zlib ] + ++ lib.optional enableAuthDovecot dovecot + ++ lib.optional enablePAM pam + ++ lib.optional enableSPF libspf2 + ++ lib.optional enableDMARC opendmarc; preBuild = '' sed ' @@ -49,32 +49,32 @@ stdenv.mkDerivation rec { s:^# \(TOUCH_COMMAND\)=.*:\1=${coreutils}/bin/touch: s:^# \(PERL_COMMAND\)=.*:\1=${perl}/bin/perl: s:^# \(LOOKUP_DSEARCH=yes\)$:\1: - ${stdenv.lib.optionalString enableLDAP '' + ${lib.optionalString enableLDAP '' s:^# \(LDAP_LIB_TYPE=OPENLDAP2\)$:\1: s:^# \(LOOKUP_LDAP=yes\)$:\1: s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lldap -llber: s:^# \(LOOKUP_LIBS\)=.*:\1=-lldap -llber: ''} - ${stdenv.lib.optionalString enableMySQL '' + ${lib.optionalString enableMySQL '' s:^# \(LOOKUP_MYSQL=yes\)$:\1: s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1: s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/: ''} - ${stdenv.lib.optionalString enableAuthDovecot '' + ${lib.optionalString enableAuthDovecot '' s:^# \(AUTH_DOVECOT\)=.*:\1=yes: ''} - ${stdenv.lib.optionalString enablePAM '' + ${lib.optionalString enablePAM '' s:^# \(SUPPORT_PAM\)=.*:\1=yes: s:^\(EXTRALIBS_EXIM\)=\(.*\):\1=\2 -lpam: s:^# \(EXTRALIBS_EXIM\)=.*:\1=-lpam: ''} - ${stdenv.lib.optionalString enableSPF '' + ${lib.optionalString enableSPF '' s:^# \(SUPPORT_SPF\)=.*:\1=yes: s:^# \(LDFLAGS += -lspf2\):\1: ''} - ${stdenv.lib.optionalString enableDMARC '' + ${lib.optionalString enableDMARC '' s:^# \(SUPPORT_DMARC\)=.*:\1=yes: s:^# \(LDFLAGS += -lopendmarc\):\1: ''} @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { done ) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://exim.org/"; description = "A mail transfer agent (MTA)"; license = with licenses; [ gpl2Plus bsd3 ]; diff --git a/nixpkgs/pkgs/servers/mail/mailhog/default.nix b/nixpkgs/pkgs/servers/mail/mailhog/default.nix index d0fded5c63b5..f1ba497720a9 100644 --- a/nixpkgs/pkgs/servers/mail/mailhog/default.nix +++ b/nixpkgs/pkgs/servers/mail/mailhog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "MailHog"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "124216850572r1h0ii7ad6jd1cd5czcvkz7k2jzvjb4pv2kl8p3y"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Web and API based SMTP testing"; homepage = "https://github.com/mailhog/MailHog"; changelog = "https://github.com/mailhog/MailHog/releases/tag/v${version}"; diff --git a/nixpkgs/pkgs/servers/mail/mailman/default.nix b/nixpkgs/pkgs/servers/mail/mailman/default.nix index 8f3a382b13e2..57ceee948b50 100644 --- a/nixpkgs/pkgs/servers/mail/mailman/default.nix +++ b/nixpkgs/pkgs/servers/mail/mailman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib , requests, zope_configuration, click, falcon, importlib-resources , zope_component, lynx, postfix, authheaders, gunicorn @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = { homepage = "https://www.gnu.org/software/mailman/"; description = "Free software for managing electronic mail discussion and newsletter lists"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ peti ]; }; } diff --git a/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix b/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix index 5ed5b74d309a..58ef52e9c26d 100644 --- a/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock , robot-detection, django_extensions, rjsmin, cssmin, django-mailman3 , django-haystack, flufl_lock, networkx, dateutil, defusedxml , django-paintstore, djangorestframework, django, django-q @@ -38,8 +38,8 @@ buildPythonPackage rec { meta = { homepage = "https://www.gnu.org/software/mailman/"; description = "Archiver for GNU Mailman v3"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ peti globin ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ peti globin ]; }; } diff --git a/nixpkgs/pkgs/servers/mail/mailman/postorius.nix b/nixpkgs/pkgs/servers/mail/mailman/postorius.nix index ae797fa6cbc7..ab8ad4440ab6 100644 --- a/nixpkgs/pkgs/servers/mail/mailman/postorius.nix +++ b/nixpkgs/pkgs/servers/mail/mailman/postorius.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock +{ lib, stdenv, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock , django-mailman3, mailmanclient, readme_renderer }: @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { homepage = "https://www.gnu.org/software/mailman/"; description = "Web-based user interface for managing GNU Mailman"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ globin peti ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ globin peti ]; }; } diff --git a/nixpkgs/pkgs/servers/mail/mlmmj/default.nix b/nixpkgs/pkgs/servers/mail/mlmmj/default.nix index 4caa9e8bfefa..e9d3bf9c8f32 100644 --- a/nixpkgs/pkgs/servers/mail/mlmmj/default.nix +++ b/nixpkgs/pkgs/servers/mail/mlmmj/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { install -vDm 644 -t $out/share/doc/mlmmj/ $docfiles ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://mlmmj.org"; description = "Mailing List Management Made Joyful"; maintainers = [ maintainers.edwtjo ]; diff --git a/nixpkgs/pkgs/servers/mail/nullmailer/default.nix b/nixpkgs/pkgs/servers/mail/nullmailer/default.nix index 6744d1ffac12..95263e435f02 100644 --- a/nixpkgs/pkgs/servers/mail/nullmailer/default.nix +++ b/nixpkgs/pkgs/servers/mail/nullmailer/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0md8cf90fl2yf3zh9njjy42a673v4j4ygyq95xg7fzkygdigm1lq"; }; - buildInputs = stdenv.lib.optional tls gnutls; + buildInputs = lib.optional tls gnutls; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - ] ++ stdenv.lib.optional tls "--enable-tls"; + ] ++ lib.optional tls "--enable-tls"; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix b/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix index a59e18837d7d..ab2bdae0add7 100644 --- a/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix +++ b/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, bison +{ lib, stdenv, fetchurl, autoconf, automake, libtool, bison , libasr, libevent, zlib, libressl, db, pam, nixosTests }: stdenv.mkDerivation rec { pname = "opensmtpd"; - version = "6.7.1p1"; + version = "6.8.0p2"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib libressl db pam ]; src = fetchurl { url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; - sha256 = "1jh8vxfajm1mvp1v5yh6llrhjzv0n9fgab88mlwllwqynhcfjy3l"; + sha256 = "05sd7bmq29ibnqbl2z53hiyprfxzf0qydfdaixs68rz55wqhbgsi"; }; patches = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.opensmtpd.org/"; description = '' A free implementation of the server-side SMTP protocol as defined by diff --git a/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix b/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix index 6c29de8cddbc..65ff08b45396 100644 --- a/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix +++ b/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, openssl, libevent, libasr, - python2, pkgconfig, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis, +{ lib, stdenv, fetchurl, openssl, libevent, libasr, + python2, pkg-config, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis, enablePython ? true, enableLua ? true, enablePerl ? true, @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1b1mx71bvmv92lbm08wr2p60g3qhikvv3n15zsr6dcwbk9aqahzq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libevent libasr python2 lua5 perl libmysqlclient postgresql sqlite hiredis ]; @@ -48,40 +48,40 @@ stdenv.mkDerivation rec { "--with-scheduler-ram" "--with-scheduler-stub" - ] ++ stdenv.lib.optionals enablePython [ + ] ++ lib.optionals enablePython [ "--with-python=${python2}" "--with-filter-python" "--with-queue-python" "--with-table-python" "--with-scheduler-python" - ] ++ stdenv.lib.optionals enableLua [ - "--with-lua=${pkgconfig}" + ] ++ lib.optionals enableLua [ + "--with-lua=${pkg-config}" "--with-filter-lua" - ] ++ stdenv.lib.optionals enablePerl [ + ] ++ lib.optionals enablePerl [ "--with-perl=${perl}" "--with-filter-perl" - ] ++ stdenv.lib.optionals enableMysql [ + ] ++ lib.optionals enableMysql [ "--with-table-mysql" - ] ++ stdenv.lib.optionals enablePostgres [ + ] ++ lib.optionals enablePostgres [ "--with-table-postgres" - ] ++ stdenv.lib.optionals enableSqlite [ + ] ++ lib.optionals enableSqlite [ "--with-table-sqlite" - ] ++ stdenv.lib.optionals enableRedis [ + ] ++ lib.optionals enableRedis [ "--with-table-redis" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString enableRedis + NIX_CFLAGS_COMPILE = lib.optionalString enableRedis "-I${hiredis}/include/hiredis -lhiredis" - + stdenv.lib.optionalString enableMysql + + lib.optionalString enableMysql " -L${libmysqlclient}/lib/mysql"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.opensmtpd.org/"; description = "Extra plugins for the OpenSMTPD mail server"; license = licenses.isc; diff --git a/nixpkgs/pkgs/servers/mail/opensmtpd/proc_path.diff b/nixpkgs/pkgs/servers/mail/opensmtpd/proc_path.diff index 5e1cfd004299..a60bb603aacf 100644 --- a/nixpkgs/pkgs/servers/mail/opensmtpd/proc_path.diff +++ b/nixpkgs/pkgs/servers/mail/opensmtpd/proc_path.diff @@ -1,7 +1,7 @@ -diff --git a/smtpd/smtpd.c b/smtpd/smtpd.c +diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index e049f07c..a1bd03a0 100644 ---- a/smtpd/smtpd.c -+++ b/smtpd/smtpd.c +--- a/usr.sbin/smtpd/smtpd.c ++++ b/usr.sbin/smtpd/smtpd.c @@ -1157,6 +1157,7 @@ fork_proc_backend(const char *key, const char *conf, const char *procname) char path[PATH_MAX]; char name[PATH_MAX]; @@ -24,10 +24,10 @@ index e049f07c..a1bd03a0 100644 (ssize_t)sizeof(path)) { log_warn("warn: %s-proc: exec path too long", key); return (-1); -diff --git a/smtpd/table.c b/smtpd/table.c +diff --git a/usr.sbin/smtpd/table.c b/usr.sbin/smtpd/table.c index 9cfdfb99..24dfcca4 100644 ---- a/smtpd/table.c -+++ b/smtpd/table.c +--- a/usr.sbin/smtpd/table.c ++++ b/usr.sbin/smtpd/table.c @@ -201,6 +201,7 @@ table_create(const char *backend, const char *name, const char *tag, struct table_backend *tb; char buf[LINE_MAX]; diff --git a/nixpkgs/pkgs/servers/mail/petidomo/default.nix b/nixpkgs/pkgs/servers/mail/petidomo/default.nix index 146160b79c32..169712375c1f 100644 --- a/nixpkgs/pkgs/servers/mail/petidomo/default.nix +++ b/nixpkgs/pkgs/servers/mail/petidomo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, sendmailPath ? "/run/wrappers/bin/sendmail" }: +{ lib, stdenv, fetchurl, flex, bison, sendmailPath ? "/run/wrappers/bin/sendmail" }: stdenv.mkDerivation rec { name = "petidomo-4.3"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://petidomo.sourceforge.net/"; description = "A simple and easy to administer mailing list server"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/nixpkgs/pkgs/servers/mail/popa3d/default.nix b/nixpkgs/pkgs/servers/mail/popa3d/default.nix index 998dce882866..d086eb09e804 100644 --- a/nixpkgs/pkgs/servers/mail/popa3d/default.nix +++ b/nixpkgs/pkgs/servers/mail/popa3d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.openwall.com/popa3d/"; description = "Tiny POP3 daemon with security as the primary goal"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/servers/mail/postfix/default.nix b/nixpkgs/pkgs/servers/mail/postfix/default.nix index 0b6ed49737d2..deea480b2f71 100644 --- a/nixpkgs/pkgs/servers/mail/postfix/default.nix +++ b/nixpkgs/pkgs/servers/mail/postfix/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { ./relative-symlinks.patch ]; - postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' sed -e 's!bin/postconf!${buildPackages.postfix}/bin/postconf!' -i postfix-install '' + '' sed -e '/^PATH=/d' -i postfix-install diff --git a/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix b/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix index 40a2d7fe092d..df04ade5b452 100644 --- a/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix +++ b/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, git, gperf, pcre, unbound, libev, tokyocabinet, pkgconfig, bash, libsrs2 }: +{ stdenv, lib, fetchFromGitHub, git, gperf, pcre, unbound, libev, tokyocabinet, pkg-config, bash, libsrs2 }: let version = "0.9"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { patches = [ ./0001-Fix-build-with-unbound-1.6.1.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [git gperf pcre unbound libev tokyocabinet bash libsrs2]; postUnpack = '' @@ -50,7 +50,7 @@ stdenv.mkDerivation { description = "A collection of postfix-related tools"; license = with lib.licenses; [ bsd3 ]; homepage = "https://github.com/Fruneau/pfixtools"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ jerith666 ]; }; } diff --git a/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix b/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix index e6451cddec6d..1c92a4a76764 100644 --- a/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix +++ b/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages }: +{ lib, stdenv, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { pname = "pflogsumm"; @@ -27,8 +27,8 @@ perlPackages.buildPerlPackage rec { meta = { homepage = "http://jimsun.linxnet.com/postfix_contrib.html"; - maintainers = with stdenv.lib.maintainers; [ schneefux ]; + maintainers = with lib.maintainers; [ schneefux ]; description = "Postfix activity overview"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/servers/mail/postgrey/default.nix b/nixpkgs/pkgs/servers/mail/postgrey/default.nix index dffe0191a0a4..d0eaf40d06c7 100644 --- a/nixpkgs/pkgs/servers/mail/postgrey/default.nix +++ b/nixpkgs/pkgs/servers/mail/postgrey/default.nix @@ -15,7 +15,7 @@ in runCommand name { url = "https://postgrey.schweikert.ch/pub/${name}.tar.gz"; sha256 = "1xx51xih4711vrvc6d57il9ccallbljj5zhgqdb07jzmz11rakgz"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A postfix policy server to provide greylisting"; homepage = "https://postgrey.schweikert.ch/"; platforms = postfix.meta.platforms; diff --git a/nixpkgs/pkgs/servers/mail/postsrsd/default.nix b/nixpkgs/pkgs/servers/mail/postsrsd/default.nix index 28d281dde158..978a3f6216bc 100644 --- a/nixpkgs/pkgs/servers/mail/postsrsd/default.nix +++ b/nixpkgs/pkgs/servers/mail/postsrsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, help2man }: +{ lib, stdenv, fetchFromGitHub, cmake, help2man }: stdenv.mkDerivation rec { pname = "postsrsd"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake help2man ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/roehling/postsrsd"; description = "Postfix Sender Rewriting Scheme daemon"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/servers/mail/rspamd/default.nix b/nixpkgs/pkgs/servers/mail/rspamd/default.nix index 71205ee093a4..0740613bad7a 100644 --- a/nixpkgs/pkgs/servers/mail/rspamd/default.nix +++ b/nixpkgs/pkgs/servers/mail/rspamd/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, perl -, glib, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu +, glib, luajit, openssl, pcre, pkg-config, sqlite, ragel, icu , hyperscan, jemalloc, blas, lapack, lua, libsodium , withBlas ? true , withHyperscan ? stdenv.isx86_64 @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "0vwa7k2s2bkfb8w78z5izkd6ywjbzqysb0grls898y549hm8ii70"; }; - nativeBuildInputs = [ cmake pkgconfig perl ]; + nativeBuildInputs = [ cmake pkg-config perl ]; buildInputs = [ glib openssl pcre sqlite ragel icu jemalloc libsodium ] ++ lib.optional withHyperscan hyperscan ++ lib.optionals withBlas [ blas lapack ] @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { passthru.tests.rspamd = nixosTests.rspamd; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://rspamd.com"; license = licenses.asl20; description = "Advanced spam filtering system"; diff --git a/nixpkgs/pkgs/servers/mail/spamassassin/default.nix b/nixpkgs/pkgs/servers/mail/spamassassin/default.nix index 25449fab5113..c5980bc8889e 100644 --- a/nixpkgs/pkgs/servers/mail/spamassassin/default.nix +++ b/nixpkgs/pkgs/servers/mail/spamassassin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, makeWrapper, gnupg }: +{ lib, stdenv, fetchurl, perlPackages, makeWrapper, gnupg }: perlPackages.buildPerlPackage rec { pname = "SpamAssassin"; @@ -35,8 +35,8 @@ perlPackages.buildPerlPackage rec { meta = { homepage = "http://spamassassin.apache.org/"; description = "Open-Source Spam Filter"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ peti qknight ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ peti qknight qyliss ]; }; } diff --git a/nixpkgs/pkgs/servers/mail/sympa/default.nix b/nixpkgs/pkgs/servers/mail/sympa/default.nix index 3e69274ff2d5..4bc969a851c1 100644 --- a/nixpkgs/pkgs/servers/mail/sympa/default.nix +++ b/nixpkgs/pkgs/servers/mail/sympa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, fetchFromGitHub, autoreconfHook, nixosTests }: +{ lib, stdenv, perl, fetchFromGitHub, autoreconfHook, nixosTests }: let dataDir = "/var/lib/sympa"; @@ -63,13 +63,13 @@ let in stdenv.mkDerivation rec { pname = "sympa"; - version = "6.2.56"; + version = "6.2.60"; src = fetchFromGitHub { owner = "sympa-community"; repo = pname; rev = version; - sha256 = "13cs2azpskmp2hkfy5zqf4qb6sb9r8d4wwzc8mw74mg2kdjnvfpy"; + sha256 = "0mnpmkvxf3bmrmahkf3d0i5r6sj7xb1yca5v7xdnwnh5wh9vlx7v"; }; configureFlags = [ @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { inherit (nixosTests) sympa; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source mailing list manager"; homepage = "https://www.sympa.org"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/servers/mail/system-sendmail/default.nix b/nixpkgs/pkgs/servers/mail/system-sendmail/default.nix index 7bd7df849244..a8fb65c0f42e 100644 --- a/nixpkgs/pkgs/servers/mail/system-sendmail/default.nix +++ b/nixpkgs/pkgs/servers/mail/system-sendmail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, runtimeShell }: +{ lib, stdenv, writeText, runtimeShell }: let script = writeText "script" '' #!${runtimeShell} @@ -26,7 +26,7 @@ stdenv.mkDerivation { chmod +x $out/bin/sendmail ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' A sendmail wrapper that calls the system sendmail. Do not install as system-wide sendmail! ''; |