swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-11-06 02:06:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
[staging] openssh: 8.7p1 -> 8.8p1
This commit is contained in:
Lassulus 2021-09-30 22:16:03 +02:00 committed by GitHub
parent 598bfc7b6b 1b41f51b96
commit af098586e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/tools/networking/openssh/common.nix
View file

@ -122,7 +122,7 @@ stdenv.mkDerivation rec {
changelog = "https://www.openssh.com/releasenotes.html";
license = licenses.bsd2;
platforms = platforms.unix ++ platforms.windows;
maintainers = with maintainers; [ eelco aneeshusa ];
maintainers = (extraMeta.maintainers or []) ++ (with maintainers; [ eelco aneeshusa ]);
mainProgram = "ssh";
} // extraMeta;
}

7
pkgs/tools/networking/openssh/default.nix
View file

@ -1,4 +1,4 @@
{ callPackage, fetchurl, fetchpatch, fetchFromGitHub, autoreconfHook }:
{ callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, autoreconfHook }:
let
common = opts: callPackage (import ./common.nix opts) { };
in
@ -6,14 +6,15 @@ in
openssh = common rec {
pname = "openssh";
version = "8.7p1";
version = "8.8p1";
src = fetchurl {
url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
sha256 = "090yxpi03pxxzb4ppx8g8hdpw7c4nf8p0avr6c7ybsaana5lp8vw";
sha256 = "1s8z6f7mi1pwsl79cqai8cr350m5lf2ifcxff57wx6mvm478k425";
};
extraPatches = [ ./ssh-keysign-8.5.patch ];
extraMeta.maintainers = with lib.maintainers; [ das_j ];
};
openssh_hpn = common rec {