From 353c7943f5a4120122c5058d1c84f7883217b7ff Mon Sep 17 00:00:00 2001 From: "PAEPCKE, Michael" Date: Sat, 29 Mar 2025 09:17:11 +0000 Subject: [PATCH] opnborg: 0.1.66 -> 0.1.68, add versionHook, switch to buildGoModule --- pkgs/by-name/op/opnborg/package.nix | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/op/opnborg/package.nix b/pkgs/by-name/op/opnborg/package.nix index be65fe8c6887..f5e20af9d1a3 100644 --- a/pkgs/by-name/op/opnborg/package.nix +++ b/pkgs/by-name/op/opnborg/package.nix @@ -3,19 +3,21 @@ buildGoModule, fetchFromGitHub, nix-update-script, + versionCheckHook, }: -buildGoModule rec { + +buildGoModule (finalAttrs: { pname = "opnborg"; - version = "0.1.66"; + version = "0.1.68"; src = fetchFromGitHub { owner = "paepckehh"; repo = "opnborg"; - rev = "v${version}"; - hash = "sha256-7WYDkAHhCrVghNd+77XfwF1WwYJ8azt0Twn4d/rDjU8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-fES3YlJu8Zy1CLNEkzWW0KAhy3dZj1JXAT8y9tRjyEA="; }; - vendorHash = "sha256-i9MDtaR5uTrIhpliCyK/WMZqT69TyPVLQI9AGHCWavU="; + vendorHash = "sha256-u1LZvLAKYd1TQlZkYxgztOm1g94N4orMe6Y1Ab1to5Y="; ldflags = [ "-s" @@ -24,12 +26,18 @@ buildGoModule rec { passthru.updateScript = nix-update-script { }; + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/opnborg"; + versionCheckProgramArg = "--version"; + meta = { - changelog = "https://github.com/paepckehh/opnborg/releases/tag/v${version}"; + changelog = "https://github.com/paepckehh/opnborg/releases/tag/v${finalAttrs.version}"; homepage = "https://paepcke.de/opnborg"; description = "Sefhosted OPNSense Appliance Backup & Configuration Management Portal"; license = lib.licenses.bsd3; mainProgram = "opnborg"; maintainers = with lib.maintainers; [ paepcke ]; }; -} +})