Merge remote-tracking branch 'origin/master' into staging-next

1 files changed, 9 insertions, 7 deletions

diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix
index b6a6ca7780fb6..e1a3f00255eb0 100644
--- a/pkgs/applications/terminal-emulators/kitty/default.nix
+++ b/pkgs/applications/terminal-emulators/kitty/default.nix
@@ -7,12 +7,13 @@
 , openssl
 , installShellFiles
 , dbus
-, darwin
 , Cocoa
 , CoreGraphics
 , Foundation
 , IOKit
 , Kernel
+, UniformTypeIdentifiers
+, UserNotifications
 , OpenGL
 , libcanberra
 , libicns
@@ -28,14 +29,14 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.26.2";
+  version = "0.26.5";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
-    rev = "v${version}";
-    sha256 = "sha256-IqXRkKzOfqWolH/534nmM2R/69olhFOk6wbbF4ifRd0=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-UloBlV26HnkvbzP/NynlPI77z09MBEVgtrg5SeTmwB4=";
   };
 
   buildInputs = [
@@ -51,11 +52,11 @@ buildPythonApplication rec {
     IOKit
     Kernel
     OpenGL
+    UniformTypeIdentifiers
+    UserNotifications
     libpng
     python3
     zlib
-  ] ++ lib.optionals (stdenv.isDarwin && (builtins.hasAttr "UserNotifications" darwin.apple_sdk.frameworks)) [
-    darwin.apple_sdk.frameworks.UserNotifications
   ] ++ lib.optionals stdenv.isLinux [
     fontconfig libunistring libcanberra libX11
     libXrandr libXinerama libXcursor libxkbcommon libXi libXext
@@ -218,6 +219,7 @@ buildPythonApplication rec {
     license = licenses.gpl3Only;
     changelog = "https://sw.kovidgoyal.net/kitty/changelog/";
     platforms = platforms.darwin ++ platforms.linux;
-    maintainers = with maintainers; [ tex rvolosatovs Luflosi ];
+    broken = (stdenv.isDarwin && stdenv.isx86_64);
+    maintainers = with maintainers; [ tex rvolosatovs Luflosi adamcstephens ];
   };
 }