From be88e0ac920208ed8e87cbdae46bcb4eebe342bd Mon Sep 17 00:00:00 2001 From: whispers Date: Wed, 19 Aug 2026 19:21:49 -0400 Subject: [PATCH] ztags: 1.0.1 -> 1.0.1-unstable-2026-04-23, zig_0_13 -> zig_0_16 diff: https://github.com/gpanders/ztags/compare/v1.0.1...49d45d0db73c6e5705853bfdb25a471d19538993 zig 0.13 will soon be removed from nixpkgs as it depends on llvm 18. ztags needs to be updated to a newer zig version, and has been upstream without a release. accordingly, we update to the latest upstream commit in order to get support for zig 0.16. the resulting binaries still seem to work, e.g. to index the standard library as described in the README. also, we switch to codeberg instead of github as the man page mentions codeberg under the # CONTRIBUTE section, while it does not do the same for github: https://codeberg.org/gpanders/ztags/src/commit/49d45d0db73c6e5705853bfdb25a471d19538993/ztags.1.scd. the README still mentions both. --- pkgs/by-name/zt/ztags/deps.nix | 14 ++++++++++++++ pkgs/by-name/zt/ztags/package.nix | 32 +++++++++++++++---------------- 2 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 pkgs/by-name/zt/ztags/deps.nix diff --git a/pkgs/by-name/zt/ztags/deps.nix b/pkgs/by-name/zt/ztags/deps.nix new file mode 100644 index 000000000000..a96b17c46396 --- /dev/null +++ b/pkgs/by-name/zt/ztags/deps.nix @@ -0,0 +1,14 @@ +# generated by zon2nix (https://github.com/nix-community/zon2nix) + +{ linkFarm, fetchgit }: + +linkFarm "zig-packages" [ + { + name = "zzdoc-0.0.0-tzT1PjPfAAD6wsVuNRwwCStXJC5la08OkS3u4ra7fHpM"; + path = fetchgit { + url = "https://github.com/rockorager/zzdoc"; + rev = "98cdf8ba5ae2d01b4da0793dd43dd2f6d6b1e217"; + hash = "sha256-34FtjraFGbA+QcwiBolpFQoma1bscup/3+4RgkXVJEg="; + }; + } +] diff --git a/pkgs/by-name/zt/ztags/package.nix b/pkgs/by-name/zt/ztags/package.nix index 2c407cb74d6c..363f8f55287c 100644 --- a/pkgs/by-name/zt/ztags/package.nix +++ b/pkgs/by-name/zt/ztags/package.nix @@ -1,37 +1,37 @@ { lib, stdenv, - fetchFromGitHub, - scdoc, - zig_0_13, + callPackage, + fetchFromCodeberg, + zig_0_16, }: let - zig = zig_0_13; + zig = zig_0_16; in stdenv.mkDerivation (finalAttrs: { pname = "ztags"; - version = "1.0.1"; + version = "1.0.1-unstable-2026-04-23"; - src = fetchFromGitHub { + src = fetchFromCodeberg { owner = "gpanders"; repo = "ztags"; - rev = "v${finalAttrs.version}"; - hash = "sha256-XDwHuQ+UwScolxyxCHJUmxxG+OgKvZmNGQEZlfywV2s="; + rev = "49d45d0db73c6e5705853bfdb25a471d19538993"; + hash = "sha256-RawMttAMlRj2ofXmtgeCl/g8XxyUZjXg22heHYRpJy8="; }; - nativeBuildInputs = [ - scdoc - zig - ]; + deps = callPackage ./deps.nix { }; - postInstall = '' - zig build docs --prefix $out - ''; + nativeBuildInputs = [ zig ]; + + zigBuildFlags = [ + "--system" + "${finalAttrs.deps}" + ]; meta = { description = "Generate tags files for Zig projects"; - homepage = "https://github.com/gpanders/ztags"; + homepage = "https://codeberg.org/gpanders/ztags"; license = lib.licenses.mit; maintainers = [ ]; mainProgram = "ztags";