From deb889e5f25a0505356bc4ad1f2258b5079060e9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 22 Oct 2007 11:41:30 +0000 Subject: [PATCH] * OpenSSH 4.7p1. Also pass --with-mantype=man to prevent an impurity where "make install" installs the manpages under either "man" or "cat" depending on whether it can run /usr/bin/groff (or something like that). svn path=/nixpkgs/trunk/; revision=9503 --- pkgs/tools/networking/openssh/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index d5bded9ea75..12e1594fdfb 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -5,11 +5,11 @@ assert pamSupport -> pam != null; stdenv.mkDerivation { - name = "openssh-4.6p1"; + name = "openssh-4.7p1"; src = fetchurl { - url = ftp://ftp.nluug.nl/pub/security/OpenSSH/openssh-4.6p1.tar.gz; - sha256 = "0fpjlr3bfind0y94bk442x2ps060byv1s4cnrgcxij40m9zjggkv"; + url = ftp://ftp.nluug.nl/pub/security/OpenSSH/openssh-4.7p1.tar.gz; + sha256 = "1g28npm025a5a8dd2g7sqz8nh8pwi7rvv9wdpy4jhzbkqvq36wfl"; }; buildInputs = [zlib openssl perl @@ -17,6 +17,7 @@ stdenv.mkDerivation { ]; configureFlags = " + --with-mantype=man ${if pamSupport then "--with-pam" else ""} "; @@ -29,7 +30,7 @@ stdenv.mkDerivation { # Install ssh-copy-id, it's very useful. cp contrib/ssh-copy-id $out/bin/ chmod +x $out/bin/ssh-copy-id - cp contrib/ssh-copy-id.1 $out/share/man/cat1/ + cp contrib/ssh-copy-id.1 $out/share/man/man1/ "; installTargets = "install-nokeys";