diff options
| author | ajs124 <ajs124@users.noreply.github.com> | 2021-06-21 23:10:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 23:10:51 +0200 |
| commit | 94e57e81dd84e1362484dd27f75e7dcea8a660b3 (patch) | |
| tree | fe97265a1d4cea8f44aac5001e76702e3188dac8 | |
| parent | Merge pull request #127679 from NixOS/revert-125407-patch-2 (diff) | |
| parent | dovecout: fix systemd unit dir (diff) | |
| download | nixpkgs-94e57e81dd84e1362484dd27f75e7dcea8a660b3.tar.gz | |
Merge pull request #127719 from NixOS/backport-127667-to-release-21.05
[Backport release-21.05] dovecot: 2.3.14 -> 2.3.15
| -rw-r--r-- | pkgs/servers/mail/dovecot/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix | 8 |
2 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 337405ff6729..d5fb9e7ed6ee 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "dovecot"; - version = "2.3.14"; + version = "2.3.15"; nativeBuildInputs = [ perl pkg-config ]; buildInputs = @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "0jm3p52z619v7ajh533g2g7d790k82fk0w7ry0zqlm8ymzrxgcy8"; + sha256 = "141manrh54cy8xizr7f8fsa3vdzc2ccfgdz87l9rjylm8mfxvfr1"; }; enableParallelBuilding = true; preConfigure = '' patchShebangs src/config/settings-get.pl - ''; + '' + lib.optionalString (stdenv.isLinux) "export systemdsystemunitdir=$out/etc/systemd/system"; # We need this for sysconfdir, see remark below. installFlags = [ "DESTDIR=$(out)" ]; @@ -75,17 +75,18 @@ stdenv.mkDerivation rec { "lib_cv_va_copy=yes" "lib_cv___va_copy=yes" "lib_cv_va_val_copy=yes" - ] ++ lib.optional (stdenv.isLinux) "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - ++ lib.optional (stdenv.isDarwin) "--enable-static" + ] ++ lib.optional stdenv.isLinux "--with-systemd" + ++ lib.optional stdenv.isDarwin "--enable-static" ++ lib.optional withMySQL "--with-mysql" ++ lib.optional withPgSQL "--with-pgsql" ++ lib.optional withSQLite "--with-sqlite"; - meta = { + meta = with lib; { homepage = "https://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; - maintainers = with lib.maintainers; [ peti fpletz globin ajs124 ]; - platforms = lib.platforms.unix; + license = with licenses; [ mit publicDomain lgpl21Only bsd3 bsdOriginal ]; + maintainers = with maintainers; [ peti fpletz globin ajs124 ]; + platforms = platforms.unix; }; passthru.tests = { opensmtpd-interaction = nixosTests.opensmtpd; diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 6cdb2ee06f20..33c66a46bb72 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -3,11 +3,11 @@ let dovecotMajorMinor = lib.versions.majorMinor dovecot.version; in stdenv.mkDerivation rec { pname = "dovecot-pigeonhole"; - version = "0.5.14"; + version = "0.5.15"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz"; - sha256 = "1lmjzz4kd90wbdslacybizd1dks4bhwmrx39lj8b19naldw0zjk8"; + sha256 = "1l2h0p8ddsl3ja2lnwk0mfqplqh8n0iw8k27awd3ak7prr88yjg1"; }; buildInputs = [ dovecot openssl ]; @@ -32,8 +32,8 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "http://pigeonhole.dovecot.org/"; description = "A sieve plugin for the Dovecot IMAP server"; - license = licenses.lgpl21; - maintainers = with maintainers; [ globin ]; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ globin ajs124 ]; platforms = platforms.unix; }; } |