Unverified Commit 34fe3faf authored by Fabián Heredia Montiel's avatar Fabián Heredia Montiel Committed by GitHub
Browse files

Merge pull request #256072 from kashw2/kitty 

kitty: 0.29.2 -> 0.30.0
parents 829514e2 d13268ac

pkgs/applications/terminal-emulators/kitty/default.nix

+8 −6
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring

, harfbuzz, fontconfig, pkg-config, ncurses, imagemagick

, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor

, libxkbcommon, libXi, libXext, wayland-protocols, wayland

, libxkbcommon, libXi, libXext, wayland-protocols, wayland, xxHash

, lcms2

, librsync

, openssl
@@ -29,20 +29,20 @@ 
with python3Packages;

buildPythonApplication rec {

  pname = "kitty";

  version = "0.29.2";

  version = "0.30.0";

  format = "other";



  src = fetchFromGitHub {

    owner = "kovidgoyal";

    repo = "kitty";

    rev = "refs/tags/v${version}";

    hash = "sha256-ureJHG6Jh4bsXqQZnGwY5Hlq7sXxYX3iTajb8ZkpZw8=";

    hash = "sha256-M6qFkeUp2rBudO2PiLN2VSrmut68c9mjjUr07WEX9VY=";

  };



  goModules = (buildGoModule {

    pname = "kitty-go-modules";

    inherit src version;

    vendorHash = "sha256-jk2EcYVuhV/UQfHAIfpnn8ZIZnwjA/o8YRXmpoC85Vc=";

    vendorHash = "sha256-53Y2S/P2fWT9STZFTdlkESxHNpoAggifZJ0+WXCzbkU=";

  }).goModules;



  buildInputs = [
@@ -51,6 +51,7 @@ buildPythonApplication rec { 
    lcms2

    librsync

    openssl.dev

    xxHash

  ] ++ lib.optionals stdenv.isDarwin [

    Cocoa

    Kernel
@@ -155,7 +156,8 @@ buildPythonApplication rec { 
  preCheck = lib.optionalString stdenv.isDarwin ''

    substituteInPlace kitty_tests/file_transmission.py \

      --replace test_file_get dont_test_file_get \

      --replace test_path_mapping_receive dont_test_path_mapping_receive

      --replace test_path_mapping_receive dont_test_path_mapping_receive \

      --replace test_transfer_send dont_test_transfer_send

    substituteInPlace kitty_tests/shell_integration.py \

      --replace test_fish_integration dont_test_fish_integration

    substituteInPlace kitty_tests/shell_integration.py \
@@ -237,6 +239,6 @@ buildPythonApplication rec { 
    changelog = "https://sw.kovidgoyal.net/kitty/changelog/";

    platforms = platforms.darwin ++ platforms.linux;

    mainProgram = "kitty";

    maintainers = with maintainers; [ tex rvolosatovs Luflosi adamcstephens ];

    maintainers = with maintainers; [ tex rvolosatovs Luflosi adamcstephens kashw2 ];

  };

}

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -3002,7 +3002,7 @@ with pkgs; 
  kermit-terminal = callPackage ../applications/terminal-emulators/kermit-terminal { };















  kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty {













    go = go_1_20;













    go = go_1_21;















    harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };















    inherit (darwin.apple_sdk_11_0) Libsystem;















    inherit (darwin.apple_sdk_11_0.frameworks)