nix: use go 1.21 and universal-ctags 6.0.0 (#664)

sourcegraph · Oct 19, 2023 · 328fcb7 · 328fcb7
1 parent 4f21415
commit 328fcb7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/flake.lock b/flake.lock
diff --git 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
@@ -11,7 +11,7 @@ pkgs.mkShell {
   name = "zoekt";
 
   nativeBuildInputs = [
-    pkgs.go_1_20
+    pkgs.go_1_21
 
     # zoekt-git-index
     pkgs.git