1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 03:30:45 +00:00

Merge pull request #300106 from anthonyroussel/upgrade/httping

httping: 2.9 -> 3.6
This commit is contained in:
Weijia Wang 2024-06-20 14:59:36 +02:00 committed by GitHub
commit ba66cae43e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 71 additions and 65 deletions

View file

@ -0,0 +1,71 @@
{
cmake,
fetchFromGitHub,
fftw,
gettext,
lib,
libintl,
ncurses,
nix-update-script,
openssl,
stdenv,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "httping";
version = "3.6";
src = fetchFromGitHub {
owner = "folkertvanheusden";
repo = "HTTPing";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-lDgQC3VzfcLqMOQSaRZ/znMamAAGYq/9C9bHgI4G7B8=";
};
nativeBuildInputs = [
cmake
gettext
];
buildInputs = [
fftw
libintl
ncurses
openssl
];
cmakeFlags = [
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
];
installPhase = ''
runHook preInstall
install -D httping $out/bin/httping
runHook postInstall
'';
passthru = {
tests.version = testers.testVersion {
command = "${lib.getExe finalAttrs.finalPackage} --version";
package = finalAttrs.finalPackage;
};
updateScript = nix-update-script { };
};
meta = {
changelog = "https://github.com/folkertvanheusden/HTTPing/releases/tag/v${finalAttrs.version}";
description = "Ping with HTTP requests";
homepage = "https://vanheusden.com/httping";
license = lib.licenses.agpl3Only;
longDescription = ''
Give httping an url, and it'll show you how long it takes to connect,
send a request and retrieve the reply (only the headers). Be aware that
the transmission across the network also takes time! So it measures the
latency of the webserver + network. It supports IPv6.
'';
mainProgram = "httping";
maintainers = [ lib.maintainers.anthonyroussel ];
platforms = lib.platforms.linux;
};
})

View file

@ -1,63 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, fftw ? null
, gettext
, libintl
, ncurses
, openssl
}:
stdenv.mkDerivation rec {
pname = "httping";
version = "2.9";
src = fetchFromGitHub {
owner = "folkertvanheusden";
repo = "HTTPing";
rev = "v${version}";
hash = "sha256-aExTXXtW03UKMuMjTMx1k/MUpcRMh1PdSPkDGH+Od70=";
};
patches = [
# Pull upstream fix for missing <unistd.h>
# https://github.com/folkertvanheusden/HTTPing/pull/8
(fetchpatch {
name = "add-unistd.patch";
url = "https://github.com/folkertvanheusden/HTTPing/commit/aad3c275686344fe9a235faeac4ee3832f3aa8d5.patch";
hash = "sha256-bz3AMQTSfSTwUyf9WbkAFWVmFo06ei+Qd55x+RRDREY=";
})
];
nativeBuildInputs = [
gettext
];
buildInputs = [
fftw
libintl
ncurses
openssl
];
makeFlags = [
"DESTDIR=$(out)"
"PREFIX="
];
meta = with lib; {
homepage = "https://vanheusden.com/httping";
description = "ping with HTTP requests";
longDescription = ''
Give httping an url, and it'll show you how long it takes to connect,
send a request and retrieve the reply (only the headers). Be aware that
the transmission across the network also takes time! So it measures the
latency of the webserver + network. It supports IPv6.
'';
license = licenses.agpl3Only;
maintainers = [];
platforms = platforms.linux ++ platforms.darwin;
mainProgram = "httping";
};
}

View file

@ -8961,8 +8961,6 @@ with pkgs;
httpie = with python3Packages; toPythonApplication httpie;
httping = callPackage ../tools/networking/httping { };
httplz = callPackage ../tools/networking/httplz { };
httpfs2 = callPackage ../tools/filesystems/httpfs { };