diff options
| author | Aneesh Agrawal <aneeshusa@gmail.com> | 2017-10-05 15:45:38 -0400 |
|---|---|---|
| committer | Aneesh Agrawal <aneeshusa@gmail.com> | 2017-10-06 16:38:18 -0400 |
| commit | d473ef2ed2aa00e7c358ba4b64822057c4b6573f (patch) | |
| tree | 8be4dcdb1bd247ce25983a123c16e5a72f11e568 /pkgs/tools/networking/openssh | |
| parent | 1ff1c6ac4a4c8bc7f237bc14d5ff2ca336f3f610 (diff) | |
| download | nixpkgs-d473ef2ed2aa00e7c358ba4b64822057c4b6573f.tar nixpkgs-d473ef2ed2aa00e7c358ba4b64822057c4b6573f.tar.gz nixpkgs-d473ef2ed2aa00e7c358ba4b64822057c4b6573f.tar.bz2 nixpkgs-d473ef2ed2aa00e7c358ba4b64822057c4b6573f.tar.lz nixpkgs-d473ef2ed2aa00e7c358ba4b64822057c4b6573f.tar.xz nixpkgs-d473ef2ed2aa00e7c358ba4b64822057c4b6573f.tar.zst nixpkgs-d473ef2ed2aa00e7c358ba4b64822057c4b6573f.zip | |
openssh: 7.5p1 -> 7.6p1
Release notes are available at https://www.openssh.com/txt/release-7.6. Mostly a bugfix release, no major backwards-incompatible changes.
Diffstat (limited to 'pkgs/tools/networking/openssh')
| -rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 8343f23a1a0..037bb07922b 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -13,11 +13,11 @@ assert withGssapiPatches -> withKerberos; let # **please** update this patch when you update to a new openssh release. - gssapiSrc = fetchpatch { + gssapiPatch = fetchpatch { name = "openssh-gssapi.patch"; url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian" - + "/patches/gssapi.patch?id=db2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92"; - sha256 = "1rw10pmvjw55521ys59x1kabvbvmla506znakwwjijggdsakvsjm"; + + "/patches/gssapi.patch?id=1e0d55f9163793742d20eaadd4784db16fd3459d"; + sha256 = "130phj87q87p9crigd6852nnaqsqkfg09h45a32lk4524h9kkxgb"; }; in @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # Please ensure that openssh_with_kerberos still builds when # bumping the version here! name = "openssh-${version}"; - version = "7.5p1"; + version = if hpnSupport then "7.5p1" else "7.6p1"; src = if hpnSupport then fetchurl { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { else fetchurl { url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq"; + sha256 = "08qpsb8mrzcx8wgvz9insiyvq7sbg26yj5nvl2m5n57yvppcl8x3"; }; patches = @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch ] - ++ optional withGssapiPatches gssapiSrc; + ++ optional withGssapiPatches gssapiPatch; postPatch = # On Hydra this makes installation fail (sometimes?), |