From 4a80fd6c403cbd6771c451e39ac8f08bc425b1c6 Mon Sep 17 00:00:00 2001
From: Dom Rodriguez <shymega@shymega.org.uk>
Date: Sun, 23 Nov 2025 19:31:50 +0000
Subject: [PATCH 1/2] davmail: 6.4.0 -> 6.5.1

Currently using the Zulu JRE causes a runtime error where Davmail(/SWT?)
tries to access win32 libraries, and of course, it can't.
---
 pkgs/by-name/da/davmail/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/da/davmail/package.nix b/pkgs/by-name/da/davmail/package.nix
index 4f84ba6f1ab6..c2247c8d73e0 100644
--- a/pkgs/by-name/da/davmail/package.nix
+++ b/pkgs/by-name/da/davmail/package.nix
@@ -14,7 +14,7 @@
   gnugrep,
   zulu,
   preferGtk3 ? true,
-  preferZulu ? true,
+  preferZulu ? false,
 }:
 
 let
@@ -23,13 +23,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "davmail";
-  version = "6.4.0";
+  version = "6.5.1";
 
   src = fetchFromGitHub {
     owner = "mguessan";
     repo = "davmail";
     tag = finalAttrs.version;
-    hash = "sha256-dj+7e0b8GcyoDzEWGG1SEMijqRBo1IJUFtgxkt9XNRU=";
+    hash = "sha256-D/MEWq696PFXlarQZdSrTS9VFODg7u7yhUsbCwHV9qs=";
   };
 
   buildPhase = ''

From 27b006f4983c74e416f59301910d0f078c597734 Mon Sep 17 00:00:00 2001
From: Dom Rodriguez <shymega@shymega.org.uk>
Date: Sat, 7 Mar 2026 17:27:00 +0000
Subject: [PATCH 2/2] fix: temp zulu davmail

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

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