From c4ae5f6b7575e5fea0cd066056fdb8adf29498fa Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 19 Mar 2026 18:10:50 +0200
Subject: [PATCH 1/3] davmail: Revert "fix: temp zulu davmail"

This reverts commit 27b006f4983c74e416f59301910d0f078c597734.

As explained in
https://github.com/NixOS/nixpkgs/pull/464406#issuecomment-4027196480
---
 pkgs/by-name/da/davmail/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/da/davmail/package.nix b/pkgs/by-name/da/davmail/package.nix
index 45ab61b1649c..c2247c8d73e0 100644
--- a/pkgs/by-name/da/davmail/package.nix
+++ b/pkgs/by-name/da/davmail/package.nix
@@ -12,11 +12,13 @@
   libxtst,
   coreutils,
   gnugrep,
+  zulu,
   preferGtk3 ? true,
+  preferZulu ? false,
 }:
 
 let
-  jre' = jdk.override { enableJavaFX = true; };
+  jre' = (if preferZulu then zulu else jdk).override { enableJavaFX = true; };
   gtk' = if preferGtk3 then gtk3 else gtk2;
 in
 stdenv.mkDerivation (finalAttrs: {

From e2363bd8e089780d7c2b823ef549595883927895 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 19 Mar 2026 18:11:45 +0200
Subject: [PATCH 2/3] davmail: Add doronbehar as maintainer

---
 pkgs/by-name/da/davmail/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/da/davmail/package.nix b/pkgs/by-name/da/davmail/package.nix
index c2247c8d73e0..71fe04d38e0f 100644
--- a/pkgs/by-name/da/davmail/package.nix
+++ b/pkgs/by-name/da/davmail/package.nix
@@ -82,7 +82,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers";
     homepage = "https://davmail.sourceforge.net/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ peterhoeg ];
+    maintainers = with lib.maintainers; [
+      peterhoeg
+      doronbehar
+    ];
     platforms = lib.platforms.all;
     mainProgram = "davmail";
   };

From 61dd16da9af2d0ac5700176a712d3682c48d13c7 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 20 Mar 2026 11:43:27 +0200
Subject: [PATCH 3/3] davmail: Add shymega to maintainers

---
 pkgs/by-name/da/davmail/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/da/davmail/package.nix b/pkgs/by-name/da/davmail/package.nix
index 71fe04d38e0f..e80be26e650e 100644
--- a/pkgs/by-name/da/davmail/package.nix
+++ b/pkgs/by-name/da/davmail/package.nix
@@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       peterhoeg
       doronbehar
+      shymega
     ];
     platforms = lib.platforms.all;
     mainProgram = "davmail";