dovecot: 2.4.0 -> 2.4.2

Author: Jappie3

pkgs/by-name/do/dovecot/2_3.nix

@@ -1,6 +1,7 @@
 {
   callPackage,
   fetchpatch,
+  dovecot_pigeonhole_2_3,
 }:
 callPackage ./generic.nix { } {
   version = "2.3.21.1";
@@ -19,4 +20,6 @@ callPackage ./generic.nix { } {
       hash = "sha256-dAX80dRqOba9Fkzl11ChYJ6vqcgfkaw/o+TOQKCnnns=";
     })
   ];
+
+  dovecot_pigeonhole = dovecot_pigeonhole_2_3;
 }

pkgs/by-name/do/dovecot/generic.nix

@@ -24,6 +24,7 @@
   libsodium,
   libstemmer,
   cyrus_sasl,
+  pcre2,
   nixosTests,
   rpcsvc-proto,
   libtirpc,
@@ -45,6 +46,8 @@
   version,
   hash,
   patches ? [ ],
+  # Re-exported plugins for this version
+  dovecot_pigeonhole,
 }:
 stdenv.mkDerivation {
   pname = "dovecot";
@@ -73,6 +76,7 @@ stdenv.mkDerivation {
     libstemmer
     cyrus_sasl.dev
   ]
+  ++ lib.optional (lib.strings.versionAtLeast version "2.4") pcre2
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     systemd
     pam
@@ -94,6 +98,12 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  postConfigure = lib.optionalString (lib.strings.versionAtLeast version "2.4") ''
+    substituteInPlace src/lib-regex/Makefile --replace-fail \
+    "test_regex_DEPENDENCIES = libdregex.la \$(LIBPCRE_LIBS)" \
+    "test_regex_DEPENDENCIES = libdregex.la"
+  '';
+
   postPatch = ''
     sed -i -E \
       -e 's!/bin/sh\b!${stdenv.shell}!g' \
@@ -205,5 +215,7 @@ stdenv.mkDerivation {
       opensmtpd-interaction = nixosTests.opensmtpd;
       inherit (nixosTests) dovecot;
     };
+
+    pigeonhole = dovecot_pigeonhole;
   };
 }

pkgs/by-name/do/dovecot/package.nix

@@ -1,9 +1,14 @@
-{ callPackage }:
+{
+  callPackage,
+  dovecot_pigeonhole,
+}:
 callPackage ./generic.nix { } {
-  version = "2.4.0";
-  hash = "sha256-6Q5J+MMbCaUIJJpP7oYF+qZf4yCBm/ytryUkEmJT1a4=";
+  version = "2.4.2";
+  hash = "sha256-LNYuTSK5/ByAvThklzmVDw29o0+8PmJiT7aEImTpPG4=";
   patches = [
     # Fix loading extended modules.
     ./load-extended-modules.patch
   ];
+
+  inherit dovecot_pigeonhole;
 }

pkgs/by-name/do/dovecot_pigeonhole/2_3.nix

@@ -0,0 +1,12 @@
+{
+  lib,
+  callPackage,
+  dovecot_2_3,
+}:
+callPackage ./generic.nix { } rec {
+  url = "https://pigeonhole.dovecot.org/releases/${lib.versions.majorMinor dovecot.version}/dovecot-${lib.versions.majorMinor dovecot.version}-pigeonhole-${version}.tar.gz";
+  version = "0.5.21.1";
+  hash = "sha256-A3fbKEtiByPeBgQxEV+y53keHfQyFBGvcYIB1pJcRpI=";
+
+  dovecot = dovecot_2_3;
+}

pkgs/by-name/do/dovecot_pigeonhole/generic.nix

@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  openssl,
+  openldap,
+}:
+{
+  url,
+  version,
+  hash,
+  dovecot,
+}:
+stdenv.mkDerivation rec {
+  pname = "dovecot-pigeonhole";
+  inherit version;
+
+  src = fetchurl {
+    inherit url hash;
+  };
+
+  buildInputs = [
+    dovecot
+    openssl
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "2.4") [
+    openldap
+  ];
+
+  preConfigure = ''
+    substituteInPlace src/managesieve/managesieve-settings.c --replace-fail \
+      ".executable = \"managesieve\"" \
+      ".executable = \"$out/libexec/dovecot/managesieve\""
+    substituteInPlace src/managesieve-login/managesieve-login-settings.c --replace-fail \
+      ".executable = \"managesieve-login\"" \
+      ".executable = \"$out/libexec/dovecot/managesieve-login\""
+  '';
+
+  configureFlags = [
+    "--with-dovecot=${dovecot}/lib/dovecot"
+    "--with-moduledir=${placeholder "out"}/lib/dovecot/modules"
+    "--without-dovecot-install-dirs"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    homepage = "https://pigeonhole.dovecot.org/";
+    description = "Sieve plugin for the Dovecot IMAP server";
+    license = licenses.lgpl21Only;
+    maintainers = with maintainers; [ globin ] ++ teams.helsinki-systems.members;
+    platforms = platforms.unix;
+  };
+}

pkgs/by-name/do/dovecot_pigeonhole/package.nix

@@ -1,50 +1,12 @@
 {
   lib,
-  stdenv,
-  fetchurl,
+  callPackage,
   dovecot,
-  openssl,
 }:
-let
-  dovecotMajorMinor = lib.versions.majorMinor dovecot.version;
-in
-stdenv.mkDerivation rec {
-  pname = "dovecot-pigeonhole";
-  version = "0.5.21.1";
+callPackage ./generic.nix { } rec {
+  url = "https://pigeonhole.dovecot.org/releases/${lib.versions.majorMinor dovecot.version}/dovecot-pigeonhole-${version}.tar.gz";
+  version = "2.4.0";
+  hash = "sha256-DtCK4WOsOalEcgD7tC17OwXTXpHZmBjdD0r9etHbx1M=";
 
-  src = fetchurl {
-    url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz";
-    hash = "sha256-A3fbKEtiByPeBgQxEV+y53keHfQyFBGvcYIB1pJcRpI=";
-  };
-
-  buildInputs = [
-    dovecot
-    openssl
-  ];
-
-  preConfigure = ''
-    substituteInPlace src/managesieve/managesieve-settings.c --replace \
-      ".executable = \"managesieve\"" \
-      ".executable = \"$out/libexec/dovecot/managesieve\""
-    substituteInPlace src/managesieve-login/managesieve-login-settings.c --replace \
-      ".executable = \"managesieve-login\"" \
-      ".executable = \"$out/libexec/dovecot/managesieve-login\""
-  '';
-
-  configureFlags = [
-    "--with-dovecot=${dovecot}/lib/dovecot"
-    "--with-moduledir=${placeholder "out"}/lib/dovecot/modules"
-    "--without-dovecot-install-dirs"
-  ];
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    homepage = "https://pigeonhole.dovecot.org/";
-    description = "Sieve plugin for the Dovecot IMAP server";
-    license = licenses.lgpl21Only;
-    maintainers = with maintainers; [ globin ];
-    teams = [ teams.helsinki-systems ];
-    platforms = platforms.unix;
-  };
+  inherit dovecot;
 }

pkgs/top-level/all-packages.nix

@@ -9141,6 +9141,9 @@ with pkgs;
   dovecot_2_3 = callPackage ../by-name/do/dovecot/2_3.nix { };
   dovecot_2_4 = callPackage ../by-name/do/dovecot/package.nix { };
 
+  dovecot_pigeonhole_2_3 = callPackage ../by-name/do/dovecot_pigeonhole/2_3.nix { };
+  dovecot_pigeonhole_2_4 = callPackage ../by-name/do/dovecot_pigeonhole/package.nix { };
+
   prosody = callPackage ../servers/xmpp/prosody {
     withExtraLibs = [ ];
     withExtraLuaPackages = _: [ ];