git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #127667 from helsinki-systems/upd/dovecot

dovecot: 2.3.14 -> 2.3.15

commit89242458a197a4365365af2ed8c5568bf048ca4c authorajs124 <ajs124@users.noreply.github.com> dateMon 21 Jun 2021, 22:19 (5 years ago) parent1a9f4645fa6e9c
2 files changed+13−12
compare with master
unifiedsplit
pkgs/servers/mail/dovecot/default.nix+9−8 pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix+4−4
pkgs/servers/mail/dovecot/default.nix+9−8
@@ -10,7 +10,7 @@
1010
1111stdenv.mkDerivation rec {
1212 pname = "dovecot";
13− version = "2.3.14";
13+ version = "2.3.15";
1414
1515 nativeBuildInputs = [ perl pkg-config ];
1616 buildInputs =
@@ -22,14 +22,14 @@ stdenv.mkDerivation rec {
2222
2323 src = fetchurl {
2424 url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
25− sha256 = "0jm3p52z619v7ajh533g2g7d790k82fk0w7ry0zqlm8ymzrxgcy8";
25+ sha256 = "141manrh54cy8xizr7f8fsa3vdzc2ccfgdz87l9rjylm8mfxvfr1";
2626 };
2727
2828 enableParallelBuilding = true;
2929
3030 preConfigure = ''
3131 patchShebangs src/config/settings-get.pl
32− '';
32+ '' + lib.optionalString (stdenv.isLinux) "export systemdsystemunitdir=$out/etc/systemd/system";
3333
3434 # We need this for sysconfdir, see remark below.
3535 installFlags = [ "DESTDIR=$(out)" ];
@@ -75,17 +75,18 @@ stdenv.mkDerivation rec {
7575 "lib_cv_va_copy=yes"
7676 "lib_cv___va_copy=yes"
7777 "lib_cv_va_val_copy=yes"
78− ] ++ lib.optional (stdenv.isLinux) "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
79− ++ lib.optional (stdenv.isDarwin) "--enable-static"
78+ ] ++ lib.optional stdenv.isLinux "--with-systemd"
79+ ++ lib.optional stdenv.isDarwin "--enable-static"
8080 ++ lib.optional withMySQL "--with-mysql"
8181 ++ lib.optional withPgSQL "--with-pgsql"
8282 ++ lib.optional withSQLite "--with-sqlite";
8383
84− meta = {
84+ meta = with lib; {
8585 homepage = "https://dovecot.org/";
8686 description = "Open source IMAP and POP3 email server written with security primarily in mind";
87− maintainers = with lib.maintainers; [ peti fpletz globin ajs124 ];
88− platforms = lib.platforms.unix;
87+ license = with licenses; [ mit publicDomain lgpl21Only bsd3 bsdOriginal ];
88+ maintainers = with maintainers; [ peti fpletz globin ajs124 ];
89+ platforms = platforms.unix;
8990 };
9091 passthru.tests = {
9192 opensmtpd-interaction = nixosTests.opensmtpd;
pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix+4−4
@@ -3,11 +3,11 @@ let
33 dovecotMajorMinor = lib.versions.majorMinor dovecot.version;
44in stdenv.mkDerivation rec {
55 pname = "dovecot-pigeonhole";
6− version = "0.5.14";
6+ version = "0.5.15";
77
88 src = fetchurl {
99 url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz";
10− sha256 = "1lmjzz4kd90wbdslacybizd1dks4bhwmrx39lj8b19naldw0zjk8";
10+ sha256 = "1l2h0p8ddsl3ja2lnwk0mfqplqh8n0iw8k27awd3ak7prr88yjg1";
1111 };
1212
1313 buildInputs = [ dovecot openssl ];
@@ -32,8 +32,8 @@ in stdenv.mkDerivation rec {
3232 meta = with lib; {
3333 homepage = "http://pigeonhole.dovecot.org/";
3434 description = "A sieve plugin for the Dovecot IMAP server";
35− license = licenses.lgpl21;
36− maintainers = with maintainers; [ globin ];
35+ license = licenses.lgpl21Only;
36+ maintainers = with maintainers; [ globin ajs124 ];
3737 platforms = platforms.unix;
3838 };
3939}