public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #127719 from NixOS/backport-127667-to-release-21.05 

[Backport release-21.05] dovecot: 2.3.14 -> 2.3.15
This commit is contained in:
ajs124 2021-06-21 23:10:51 +02:00 committed by GitHub
parent 3c6f3f84af c466620ad2
commit 94e57e81dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/servers/mail/dovecot/default.nix
View File

@ -10,7 +10,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dovecot"; pname = "dovecot";
version = "2.3.14"; version = "2.3.15";
nativeBuildInputs = [ perl pkg-config ]; nativeBuildInputs = [ perl pkg-config ];
buildInputs = buildInputs =
@ -22,14 +22,14 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
sha256 = "0jm3p52z619v7ajh533g2g7d790k82fk0w7ry0zqlm8ymzrxgcy8"; sha256 = "141manrh54cy8xizr7f8fsa3vdzc2ccfgdz87l9rjylm8mfxvfr1";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
preConfigure = '' preConfigure = ''
patchShebangs src/config/settings-get.pl patchShebangs src/config/settings-get.pl
''; '' + lib.optionalString (stdenv.isLinux) "export systemdsystemunitdir=$out/etc/systemd/system";
# We need this for sysconfdir, see remark below. # We need this for sysconfdir, see remark below.
installFlags = [ "DESTDIR=$(out)" ]; installFlags = [ "DESTDIR=$(out)" ];
@ -75,17 +75,18 @@ stdenv.mkDerivation rec {
"lib_cv_va_copy=yes" "lib_cv_va_copy=yes"
"lib_cv___va_copy=yes" "lib_cv___va_copy=yes"
"lib_cv_va_val_copy=yes" "lib_cv_va_val_copy=yes"
] ++ lib.optional (stdenv.isLinux) "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ] ++ lib.optional stdenv.isLinux "--with-systemd"
++ lib.optional (stdenv.isDarwin) "--enable-static" ++ lib.optional stdenv.isDarwin "--enable-static"
++ lib.optional withMySQL "--with-mysql" ++ lib.optional withMySQL "--with-mysql"
++ lib.optional withPgSQL "--with-pgsql" ++ lib.optional withPgSQL "--with-pgsql"
++ lib.optional withSQLite "--with-sqlite"; ++ lib.optional withSQLite "--with-sqlite";
meta = { meta = with lib; {
homepage = "https://dovecot.org/"; homepage = "https://dovecot.org/";
description = "Open source IMAP and POP3 email server written with security primarily in mind"; description = "Open source IMAP and POP3 email server written with security primarily in mind";
maintainers = with lib.maintainers; [ peti fpletz globin ajs124 ]; license = with licenses; [ mit publicDomain lgpl21Only bsd3 bsdOriginal ];
platforms = lib.platforms.unix; maintainers = with maintainers; [ peti fpletz globin ajs124 ];
platforms = platforms.unix;
}; };
passthru.tests = { passthru.tests = {
opensmtpd-interaction = nixosTests.opensmtpd; opensmtpd-interaction = nixosTests.opensmtpd;

8
pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
View File

@ -3,11 +3,11 @@ let
dovecotMajorMinor = lib.versions.majorMinor dovecot.version; dovecotMajorMinor = lib.versions.majorMinor dovecot.version;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "dovecot-pigeonhole"; pname = "dovecot-pigeonhole";
version = "0.5.14"; version = "0.5.15";
src = fetchurl { src = fetchurl {
url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz"; url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz";
sha256 = "1lmjzz4kd90wbdslacybizd1dks4bhwmrx39lj8b19naldw0zjk8"; sha256 = "1l2h0p8ddsl3ja2lnwk0mfqplqh8n0iw8k27awd3ak7prr88yjg1";
}; };
buildInputs = [ dovecot openssl ]; buildInputs = [ dovecot openssl ];
@ -32,8 +32,8 @@ in stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
homepage = "http://pigeonhole.dovecot.org/"; homepage = "http://pigeonhole.dovecot.org/";
description = "A sieve plugin for the Dovecot IMAP server"; description = "A sieve plugin for the Dovecot IMAP server";
license = licenses.lgpl21; license = licenses.lgpl21Only;
maintainers = with maintainers; [ globin ]; maintainers = with maintainers; [ globin ajs124 ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }