nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-20 19:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
exim: 4.96.2 -> 4.97.1
This commit is contained in:
Thomas Gerbet 2024-01-07 12:22:52 +01:00 committed by GitHub
commit 24fe8bb4f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/opendmarc/default.nix
View File

@ -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" ];

14
pkgs/servers/mail/exim/default.nix
View File

@ -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:

14
pkgs/top-level/perl-packages.nix
View File

@ -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";