From 4e711ff34ae66898990b6814414ff38a8a4d0ff4 Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Mon, 2 Sep 2024 14:09:38 +0200 Subject: [PATCH 1/2] ci: use ctags v6.1.0 --- install-ctags-alpine.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install-ctags-alpine.sh b/install-ctags-alpine.sh index 19951c5ed..c94968733 100755 --- a/install-ctags-alpine.sh +++ b/install-ctags-alpine.sh @@ -3,9 +3,9 @@ # This script installs universal-ctags within an alpine container. # Commit hash of github.com/universal-ctags/ctags. -# Last bumped 2023-10-24. -CTAGS_VERSION=v6.0.0 -CTAGS_ARCHIVE_TOP_LEVEL_DIR=ctags-6.0.0 +# Last bumped 2024-09-02. +CTAGS_VERSION=v6.1.0 +CTAGS_ARCHIVE_TOP_LEVEL_DIR=ctags-6.1.0 # When using commits you can rely on # CTAGS_ARCHIVE_TOP_LEVEL_DIR=ctags-$CTAGS_VERSION From 2dc6c51e0e62e87a771d9a35a52d10f2fa5381ef Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Mon, 2 Sep 2024 14:13:08 +0200 Subject: [PATCH 2/2] update flake.nix --- flake.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index ee735e73f..08e1595c9 100644 --- a/flake.nix +++ b/flake.nix @@ -19,18 +19,18 @@ # Pin a specific version of universal-ctags to the same version as in cmd/symbols/ctags-install-alpine.sh. overlays.ctags = self: super: rec { my-universal-ctags = super.universal-ctags.overrideAttrs (old: rec { - version = "6.0.0"; + version = "6.1.0"; src = super.fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; rev = "v${version}"; - sha256 = "sha256-XlqBndo8g011SDGp3zM7S+AQ0aCp6rpQlqJF6e5Dd6w="; + sha256 = "sha256-f8+Ifjn7bhSYozOy7kn+zCLdHGrH3iFupHUZEGynz9Y="; }; # 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 + # Skip building if same ctags version as registry universal-ctags = if super.universal-ctags.version == my-universal-ctags.version then super.universal-ctags else my-universal-ctags; }; };