diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-22 21:44:33 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-22 21:44:33 +0000 |
| commit | 6f2fac6466cbc684f01093364e60bb96b79c120f (patch) | |
| tree | 2b0ee90e26a0d6ed8a081351299a66daf35ef9f9 /pkgs/tools/networking/openssh/default.nix | |
| parent | 6d62947d71342aa29441a720d4eeb2f003126c76 (diff) | |
| parent | 93d2b4b7bfe5c78e36c93f94a0c057cde04b580f (diff) | |
| download | nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.gz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.bz2 nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.lz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.xz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.zst nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.zip | |
Merging from trunk.
I hope I resolved the conflicts well (gmp and gccCross) svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
Diffstat (limited to 'pkgs/tools/networking/openssh/default.nix')
| -rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index a46762a4a4f..cd3074546f4 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, openssl, perl +{ stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig , pamSupport ? false, pam ? null , etcDir ? null , hpnSupport ? false @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { - name = "openssh-5.3p1"; + name = "openssh-5.5p1"; src = fetchurl { - url = "ftp://ftp.nluug.nl/pub/security/OpenSSH/${name}.tar.gz"; - sha256 = "04pgqmb43p5lr5wrfnvyys8r504brghshm24n60495wn5131gjfh"; + url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz"; + sha256 = "12kywhjnz6w6kx5fk526fhs2xc7rf234hwrms9p1hqv6zrpdvvin"; }; patchPhase = stdenv.lib.optionalString hpnSupport @@ -29,12 +29,13 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ zlib openssl perl ] + [ zlib openssl perl libedit pkgconfig ] ++ stdenv.lib.optional pamSupport pam; configureFlags = '' --with-mantype=man + --with-libedit=yes ${if pamSupport then "--with-pam" else "--without-pam"} ${if etcDir != null then "--sysconfdir=${etcDir}" else ""} ''; |