From 6063ceda5f81cfc0f591e07970c05b282a7e20bb Mon Sep 17 00:00:00 2001
From: leiserfg <leiserfg@gmail.com>
Date: Sat, 8 Mar 2025 12:32:53 +0100
Subject: [PATCH] kitty: 0.39.1->0.40.0

---
 .../terminal-emulators/kitty/default.nix            | 12 +++++++++---
 .../terminal-emulators/kitty/fix_setup.patch        | 13 +++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/terminal-emulators/kitty/fix_setup.patch

diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix
index c69d58005ecf0a..a95a45affb558d 100644
--- a/pkgs/applications/terminal-emulators/kitty/default.nix
+++ b/pkgs/applications/terminal-emulators/kitty/default.nix
@@ -49,26 +49,27 @@
   nix-update-script,
   makeBinaryWrapper,
   autoSignDarwinBinariesHook,
+  cairo,
 }:
 
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.39.1";
+  version = "0.40.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     tag = "v${version}";
-    hash = "sha256-Cgbs9tdEGKhDShNh3M8N1UdRJu4aMylr9xLOGLpDAZE=";
+    hash = "sha256-c+u+lMuokDR8kWM0an3jFPC/qoK2RZTKqHZtfEnqtnM=";
   };
 
   goModules =
     (buildGo123Module {
       pname = "kitty-go-modules";
       inherit src version;
-      vendorHash = "sha256-j5ToLPQeaf4xIaziBAROYZNvoaOx2TkTcuY95X4Neqc=";
+      vendorHash = "sha256-gBEzW2k1HDDmg1P1t6u90Lf1lLe1IKGpF2T9iCA31qs=";
     }).goModules;
 
   buildInputs =
@@ -109,6 +110,7 @@ buildPythonApplication rec {
       wayland
       dbus
       libGL
+      cairo
     ];
 
   nativeBuildInputs =
@@ -156,6 +158,9 @@ buildPythonApplication rec {
     # Skip `test_ssh_bootstrap_with_different_launchers` when launcher is `zsh` since it causes:
     # OSError: master_fd is in error condition
     ./disable-test_ssh_bootstrap_with_different_launchers.patch
+
+    # Temporary fix for setup.py until it's merged upstream
+    ./fix_setup.patch
   ];
 
   hardeningDisable = [
@@ -327,6 +332,7 @@ buildPythonApplication rec {
       rvolosatovs
       Luflosi
       kashw2
+      leiserfg
     ];
   };
 }
diff --git a/pkgs/applications/terminal-emulators/kitty/fix_setup.patch b/pkgs/applications/terminal-emulators/kitty/fix_setup.patch
new file mode 100644
index 00000000000000..7197f3ddc653a3
--- /dev/null
+++ b/pkgs/applications/terminal-emulators/kitty/fix_setup.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 9e9c3f177..8183a3b69 100755
+--- a/setup.py
++++ b/setup.py
+@@ -1778,7 +1778,7 @@ def repl(name: str, raw: str, defval: Union[str, float, FrozenSet[str]], val: Un
+             return raw
+         tname = type(defval).__name__
+         if tname == 'frozenset':
+-            tname = 'typing.FrozenSet[str]'
++            tname = 'frozenset[str]'
+         prefix = f'{name}: {tname} ='
+         nraw = raw.replace(f'{prefix} {defval!r}', f'{prefix} {val!r}', 1)
+         if nraw == raw: