From a197d74ed5ec5029671d0b09de1785b4b1735241 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Dec 2024 03:10:17 +0000 Subject: [PATCH 1/2] sshocker: 0.3.4 -> 0.3.5 --- pkgs/by-name/ss/sshocker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ss/sshocker/package.nix b/pkgs/by-name/ss/sshocker/package.nix index 412d73e7d601..4e25276a4cc2 100644 --- a/pkgs/by-name/ss/sshocker/package.nix +++ b/pkgs/by-name/ss/sshocker/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sshocker"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "lima-vm"; repo = "sshocker"; rev = "refs/tags/v${version}"; - hash = "sha256-IDbGRQSLQlT4lt2bextGYB4fJfbpLhPx3JF1eYDJ6gw="; + hash = "sha256-Q+g48Mm3JsFz9zTsFFypgp7RtQL/03EbVGAwnXLE8fA="; }; - vendorHash = "sha256-kee5D80RjCVosts/Jd6WuvtiK/J5+79HsM5ITHs15xc="; + vendorHash = "sha256-D4TJ8bIahv05cE6gvF6LmcU2RzV2krjtU8t8wD6R/lY="; ldflags = [ "-s" From 975b05b7c563111a0b3df219f5c2f2cbcb33f111 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Dec 2024 05:00:43 +0100 Subject: [PATCH 2/2] sshocker: add versionCheckHook --- pkgs/by-name/ss/sshocker/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ss/sshocker/package.nix b/pkgs/by-name/ss/sshocker/package.nix index 4e25276a4cc2..fe3b2eaa0a46 100644 --- a/pkgs/by-name/ss/sshocker/package.nix +++ b/pkgs/by-name/ss/sshocker/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, }: buildGoModule rec { @@ -17,18 +18,24 @@ buildGoModule rec { vendorHash = "sha256-D4TJ8bIahv05cE6gvF6LmcU2RzV2krjtU8t8wD6R/lY="; + nativeInstallCheckInputs = [ versionCheckHook ]; + ldflags = [ "-s" "-w" "-X=github.com/lima-vm/sshocker/pkg/version.Version=${version}" ]; + doInstallCheck = true; + + versionCheckProgramArg = [ "--version" ]; + meta = with lib; { description = "Tool for SSH, reverse sshfs and port forwarder"; - mainProgram = "sshocker"; homepage = "https://github.com/lima-vm/sshocker"; changelog = "https://github.com/lima-vm/sshocker/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + mainProgram = "sshocker"; }; }