From 29a721d448841c9c20eba71386a2616c0d80f314 Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Mon, 30 Mar 2026 12:59:54 +0300 Subject: [PATCH 1/2] xq-xml: add progrm_jarvis to maintainers --- pkgs/by-name/xq/xq-xml/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/xq/xq-xml/package.nix b/pkgs/by-name/xq/xq-xml/package.nix index 8ae50c91c5c6..af5df97ccc97 100644 --- a/pkgs/by-name/xq/xq-xml/package.nix +++ b/pkgs/by-name/xq/xq-xml/package.nix @@ -38,6 +38,6 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/sibprogrammer/xq"; changelog = "https://github.com/sibprogrammer/xq/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; }) From c33de3d997afb86b0bda7f8a52ae1fc76b39c50d Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Mon, 30 Mar 2026 13:16:19 +0300 Subject: [PATCH 2/2] xq-xml: add nix-update-script --- pkgs/by-name/xq/xq-xml/package.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/xq/xq-xml/package.nix b/pkgs/by-name/xq/xq-xml/package.nix index af5df97ccc97..5b806abd8649 100644 --- a/pkgs/by-name/xq/xq-xml/package.nix +++ b/pkgs/by-name/xq/xq-xml/package.nix @@ -2,8 +2,8 @@ lib, buildGoModule, fetchFromGitHub, - testers, - xq-xml, + versionCheckHook, + nix-update-script, }: buildGoModule (finalAttrs: { @@ -13,7 +13,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "sibprogrammer"; repo = "xq"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6iC5YhCppzlyp6o+Phq98gQj4LjQx/5pt2+ejOvGvTE="; }; @@ -22,21 +22,20 @@ buildGoModule (finalAttrs: { ldflags = [ "-s" "-w" - "-X=main.commit=${finalAttrs.src.rev}" + "-X=main.commit=v${finalAttrs.version}" "-X=main.version=${finalAttrs.version}" ]; - passthru.tests = { - version = testers.testVersion { - package = xq-xml; - }; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; meta = { description = "Command-line XML and HTML beautifier and content extractor"; mainProgram = "xq"; homepage = "https://github.com/sibprogrammer/xq"; - changelog = "https://github.com/sibprogrammer/xq/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/sibprogrammer/xq/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.progrm_jarvis ]; };