From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: [PATCH] gnu: Add httpstat. Date: Tue, 27 Dec 2016 17:01:18 +0100 Message-ID: <87zijhwecx.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <87k2aq1hda.fsf@xsteve.at> <87inq9o15y.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <87fulatoqd.fsf@xsteve.at> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cLuBo-0000ts-C9 for guix-devel@gnu.org; Tue, 27 Dec 2016 11:01:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cLuBl-0007ey-9y for guix-devel@gnu.org; Tue, 27 Dec 2016 11:01:24 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:39539) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cLuBl-0007eo-6f for guix-devel@gnu.org; Tue, 27 Dec 2016 11:01:21 -0500 In-Reply-To: <87fulatoqd.fsf@xsteve.at> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Stefan =?utf-8?Q?Reich=C3=B6r?= , guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Stefan Reich=C3=B6r writes: > Hi Marius! > >> Stefan Reich=C3=B6r writes: >> >>> From 06958884c4a29f43b9ade58a950b95bf9046d9f4 Mon Sep 17 00:00:00 2001 >>> From: Stefan Reichoer >>> Date: Fri, 23 Dec 2016 22:06:15 +0100 >>> Subject: [PATCH] gnu: Add httpstat. >>> >>> * gnu/packages/networking.scm (httpstat): New variable. >>> --- >>> gnu/packages/networking.scm | 21 ++++++++++++++++++++- >>> 1 file changed, 20 insertions(+), 1 deletion(-) >> >> Thanks for this patch! Since it has a hard dependency on curl to >> function, I think we should patch it with curl as input so that the user >> don't have to install curl separately. Can you try that? >> >> Typically this involves adding a substitution to the code that invokes >> `curl` and replacing it with '(string-append (assoc-ref inputs "curl") >> "/bin/curl")'. >> >> TIA! >> > > Good idea - thanks for your feedback! > > Here is my attempt to use the guix provided curl package: Thanks! I altered the description to be a little more informative and ran the indentation through emacs. Pushed! > > From f4ed7438a254e0496518008ca368e1394cce34ce Mon Sep 17 00:00:00 2001 > From: Stefan Reichoer > Date: Mon, 26 Dec 2016 21:22:19 +0100 > Subject: [PATCH] gnu: Add httpstat. > > * gnu/packages/networking.scm (httpstat): New variable. > --- > gnu/packages/networking.scm | 33 ++++++++++++++++++++++++++++++++- > 1 file changed, 32 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm > index 2a5ff09..174d0b3 100644 > --- a/gnu/packages/networking.scm > +++ b/gnu/packages/networking.scm > @@ -2,7 +2,7 @@ > ;;; Copyright =C2=A9 2014 Ludovic Court=C3=A8s > ;;; Copyright =C2=A9 2015, 2016 Ricardo Wurmus > ;;; Copyright =C2=A9 2015 Mark H Weaver > -;;; Copyright =C2=A9 2015 Stefan Reich=C3=B6r > +;;; Copyright =C2=A9 2015, 2016 Stefan Reich=C3=B6r > ;;; Copyright =C2=A9 2016 Raimon Grau > ;;; Copyright =C2=A9 2016 Tobias Geerinckx-Rice > ;;; Copyright =C2=A9 2016 John Darrington > @@ -34,6 +34,7 @@ > #:use-module (guix download) > #:use-module (guix build-system glib-or-gtk) > #:use-module (guix build-system gnu) > + #:use-module (guix build-system python) > #:use-module (gnu packages) > #:use-module (gnu packages admin) > #:use-module (gnu packages adns) > @@ -43,6 +44,7 @@ > #:use-module (gnu packages check) > #:use-module (gnu packages code) > #:use-module (gnu packages compression) > + #:use-module (gnu packages curl) > #:use-module (gnu packages databases) > #:use-module (gnu packages flex) > #:use-module (gnu packages gettext) > @@ -549,6 +551,35 @@ by firewalls or when you want to monitor the respons= e time of the actual web > application stack itself.") > (license license:gpl2))) ; with permission to link with OpenS= SL >=20=20 > +(define-public httpstat > + (package > + (name "httpstat") > + (version "1.2.1") > + (source > + (origin > + (method url-fetch) > + (uri (pypi-uri "httpstat" version)) > + (sha256 > + (base32 > + "1chw2nk56vaq87aba012a270k9na06hfx1pfbsrc3jfvlc2kb9hb")))) > + (build-system python-build-system) > + (inputs `(("curl" ,curl))) > + (arguments > + '(#:phases > + (modify-phases %standard-phases > + (add-before 'build 'fix-curl-path > + (lambda* (#:key inputs #:allow-other-keys) > + (substitute* "httpstat.py" > + (("ENV_CURL_BIN.get\\('curl'\\)") > + (string-append "ENV_CURL_BIN.get('" > + (assoc-ref inputs "curl") > + "/bin/curl')")))))))) > + (home-page "https://github.com/reorx/httpstat") > + (synopsis "Visualize curl statistics") > + (description > + "httpstat visualizes curl statistics in a way of beauty and clarity= .") > + (license license:expat))) > + > (define-public bwm-ng > (package > (name "bwm-ng") > --=20 > 2.7.4 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlhikE4ACgkQoqBt8qM6 VPpq3QgAoD530Z4ahH5nFJ44gk5tSykp+GGmzzJW4ML176Yjw5HIlB+4BNWT9nw2 fPYoOMWCdGNl/tiQVehz8YjR4lTSCwnkhhdSL/rFvTCUCHqp6GIvChOeSqrRhbz0 BJQRYrovlXSjf1V2ixOGxQRbJRb3KbgZb4ITfr5gFElyII1bWG9EbMRTYLsfJH2g PgNk7RZoNI5bkVbpxrf0a9B0igQUIBrAht90voc/wRhWvZyoweVvw28410RFztuw DzCZgCBRNgLo+sQ6Du+HQF/6lH2F1IYDpQexOy70qsIZYoYZSjQjPLRrQ5u5c/ML NsssAjzdfjGnR930aWZ/dw80K5lP0Q== =QnU5 -----END PGP SIGNATURE----- --=-=-=--