Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kitty: 0.39.1->0.40.0 #388182

Merged
merged 4 commits into from
Mar 12, 2025
+26 −6
Merged

kitty: 0.39.1->0.40.0 #388182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
932dcd0
maintainers: add leiserfg
leiserfg Mar 8, 2025
6063ced
kitty: 0.39.1->0.40.0
leiserfg Mar 8, 2025
71b99a1
kitty: move to by-name
leiserfg Mar 9, 2025
02e08e6
kitty: refactor add patch to solve darwin test errors
leiserfg Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
0 ...tions/terminal-emulators/kitty/themes.nix → pkgs/by-name/ki/kitty-themes/package.nix
View file
Open in desktop
File renamed without changes.
0 ..._bootstrap_with_different_launchers.patch → ..._bootstrap_with_different_launchers.patch
View file
Open in desktop
File renamed without changes.
0 ...ulators/kitty/fix-test_ssh_env_vars.patch → ...name/ki/kitty/fix-test_ssh_env_vars.patch
View file
Open in desktop
File renamed without changes.
22 changes: 19 additions & 3 deletions ...ions/terminal-emulators/kitty/default.nix → pkgs/by-name/ki/kitty/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,26 +49,28 @@
nix-update-script,
makeBinaryWrapper,
autoSignDarwinBinariesHook,
cairo,
fetchpatch,
}:

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 =
Expand Down Expand Up @@ -109,6 +111,7 @@ buildPythonApplication rec {
wayland
dbus
libGL
cairo
];

nativeBuildInputs =
Expand Down Expand Up @@ -156,6 +159,18 @@ 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

# 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 = [
Expand Down Expand Up @@ -327,6 +342,7 @@ buildPythonApplication rec {
rvolosatovs
Luflosi
kashw2
leiserfg
];
};
}
0 ...rminal-emulators/kitty/zsh-compinit.patch → pkgs/by-name/ki/kitty/zsh-compinit.patch
View file
Open in desktop
File renamed without changes.
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down