diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-19 17:08:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-19 17:08:00 +0000 |
| commit | e2bb7997c49d47dc1184bfb85741fcf0e6e97d9d (patch) | |
| tree | d5f25accdea8a4c9b7304ea0341412db52f5bf62 /pkgs/tools/networking/openssh | |
| parent | d43df749ac4779cdb3f53146c8c1ef66b4f33e33 (diff) | |
| parent | e89c396d660e39d71e6a8ab88175405e75952138 (diff) | |
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts: nixos/doc/manual/release-notes/rl-2111.section.md
Diffstat (limited to 'pkgs/tools/networking/openssh')
| -rw-r--r-- | pkgs/tools/networking/openssh/common.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 40011a14c8930..eaa42039dbaaa 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -123,5 +123,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ eelco aneeshusa ]; + mainProgram = "ssh"; } // extraMeta; } |