From cfaa89b03ba45b142be130d79de9fb6b8d2e0154 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 19 Sep 2021 19:10:58 +0200 Subject: [PATCH] openssh-portable: switch to fetchFromGitHub --- pkgs/tools/networking/openssh/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 4cc943fc75f5..2652f6823425 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 = [