From 2d8e0c3c986d9c7339dfde2d98f58d03949c2fb9 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Mon, 1 May 2023 13:32:29 +0200
Subject: [PATCH] git-cola: 4.1.0 -> 4.2.1

https://github.com/git-cola/git-cola/releases/tag/v4.2.1

Additionally, include qtwayland in buildInputs to enable Wayland
support.
---
 .../version-management/git-cola/default.nix          | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/version-management/git-cola/default.nix b/pkgs/applications/version-management/git-cola/default.nix
index e9959cd42dee..d84e61735811 100644
--- a/pkgs/applications/version-management/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-cola/default.nix
@@ -2,22 +2,16 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "git-cola";
-  version = "4.1.0";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "git-cola";
     repo = "git-cola";
     rev = "refs/tags/v${version}";
-    hash = "sha256-s+acQo9b+ZQ31qXBf0m8ajXYuYEQzNybmX9nw+c0DQY=";
+    hash = "sha256-VAn4zXypOugPIVyXQ/8Yt0rCDM7hVdIY+jpmoTHqssU=";
   };
 
-  # TODO: remove in the next release since upstream removed pytest-flake8
-  # https://github.com/git-cola/git-cola/commit/6c5c5c6c888ee1a095fc1ca5521af9a03b833205
-  postPatch = ''
-    substituteInPlace pytest.ini \
-      --replace "--flake8" ""
-  '';
-
+  buildInputs = [ qt5.qtwayland ];
   propagatedBuildInputs = with python3Packages; [ git pyqt5 qtpy send2trash ];
   nativeBuildInputs = [ gettext qt5.wrapQtAppsHook ];
   nativeCheckInputs = with python3Packages; [ git pytestCheckHook ];