From 35891e5f6561d3888760ef998b89d5d00e0add2c Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 2 Jun 2025 16:01:46 +0000 Subject: [PATCH 1/3] passh: remove usage of pname --- pkgs/by-name/pa/passh/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pa/passh/package.nix b/pkgs/by-name/pa/passh/package.nix index 16e203f76155..97608a37b2b5 100644 --- a/pkgs/by-name/pa/passh/package.nix +++ b/pkgs/by-name/pa/passh/package.nix @@ -4,7 +4,7 @@ stdenv, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "passh"; version = "2020-03-18"; @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' mkdir -p $out/bin - cp ${finalAttrs.pname} $out/bin + cp passh $out/bin ''; meta = with lib; { @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Sshpass alternative for non-interactive ssh auth"; license = licenses.gpl3; maintainers = [ maintainers.lovesegfault ]; - mainProgram = finalAttrs.pname; + mainProgram = "passh"; platforms = platforms.unix; }; -}) +} From 577800ddf86def28940810038313d0fd15c69a86 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 3 Jun 2025 14:19:11 +0000 Subject: [PATCH 2/3] passh: add hooks to script --- pkgs/by-name/pa/passh/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pa/passh/package.nix b/pkgs/by-name/pa/passh/package.nix index 97608a37b2b5..1d91a2258d1d 100644 --- a/pkgs/by-name/pa/passh/package.nix +++ b/pkgs/by-name/pa/passh/package.nix @@ -16,16 +16,17 @@ stdenv.mkDerivation { }; installPhase = '' - mkdir -p $out/bin - cp passh $out/bin + runHook preInstall + install -Dm755 passh $out/bin/passh + runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/clarkwang/passh"; description = "Sshpass alternative for non-interactive ssh auth"; - license = licenses.gpl3; - maintainers = [ maintainers.lovesegfault ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.lovesegfault ]; mainProgram = "passh"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } From c23d05cc867dd05d2aaa181c8ff08f9bbd9e5016 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 3 Jun 2025 14:26:56 +0000 Subject: [PATCH 3/3] passh: Update gpl3 license from nixpkgs-hammering --- pkgs/by-name/pa/passh/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pa/passh/package.nix b/pkgs/by-name/pa/passh/package.nix index 1d91a2258d1d..a2e8b0a8d58b 100644 --- a/pkgs/by-name/pa/passh/package.nix +++ b/pkgs/by-name/pa/passh/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/clarkwang/passh"; description = "Sshpass alternative for non-interactive ssh auth"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.lovesegfault ]; mainProgram = "passh"; platforms = lib.platforms.unix;