ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-17 14:19:58 +03:00
Code Issues Projects Releases Wiki Activity

Updating openssh, fixing libedit for openssh to link well with it, and... here we

Browse Source 
finally have sftp with some kind of 'readline'!

svn path=/nixpkgs/trunk/; revision=21246
This commit is contained in:
Lluís Batlle i Rossell 2010-04-22 18:16:18 +00:00
parent 1bf1500d39
commit 5d04ec0364
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libedit/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses }: { stdenv, fetchurl, ncurses}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libedit-20090923-3.0"; name = "libedit-20090923-3.0";
@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "02j66qbd1c9wfghpjb8dzshkcj4i0n9xanxy81552j3is9ilxjka"; sha256 = "02j66qbd1c9wfghpjb8dzshkcj4i0n9xanxy81552j3is9ilxjka";
}; };
postInstall = ''
sed -i s/-lcurses/-lncurses/g $out/lib/pkgconfig/libedit.pc
'';
propagatedBuildInputs = [ ncurses ]; propagatedBuildInputs = [ ncurses ];
meta = { meta = {

11
pkgs/tools/networking/openssh/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib, openssl, perl { stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig
, pamSupport ? false, pam ? null , pamSupport ? false, pam ? null
, etcDir ? null , etcDir ? null
, hpnSupport ? false , hpnSupport ? false
@ -16,11 +16,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openssh-5.4p1"; name = "openssh-5.5p1";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.nluug.nl/pub/security/OpenSSH/${name}.tar.gz"; url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/${name}.tar.gz";
sha256 = "0kj0qp43dn2pnkcgrbbhm2r9db448ppsmmzh22mj8j0h0h6yg5mf"; sha256 = "12kywhjnz6w6kx5fk526fhs2xc7rf234hwrms9p1hqv6zrpdvvin";
}; };
patchPhase = stdenv.lib.optionalString hpnSupport patchPhase = stdenv.lib.optionalString hpnSupport
@ -29,12 +29,13 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = buildInputs =
[ zlib openssl perl ] [ zlib openssl perl libedit pkgconfig ]
++ stdenv.lib.optional pamSupport pam; ++ stdenv.lib.optional pamSupport pam;
configureFlags = configureFlags =
'' ''
--with-mantype=man --with-mantype=man
--with-libedit=yes
${if pamSupport then "--with-pam" else "--without-pam"} ${if pamSupport then "--with-pam" else "--without-pam"}
${if etcDir != null then "--sysconfdir=${etcDir}" else ""} ${if etcDir != null then "--sysconfdir=${etcDir}" else ""}
''; '';

2
pkgs/top-level/all-packages.nix
View File

@ -1274,7 +1274,7 @@ let
}; };
openssh = import ../tools/networking/openssh { openssh = import ../tools/networking/openssh {
inherit fetchurl stdenv zlib openssl pam perl; inherit fetchurl stdenv zlib openssl pam perl libedit pkgconfig;
pamSupport = getPkgConfig "openssh" "pam" true; pamSupport = getPkgConfig "openssh" "pam" true;
hpnSupport = getPkgConfig "openssh" "hpn" false; hpnSupport = getPkgConfig "openssh" "hpn" false;
etcDir = getPkgConfig "openssh" "etcDir" "/etc/ssh"; etcDir = getPkgConfig "openssh" "etcDir" "/etc/ssh";