diff options
| author | Janne Heß <janne@hess.ooo> | 2023-02-02 16:18:12 +0100 |
|---|---|---|
| committer | Janne Heß <janne@hess.ooo> | 2023-02-02 16:33:11 +0100 |
| commit | b0252da854375c8e574e5e72649b7a7370c41a8c (patch) | |
| tree | 0c996218489ff455a5e52e87bb3fa20c9ab00ea2 | |
| parent | Merge pull request #214064 from mweinelt/pyopenssl-23.0.0 (diff) | |
| download | nixpkgs-origin/upd/openssh-92.tar.gz | |
openssh: 9.1p1 -> 9.2p1origin/upd/openssh-92
Changelog: https://www.openssh.com/txt/release-9.2
This also introduces a backwards-incompatible config change that is
reverted in the config for convenience.
| -rw-r--r-- | nixos/modules/programs/ssh.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 36b724e04bde..22e657d7a522 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -310,6 +310,8 @@ in XAuthLocation ${pkgs.xorg.xauth}/bin/xauth ''} + EnableEscapeCommandline yes + ForwardX11 ${if cfg.forwardX11 then "yes" else "no"} ${optionalString (cfg.pubkeyAcceptedKeyTypes != []) "PubkeyAcceptedKeyTypes ${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"} diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index f9ad037d55da..24e4a0ec2ead 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -6,11 +6,11 @@ in openssh = common rec { pname = "openssh"; - version = "9.1p1"; + version = "9.2p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-GfhQCcfj4jeH8CNvuxV4OSq01L+fjsX+a8HNfov90og="; + hash = "sha256-P2bb8WVftF9Q4cVtpiqwEhjCKIB7ITONY068351xz0Y="; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; |