diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2022-11-05 13:43:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-05 13:43:09 -0500 |
| commit | c4b49b957bfd008a77be9188be0b43a34d5fd01e (patch) | |
| tree | 06e4463f92d29ad96f172dfb022e5c9b3a79ce62 | |
| parent | ad09e418b4b9c7bf6be6627df4ce5e59359f1bbc (diff) | |
| parent | ed9bd02e77a8d0b2d8657b3d3c8acb8383ecabca (diff) | |
Merge pull request #199557 from fabaff/httping-bump
httping: 2.5 -> 2.9
| -rw-r--r-- | pkgs/tools/networking/httping/default.nix | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index 77f2b52890e0..195f739aa5ae 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -1,26 +1,34 @@ -{ lib, stdenv, fetchurl, fetchpatch, gettext, libintl, ncurses, openssl -, fftw ? null }: +{ lib +, stdenv +, fetchFromGitHub +, fftw ? null +, gettext +, libintl +, ncurses +, openssl +}: stdenv.mkDerivation rec { pname = "httping"; - version = "2.5"; + version = "2.9"; - src = fetchurl { - url = "https://vanheusden.com/httping/${pname}-${version}.tgz"; - sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y"; + src = fetchFromGitHub { + owner = "folkertvanheusden"; + repo = "HTTPing"; + rev = "v${version}"; + hash = "sha256-aExTXXtW03UKMuMjTMx1k/MUpcRMh1PdSPkDGH+Od70="; }; - patches = [ - # Upstream fix for ncurses-6.3. - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/folkertvanheusden/HTTPing/commit/4ea9d5b78540c972e3fe1bf44db9f7b3f87c0ad0.patch"; - sha256 = "0w3kdkq6c6hz1d9jjnw0ldvd6dy39yamj8haf0hvcyb1sb67qjmp"; - }) + nativeBuildInputs = [ + gettext ]; - buildInputs = [ fftw libintl ncurses openssl ]; - nativeBuildInputs = [ gettext ]; + buildInputs = [ + fftw + libintl + ncurses + openssl + ]; makeFlags = [ "DESTDIR=$(out)" @@ -36,7 +44,7 @@ stdenv.mkDerivation rec { the transmission across the network also takes time! So it measures the latency of the webserver + network. It supports IPv6. ''; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = []; platforms = platforms.linux ++ platforms.darwin; }; |