pyrox.dev
Merge pull request #162215 from Luflosi/update/kitty
+50
-26
pkgs/applications/terminal-emulators/kitty/default.nix
+50
-26
pkgs/applications/terminal-emulators/kitty/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring,
2
-
harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel,
3
-
libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor,
4
-
libxkbcommon, libXi, libXext, wayland-protocols, wayland,
5
-
lcms2,
6
-
librsync,
7
-
installShellFiles,
8
-
dbus,
9
-
darwin,
10
-
Cocoa,
11
-
CoreGraphics,
12
-
Foundation,
13
-
IOKit,
14
-
Kernel,
15
-
OpenGL,
16
-
libcanberra,
17
-
libicns,
18
-
libpng,
19
-
python3,
20
-
zlib,
1
+
{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring
2
+
, harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel
3
+
, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor
4
+
, libxkbcommon, libXi, libXext, wayland-protocols, wayland
5
+
, lcms2
6
+
, librsync
7
+
, installShellFiles
8
+
, dbus
9
+
, darwin
10
+
, Cocoa
11
+
, CoreGraphics
12
+
, Foundation
13
+
, IOKit
14
+
, Kernel
15
+
, OpenGL
16
+
, libcanberra
17
+
, libicns
18
+
, libpng
19
+
, python3
20
+
, zlib
21
+
, bashInteractive
22
+
, zsh
23
+
, fish
24
+
, fetchpatch
21
25
}:
22
26
23
27
with python3Packages;
24
28
buildPythonApplication rec {
25
29
pname = "kitty";
26
-
version = "0.24.2";
30
+
version = "0.24.4";
27
31
format = "other";
28
32
29
33
src = fetchFromGitHub {
30
34
owner = "kovidgoyal";
31
35
repo = "kitty";
32
36
rev = "v${version}";
33
-
sha256 = "sha256-nGBdoOueX8tcxXRDqKQ/Q+woT6rNQeLXwy1MJbwizKs=";
37
+
sha256 = "sha256-c6XM/xeGZ68srf8xQJA1iYCUR3kXNceTMxsZAnbFmug=";
34
38
};
35
39
36
40
buildInputs = [
···
74
78
75
79
outputs = [ "out" "terminfo" "shell_integration" ];
76
80
81
+
patches = [
82
+
(fetchpatch {
83
+
name = "fix-zsh-completion-test-1.patch";
84
+
url = "https://github.com/kovidgoyal/kitty/commit/297592242c290a81ca4ba08802841f4c33a4de25.patch";
85
+
sha256 = "sha256-/V6y/4AaJsZvx1KS5UFZ+0zyAoZuLgbgFORZ1dX/1qE=";
86
+
})
87
+
(fetchpatch {
88
+
name = "fix-zsh-completion-test-2.patch";
89
+
url = "https://github.com/kovidgoyal/kitty/commit/d8ed42ae8e014d9abf9550a65ae203468f8bfa43.patch";
90
+
sha256 = "sha256-Azgzqf5atW999FVn9rSGKMyZLsI692dYXhJPx07GBO0=";
91
+
})
92
+
];
93
+
77
94
# Causes build failure due to warning
78
95
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
79
96
···
101
118
runHook postBuild
102
119
'';
103
120
104
-
checkInputs = [ pillow ];
121
+
checkInputs = [
122
+
pillow
123
+
124
+
# Shells needed for shell integration tests
125
+
bashInteractive
126
+
zsh
127
+
fish
128
+
];
105
129
106
130
checkPhase =
107
131
let buildBinPath =
···
132
156
wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick xsel ncurses.dev ]}"
133
157
134
158
installShellCompletion --cmd kitty \
135
-
--bash <("$out/bin/kitty" + complete setup bash) \
136
-
--fish <("$out/bin/kitty" + complete setup fish) \
137
-
--zsh <("$out/bin/kitty" + complete setup zsh)
159
+
--bash <("$out/bin/kitty" +complete setup bash) \
160
+
--fish <("$out/bin/kitty" +complete setup fish2) \
161
+
--zsh <("$out/bin/kitty" +complete setup zsh)
138
162
139
163
terminfo_src=${if stdenv.isDarwin then
140
164
''"$out/Applications/kitty.app/Contents/Resources/terminfo"''