diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-18 22:07:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-18 22:07:57 +0200 |
| commit | 20bc7f75fede41f374921f7e18e42511e3342247 (patch) | |
| tree | a0894ce867670b2dae79d35eefae1502f37cfb14 /pkgs/servers | |
| parent | a6e737c65eee89ee809dce73923bce8ec210acd7 (diff) | |
| parent | c068e1ca9af3e86f56615aafd705fbd851f466bb (diff) | |
| download | nixlib-20bc7f75fede41f374921f7e18e42511e3342247.tar nixlib-20bc7f75fede41f374921f7e18e42511e3342247.tar.gz nixlib-20bc7f75fede41f374921f7e18e42511e3342247.tar.bz2 nixlib-20bc7f75fede41f374921f7e18e42511e3342247.tar.lz nixlib-20bc7f75fede41f374921f7e18e42511e3342247.tar.xz nixlib-20bc7f75fede41f374921f7e18e42511e3342247.tar.zst nixlib-20bc7f75fede41f374921f7e18e42511e3342247.zip | |
Merge pull request #42139 from Ekleog/opensmtpd-dovecot-fix
opensmtpd: fix interaction with dovecot-2.3.1
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/mail/opensmtpd/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index e562fdc88a6c..60c517230b4f 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoconf, automake, libtool, bison +{ stdenv, lib, fetchurl, fetchpatch, autoconf, automake, libtool, bison , libasr, libevent, zlib, openssl, db, pam # opensmtpd requires root for no reason to encrypt passwords, this patch fixes it @@ -23,7 +23,13 @@ else stdenv.mkDerivation rec { sha256 = "291881862888655565e8bbe3cfb743310f5dc0edb6fd28a889a9a547ad767a81"; }; - patches = [ ./proc_path.diff ]; + patches = [ + ./proc_path.diff + (fetchpatch { + url = "https://github.com/OpenSMTPD/OpenSMTPD/commit/725ba4fa2ddf23bbcd1ff9ec92e86bbfaa6825c8.diff"; + sha256 = "19rla0b2r53jpdiz25fcza29c2msz6j6paivxhp9jcy1xl457dqa"; + }) + ]; postPatch = with builtins; with lib; optionalString unpriviledged_smtpctl_encrypt '' |