From 82073c938d2d585aaf9a86701b60fedabad6c83b Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 11 Jul 2023 09:33:30 -0400 Subject: [PATCH 1/3] sish: fix version --- pkgs/tools/networking/sish/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/networking/sish/default.nix b/pkgs/tools/networking/sish/default.nix index d75d5131ea67..3ba11d086797 100644 --- a/pkgs/tools/networking/sish/default.nix +++ b/pkgs/tools/networking/sish/default.nix @@ -16,6 +16,14 @@ buildGoModule rec { vendorHash = "sha256-RnvkEUvL/bQTTTlg0RF0xjjvVniltequNKRD3z0H3O8="; + ldflags = [ + "-s" + "-w" + "-X=github.com/antoniomika/sish/cmd.Commit=${src.rev}" + "-X=github.com/antoniomika/sish/cmd.Date=1970-01-01" + "-X=github.com/antoniomika/sish/cmd.Version=${version}" + ]; + meta = with lib; { description = "HTTP(S)/WS(S)/TCP Tunnels to localhost"; homepage = "https://github.com/antoniomika/sish"; From 8fcc6b78353b3b423153d4b6107f5e40baf5453a Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 11 Jul 2023 09:35:57 -0400 Subject: [PATCH 2/3] sish: add changelog to meta Co-authored-by: Fabian Affolter --- pkgs/tools/networking/sish/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/sish/default.nix b/pkgs/tools/networking/sish/default.nix index 3ba11d086797..cdd670f3156a 100644 --- a/pkgs/tools/networking/sish/default.nix +++ b/pkgs/tools/networking/sish/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "antoniomika"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-6PCZtiXsDQfPZFw3r1n3rwgxigSnWgggHXzZdBT/fxA="; }; @@ -27,6 +27,7 @@ buildGoModule rec { meta = with lib; { description = "HTTP(S)/WS(S)/TCP Tunnels to localhost"; homepage = "https://github.com/antoniomika/sish"; + changelog = "https://github.com/antoniomika/sish/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From b3842c2439dc36152a8a01165964fdd9074f9596 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 11 Jul 2023 09:38:35 -0400 Subject: [PATCH 3/3] sish: add version test --- pkgs/tools/networking/sish/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/networking/sish/default.nix b/pkgs/tools/networking/sish/default.nix index cdd670f3156a..0bcf6bff9431 100644 --- a/pkgs/tools/networking/sish/default.nix +++ b/pkgs/tools/networking/sish/default.nix @@ -1,6 +1,8 @@ { lib , buildGoModule , fetchFromGitHub +, testers +, sish }: buildGoModule rec { @@ -24,6 +26,12 @@ buildGoModule rec { "-X=github.com/antoniomika/sish/cmd.Version=${version}" ]; + passthru.tests = { + version = testers.testVersion { + package = sish; + }; + }; + meta = with lib; { description = "HTTP(S)/WS(S)/TCP Tunnels to localhost"; homepage = "https://github.com/antoniomika/sish";