From 5de6e6c770a985e16b40df57a87c61d7d0caf226 Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 4 Nov 2025 11:44:59 +0100 Subject: [PATCH 1/2] rare-regex: cleanup --- pkgs/by-name/ra/rare-regex/package.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ra/rare-regex/package.nix b/pkgs/by-name/ra/rare-regex/package.nix index cf234ea704e4..64926044ed24 100644 --- a/pkgs/by-name/ra/rare-regex/package.nix +++ b/pkgs/by-name/ra/rare-regex/package.nix @@ -9,14 +9,14 @@ rare-regex, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "rare"; version = "0.5.2"; src = fetchFromGitHub { owner = "zix99"; repo = "rare"; - rev = version; + tag = finalAttrs.version; hash = "sha256-tzAbt9THSTYDvooU7yNQJhJaFM1bcKCabDNtiMpux3Q="; }; @@ -28,9 +28,13 @@ buildGoModule rec { ldflags = [ "-s" - "-w" - "-X=main.version=${version}" - "-X=main.buildSha=${src.rev}" + "-X=main.version=${finalAttrs.version}" + "-X=main.buildSha=${finalAttrs.src.tag}" + ]; + + # Skip tests try /dev. + checkFlags = [ + "-skip=TestNoMountTraverseWithSymlink" ]; tags = lib.optionals withPcre2 [ @@ -43,11 +47,12 @@ buildGoModule rec { }; }; - meta = with lib; { + meta = { description = "Fast text scanner/regex extractor and realtime summarizer"; homepage = "https://rare.zdyn.net"; - changelog = "https://github.com/zix99/rare/releases/tag/${src.rev}"; - license = licenses.gpl3Plus; maintainers = [ ]; + changelog = "https://github.com/zix99/rare/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.gpl3Plus; + mainProgram = "rare"; }; -} +}) From 7bd3c7c0b62a12bb589f9b133c550083ee8101c7 Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 5 Nov 2025 10:34:51 +0100 Subject: [PATCH 2/2] rare-regex: add liberodark to maintainers --- pkgs/by-name/ra/rare-regex/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ra/rare-regex/package.nix b/pkgs/by-name/ra/rare-regex/package.nix index 64926044ed24..fa73b413b681 100644 --- a/pkgs/by-name/ra/rare-regex/package.nix +++ b/pkgs/by-name/ra/rare-regex/package.nix @@ -50,7 +50,7 @@ buildGoModule (finalAttrs: { meta = { description = "Fast text scanner/regex extractor and realtime summarizer"; homepage = "https://rare.zdyn.net"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ liberodark ]; changelog = "https://github.com/zix99/rare/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Plus; mainProgram = "rare";