diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-09-23 00:01:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-23 00:01:50 +0000 |
| commit | 796a5df129d52d7a7913355130c86add2145a494 (patch) | |
| tree | 746f8c988cc42cfd78204dad0bc2c86baecfb6fc /pkgs/tools/networking/openssh | |
| parent | 314e0f22d87ea7e8f3dc63273e59a033f956377b (diff) | |
| parent | ed4f741c9c7ff7d2283d216debd3a721fd1b6ec2 (diff) | |
| download | nixpkgs-796a5df129d52d7a7913355130c86add2145a494.tar nixpkgs-796a5df129d52d7a7913355130c86add2145a494.tar.gz nixpkgs-796a5df129d52d7a7913355130c86add2145a494.tar.bz2 nixpkgs-796a5df129d52d7a7913355130c86add2145a494.tar.lz nixpkgs-796a5df129d52d7a7913355130c86add2145a494.tar.xz nixpkgs-796a5df129d52d7a7913355130c86add2145a494.tar.zst nixpkgs-796a5df129d52d7a7913355130c86add2145a494.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/networking/openssh')
| -rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 0126219042c..b57633b750f 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,7 +1,8 @@ -{ callPackage, fetchurl, fetchpatch, autoreconfHook }: +{ callPackage, fetchurl, fetchpatch, fetchFromGitHub, autoreconfHook }: let - common = opts: callPackage (import ./common.nix opts) {}; -in { + common = opts: callPackage (import ./common.nix opts) { }; +in +{ openssh = common rec { pname = "openssh"; @@ -20,9 +21,11 @@ in { version = "8.4p1"; extraDesc = " with high performance networking patches"; - src = fetchurl { - url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${builtins.replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz"; - sha256 = "1x2afjy1isslbg7qlvhhs4zhj2c8q2h1ljz0fc5b4h9pqcm9j540"; + src = fetchFromGitHub { + owner = "rapier1"; + repo = "openssh-portable"; + rev = "hpn-KitchenSink-${builtins.replaceStrings [ "." "p" ] [ "_" "_P" ] version}"; + hash = "sha256-SYQPDGxZR41m4g603RaZaOYm4vCr9uZnFnZoKhruueY="; }; extraPatches = [ |