From 88ae01f67969a7b5b798f8fd3944591cc54fa1f7 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 20 Sep 2021 10:15:03 +0300 Subject: [PATCH] =?UTF-8?q?sslh:=201.21c=20=E2=86=92=201.22c?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/sslh/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index e7637e26f14..6add47454c2 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -1,17 +1,19 @@ -{ lib, stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre, nixosTests }: +{ lib, stdenv, fetchFromGitHub, libcap, libconfig, perl, tcp_wrappers, pcre2, nixosTests }: stdenv.mkDerivation rec { pname = "sslh"; - version = "1.21c"; + version = "1.22c"; - src = fetchurl { - url = "https://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz"; - sha256 = "01p7w74ppszxgz6n41lqd6xqvc7bjk2dsc769dd1yb7q4qvpiziv"; + src = fetchFromGitHub { + owner = "yrutschle"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-A+nUWiOPoz/T5afZUzt5In01e049TgHisTF8P5Vj180="; }; postPatch = "patchShebangs *.sh"; - buildInputs = [ libcap libconfig perl tcp_wrappers pcre ]; + buildInputs = [ libcap libconfig perl tcp_wrappers pcre2 ]; makeFlags = [ "USELIBCAP=1" "USELIBWRAP=1" ];