diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-19 11:02:20 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-19 11:03:10 +0100 |
| commit | 3a1d3990e5c12566f9a0552107523b725469e413 (patch) | |
| tree | 5c74aa609a7883d23a3ae64e0fcc612abfde238c /pkgs/tools/networking/openssh | |
| parent | cde20d69515e38b2fd45f4aa1387f52edb02885c (diff) | |
| download | nixlib-3a1d3990e5c12566f9a0552107523b725469e413.tar nixlib-3a1d3990e5c12566f9a0552107523b725469e413.tar.gz nixlib-3a1d3990e5c12566f9a0552107523b725469e413.tar.bz2 nixlib-3a1d3990e5c12566f9a0552107523b725469e413.tar.lz nixlib-3a1d3990e5c12566f9a0552107523b725469e413.tar.xz nixlib-3a1d3990e5c12566f9a0552107523b725469e413.tar.zst nixlib-3a1d3990e5c12566f9a0552107523b725469e413.zip | |
openssh: Just use a mirror of the HPN patch
Diffstat (limited to 'pkgs/tools/networking/openssh')
| -rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 78294d529a7c..2d60b0f0e304 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,30 +1,13 @@ -{ stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig, pam, curl +{ stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig, pam , etcDir ? null , hpnSupport ? false }: let - # Ugly download - hpnSrc = stdenv.mkDerivation { - name = "openssh-6.1p1-hpn13v14.diff.gz"; - - buildInputs = [ curl ]; - - url = "http://www.psc.edu/index.php/component/remository/HPN-SSH/OpenSSH-6.1-Patches/HPN-SSH-Kitchen-Sink-Patch-for-OpenSSH-6.1/"; - - phases = [ "installPhase" ]; - - installPhase = '' - URL2=$(curl -c cookies.jar "$url" | grep "window.location" | - sed 's,.*\(http:/.*\)'"'"'},\1,') - URL3=$(curl -b cookies.jar -c cookies.jar "$URL2" | grep "window.location" | - sed 's,.*\(http:/.*\)'"'"'},\1,') - curl -b cookies.jar "$URL3" > $out - ''; - - outputHashAlgo = "sha256"; - outputHash = "14das6lim6fxxnx887ssw76ywsbvx3s4q3n43afgh5rgvs4xmnnq"; + hpnSrc = fetchurl { + url = http://nixos.org/tarballs/openssh-6.1p1-hpn13v14.diff.gz; + sha256 = "14das6lim6fxxnx887ssw76ywsbvx3s4q3n43afgh5rgvs4xmnnq"; }; in @@ -42,7 +25,7 @@ stdenv.mkDerivation rec { gunzip -c ${hpnSrc} | patch -p1 export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" ''; - + patches = [ ./locale_archive.patch ]; buildNativeInptus = [ perl ]; |