From 334dfc3086444e72e3ec3426dcb58ae9d8cf9392 Mon Sep 17 00:00:00 2001 From: Diego Zamboni Date: Thu, 21 Sep 2017 22:23:16 +0200 Subject: [PATCH 1/2] assh: init at 2.6.0 Powerful wrapper around ssh. --- lib/maintainers.nix | 1 + pkgs/tools/networking/assh/default.nix | 28 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 pkgs/tools/networking/assh/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e9cf58c5baa..a256f4444e7 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -662,4 +662,5 @@ zoomulator = "Kim Simmons "; zraexy = "David Mell "; zx2c4 = "Jason A. Donenfeld "; + zzamboni = "Diego Zamboni "; } diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix new file mode 100644 index 00000000000..bbed205cce8 --- /dev/null +++ b/pkgs/tools/networking/assh/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "assh-${version}"; + version = "2.6.0"; + + goPackagePath = "github.com/moul/advanced-ssh-config"; + subPackages = [ "cmd/assh" ]; + + postInstall = stdenv.lib.optionalString (stdenv.isDarwin) '' + install_name_tool -delete_rpath $out/lib $bin/bin/assh + ''; + + src = fetchFromGitHub { + repo = "advanced-ssh-config"; + owner = "moul"; + rev = "v${version}"; + sha256 = "1vv98dz5822k51xklnmky0lwfjw8nc6ryvn8lmv9n63ppwh9s2s6"; + }; + + meta = with stdenv.lib; { + description = "Advanced SSH config - Regex, aliases, gateways, includes and dynamic hosts"; + homepage = https://github.com/moul/advanced-ssh-config; + license = licenses.mit; + maintainers = with maintainers; [ zzamboni ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b75752bd42..ac78881d723 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1234,6 +1234,8 @@ with pkgs; autossh = callPackage ../tools/networking/autossh { }; + assh = callPackage ../tools/networking/assh { }; + asynk = callPackage ../tools/networking/asynk { }; bacula = callPackage ../tools/backup/bacula { }; From 81569ecd722c466d3753caef0806adb12b8f3595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 21 Sep 2017 23:03:55 +0100 Subject: [PATCH 2/2] assh: add openssh to PATH --- pkgs/tools/networking/assh/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index bbed205cce8..1de87e07e04 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }: buildGoPackage rec { name = "assh-${version}"; @@ -7,8 +7,13 @@ buildGoPackage rec { goPackagePath = "github.com/moul/advanced-ssh-config"; subPackages = [ "cmd/assh" ]; + nativeBuildInputs = [ makeWrapper ]; + postInstall = stdenv.lib.optionalString (stdenv.isDarwin) '' install_name_tool -delete_rpath $out/lib $bin/bin/assh + '' + '' + wrapProgram "$bin/bin/assh" \ + --prefix PATH : ${openssh}/bin ''; src = fetchFromGitHub {