diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 03ccad62723e..e25993483f9d 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -214,16 +214,13 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = - with lib; - { - description = "Implementation of the SSH protocol${extraDesc}"; - homepage = "https://www.openssh.com/"; - changelog = "https://www.openssh.com/releasenotes.html"; - license = licenses.bsd2; - platforms = platforms.unix ++ platforms.windows; - maintainers = (extraMeta.maintainers or [ ]) ++ (with maintainers; [ aneeshusa ]); - mainProgram = "ssh"; - } - // extraMeta; + meta = { + description = "Implementation of the SSH protocol${extraDesc}"; + homepage = "https://www.openssh.com/"; + changelog = "https://www.openssh.com/releasenotes.html"; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix ++ lib.platforms.windows; + maintainers = extraMeta.maintainers or [ ]; + mainProgram = "ssh"; + } // extraMeta; }) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index d8237cae7a3c..7654eacaca5b 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -19,7 +19,7 @@ in }; extraPatches = [ ./ssh-keysign-8.5.patch ]; - extraMeta.maintainers = lib.teams.helsinki-systems.members; + extraMeta.maintainers = lib.teams.helsinki-systems.members ++ [ lib.maintainers.philiptaron ]; }; openssh_hpn = common rec {