diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-09-08 00:46:04 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:13:21 +0000 |
commit | afcf2d55332c5c01c2d989e9d010577d257cb6cc (patch) | |
tree | e1c816a271686b014a6403bcad7c57dd2ee4d9c7 /nixpkgs/pkgs/servers/mail | |
parent | 175b9acd282aaf65b5f354ea6e95c1348fe3daa3 (diff) | |
parent | 4e60699fa727e4a0f9a3e78948012f86da32cfef (diff) | |
download | nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.gz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.bz2 nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.lz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.xz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.zst nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.zip |
Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'
Diffstat (limited to 'nixpkgs/pkgs/servers/mail')
17 files changed, 131 insertions, 72 deletions
diff --git a/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix b/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix index 080cbc897756..5a318c311af8 100644 --- a/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix +++ b/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, openssl, perl, zlib, jam }: stdenv.mkDerivation rec { version = "3.2.0"; - name = "archiveopteryx-${version}"; + pname = "archiveopteryx"; src = fetchurl { - url = "http://archiveopteryx.org/download/${name}.tar.bz2"; + url = "http://archiveopteryx.org/download/${pname}-${version}.tar.bz2"; sha256 = "0i0zg8di8nbh96qnyyr156ikwcsq1w9b2291bazm5whb351flmqx"; }; diff --git a/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index dce0b9174092..b7d791f34166 100644 --- a/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, dovecot, openssl }: stdenv.mkDerivation rec { - name = "dovecot-pigeonhole-${version}"; + pname = "dovecot-pigeonhole"; version = "0.5.7.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/servers/mail/mailhog/default.nix b/nixpkgs/pkgs/servers/mail/mailhog/default.nix index 019c84d2898b..429d735ffcd0 100644 --- a/nixpkgs/pkgs/servers/mail/mailhog/default.nix +++ b/nixpkgs/pkgs/servers/mail/mailhog/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "MailHog-${version}"; + pname = "MailHog"; version = "1.0.0"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch b/nixpkgs/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch deleted file mode 100644 index b8a5476c0559..000000000000 --- a/nixpkgs/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 47469af384a6d4a0877c76d3c52013b40ab61f04 Mon Sep 17 00:00:00 2001 -From: Peter Simons <simons@cryp.to> -Date: Mon, 26 Aug 2019 16:10:04 +0200 -Subject: [PATCH] Find external tools via $PATH rather than hard-coding - /usr/bin. - ---- - src/mailman/config/mhonarc.cfg | 2 +- - src/mailman/config/postfix.cfg | 2 +- - src/mailman/config/schema.cfg | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/mailman/config/mhonarc.cfg b/src/mailman/config/mhonarc.cfg -index b00f93aea..096e9521b 100644 ---- a/src/mailman/config/mhonarc.cfg -+++ b/src/mailman/config/mhonarc.cfg -@@ -24,4 +24,4 @@ base_url: http://$hostname/archives/$fqdn_listname - - # If the archiver works by calling a command on the local machine, this is the - # command to call. --command: /usr/bin/mhonarc -outdir /path/to/archive/$listname -add -+command: mhonarc -outdir /path/to/archive/$listname -add -diff --git a/src/mailman/config/postfix.cfg b/src/mailman/config/postfix.cfg -index cddda220a..934c9a977 100644 ---- a/src/mailman/config/postfix.cfg -+++ b/src/mailman/config/postfix.cfg -@@ -5,7 +5,7 @@ - # db file, from the associated plain text files. The file being updated will - # be appended to this string (with a separating space), so it must be - # appropriate for os.system(). --postmap_command: /usr/sbin/postmap -+postmap_command: postmap - - # This variable describes the type of transport maps that will be generated by - # mailman to be used with postfix for LMTP transport. By default, it is set to -diff --git a/src/mailman/config/schema.cfg b/src/mailman/config/schema.cfg -index fa06ccced..406999e13 100644 ---- a/src/mailman/config/schema.cfg -+++ b/src/mailman/config/schema.cfg -@@ -65,7 +65,7 @@ filtered_messages_are_preservable: no - # where the substitution variable $filename is filled in by Mailman, and - # contains the path to the temporary file that the command should read from. - # The command should print the converted text to stdout. --html_to_plain_text_command: /usr/bin/lynx -dump $filename -+html_to_plain_text_command: lynx -dump $filename - - # Specify what characters are allowed in list names. Characters outside of - # the class [-_.+=!$*{}~0-9a-z] matched case insensitively are never allowed, --- -2.22.0 - diff --git a/nixpkgs/pkgs/servers/mail/mailman/core.nix b/nixpkgs/pkgs/servers/mail/mailman/core.nix index fcd594270db4..1ba220039ea9 100644 --- a/nixpkgs/pkgs/servers/mail/mailman/core.nix +++ b/nixpkgs/pkgs/servers/mail/mailman/core.nix @@ -1,15 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi, alembic, aiosmtpd, dnspython , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib , requests, zope_configuration, click, falcon, importlib-resources -, zope_component +, zope_component, lynx, postfix }: buildPythonPackage rec { pname = "mailman"; version = "3.2.2"; - patches = [ ./0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch ]; - src = fetchPypi { inherit pname version; sha256 = "09s9p5pb8gff6zblwidyq830yfgcvv50p5drdaxj1qpy8w46lvc6"; @@ -21,6 +19,13 @@ buildPythonPackage rec { zope_component ]; + patchPhase = '' + substituteInPlace src/mailman/config/postfix.cfg \ + --replace /usr/sbin/postmap ${postfix}/bin/postmap + substituteInPlace src/mailman/config/schema.cfg \ + --replace /usr/bin/lynx ${lynx}/bin/lynx + ''; + # Mailman assumes that those scripts in $out/bin are Python scripts. Wrapping # them in shell code breaks this assumption. The proper way to use mailman is # to create a specialized python interpreter: diff --git a/nixpkgs/pkgs/servers/mail/mailman/default.nix b/nixpkgs/pkgs/servers/mail/mailman/default.nix new file mode 100644 index 000000000000..e9f66b92be29 --- /dev/null +++ b/nixpkgs/pkgs/servers/mail/mailman/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, python2 }: + +stdenv.mkDerivation rec { + pname = "mailman"; + version = "2.1.29"; + + src = fetchurl { + url = "mirror://gnu/mailman/${pname}-${version}.tgz"; + sha256 = "0b0dpwf6ap260791c7lg2vpw30llf19hymbf2hja3s016rqp5243"; + }; + + buildInputs = [ python2 python2.pkgs.dnspython ]; + + patches = [ ./fix-var-prefix.patch ]; + + configureFlags = [ + "--without-permcheck" + "--with-cgi-ext=.cgi" + "--with-var-prefix=/var/lib/mailman" + ]; + + installTargets = "doinstall"; # Leave out the 'update' target that's implied by 'install'. + + makeFlags = [ "DIRSETGID=:" ]; + + meta = { + homepage = https://www.gnu.org/software/mailman/; + description = "Free software for managing electronic mail discussion and e-newsletter lists"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.peti ]; + }; +} diff --git a/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix b/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix new file mode 100644 index 000000000000..8f060da34461 --- /dev/null +++ b/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchPypi, coverage, mock +, robot-detection, django_extensions, rjsmin, cssmin, django-mailman3 +, django-haystack, lockfile, networkx, dateutil, defusedxml +, django-paintstore, djangorestframework, django, django-q +, django_compressor, beautifulsoup4, six, psycopg2, whoosh +}: + +buildPythonPackage rec { + pname = "HyperKitty"; + version = "1.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1z2zswlml6nppxhzw9a4nrj7i5wsxd29s3q78ka1rwr5m5n7s1rz"; + }; + + buildInputs = [ coverage mock ]; + propagatedBuildInputs = [ + robot-detection django_extensions rjsmin cssmin django-mailman3 + django-haystack lockfile networkx dateutil defusedxml + django-paintstore djangorestframework django django-q + django_compressor beautifulsoup4 six psycopg2 whoosh + ]; + + checkPhase = '' + cd $NIX_BUILD_TOP/$sourceRoot + PYTHONPATH=.:$PYTHONPATH python example_project/manage.py test \ + --settings=hyperkitty.tests.settings_test hyperkitty + ''; + + meta = { + homepage = "http://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 ]; + }; +} diff --git a/nixpkgs/pkgs/servers/mail/mlmmj/default.nix b/nixpkgs/pkgs/servers/mail/mlmmj/default.nix index 98b270ad7d41..2c1c07e502a7 100644 --- a/nixpkgs/pkgs/servers/mail/mlmmj/default.nix +++ b/nixpkgs/pkgs/servers/mail/mlmmj/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "mlmmj-${version}"; + pname = "mlmmj"; version = "1.3.0"; src = fetchurl { - url = "http://mlmmj.org/releases/${name}.tar.gz"; + url = "http://mlmmj.org/releases/${pname}-${version}.tar.gz"; sha256 = "1sghqvwizvm1a9w56r34qy5njaq1c26bagj85r60h32gh3fx02bn"; }; diff --git a/nixpkgs/pkgs/servers/mail/nullmailer/default.nix b/nixpkgs/pkgs/servers/mail/nullmailer/default.nix index 4b753bdf0cdb..7738c4eb3d4a 100644 --- a/nixpkgs/pkgs/servers/mail/nullmailer/default.nix +++ b/nixpkgs/pkgs/servers/mail/nullmailer/default.nix @@ -5,7 +5,7 @@ assert tls -> gnutls != null; stdenv.mkDerivation rec { version = "2.2"; - name = "nullmailer-${version}"; + pname = "nullmailer"; src = fetchurl { url = "https://untroubled.org/nullmailer/nullmailer-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix b/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix index 2e1b3a4f7980..fdc2b3fd2c42 100644 --- a/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix +++ b/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "opensmtpd-${version}"; + pname = "opensmtpd"; version = "6.4.2p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib libressl db pam ]; src = fetchurl { - url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; + url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; sha256 = "0pgv080ai7d98l9340jadp9wjiaqj2qvgpqhilcz0kps2mdiawbd"; }; diff --git a/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix b/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix index 1d4ad63c37d2..71b27facbab6 100644 --- a/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix +++ b/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { - name = "opensmtpd-extras-${version}"; + pname = "opensmtpd-extras"; version = "6.4.0"; src = fetchurl { - url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; + url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; sha256 = "09k25l7zy5ch3fk6qphni2h0rxdp8wacmfag1whi608dgimrhrnb"; }; diff --git a/nixpkgs/pkgs/servers/mail/postfix/default.nix b/nixpkgs/pkgs/servers/mail/postfix/default.nix index a4b0b921adb2..39845f12f03c 100644 --- a/nixpkgs/pkgs/servers/mail/postfix/default.nix +++ b/nixpkgs/pkgs/servers/mail/postfix/default.nix @@ -24,12 +24,12 @@ let in stdenv.mkDerivation rec { - name = "postfix-${version}"; + pname = "postfix"; version = "3.4.6"; src = fetchurl { - url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; + url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; sha256 = "09p3vg2xlh6iq45gp6zanbp1728fc31r7zz71r131vh20ssajx6n"; }; diff --git a/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix b/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix index 8c00bcdbee25..890cd1880535 100644 --- a/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix +++ b/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix @@ -22,7 +22,8 @@ let in stdenv.mkDerivation { - name = "pfixtools-${version}"; + pname = "pfixtools"; + inherit version; src = pfixtoolsSrc; diff --git a/nixpkgs/pkgs/servers/mail/postsrsd/default.nix b/nixpkgs/pkgs/servers/mail/postsrsd/default.nix index f13c57e3b35d..49854927e57f 100644 --- a/nixpkgs/pkgs/servers/mail/postsrsd/default.nix +++ b/nixpkgs/pkgs/servers/mail/postsrsd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, help2man }: stdenv.mkDerivation rec { - name = "postsrsd-${version}"; + pname = "postsrsd"; version = "1.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/servers/mail/pypolicyd-spf/default.nix b/nixpkgs/pkgs/servers/mail/pypolicyd-spf/default.nix index d5e410a86c1f..5da94ca80269 100644 --- a/nixpkgs/pkgs/servers/mail/pypolicyd-spf/default.nix +++ b/nixpkgs/pkgs/servers/mail/pypolicyd-spf/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonApplication, fetchurl, pyspf }: buildPythonApplication rec { - name = "pypolicyd-spf-${version}"; + pname = "pypolicyd-spf"; majorVersion = "2.0"; version = "${majorVersion}.2"; src = fetchurl { - url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1nm8y1jjgx6mxrbcxrbdnmkf8vglwp0wiw6jipzh641wb24gi76z"; }; diff --git a/nixpkgs/pkgs/servers/mail/rmilter/default.nix b/nixpkgs/pkgs/servers/mail/rmilter/default.nix new file mode 100644 index 000000000000..9d7730e399f3 --- /dev/null +++ b/nixpkgs/pkgs/servers/mail/rmilter/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cmake, bison, flex, pkgconfig, openssl, pcre +, libmilter, opendkim, libmemcached, glib }: + +let patchedLibmilter = stdenv.lib.overrideDerivation libmilter (_ : { + patches = libmilter.patches ++ [ ./fd-passing-libmilter.patch ]; +}); +in + +stdenv.mkDerivation rec { + pname = "rmilter"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "vstakhov"; + repo = "rmilter"; + rev = version; + sha256 = "1gbp6jah88l6xqgflim01ycyp63l733bgir65fxnnrmifj1qzymh"; + }; + + nativeBuildInputs = [ bison cmake flex pkgconfig ]; + buildInputs = [ libmemcached patchedLibmilter openssl pcre opendkim glib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/vstakhov/rmilter; + license = licenses.asl20; + description = '' + Daemon to integrate rspamd and milter compatible MTA, for example + postfix or sendmail + ''; + maintainers = with maintainers; [ avnik fpletz ]; + platforms = with platforms; linux; + }; +} diff --git a/nixpkgs/pkgs/servers/mail/rspamd/default.nix b/nixpkgs/pkgs/servers/mail/rspamd/default.nix index 67a647b236b4..2b3986c412d0 100644 --- a/nixpkgs/pkgs/servers/mail/rspamd/default.nix +++ b/nixpkgs/pkgs/servers/mail/rspamd/default.nix @@ -13,7 +13,7 @@ let libmagic = file; # libmagic provided by file package ATM in stdenv.mkDerivation rec { - name = "rspamd-${version}"; + pname = "rspamd"; version = "1.9.4"; src = fetchFromGitHub { |