From 38331062de08cd1fa47e6f30fd8187e25f909fe9 Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Thu, 4 Dec 2025 21:15:13 +0300 Subject: [PATCH 1/4] fblog: add progrm_jarvis to maintainers --- pkgs/by-name/fb/fblog/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fb/fblog/package.nix b/pkgs/by-name/fb/fblog/package.nix index 90893c9e6987..b2c0b8e8daaa 100644 --- a/pkgs/by-name/fb/fblog/package.nix +++ b/pkgs/by-name/fb/fblog/package.nix @@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "fblog"; homepage = "https://github.com/brocode/fblog"; license = licenses.wtfpl; - maintainers = [ ]; + maintainers = [ maintainers.progrm_jarvis ]; }; } From cd52b4e7e557df395aaceaccb2b7ce2d133c030d Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Thu, 4 Dec 2025 21:18:16 +0300 Subject: [PATCH 2/4] fblog: use finalAttrs --- pkgs/by-name/fb/fblog/package.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/fb/fblog/package.nix b/pkgs/by-name/fb/fblog/package.nix index b2c0b8e8daaa..b553c25d43c7 100644 --- a/pkgs/by-name/fb/fblog/package.nix +++ b/pkgs/by-name/fb/fblog/package.nix @@ -2,26 +2,32 @@ lib, rustPlatform, fetchFromGitHub, + versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "fblog"; version = "4.16.0"; src = fetchFromGitHub { owner = "brocode"; repo = "fblog"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-SWwk7qNe2R1aBYGBFqltUZjeOvr4jG1P7/CPIAfHCc8="; }; cargoHash = "sha256-du9FXuUNqQm1AMqcCFqeso5OPrPCxzTVl5e7kR0rpwc="; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + meta = { description = "Small command-line JSON log viewer"; mainProgram = "fblog"; homepage = "https://github.com/brocode/fblog"; - license = licenses.wtfpl; - maintainers = [ maintainers.progrm_jarvis ]; + changelog = "https://github.com/brocode/fblog/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.wtfpl; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; -} +}) From 4cf69551d0a90759c4530a64079641954a05d0c3 Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Thu, 4 Dec 2025 21:18:59 +0300 Subject: [PATCH 3/4] fblog: add nix-update-script --- pkgs/by-name/fb/fblog/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/fb/fblog/package.nix b/pkgs/by-name/fb/fblog/package.nix index b553c25d43c7..b4e3d9b335b5 100644 --- a/pkgs/by-name/fb/fblog/package.nix +++ b/pkgs/by-name/fb/fblog/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchFromGitHub, versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -22,6 +23,8 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; + passthru.updateScript = nix-update-script { }; + meta = { description = "Small command-line JSON log viewer"; mainProgram = "fblog"; From e12c748a45b2f9e39c545f711bb7ea69a1ff8181 Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Thu, 4 Dec 2025 21:27:11 +0300 Subject: [PATCH 4/4] fblog: 4.16.0 -> 4.17.0 --- pkgs/by-name/fb/fblog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fb/fblog/package.nix b/pkgs/by-name/fb/fblog/package.nix index b4e3d9b335b5..9b316df28f77 100644 --- a/pkgs/by-name/fb/fblog/package.nix +++ b/pkgs/by-name/fb/fblog/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fblog"; - version = "4.16.0"; + version = "4.17.0"; src = fetchFromGitHub { owner = "brocode"; repo = "fblog"; rev = "v${finalAttrs.version}"; - hash = "sha256-SWwk7qNe2R1aBYGBFqltUZjeOvr4jG1P7/CPIAfHCc8="; + hash = "sha256-SDOYW9CpC7E62nVnZL04Kx9ckVEZyvcMolJCfKDqdMk="; }; - cargoHash = "sha256-du9FXuUNqQm1AMqcCFqeso5OPrPCxzTVl5e7kR0rpwc="; + cargoHash = "sha256-Pn8HsBz+5OHz4jF6xmORLQSLYClTHpaJXWiS5sPyV2w="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ];