From 0a04ac1735b0edef12044916fef0933fe594e994 Mon Sep 17 00:00:00 2001 From: Limbo Peng Date: Thu, 11 Oct 2018 00:36:26 +0000 Subject: [PATCH 1/2] httping: add libintl to buildInputs on Darwin Otherwise it won't compile. --- pkgs/tools/networking/httping/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index bfe9f115133c3..7c24cd013bf5d 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, ncurses, openssl +{ stdenv, fetchurl, gettext, libintl, ncurses, openssl , fftw ? null }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y"; }; - buildInputs = [ fftw ncurses openssl ]; + buildInputs = [ fftw libintl ncurses openssl ]; nativeBuildInputs = [ gettext ]; makeFlags = [ @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { ''; license = licenses.agpl3; maintainers = with maintainers; [ rickynils ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From acc43c2e495bdb8487fa4d5602b029789bef612d Mon Sep 17 00:00:00 2001 From: Limbo Peng Date: Sun, 14 Oct 2018 06:19:32 +0000 Subject: [PATCH 2/2] httping: fix URLs --- pkgs/tools/networking/httping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index 7c24cd013bf5d..abde3f2a380d1 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "2.5"; src = fetchurl { - url = "https://www.vanheusden.com/httping/${name}.tgz"; + url = "https://vanheusden.com/httping/${name}.tgz"; sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.vanheusden.com/httping; + 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,