From 049f4fb8429dfda9b4e16962f8f1bc9682bf9847 Mon Sep 17 00:00:00 2001
From: emaryn <197520219+emaryn@users.noreply.github.com>
Date: Fri, 18 Apr 2025 22:01:06 +0000
Subject: [PATCH 1/2] charles4: 4.6.4 -> 4.6.8

---
 pkgs/applications/networking/charles/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix
index a76be42cf112..38b71e06c794 100644
--- a/pkgs/applications/networking/charles/default.nix
+++ b/pkgs/applications/networking/charles/default.nix
@@ -88,8 +88,8 @@ in
 {
   charles4 = (
     generic {
-      version = "4.6.4";
-      sha256 = "KEQYb90kt41dS3TJLZqdaV9P3mQA9UPsEyiFb/knm3w=";
+      version = "4.6.8";
+      sha256 = "sha256-AaS+zmQTWsGoLEhyGHA/UojmctE7IV0N9fnygNhEPls=";
       platform = "_amd64";
       jdk = jdk11;
     }

From c8b290cea1b354e9676a747d72b7162a9c210449 Mon Sep 17 00:00:00 2001
From: emaryn <197520219+emaryn@users.noreply.github.com>
Date: Fri, 18 Apr 2025 22:01:39 +0000
Subject: [PATCH 2/2] charles5: init at 5.0

---
 .../networking/charles/default.nix            | 34 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix
index 38b71e06c794..f30c4262a176 100644
--- a/pkgs/applications/networking/charles/default.nix
+++ b/pkgs/applications/networking/charles/default.nix
@@ -4,6 +4,7 @@
   makeWrapper,
   makeDesktopItem,
   fetchurl,
+  openjdk17-bootstrap,
   jdk11,
   jdk8,
 }:
@@ -12,7 +13,7 @@ let
   generic =
     {
       version,
-      sha256,
+      hash,
       platform ? "",
       jdk,
       ...
@@ -52,13 +53,16 @@ let
           "--user-agent"
           "Mozilla/5.0"
         ]; # HTTP 104 otherwise
-        inherit sha256;
+        inherit hash;
       };
+
       nativeBuildInputs = [ makeWrapper ];
 
       installPhase = ''
+        runHook preInstall
+
         makeWrapper ${jdk}/bin/java $out/bin/charles \
-          --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar"
+          --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' ${lib.optionalString (lib.versionOlder version "5.0") "-jar $out/share/java/charles.jar"} ${lib.optionalString (lib.versionAtLeast version "5.0") "-XX:+UseZGC -Djava.library.path='$out/share/java' --add-opens java.base/sun.security.ssl=com.charlesproxy --add-opens java.desktop/java.awt.event=com.charlesproxy --add-opens java.base/java.io=com.charlesproxy --add-modules com.jthemedetector,com.formdev.flatlaf --module-path '$out/share/java' -m com.charlesproxy"}"
 
         for fn in lib/*.jar; do
           install -D -m644 $fn $out/share/java/$(basename $fn)
@@ -69,27 +73,37 @@ let
 
         mkdir -p $out/share/icons
         cp -r icon $out/share/icons/hicolor
+
+        runHook postInstall
       '';
 
-      meta = with lib; {
+      meta = {
         description = "Web Debugging Proxy";
         homepage = "https://www.charlesproxy.com/";
-        maintainers = with maintainers; [
+        maintainers = with lib.maintainers; [
           kalbasit
           kashw2
         ];
-        sourceProvenance = with sourceTypes; [ binaryBytecode ];
-        license = licenses.unfree;
-        platforms = platforms.unix;
+        sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+        license = lib.licenses.unfree;
+        platforms = lib.platforms.unix;
       };
     };
 
 in
 {
+  charles5 = (
+    generic {
+      version = "5.0";
+      hash = "sha256-gvspRI3uF7bjE4UBuTGS5+n2h0nKudLtW3sqs2GZIyM=";
+      platform = "_x86_64";
+      jdk = openjdk17-bootstrap;
+    }
+  );
   charles4 = (
     generic {
       version = "4.6.8";
-      sha256 = "sha256-AaS+zmQTWsGoLEhyGHA/UojmctE7IV0N9fnygNhEPls=";
+      hash = "sha256-AaS+zmQTWsGoLEhyGHA/UojmctE7IV0N9fnygNhEPls=";
       platform = "_amd64";
       jdk = jdk11;
     }
@@ -97,7 +111,7 @@ in
   charles3 = (
     generic {
       version = "3.12.3";
-      sha256 = "13zk82ny1w5zd9qcs9qkq0kdb22ni5byzajyshpxdfm4zv6p32ss";
+      hash = "sha256-Wotxzf6kutYv1F6q71eJVojVJsATJ81war/w4K1A848=";
       jdk = jdk8.jre;
       mainProgram = "charles";
     }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 914f615c134c..631d8bdf8f2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2099,10 +2099,11 @@ with pkgs;
 
   birdtray = libsForQt5.callPackage ../applications/misc/birdtray { };
 
-  charles = charles4;
+  charles = charles5;
   inherit (callPackages ../applications/networking/charles { })
     charles3
     charles4
+    charles5
     ;
 
   quaternion-qt5 =