diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-13 09:48:51 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-13 09:48:51 +0200 |
| commit | 71f67f178df91c42ff230c41ab724dd3a90a5bb5 (patch) | |
| tree | b55f27e4cc46982ebddabf4935268e4ea38610c9 /pkgs/tools/networking/openssh/default.nix | |
| parent | eeaf3a131fbe8611d59592ae2e215131b23c70e5 (diff) | |
| parent | 6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204 (diff) | |
| download | nixlib-71f67f178df91c42ff230c41ab724dd3a90a5bb5.tar nixlib-71f67f178df91c42ff230c41ab724dd3a90a5bb5.tar.gz nixlib-71f67f178df91c42ff230c41ab724dd3a90a5bb5.tar.bz2 nixlib-71f67f178df91c42ff230c41ab724dd3a90a5bb5.tar.lz nixlib-71f67f178df91c42ff230c41ab724dd3a90a5bb5.tar.xz nixlib-71f67f178df91c42ff230c41ab724dd3a90a5bb5.tar.zst nixlib-71f67f178df91c42ff230c41ab724dd3a90a5bb5.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/tools/networking/openssh/default.nix')
| -rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 04a77176682d..96bc2c56ece8 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { patches = [ + # Remove on update! + (fetchpatch { + name = "fix-tunnel-forwarding.diff"; + url = "https://github.com/openssh/openssh-portable/commit/cfb1d9bc767.diff"; + sha256 = "1mszj7f1kj6bazr7asbi1bi4238lfpilpp98f6c1dn3py4fbsdg8"; + }) + ./locale_archive.patch ./fix-host-key-algorithms-plus.patch |