diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-03-07 15:03:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-07 15:03:11 +0100 |
commit | b8e96973e6ab4dca2acc382eb809278d69e95632 (patch) | |
tree | 0536fd82224d1530eac4b6e3cb7b42df5ecc338a /pkgs/applications | |
parent | 09930fe11ecb6d13e228f548badaad109a5bd184 (diff) | |
parent | b5545af4c9ebc38cc1e5fb52bc1a64c793ef72ff (diff) | |
download | nixlib-b8e96973e6ab4dca2acc382eb809278d69e95632.tar nixlib-b8e96973e6ab4dca2acc382eb809278d69e95632.tar.gz nixlib-b8e96973e6ab4dca2acc382eb809278d69e95632.tar.bz2 nixlib-b8e96973e6ab4dca2acc382eb809278d69e95632.tar.lz nixlib-b8e96973e6ab4dca2acc382eb809278d69e95632.tar.xz nixlib-b8e96973e6ab4dca2acc382eb809278d69e95632.tar.zst nixlib-b8e96973e6ab4dca2acc382eb809278d69e95632.zip |
Merge pull request #162215 from Luflosi/update/kitty
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/terminal-emulators/kitty/default.nix | 76 |
1 files changed, 50 insertions, 26 deletions
diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index cca7e7eb9b96..1e6db04dd76d 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -1,36 +1,40 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring, - harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel, - libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, - libxkbcommon, libXi, libXext, wayland-protocols, wayland, - lcms2, - librsync, - installShellFiles, - dbus, - darwin, - Cocoa, - CoreGraphics, - Foundation, - IOKit, - Kernel, - OpenGL, - libcanberra, - libicns, - libpng, - python3, - zlib, +{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring +, harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel +, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor +, libxkbcommon, libXi, libXext, wayland-protocols, wayland +, lcms2 +, librsync +, installShellFiles +, dbus +, darwin +, Cocoa +, CoreGraphics +, Foundation +, IOKit +, Kernel +, OpenGL +, libcanberra +, libicns +, libpng +, python3 +, zlib +, bashInteractive +, zsh +, fish +, fetchpatch }: with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.24.2"; + version = "0.24.4"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "sha256-nGBdoOueX8tcxXRDqKQ/Q+woT6rNQeLXwy1MJbwizKs="; + sha256 = "sha256-c6XM/xeGZ68srf8xQJA1iYCUR3kXNceTMxsZAnbFmug="; }; buildInputs = [ @@ -74,6 +78,19 @@ buildPythonApplication rec { outputs = [ "out" "terminfo" "shell_integration" ]; + patches = [ + (fetchpatch { + name = "fix-zsh-completion-test-1.patch"; + url = "https://github.com/kovidgoyal/kitty/commit/297592242c290a81ca4ba08802841f4c33a4de25.patch"; + sha256 = "sha256-/V6y/4AaJsZvx1KS5UFZ+0zyAoZuLgbgFORZ1dX/1qE="; + }) + (fetchpatch { + name = "fix-zsh-completion-test-2.patch"; + url = "https://github.com/kovidgoyal/kitty/commit/d8ed42ae8e014d9abf9550a65ae203468f8bfa43.patch"; + sha256 = "sha256-Azgzqf5atW999FVn9rSGKMyZLsI692dYXhJPx07GBO0="; + }) + ]; + # Causes build failure due to warning hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; @@ -101,7 +118,14 @@ buildPythonApplication rec { runHook postBuild ''; - checkInputs = [ pillow ]; + checkInputs = [ + pillow + + # Shells needed for shell integration tests + bashInteractive + zsh + fish + ]; checkPhase = let buildBinPath = @@ -132,9 +156,9 @@ buildPythonApplication rec { wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick xsel ncurses.dev ]}" installShellCompletion --cmd kitty \ - --bash <("$out/bin/kitty" + complete setup bash) \ - --fish <("$out/bin/kitty" + complete setup fish) \ - --zsh <("$out/bin/kitty" + complete setup zsh) + --bash <("$out/bin/kitty" +complete setup bash) \ + --fish <("$out/bin/kitty" +complete setup fish2) \ + --zsh <("$out/bin/kitty" +complete setup zsh) terminfo_src=${if stdenv.isDarwin then ''"$out/Applications/kitty.app/Contents/Resources/terminfo"'' |