Unverified Commit 24fe8bb4 authored by Thomas Gerbet's avatar Thomas Gerbet Committed by GitHub
Browse files

Merge pull request #266312 from helsinki-systems/upd/exim 

exim: 4.96.2 -> 4.97.1
parents 5fa2fe4b fe7cd981

pkgs/development/libraries/opendmarc/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


stdenv.mkDerivation rec {

  pname = "opendmarc";

  version = "1.3.3";

  version = "1.4.2";



  src = fetchFromGitHub {

    owner = "trusteddomainproject";

    repo = "opendmarc";

    rev = "rel-opendmarc-${builtins.replaceStrings [ "." ] [ "-" ] version}";

    sha256 = "sha256-SQH85FLfVEEtYhR1+A1XxCDMiTjDgLQX6zifbLxCa5c=";

    hash = "sha256-vnWtTvHhzCed7P6rN3wAz6zfRvtV0cLn5GhDxLF8H3c=";

  };



  outputs = [ "bin" "dev" "out" "doc" ];

pkgs/servers/mail/exim/default.nix

+8 −6
Original line number Diff line number Diff line 
{ 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:

pkgs/top-level/perl-packages.nix

+14 −0
Original line number Diff line number Diff line
@@ -9825,6 +9825,20 @@ with self; { 
    };

  };













  FileFcntlLock = buildPerlPackage {













    pname = "File-FcntlLock";













    version = "0.22";













    src = fetchurl {













      url = "mirror://cpan/authors/id/J/JT/JTT/File-FcntlLock-0.22.tar.gz";













      hash = "sha256-mpq7Lv/5Orc3QaEo0/cA5SUnNUbBXQTnxRxwSrCdvN8=";













    };













    meta = {













      description = "File locking with fcntl(2)";













      license = with lib.licenses; [ artistic1 ];













      maintainers = with maintainers; [ ajs124 das_j ];













    };













  };



























  FileGrep = buildPerlPackage {















    pname = "File-Grep";















    version = "0.02";