diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1134057a3a8e..c3d41c70bc03 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -30891,6 +30891,11 @@
     githubId = 106241330;
     name = "Success Kingsley";
   };
+  xqtc161 = {
+    github = "xqtc161";
+    githubId = 65857432;
+    name = "tila";
+  };
   xrelkd = {
     github = "xrelkd";
     githubId = 46590321;
diff --git a/pkgs/by-name/zi/ziglint/package.nix b/pkgs/by-name/zi/ziglint/package.nix
new file mode 100644
index 000000000000..36de1a77f914
--- /dev/null
+++ b/pkgs/by-name/zi/ziglint/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  zig_0_16,
+  versionCheckHook,
+}:
+
+let
+  zig = zig_0_16;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ziglint";
+  version = "0.5.3";
+
+  src = fetchFromGitHub {
+    owner = "rockorager";
+    repo = "ziglint";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-kLcUIFMDJHuCA0rn3l5a3h/E6TUwNWA5mWRADCDB1cw=";
+  };
+
+  postPatch = ''
+    substituteInPlace build.zig \
+      --replace-fail "getVersion(b)" '"${finalAttrs.version}"'
+  '';
+
+  nativeBuildInputs = [ zig.hook ];
+
+  strictDeps = true;
+
+  __structuredAttrs = true;
+
+  doCheck = true;
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  meta = {
+    homepage = "https://github.com/rockorager/ziglint";
+    description = "Linter for Zig source code";
+    changelog = "https://github.com/rockorager/ziglint/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ xqtc161 ];
+    mainProgram = "ziglint";
+    inherit (zig.meta) platforms;
+  };
+})