diff options
| author | Shea Levy <shea@shealevy.com> | 2013-02-19 10:09:39 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2013-02-19 10:09:39 -0500 |
| commit | aacca1902cbb7117d978199323cf7bc1ffa4ee97 (patch) | |
| tree | 00d3f88fac66fd7cdd37d4e288145f24bbeb30f8 /pkgs/tools/networking/openssh | |
| parent | b6c71e6eb3ddd36073516de29c571efab6914613 (diff) | |
| parent | 7dfd7a93d43eb391e1177b881cc40ed47706ddca (diff) | |
| download | nixlib-aacca1902cbb7117d978199323cf7bc1ffa4ee97.tar nixlib-aacca1902cbb7117d978199323cf7bc1ffa4ee97.tar.gz nixlib-aacca1902cbb7117d978199323cf7bc1ffa4ee97.tar.bz2 nixlib-aacca1902cbb7117d978199323cf7bc1ffa4ee97.tar.lz nixlib-aacca1902cbb7117d978199323cf7bc1ffa4ee97.tar.xz nixlib-aacca1902cbb7117d978199323cf7bc1ffa4ee97.tar.zst nixlib-aacca1902cbb7117d978199323cf7bc1ffa4ee97.zip | |
Merge branch 'upstream-master' into stdenv-updates
Diffstat (limited to 'pkgs/tools/networking/openssh')
| -rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index d50811febbb5..1c0ed3c6e778 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -6,8 +6,8 @@ let hpnSrc = fetchurl { - url = http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.9p1-hpn13v12.diff.gz; - sha256 = "0h1h45vic4zks5bc5mvkc50rlgy2c219vn3rmpmalgm5hws9qjbl"; + url = http://nixos.org/tarballs/openssh-6.1p1-hpn13v14.diff.gz; + sha256 = "14das6lim6fxxnx887ssw76ywsbvx3s4q3n43afgh5rgvs4xmnnq"; }; in @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { gunzip -c ${hpnSrc} | patch -p1 export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" ''; - + patches = [ ./locale_archive.patch ]; buildInputs = [ zlib openssl libedit pkgconfig pam ]; |