public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #99959 from helsinki-systems/upd/openssh

Browse Source 
[staging] openssh: 8.3p1 -> 8.4p1
This commit is contained in:
Andreas Rammhold 2020-11-03 16:00:31 +01:00 committed by GitHub
commit be6e50a3ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,13 +19,13 @@
let let
version = "8.3p1"; version = "8.4p1";
# **please** update this patch when you update to a new openssh release. # **please** update this patch when you update to a new openssh release.
gssapiPatch = fetchpatch { gssapiPatch = fetchpatch {
name = "openssh-gssapi.patch"; name = "openssh-gssapi.patch";
url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-1/debian/patches/gssapi.patch"; url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-2/debian/patches/gssapi.patch";
sha256 = "0j22ccg6msyi88mpsb6x0il5cg8v2b7qdah57ninbwx5isyld80l"; sha256 = "1z1ckzimlkm1dmr9f5fqjnjg28gsqcwx6xka0klak857548d2lp2";
}; };
in in
@ -37,12 +37,12 @@ stdenv.mkDerivation rec {
src = if hpnSupport then src = if hpnSupport then
fetchurl { fetchurl {
url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz"; url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz";
sha256 = "1ssdwgdxnvjwigisqi8c053znps5a4jf7bzsi99y0xyfzbw0x55k"; sha256 = "06mr2q8d9kbj145r7mzmpm3a4ilnssibwlbjyy0bjsqrqnrll3zl";
} }
else else
fetchurl { fetchurl {
url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz"; url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz";
sha256 = "1cl74ghi9y21dc3f4xa0qamb7dhwacbynh1ks9syprrg8zhgpgpj"; sha256 = "091b3pxdlj47scxx6kkf4agkx8c8sdacdxx8m1dw1cby80pd40as";
}; };
patches = patches =