From c58e42508bfcc3c9de658846b1e7b8f58b82f9e0 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Sun, 6 Feb 2022 17:53:04 -0800
Subject: [PATCH 1/2] universal-ctags: 5.9.20210411.0 -> 5.9.20220220.0

---
 pkgs/development/tools/misc/universal-ctags/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index e443ca7751eb..19ea9c4787ce 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "universal-ctags";
-  version = "5.9.20210411.0";
+  version = "5.9.20220220.0";
 
   src = fetchFromGitHub {
     owner = "universal-ctags";
     repo = "ctags";
     rev = "p${version}";
-    sha256 = "0c031y0dl2b70pd0mqfbylplf8f27x11b0ch7ljka3rqav0zb1zr";
+    sha256 = "1118iq33snxyw1jk8nwvsl08f3zdainksh0yiapzvg0y5906jjjd";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -29,6 +29,11 @@ stdenv.mkDerivation rec {
 
     substituteInPlace Tmain/utils.sh \
       --replace /bin/echo ${coreutils}/bin/echo
+
+    # Remove git-related housekeeping from check phase
+    substituteInPlace makefiles/testing.mak \
+      --replace "check: tmain units tlib man-test check-genfile" \
+                "check: tmain units tlib man-test"
   '';
 
   postConfigure = ''

From 86e02dc24ab5c8d2fe592b8bb3dc6d0b04f55664 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Tue, 22 Feb 2022 19:25:34 -0800
Subject: [PATCH 2/2] universal-ctags: remove incorrect use of checkFlags

"units" is a Makefile target run as part of the "check" target.

"units" is not an argument to be passed to any Makefile target.
---
 pkgs/development/tools/misc/universal-ctags/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index 19ea9c4787ce..51ea6302743a 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -42,8 +42,6 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  checkFlags = [ "units" ];
-
   meta = with lib; {
     description = "A maintained ctags implementation";
     homepage = "https://ctags.io/";