From 328fcb7a505c5cafbd3e8bb7fd8da6db0c692cf6 Mon Sep 17 00:00:00 2001
From: Keegan Carruthers-Smith <keegan.csmith@gmail.com>
Date: Thu, 19 Oct 2023 12:24:03 +0200
Subject: [PATCH] nix: use go 1.21 and universal-ctags 6.0.0 (#664)

---
 flake.lock |  6 +++---
 flake.nix  | 10 ++++++----
 shell.nix  |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 430df0b9e..f2c81a707 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1682879489,
-        "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
+        "lastModified": 1697456312,
+        "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
+        "rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index d5d82771e..a3f288fce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,18 +18,20 @@
       in { default = import ./shell.nix { inherit pkgs; }; });
     # Pin a specific version of universal-ctags to the same version as in cmd/symbols/ctags-install-alpine.sh.
     overlays.ctags = self: super: rec {
-      universal-ctags = super.universal-ctags.overrideAttrs (old: {
-        version = "5.9.20220403.0";
+      my-universal-ctags = super.universal-ctags.overrideAttrs (old: {
+        version = "6.0.0";
         src = super.fetchFromGitHub {
           owner = "universal-ctags";
           repo = "ctags";
-          rev = "f95bb3497f53748c2b6afc7f298cff218103ab90";
-          sha256 = "sha256-pd89KERQj6K11Nue3YFNO+NLOJGqcMnHkeqtWvMFk38=";
+          rev = "3af413544a0ed0a4c52200894cfd6391f06d2e94";
+          sha256 = "sha256-XlqBndo8g011SDGp3zM7S+AQ0aCp6rpQlqJF6e5Dd6w=";
         };
         # disable checks, else we get `make[1]: *** No rule to make target 'optlib/cmake.c'.  Stop.`
         doCheck = false;
         checkFlags = [ ];
       });
+      # The ctags in the registry currently is 6.0.0 so we can skip building in that case
+      universal-ctags = if super.universal-ctags.version == my-universal-ctags.version then super.universal-ctags else my-universal-ctags;
     };
   };
 }
diff --git a/shell.nix b/shell.nix
index 7f29c244c..d1bfd881c 100644
--- a/shell.nix
+++ b/shell.nix
@@ -11,7 +11,7 @@ pkgs.mkShell {
   name = "zoekt";
 
   nativeBuildInputs = [
-    pkgs.go_1_20
+    pkgs.go_1_21
 
     # zoekt-git-index
     pkgs.git