From 9bf55f033611f1d212b936e14ac54e8379993572 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Thu, 28 May 2026 10:13:08 +0200 Subject: [PATCH 1/7] kitty: 0.47.0 -> 0.47.1 Changelog: https://sw.kovidgoyal.net/kitty/changelog/#detailed-list-of-changes Diff: https://github.com/kovidgoyal/kitty/compare/v0.47.0...v0.47.1 (cherry picked from commit 56e52bc01e46bed49434b22d910d5becdb716fac) --- 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 858f09673296..32d439b36e2a 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -50,21 +50,21 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.47.0"; + version = "0.47.1"; pyproject = false; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; tag = "v${version}"; - hash = "sha256-QI+h7LSpJ5VYae3XdwDhKmpLqEGpmSulXP/mTop3gio="; + hash = "sha256-/FOeJiC9SNE/k7SzXl5nmwdfKiFlKa0C0IuIph4cRxQ="; }; goModules = (buildGo126Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-ZEiIGHj30h3l7mfJkOrPDTMI/GBtf/QDiG/lrqceggg="; + vendorHash = "sha256-SuLcY8M+F9HijinaNr6jmsGlJ00o5LJN+Y04cfjyQ/c="; }).goModules; buildInputs = [ From 29ca57701f703524cf3602f5df28bd551169b1ee Mon Sep 17 00:00:00 2001 From: n3tcat Date: Sun, 7 Jun 2026 22:34:15 -0400 Subject: [PATCH 2/7] kitty: 0.47.1 -> 0.47.2 (cherry picked from commit b317380e6169e9ae332cbacb3d835bf182b3ba7a) --- pkgs/by-name/ki/kitty/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index 32d439b36e2a..cd4083b3194d 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -50,21 +50,21 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.47.1"; + version = "0.47.2"; pyproject = false; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; tag = "v${version}"; - hash = "sha256-/FOeJiC9SNE/k7SzXl5nmwdfKiFlKa0C0IuIph4cRxQ="; + hash = "sha256-hRQ/1EMBt04Er1OfLg1W9fIma3NZBHZklW1N4DmFBpM="; }; goModules = (buildGo126Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-SuLcY8M+F9HijinaNr6jmsGlJ00o5LJN+Y04cfjyQ/c="; + vendorHash = "sha256-zZZDrWzl2q/o4f52diE0YDV/MdYfsdKWWjQ0ej2bBTM="; }).goModules; buildInputs = [ @@ -152,6 +152,7 @@ buildPythonApplication rec { env = { CGO_ENABLED = 0; GOFLAGS = "-trimpath"; + GOTOOLCHAIN = "local"; }; configurePhase = '' From 4c0b00e6f8f38cfb94c21386bbc068478a8ee279 Mon Sep 17 00:00:00 2001 From: leiserfg Date: Sat, 13 Jun 2026 11:50:20 +0200 Subject: [PATCH 3/7] kitty: 0.47.2->0.47.4 (cherry picked from commit 363fc23dd36305ce266339bbcf44b50da17e5002) --- 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 cd4083b3194d..b9483acf8a76 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -50,21 +50,21 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.47.2"; + version = "0.47.4"; pyproject = false; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; tag = "v${version}"; - hash = "sha256-hRQ/1EMBt04Er1OfLg1W9fIma3NZBHZklW1N4DmFBpM="; + hash = "sha256-UDuWbWg7HiyJ4q/fVLLD+ZFmK74H2A2HRRwPoyGyGtU="; }; goModules = (buildGo126Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-zZZDrWzl2q/o4f52diE0YDV/MdYfsdKWWjQ0ej2bBTM="; + vendorHash = "sha256-o9S5KFT+9DRQ+OcZ5Wh8ZwtWE/19DYR810zCk+yUIr4="; }).goModules; buildInputs = [ From 74bc45357dc8f4b9e1b4716b3fd18797444ef353 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sat, 18 Jul 2026 09:57:29 +0200 Subject: [PATCH 4/7] kitty: 0.47.4 -> 0.48.0 Changelog: https://sw.kovidgoyal.net/kitty/changelog/#detailed-list-of-changes Diff: https://github.com/kovidgoyal/kitty/compare/v0.47.4...v0.48.0 (cherry picked from commit f0d0d168406ee799e3b20c29b241c9361ea9fa09) --- 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 b9483acf8a76..89f1c57fc6b9 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -50,21 +50,21 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.47.4"; + version = "0.48.0"; pyproject = false; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; tag = "v${version}"; - hash = "sha256-UDuWbWg7HiyJ4q/fVLLD+ZFmK74H2A2HRRwPoyGyGtU="; + hash = "sha256-+x3saXQw+6BzBYfwwur0DiTaJZVNgOYKJ4UVzeScbtk="; }; goModules = (buildGo126Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-o9S5KFT+9DRQ+OcZ5Wh8ZwtWE/19DYR810zCk+yUIr4="; + vendorHash = "sha256-nxPca7xDgxQd8vXbGKGuKXmB5vu0d3me//m8AULJZ6o="; }).goModules; buildInputs = [ From 2b281d308c568c3e4894b3c4854802e443097bd9 Mon Sep 17 00:00:00 2001 From: Ayush Thoren Date: Sun, 19 Jul 2026 00:32:24 -0700 Subject: [PATCH 5/7] kitty: fix libxkbcommon runtime lookup (cherry picked from commit ec5218c4b6574091ed3e29e5858d57ae6d924542) --- .../ki/kitty/libxkbcommon-runtime-path.patch | 23 +++++++++++++++++++ pkgs/by-name/ki/kitty/package.nix | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/by-name/ki/kitty/libxkbcommon-runtime-path.patch diff --git a/pkgs/by-name/ki/kitty/libxkbcommon-runtime-path.patch b/pkgs/by-name/ki/kitty/libxkbcommon-runtime-path.patch new file mode 100644 index 000000000000..aa7c5cedaeb1 --- /dev/null +++ b/pkgs/by-name/ki/kitty/libxkbcommon-runtime-path.patch @@ -0,0 +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: + 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 89f1c57fc6b9..214377a2ef68 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + replaceVars, python3Packages, libunistring, harfbuzz, @@ -142,6 +143,9 @@ buildPythonApplication rec { # OSError: master_fd is in error condition ./disable-test_ssh_bootstrap_with_different_launchers.patch + (replaceVars ./libxkbcommon-runtime-path.patch { + libxkbcommon = "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0"; + }) ]; hardeningDisable = [ From 02623c6ba4876aba63a35ed42d7c561a1dac26ce Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Fri, 24 Jul 2026 13:17:34 +0200 Subject: [PATCH 6/7] kitty: 0.48.0 -> 0.48.1 Changelog: https://sw.kovidgoyal.net/kitty/changelog/#detailed-list-of-changes Diff: https://github.com/kovidgoyal/kitty/compare/v0.48.0...v0.48.1 (cherry picked from commit e2a84e800fd7118e69baa3e4e92fac51f8274749) --- pkgs/by-name/ki/kitty/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index 214377a2ef68..734d598a594f 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -51,14 +51,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.48.0"; + version = "0.48.1"; pyproject = false; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; tag = "v${version}"; - hash = "sha256-+x3saXQw+6BzBYfwwur0DiTaJZVNgOYKJ4UVzeScbtk="; + hash = "sha256-h4dE99FET26iTgEFrmeXcFDw6DLl8dQjGep0NJ7jMzk="; }; goModules = From 9f630fbacabb63eb9d638822c9d5a9a276395ddc Mon Sep 17 00:00:00 2001 From: leiserfg Date: Thu, 30 Jul 2026 15:34:38 +0200 Subject: [PATCH 7/7] kitty: 0.48.1 -> 0.48.2 (cherry picked from commit 774a69f5381cfaa4109b5777590acf9d4f8f4ea2) --- pkgs/by-name/ki/kitty/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index 734d598a594f..74978c0f6060 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -51,21 +51,21 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.48.1"; + version = "0.48.2"; pyproject = false; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; tag = "v${version}"; - hash = "sha256-h4dE99FET26iTgEFrmeXcFDw6DLl8dQjGep0NJ7jMzk="; + hash = "sha256-qNgVPpvMm8Y/nbBjVvWVuZ954ZXIuWmXhldP3w8MBhU="; }; goModules = (buildGo126Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-nxPca7xDgxQd8vXbGKGuKXmB5vu0d3me//m8AULJZ6o="; + vendorHash = "sha256-BZudfNfREwNrgalaimC5Lp+UIdFS+jHFLl9mEXcHYMI="; }).goModules; buildInputs = [ @@ -248,6 +248,9 @@ buildPythonApplication rec { + '' # These depend on files that are not available in the sandbox rm tools/utils/machine_id/api_test.go + + # These depend on cgroups and other resources that don't work as the tests expect in the sandbox + rm kitty_tests/child.py ''; checkPhase = ''