From 588eb83ca7516e209567a3ad432690b35c76e861 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 21 Jun 2021 15:18:02 +0200 Subject: [PATCH 1/5] dovecot: 2.3.14 -> 2.3.15 (cherry picked from commit 075fb19d81f4da81943f4127eba632b46368022f) --- pkgs/servers/mail/dovecot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 337405ff672..26290368e15 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,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "0jm3p52z619v7ajh533g2g7d790k82fk0w7ry0zqlm8ymzrxgcy8"; + sha256 = "141manrh54cy8xizr7f8fsa3vdzc2ccfgdz87l9rjylm8mfxvfr1"; }; enableParallelBuilding = true; From 0761599dd1781990e4920c4092612d89b3cd781f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 21 Jun 2021 15:18:52 +0200 Subject: [PATCH 2/5] dovecot: add licenses (cherry picked from commit 0fb5b6c648e14b61c3304266561c366f869af836) --- pkgs/servers/mail/dovecot/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 26290368e15..f58d65d9f16 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -81,11 +81,12 @@ stdenv.mkDerivation rec { ++ 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; From c7db318b2486315cdebbe93eaf7631fe3e4ebd2e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 21 Jun 2021 15:19:19 +0200 Subject: [PATCH 3/5] dovecot_pigeonhole: 0.5.14 -> 0.5.15 (cherry picked from commit 0187e72b571e3afc3e761d101deadf15b6c5b760) --- pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 6cdb2ee06f2..d86eee5a9c0 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 ]; From 1f762dbf63a65d79e6c347798b5e1dded9caecdf Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 21 Jun 2021 15:19:32 +0200 Subject: [PATCH 4/5] dovecot_pigeonhole: add myself as maintainer and fix licensing information (cherry picked from commit fd83b193ac343e69980978a1e4abb7a0f1a8ff5a) --- pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index d86eee5a9c0..33c66a46bb7 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -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; }; } From c466620ad2c70caedd2bb12a56546ff05bf2f63c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 21 Jun 2021 16:21:41 +0200 Subject: [PATCH 5/5] dovecout: fix systemd unit dir the configure flag we were using was dropped in https://github.com/dovecot/core/commit/a42bb363b4ab475ced72fada57cc3e1de8b05bca (cherry picked from commit 5fa6e9c403940c7c641356daf9c7ac05e464f58f) --- pkgs/servers/mail/dovecot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index f58d65d9f16..d5fb9e7ed6e 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { 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,8 +75,8 @@ 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";