From 932dcd0e37540d15e8cc67fc936e46fe13824a72 Mon Sep 17 00:00:00 2001 From: leiserfg Date: Sat, 8 Mar 2025 16:23:16 +0100 Subject: [PATCH 1/4] maintainers: add leiserfg --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 768bbf14434270..7979e0e59c78a0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13201,6 +13201,12 @@ name = "Jakob Leifhelm"; keys = [ { fingerprint = "4A82 F68D AC07 9FFD 8BF0 89C4 6817 AA02 3810 0822"; } ]; }; + leiserfg = { + email = "leiserfg@gmail.com"; + github = "leiserfg"; + githubId = 2947276; + name = "Leiser Fernández Gallo"; + }; leixb = { email = "abone9999+nixpkgs@gmail.com"; matrix = "@leix_b:matrix.org"; From 6063ceda5f81cfc0f591e07970c05b282a7e20bb Mon Sep 17 00:00:00 2001 From: leiserfg Date: Sat, 8 Mar 2025 12:32:53 +0100 Subject: [PATCH 2/4] 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: From 71b99a1d14330a4ca7808d977b43700583df0b21 Mon Sep 17 00:00:00 2001 From: leiserfg Date: Sun, 9 Mar 2025 22:34:50 +0100 Subject: [PATCH 3/4] kitty: move to by-name --- .../kitty/themes.nix => by-name/ki/kitty-themes/package.nix} | 0 .../disable-test_ssh_bootstrap_with_different_launchers.patch | 0 .../ki}/kitty/fix-test_ssh_env_vars.patch | 0 .../terminal-emulators => by-name/ki}/kitty/fix_setup.patch | 0 .../kitty/default.nix => by-name/ki/kitty/package.nix} | 0 .../ki}/kitty/zsh-compinit.patch | 0 pkgs/top-level/all-packages.nix | 4 +--- 7 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{applications/terminal-emulators/kitty/themes.nix => by-name/ki/kitty-themes/package.nix} (100%) rename pkgs/{applications/terminal-emulators => by-name/ki}/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch (100%) rename pkgs/{applications/terminal-emulators => by-name/ki}/kitty/fix-test_ssh_env_vars.patch (100%) rename pkgs/{applications/terminal-emulators => by-name/ki}/kitty/fix_setup.patch (100%) rename pkgs/{applications/terminal-emulators/kitty/default.nix => by-name/ki/kitty/package.nix} (100%) rename pkgs/{applications/terminal-emulators => by-name/ki}/kitty/zsh-compinit.patch (100%) diff --git a/pkgs/applications/terminal-emulators/kitty/themes.nix b/pkgs/by-name/ki/kitty-themes/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/kitty/themes.nix rename to pkgs/by-name/ki/kitty-themes/package.nix diff --git a/pkgs/applications/terminal-emulators/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch b/pkgs/by-name/ki/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch similarity index 100% rename from pkgs/applications/terminal-emulators/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch rename to pkgs/by-name/ki/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch diff --git a/pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch b/pkgs/by-name/ki/kitty/fix-test_ssh_env_vars.patch similarity index 100% rename from pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch rename to pkgs/by-name/ki/kitty/fix-test_ssh_env_vars.patch diff --git a/pkgs/applications/terminal-emulators/kitty/fix_setup.patch b/pkgs/by-name/ki/kitty/fix_setup.patch similarity index 100% rename from pkgs/applications/terminal-emulators/kitty/fix_setup.patch rename to pkgs/by-name/ki/kitty/fix_setup.patch diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/by-name/ki/kitty/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/kitty/default.nix rename to pkgs/by-name/ki/kitty/package.nix diff --git a/pkgs/applications/terminal-emulators/kitty/zsh-compinit.patch b/pkgs/by-name/ki/kitty/zsh-compinit.patch similarity index 100% rename from pkgs/applications/terminal-emulators/kitty/zsh-compinit.patch rename to pkgs/by-name/ki/kitty/zsh-compinit.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8588c147b93674..75fbcd25b499a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1516,7 +1516,7 @@ with pkgs; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; - kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty { + kitty = darwin.apple_sdk_11_0.callPackage ../by-name/ki/kitty/package.nix { harfbuzz = harfbuzz.override { withCoreText = stdenv.hostPlatform.isDarwin; }; inherit (darwin) autoSignDarwinBinariesHook; inherit (darwin.apple_sdk_11_0) Libsystem; @@ -1528,8 +1528,6 @@ with pkgs; ; }; - kitty-themes = callPackage ../applications/terminal-emulators/kitty/themes.nix { }; - mlterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/mlterm { }; mlterm-wayland = mlterm.override { enableX11 = false; From 02e08e63e04956f316c92452170f3b7ac8128dfc Mon Sep 17 00:00:00 2001 From: leiserfg Date: Tue, 11 Mar 2025 14:57:04 +0100 Subject: [PATCH 4/4] kitty: refactor add patch to solve darwin test errors --- pkgs/by-name/ki/kitty/fix_setup.patch | 13 ------------- pkgs/by-name/ki/kitty/package.nix | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 pkgs/by-name/ki/kitty/fix_setup.patch diff --git a/pkgs/by-name/ki/kitty/fix_setup.patch b/pkgs/by-name/ki/kitty/fix_setup.patch deleted file mode 100644 index 7197f3ddc653a3..00000000000000 --- a/pkgs/by-name/ki/kitty/fix_setup.patch +++ /dev/null @@ -1,13 +0,0 @@ -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: diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index a95a45affb558d..95a3144df619e1 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -50,6 +50,7 @@ makeBinaryWrapper, autoSignDarwinBinariesHook, cairo, + fetchpatch, }: with python3Packages; @@ -159,8 +160,17 @@ buildPythonApplication rec { # 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 + # Remove after 0.40.1 + (fetchpatch { + url = "https://github.com/kovidgoyal/kitty/commit/6171ca6.patch"; + hash = "sha256-OBB0YcgEYgw3Jcg+Dgus6rwQ4gGL6GMr6pd7m9CGq9k="; + }) + + (fetchpatch { + url = "https://github.com/kovidgoyal/kitty/commit/8cbdd003e2.patch"; + hash = "sha256-pKIJIqIdPfB4kQ6FtpYDumpgjJkMxoLT8fKzfgWYJnw="; + }) + ]; hardeningDisable = [