From 683b48c4ab14eb2c3a0fbd3dc8d8b2aec3ffd099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 13 Aug 2024 16:26:20 +0200 Subject: [PATCH] ssh-tools: 1.7 -> 1.8-unstable-2024-03-18 --- pkgs/applications/misc/ssh-tools/default.nix | 36 +++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/ssh-tools/default.nix b/pkgs/applications/misc/ssh-tools/default.nix index 2e79f69656f9..3e0b7e50d93e 100644 --- a/pkgs/applications/misc/ssh-tools/default.nix +++ b/pkgs/applications/misc/ssh-tools/default.nix @@ -1,24 +1,36 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitea, installShellFiles, perl }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "ssh-tools"; - version = "1.7"; + version = "1.8-unstable-2024-03-18"; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "codeberg.org"; owner = "vaporup"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-PDoljR/e/qraPhG9RRjHx1gBIMtTJ815TZDJws8Qg6o="; + repo = "ssh-tools"; + rev = "69c73844b2498c46f1293b129808bfdce8822c28"; + hash = "sha256-cG75Jn331G0HZZyrE+JWC05f6DgYBz6sx8MTCxsG/vw="; }; - installPhase = '' - mkdir -p $out/bin - cp ssh-* $out/bin/ + vendorHash = "sha256-GSFhz3cIRl4XUA18HUeUkrw+AJyOkU3ZrZKYTGsWbug="; + + subPackages = [ + "cmd/go/ssh-authorized-keys" + "cmd/go/ssh-sig" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ perl ]; + + postInstall = '' + install cmd/{bash,perl}/ssh-*/ssh-* -t $out/bin + installManPage man/*.1 ''; meta = with lib; { - description = "Collection of various tools using ssh"; - homepage = "https://github.com/vaporup/ssh-tools/"; + description = "Making SSH more convenient"; + homepage = "https://codeberg.org/vaporup/ssh-tools"; license = licenses.gpl3Only; maintainers = with maintainers; [ SuperSandro2000 ]; };