From 7762109ce3d4e1055dff3d18d1a9d71b6ba7106b Mon Sep 17 00:00:00 2001
From: leiserfg <leiserfg@gmail.com>
Date: Mon, 21 Sep 2026 09:17:51 +0200
Subject: [PATCH 1/3] kitty: 0.48.2->0.49.0

(cherry picked from commit ade74860ebdd31d4ede320aeeed168c774172cfa)
---
 .../ki/kitty/libxkbcommon-runtime-path.patch     | 16 ++++++++--------
 pkgs/by-name/ki/kitty/package.nix                | 10 +++++++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ki/kitty/libxkbcommon-runtime-path.patch b/pkgs/by-name/ki/kitty/libxkbcommon-runtime-path.patch
index aa7c5cedaeb1..f949ef87fa25 100644
--- a/pkgs/by-name/ki/kitty/libxkbcommon-runtime-path.patch
+++ b/pkgs/by-name/ki/kitty/libxkbcommon-runtime-path.patch
@@ -1,23 +1,23 @@
-diff --git a/kitty/key_names.py b/kitty/key_names.py
-index 1c4ce3487..00d767d45 100644
---- a/kitty/key_names.py
-+++ b/kitty/key_names.py
-@@ -59,17 +59,7 @@ if is_macos:
- else:
+diff --git i/kitty/key_names.py w/kitty/key_names.py
+index d496339..2a1d9bc 100644
+--- i/kitty/key_names.py
++++ w/kitty/key_names.py
+@@ -67,17 +67,7 @@ def get_key_name_lookup() -> LookupFunc:
      def load_libxkb_lookup() -> LookupFunc:
          import ctypes
+ 
 -        for suffix in ('.0', ''):
 -            with suppress(Exception):
 -                lib = ctypes.CDLL(f'libxkbcommon.so{suffix}')
 -                break
 -        else:
 -            from ctypes.util import find_library
+-
 -            lname = find_library('xkbcommon')
 -            if lname is None:
 -                raise RuntimeError('Failed to find libxkbcommon')
 -            lib = ctypes.CDLL(lname)
--
 +        lib = ctypes.CDLL('@libxkbcommon@')
+ 
          f = lib.xkb_keysym_from_name
          f.argtypes = [ctypes.c_char_p, ctypes.c_int]
-         f.restype = ctypes.c_int
diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix
index 74978c0f6060..bbcf968e2eaf 100644
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -46,26 +46,27 @@
   makeBinaryWrapper,
   darwin,
   cairo,
+  shader-slang,
 }:
 
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.48.2";
+  version = "0.49.0";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     tag = "v${version}";
-    hash = "sha256-qNgVPpvMm8Y/nbBjVvWVuZ954ZXIuWmXhldP3w8MBhU=";
+    hash = "sha256-C1roiJ+mAm8rEoG5VAQABYUq2FSFVuusNQ0PtLP0tPI=";
   };
 
   goModules =
     (buildGo126Module {
       pname = "kitty-go-modules";
       inherit src version;
-      vendorHash = "sha256-BZudfNfREwNrgalaimC5Lp+UIdFS+jHFLl9mEXcHYMI=";
+      vendorHash = "sha256-G+eaFOFMIIu2Qo5Mgr3ejwoYrYmNv3EIdEEraDPIdeY=";
     }).goModules;
 
   buildInputs = [
@@ -108,11 +109,13 @@ buildPythonApplication rec {
     sphinx
     furo
     sphinx-copybutton
+    sphinx-design
     sphinxext-opengraph
     sphinx-inline-tabs
     go_1_26
     fontconfig
     makeBinaryWrapper
+    shader-slang
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     imagemagick
@@ -294,6 +297,7 @@ buildPythonApplication rec {
       lib.makeBinPath [
         imagemagick
         ncurses.dev
+        shader-slang
       ]
     }"
 

From b3f0079afaa354d5f8faa000a2fc83a6de08d575 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 29 Sep 2026 22:40:43 -0400
Subject: [PATCH 2/3] kitty: backport shader-slang 2026.18 to fix build

---
 pkgs/by-name/ki/kitty/package.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix
index bbcf968e2eaf..a4af233acb2a 100644
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -49,6 +49,21 @@
   shader-slang,
 }:
 
+let
+  shader-slang' = shader-slang.overrideAttrs (
+    finalAttrs: previousAttrs: {
+      version = "2026.18";
+      src = fetchFromGitHub {
+        owner = "shader-slang";
+        repo = "slang";
+        tag = "v${finalAttrs.version}";
+        hash = "sha256-GlXTDfC6BLENmrzBceJGZIP4FU5ItqtyoxmbnFZ5fdQ=";
+        fetchSubmodules = true;
+      };
+      cmakeFlags = previousAttrs.cmakeFlags ++ [ (lib.cmakeBool "SLANG_ENABLE_DXIL" false) ];
+    }
+  );
+in
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
@@ -115,7 +130,7 @@ buildPythonApplication rec {
     go_1_26
     fontconfig
     makeBinaryWrapper
-    shader-slang
+    shader-slang'
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     imagemagick
@@ -297,7 +312,7 @@ buildPythonApplication rec {
       lib.makeBinPath [
         imagemagick
         ncurses.dev
-        shader-slang
+        shader-slang'
       ]
     }"
 

From 60f265ee25ce24fea1c610e551835380a83a7e90 Mon Sep 17 00:00:00 2001
From: leiserfg <leiserfg@gmail.com>
Date: Thu, 24 Sep 2026 09:21:25 +0200
Subject: [PATCH 3/3] kitty: 0.49.0->0.49.1

(cherry picked from commit e357fcd221b3cd5d9ec6b36d032f8669aadabf3e)
---
 pkgs/by-name/ki/kitty/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix
index a4af233acb2a..dbabc74eb17b 100644
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -67,21 +67,21 @@ in
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.49.0";
+  version = "0.49.1";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     tag = "v${version}";
-    hash = "sha256-C1roiJ+mAm8rEoG5VAQABYUq2FSFVuusNQ0PtLP0tPI=";
+    hash = "sha256-YVjTfJnsNEBjcHWQCq2nJBFPvLg7RqQcyWjgR4ijUqc=";
   };
 
   goModules =
     (buildGo126Module {
       pname = "kitty-go-modules";
       inherit src version;
-      vendorHash = "sha256-G+eaFOFMIIu2Qo5Mgr3ejwoYrYmNv3EIdEEraDPIdeY=";
+      vendorHash = "sha256-urQMf5lGYPgS65VjGw0pi/ZM6CETtGWfi/kvVDAkIoc=";
     }).goModules;
 
   buildInputs = [