pyrox.dev / nixpkgs
lol
fork atom

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

exim: 4.96.2 -> 4.97.1

authored by

Thomas Gerbet and committed by
GitHub 24fe8bb4 5fa2fe4b

+24 -8
unified split
+2 -2
pkgs/development/libraries/opendmarc/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 pname = "opendmarc"; 5 - version = "1.3.3"; 6 7 src = fetchFromGitHub { 8 owner = "trusteddomainproject"; 9 repo = "opendmarc"; 10 rev = "rel-opendmarc-${builtins.replaceStrings [ "." ] [ "-" ] version}"; 11 - sha256 = "sha256-SQH85FLfVEEtYhR1+A1XxCDMiTjDgLQX6zifbLxCa5c="; 12 }; 13 14 outputs = [ "bin" "dev" "out" "doc" ];
··· 2 3 stdenv.mkDerivation rec { 4 pname = "opendmarc"; 5 + version = "1.4.2"; 6 7 src = fetchFromGitHub { 8 owner = "trusteddomainproject"; 9 repo = "opendmarc"; 10 rev = "rel-opendmarc-${builtins.replaceStrings [ "." ] [ "-" ] version}"; 11 + hash = "sha256-vnWtTvHhzCed7P6rN3wAz6zfRvtV0cLn5GhDxLF8H3c="; 12 }; 13 14 outputs = [ "bin" "dev" "out" "doc" ];
+8 -6
pkgs/servers/mail/exim/default.nix
··· 1 { coreutils, db, fetchurl, openssl, pcre2, perl, pkg-config, lib, stdenv 2 , procps, killall 3 , enableLDAP ? false, openldap 4 , enableMySQL ? false, libmysqlclient, zlib ··· 8 , enableDMARC ? true, opendmarc 9 , enableRedis ? false, hiredis 10 }: 11 - 12 - stdenv.mkDerivation rec { 13 pname = "exim"; 14 - version = "4.96.2"; 15 16 src = fetchurl { 17 url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz"; 18 - hash = "sha256-A44yfo0ek9AFusm7Bv0irsRNUCiTDW2+iBetRLv8HeY="; 19 }; 20 21 enableParallelBuilding = true; 22 23 nativeBuildInputs = [ pkg-config ]; 24 - buildInputs = [ coreutils db openssl perl pcre2 ] 25 ++ lib.optional enableLDAP openldap 26 ++ lib.optionals enableMySQL [ libmysqlclient zlib ] 27 ++ lib.optional enableAuthDovecot dovecot ··· 54 s:^# \(MV_COMMAND\)=.*:\1=${coreutils}/bin/mv: 55 s:^# \(RM_COMMAND\)=.*:\1=${coreutils}/bin/rm: 56 s:^# \(TOUCH_COMMAND\)=.*:\1=${coreutils}/bin/touch: 57 - s:^# \(PERL_COMMAND\)=.*:\1=${perl}/bin/perl: 58 s:^# \(LOOKUP_DSEARCH=yes\)$:\1: 59 ${lib.optionalString enableLDAP '' 60 s:^# \(LDAP_LIB_TYPE=OPENLDAP2\)$:\1:
··· 1 { coreutils, db, fetchurl, openssl, pcre2, perl, pkg-config, lib, stdenv 2 + , libxcrypt 3 , procps, killall 4 , enableLDAP ? false, openldap 5 , enableMySQL ? false, libmysqlclient, zlib ··· 9 , enableDMARC ? true, opendmarc 10 , enableRedis ? false, hiredis 11 }: 12 + let 13 + perl' = perl.withPackages (p: with p; [ FileFcntlLock ]); 14 + in stdenv.mkDerivation rec { 15 pname = "exim"; 16 + version = "4.97.1"; 17 18 src = fetchurl { 19 url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz"; 20 + hash = "sha256-vXggV1CaeTWTUIUoWQYm0YXqFgzjLLNL7aJi6Zzv36k="; 21 }; 22 23 enableParallelBuilding = true; 24 25 nativeBuildInputs = [ pkg-config ]; 26 + buildInputs = [ coreutils db openssl perl' pcre2 libxcrypt ] 27 ++ lib.optional enableLDAP openldap 28 ++ lib.optionals enableMySQL [ libmysqlclient zlib ] 29 ++ lib.optional enableAuthDovecot dovecot ··· 56 s:^# \(MV_COMMAND\)=.*:\1=${coreutils}/bin/mv: 57 s:^# \(RM_COMMAND\)=.*:\1=${coreutils}/bin/rm: 58 s:^# \(TOUCH_COMMAND\)=.*:\1=${coreutils}/bin/touch: 59 + s:^# \(PERL_COMMAND\)=.*:\1=${perl'}/bin/perl: 60 s:^# \(LOOKUP_DSEARCH=yes\)$:\1: 61 ${lib.optionalString enableLDAP '' 62 s:^# \(LDAP_LIB_TYPE=OPENLDAP2\)$:\1:
+14
pkgs/top-level/perl-packages.nix
··· 9825 }; 9826 }; 9827 9828 FileGrep = buildPerlPackage { 9829 pname = "File-Grep"; 9830 version = "0.02";
··· 9825 }; 9826 }; 9827 9828 + FileFcntlLock = buildPerlPackage { 9829 + pname = "File-FcntlLock"; 9830 + version = "0.22"; 9831 + src = fetchurl { 9832 + url = "mirror://cpan/authors/id/J/JT/JTT/File-FcntlLock-0.22.tar.gz"; 9833 + hash = "sha256-mpq7Lv/5Orc3QaEo0/cA5SUnNUbBXQTnxRxwSrCdvN8="; 9834 + }; 9835 + meta = { 9836 + description = "File locking with fcntl(2)"; 9837 + license = with lib.licenses; [ artistic1 ]; 9838 + maintainers = with maintainers; [ ajs124 das_j ]; 9839 + }; 9840 + }; 9841 + 9842 FileGrep = buildPerlPackage { 9843 pname = "File-Grep"; 9844 version = "0.02";