diff options
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/networking/sshpass/default.nix | 18 |
2 files changed, 20 insertions, 3 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index fec6679a14b0..a894de647588 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -10,8 +10,8 @@ assert withKerberos -> kerberos != null; let hpnSrc = fetchurl { - url = mirror://sourceforge/hpnssh/openssh-6.3p1-hpnssh14v2.diff.gz; - sha256 = "1jldqjwry9qpxxzb3mikfmmmv90mfb7xkmcfdbvwqac6nl3r7bi3"; + url = mirror://sourceforge/hpnssh/openssh-6.6p1-hpnssh14v5.diff.gz; + sha256 = "682b4a6880d224ee0b7447241b684330b731018585f1ba519f46660c10d63950"; }; optionalString = stdenv.lib.optionalString; @@ -83,6 +83,5 @@ stdenv.mkDerivation rec { license = "bsd"; # multi BSD GPL-2 platforms = platforms.unix; maintainers = with maintainers; [ eelco ]; - broken = hpnSupport; # cf. https://github.com/NixOS/nixpkgs/pull/1640 }; } diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix new file mode 100644 index 000000000000..3a8e106155f3 --- /dev/null +++ b/pkgs/tools/networking/sshpass/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "sshpass-${version}"; + version = "1.05"; + + src = fetchurl { + url = "mirror://sourceforge/sshpass/sshpass-${version}.tar.gz"; + sha256 = "0gj8r05h1hy01vh4csygyw21z2hcxb72qcxkxxi3y34alr98gxy3"; + }; + + meta = { + homepage = http://sourceforge.net/projects/sshpass/; + description = "Non-interactive ssh password auth"; + maintainers = [ stdenv.lib.maintainers.madjar ]; + platforms = stdenv.lib.platforms.linux; + }; +} |