diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2024-01-07 12:22:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-07 12:22:52 +0100 |
| commit | 24fe8bb4f552ad3926274d29e083b79d84707da6 (patch) | |
| tree | 6136edaa0dfc7a2040d9af10dc64cada071084d2 /pkgs/servers/mail/exim | |
| parent | 5fa2fe4bffe2e8885e94a3e01d42dfa60882961b (diff) | |
| parent | fe7cd981dc7dd210ff749bfd71a6b099c3a594cc (diff) | |
Merge pull request #266312 from helsinki-systems/upd/exim
exim: 4.96.2 -> 4.97.1
Diffstat (limited to 'pkgs/servers/mail/exim')
| -rw-r--r-- | pkgs/servers/mail/exim/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index b3f19cec8fbd..a7f0a1986b99 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,4 +1,5 @@ { coreutils, db, fetchurl, openssl, pcre2, perl, pkg-config, lib, stdenv +, libxcrypt , procps, killall , enableLDAP ? false, openldap , enableMySQL ? false, libmysqlclient, zlib @@ -8,20 +9,21 @@ , enableDMARC ? true, opendmarc , enableRedis ? false, hiredis }: - -stdenv.mkDerivation rec { +let + perl' = perl.withPackages (p: with p; [ FileFcntlLock ]); +in stdenv.mkDerivation rec { pname = "exim"; - version = "4.96.2"; + version = "4.97.1"; src = fetchurl { url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz"; - hash = "sha256-A44yfo0ek9AFusm7Bv0irsRNUCiTDW2+iBetRLv8HeY="; + hash = "sha256-vXggV1CaeTWTUIUoWQYm0YXqFgzjLLNL7aJi6Zzv36k="; }; enableParallelBuilding = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ coreutils db openssl perl pcre2 ] + buildInputs = [ coreutils db openssl perl' pcre2 libxcrypt ] ++ lib.optional enableLDAP openldap ++ lib.optionals enableMySQL [ libmysqlclient zlib ] ++ lib.optional enableAuthDovecot dovecot @@ -54,7 +56,7 @@ stdenv.mkDerivation rec { s:^# \(MV_COMMAND\)=.*:\1=${coreutils}/bin/mv: s:^# \(RM_COMMAND\)=.*:\1=${coreutils}/bin/rm: s:^# \(TOUCH_COMMAND\)=.*:\1=${coreutils}/bin/touch: - s:^# \(PERL_COMMAND\)=.*:\1=${perl}/bin/perl: + s:^# \(PERL_COMMAND\)=.*:\1=${perl'}/bin/perl: s:^# \(LOOKUP_DSEARCH=yes\)$:\1: ${lib.optionalString enableLDAP '' s:^# \(LDAP_LIB_TYPE=OPENLDAP2\)$:\1: |