From 6f8d1f72743e2faa44b28a80fafb35254279fd1b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Feb 2018 06:49:41 +0100 Subject: gnu: perl-http-server-simple: Update to 0.52. * gnu/packages/web.scm (perl-http-server-simple): Update to 0.52. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 801741dd22..5bcdf28f7d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2848,7 +2848,7 @@ (define-public perl-http-request-ascgi (define-public perl-http-server-simple (package (name "perl-http-server-simple") - (version "0.51") + (version "0.52") (source (origin (method url-fetch) @@ -2856,7 +2856,7 @@ (define-public perl-http-server-simple "HTTP-Server-Simple-" version ".tar.gz")) (sha256 (base32 - "1yvd2g57z2kq00q5i3zzfi15k98qgbif3vghjsda6v612agmrp5r")))) + "0k6bg7k6mjixfzxdkkdrhqvaqmdhjszx0zsk8g0bimiby6j9z4yq")))) (build-system perl-build-system) (propagated-inputs `(("perl-cgi" ,perl-cgi))) -- cgit v1.2.3 From 12505baed9dfa179a8cb47e128a8e028d1699d3d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Feb 2018 06:50:17 +0100 Subject: gnu: perl-net-smtp-ssl: Update to 1.04. * gnu/packages/web.scm (perl-net-smtp-ssl): Update to 1.04. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5bcdf28f7d..d597d2bfb6 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3208,7 +3208,7 @@ (define-public perl-net-server (define-public perl-net-smtp-ssl (package (name "perl-net-smtp-ssl") - (version "1.03") + (version "1.04") (source (origin (method url-fetch) @@ -3216,7 +3216,7 @@ (define-public perl-net-smtp-ssl "Net-SMTP-SSL-" version ".tar.gz")) (sha256 (base32 - "05y94mb1vdw32mvwb0cp2h4ggh32f8j8nwwfjb8kjwxvfkfhyp9h")))) + "001a6dcfahf7kkyirqkc8jd4fh4fkal7n7vm9c4dblqrvmdc8abv")))) (build-system perl-build-system) (propagated-inputs `(("perl-io-socket-ssl" ,perl-io-socket-ssl))) -- cgit v1.2.3 From 4ff3484f1e7d0dccd67a94ae805d4ea41cdf675c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 25 Feb 2018 16:31:50 +0100 Subject: gnu: libpsl: Update to 0.20.0. * gnu/packages/web.scm (libpsl): Update to 0.20.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d597d2bfb6..b5a54f686b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -796,7 +796,7 @@ (define-public libwebsockets (define-public libpsl (package (name "libpsl") - (version "0.19.1") + (version "0.20.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/rockdaboot/libpsl/" @@ -804,7 +804,7 @@ (define-public libpsl "/libpsl-" version ".tar.gz")) (sha256 (base32 - "0ydwi9m39qv6k7zagqx2kzxzf59ipxj9r0c71xmwngdx3fslclbk")))) + "0rsjm6mb71nnj6ikr2dq5qmny314v3j7m07zz1i7m6v8hxxm98i7")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 0ae079ec2abdd64a937b80dcd59d6a75545ac3b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 25 Feb 2018 17:46:16 +0100 Subject: gnu: Add nghttp2. * gnu/packages/web.scm (nghttp2): New public variable. --- gnu/packages/web.scm | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b5a54f686b..26768ccc1e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -60,6 +60,7 @@ (define-module (gnu packages web) #:use-module (guix build-system ant) #:use-module (guix build-system scons) #:use-module (gnu packages) + #:use-module (gnu packages adns) #:use-module (gnu packages apr) #:use-module (gnu packages check) #:use-module (gnu packages cran) @@ -83,8 +84,10 @@ (define-module (gnu packages web) #:use-module (gnu packages gtk) #:use-module (gnu packages java) #:use-module (gnu packages javascript) + #:use-module (gnu packages jemalloc) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) #:use-module (gnu packages libunistring) #:use-module (gnu packages lisp) @@ -6343,3 +6346,84 @@ (define-public cat-avatar-generator ;; expat for the code, CC-BY 4.0 for the artwork (license (list l:expat l:cc-by4.0)))) + +(define-public nghttp2 + (package + (name "nghttp2") + (version "1.30.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/nghttp2/nghttp2/" + "releases/download/v" version "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1b2j7il0wp8hi4jl3cah7fkshmg29cchdski9cw74gx5496gp6h8")))) + (build-system gnu-build-system) + (outputs (list "out" + "lib")) ; only libnghttp2 + (native-inputs + `(("pkg-config" ,pkg-config) + + ;; Required by tests. + ("cunit" ,cunit) + ("tzdata" ,tzdata))) + (inputs + ;; Required to build the tools (i.e. without ‘--enable-lib-only’). + `(("c-ares" ,c-ares) + ("jansson" ,jansson) ; for HPACK tools + ("jemalloc" ,jemalloc) ; fight nghttpd{,x} heap fragmentation + ("libev" ,libev) + ("libxml2" ,libxml2) ; for ‘nghttp -a’ + ("openssl" ,openssl))) + (arguments + `(#:configure-flags + (list (string-append "--libdir=" (assoc-ref %outputs "lib") "/lib") + "--enable-app" ; build all the tools + "--enable-hpack-tools" ; ...all the tools + "--disable-examples" + "--disable-static") ; don't bother building .a files + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'break-circular-reference + ;; libnghttp2.pc by default retains a reference to the ‘out’ output, + ;; which is not allowed. Break this cycle. While we could install + ;; only the library to ‘out’ and move everything else to a separate + ;; output, this would inconvenience the majority of (human) users. + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "lib/libnghttp2.pc.in" + (("@prefix@") + (assoc-ref outputs "lib"))) + #t)) + (add-before 'check 'set-timezone-directory + (lambda* (#:key inputs #:allow-other-keys) + (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")) + #t))))) + (home-page "https://nghttp2.org/") + (synopsis "HTTP/2 protocol client, proxy, server, and library") + (description + "nghttp2 implements the Hypertext Transfer Protocol, version +2 (@dfn{HTTP/2}). + +A reusable C library provides the HTTP/2 framing layer, with several tools built +on top of it: + +@itemize +@item @command{nghttp}, a command-line HTTP/2 client. It exposes many advanced +and low-level aspects of the protocol and is useful for debugging. +@item @command{nghttpd}, a fast, multi-threaded HTTP/2 static web server that +serves files from a local directory. +@item @command{nghttpx}, a fast, multi-threaded HTTP/2 reverse proxy that can be +deployed in front of existing web servers that don't support HTTP/2. +Both @command{nghttpd} and @command{nghttpx} can fall back to HTTP/1.1 for +backwards compatibilty with clients that don't speak HTTP/2. +@item @command{h2load} for benchmarking (only!) your own HTTP/2 servers. +@item HTTP/2 uses a header compression method called @dfn{HPACK}. +nghttp2 provides a HPACK encoder and decoder as part of its public API. +@item @command{deflatehd} converts JSON data or HTTP/1-style header fields to +compressed JSON header blocks. +@item @command{inflatehd} converts such compressed headers back to JSON pairs. +@end itemize\n") + (license l:expat))) -- cgit v1.2.3 From 971d232b27099f86194a69b616bc33f292e0edeb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 28 Feb 2018 02:10:48 +0100 Subject: gnu: r-httpuv: Update to 1.3.6. * gnu/packages/web.scm (r-httpuv): Update to 1.3.6. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 26768ccc1e..4876918b53 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3780,13 +3780,13 @@ (define-public python2-feedparser (define-public r-httpuv (package (name "r-httpuv") - (version "1.3.5") + (version "1.3.6") (source (origin (method url-fetch) (uri (cran-uri "httpuv" version)) (sha256 (base32 - "1sg4f223zfyd265b28rlhsn3b6mqflcpnmya98cjmjncmy9vjdj3")))) + "1nzbcw1dm4l5qc9156kz95rdb8bwnpdr57wfc87w8arv7m0i40bc")))) (build-system r-build-system) (native-inputs `(("r-rcpp" ,r-rcpp))) (home-page "https://github.com/rstudio/httpuv") -- cgit v1.2.3 From b79e1fbe962c0ba9134ffb7d1250170aaeafdecf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 1 Mar 2018 21:19:21 +0100 Subject: gnu: r-httpuv: Update to 1.3.6.1. * gnu/packages/web.scm (r-httpuv): Update to 1.3.6.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4876918b53..e3412f60e2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3780,13 +3780,13 @@ (define-public python2-feedparser (define-public r-httpuv (package (name "r-httpuv") - (version "1.3.6") + (version "1.3.6.1") (source (origin (method url-fetch) (uri (cran-uri "httpuv" version)) (sha256 (base32 - "1nzbcw1dm4l5qc9156kz95rdb8bwnpdr57wfc87w8arv7m0i40bc")))) + "11kffpki4pgh352dlwsm4lnf1dcd5vs51cnimbshadyk3jprwxdf")))) (build-system r-build-system) (native-inputs `(("r-rcpp" ,r-rcpp))) (home-page "https://github.com/rstudio/httpuv") -- cgit v1.2.3 From 6fda93e6c8aa25c2b482a0502be9d39335ed2172 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 2 Mar 2018 05:16:00 +0100 Subject: gnu: libpsl: Update to 0.20.1. * gnu/packages/web.scm (libpsl): Update to 0.20.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index e3412f60e2..f9b7e3f70f 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -799,7 +799,7 @@ (define-public libwebsockets (define-public libpsl (package (name "libpsl") - (version "0.20.0") + (version "0.20.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/rockdaboot/libpsl/" @@ -807,7 +807,7 @@ (define-public libpsl "/libpsl-" version ".tar.gz")) (sha256 (base32 - "0rsjm6mb71nnj6ikr2dq5qmny314v3j7m07zz1i7m6v8hxxm98i7")))) + "17r18y25ka2ck2ykfidbg4a7jpyzmkqwrzplgqjp7mwd2l9rc6cm")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From b01a1b34f2345e66e2ba4b647fca75e7951567d6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 2 Mar 2018 05:16:27 +0100 Subject: gnu: nghttp2: Update to 1.31.0. * gnu/packages/web.scm (nghttp2): Update to 1.31.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f9b7e3f70f..760f4ef2ab 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6350,7 +6350,7 @@ (define-public cat-avatar-generator (define-public nghttp2 (package (name "nghttp2") - (version "1.30.0") + (version "1.31.0") (source (origin (method url-fetch) @@ -6359,7 +6359,7 @@ (define-public nghttp2 name "-" version ".tar.xz")) (sha256 (base32 - "1b2j7il0wp8hi4jl3cah7fkshmg29cchdski9cw74gx5496gp6h8")))) + "1ivs74v9sa2sds3dq0s7vn9bkmhr2hgwyg1an1rah3agqwnkqmrn")))) (build-system gnu-build-system) (outputs (list "out" "lib")) ; only libnghttp2 -- cgit v1.2.3 From ec8b3d48ff7f73f772e4e254c58f118935070189 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 3 Mar 2018 10:40:05 +0100 Subject: gnu: r-httpuv: Update to 1.3.6.2. * gnu/packages/web.scm (r-httpuv): Update to 1.3.6.2. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 760f4ef2ab..23bcc5fb1c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3780,13 +3780,13 @@ (define-public python2-feedparser (define-public r-httpuv (package (name "r-httpuv") - (version "1.3.6.1") + (version "1.3.6.2") (source (origin (method url-fetch) (uri (cran-uri "httpuv" version)) (sha256 (base32 - "11kffpki4pgh352dlwsm4lnf1dcd5vs51cnimbshadyk3jprwxdf")))) + "0h3hkw575b211bxma23inbq1565wkhiapgasd539h219apqs534f")))) (build-system r-build-system) (native-inputs `(("r-rcpp" ,r-rcpp))) (home-page "https://github.com/rstudio/httpuv") -- cgit v1.2.3 From 530df311ac0f04d5bddf2d538d060440b9850cd1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 5 Mar 2018 00:03:17 +0100 Subject: gnu: perl-www-mechanize: Update to 1.87. * gnu/packages/web.scm (perl-www-mechanize): Update to 1.87. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 23bcc5fb1c..07e4a1ad93 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3657,7 +3657,7 @@ (define-public perl-www-curl (define-public perl-www-mechanize (package (name "perl-www-mechanize") - (version "1.86") + (version "1.87") (source (origin (method url-fetch) @@ -3665,7 +3665,7 @@ (define-public perl-www-mechanize "WWW-Mechanize-" version ".tar.gz")) (sha256 (base32 - "0sfl6b7mx8nannnh3ys5jk44d1s1b2d1mffrnrphkzzykaw6hm0f")))) + "1kxrydhl7nxlyjv0xvyiyj4igdv4fwnggv0ihlp79bysbjjl54w1")))) (build-system perl-build-system) (native-inputs ;only for tests `(("perl-cgi" ,perl-cgi) -- cgit v1.2.3 From 55b7cd10c28934aaea144c06e5d4a8bb8b88bfbb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 5 Mar 2018 00:04:17 +0100 Subject: gnu: perl-io-socket-ip: Update to 0.39. * gnu/packages/web.scm (perl-io-socket-ip): Update to 0.39. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 07e4a1ad93..cfae9f9253 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2933,7 +2933,7 @@ (define-public perl-io-html (define-public perl-io-socket-ip (package (name "perl-io-socket-ip") - (version "0.38") + (version "0.39") (source (origin (method url-fetch) @@ -2941,7 +2941,7 @@ (define-public perl-io-socket-ip "IO-Socket-IP-" version ".tar.gz")) (sha256 (base32 - "0scsnahxwnymg80a3k0p0cnr574nk7x9inn9wjniz0iycicclyhb")))) + "15kv5g1yb4a345sk3r5wfr99f868lhfqkddzsgpqddvccfkhv58i")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/IO-Socket-IP") -- cgit v1.2.3 From 875fe4b6b625fe4626403b42da72d5c20265d41f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 8 Mar 2018 12:40:22 +0100 Subject: gnu: nghttp2: Use a fixed variant of tzdata for tests. * gnu/packages/web.scm (nghttp2)[native-inputs]: Replace TZDATA with TZDATA-FOR-TESTS. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index cfae9f9253..f5e004eda5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6368,7 +6368,7 @@ (define-public nghttp2 ;; Required by tests. ("cunit" ,cunit) - ("tzdata" ,tzdata))) + ("tzdata" ,tzdata-for-tests))) (inputs ;; Required to build the tools (i.e. without ‘--enable-lib-only’). `(("c-ares" ,c-ares) -- cgit v1.2.3 From da0baf117d740320b0e2733137611a8059b0abba Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:35:31 +0200 Subject: gnu: mod-wsgi: Declare a source file-name. * gnu/packages/web.scm (mod-wsgi)[source]: Declare a source file-name. --- gnu/packages/web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f5e004eda5..3fb860a8e3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -159,6 +159,7 @@ (define-public mod-wsgi (uri (string-append "https://github.com/GrahamDumpleton/mod_wsgi/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0n1yhmrfp8mjbsngmyjl937c6rc0069p6wdi1lknrbn1q42hzw6q")))) -- cgit v1.2.3 From 716a39bcf15e2d05709d8757e994a1613cefc95e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:36:22 +0200 Subject: gnu: tidy: Declare a source file-name. * gnu/packages/web.scm (tidy)[source]: Declare a source file-name. --- gnu/packages/web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3fb860a8e3..1cf426b5c0 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -846,6 +846,7 @@ (define-public tidy ":pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy") (module "tidy") (revision "2009-12-23"))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "14dsnmirjcrvwsffqp3as70qr6bbfaig2fv3zvs5g7005jrsbvpb")) -- cgit v1.2.3 From 295fbbd75d753ffbb84fb78edd2d92c0275c170f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Mar 2018 10:21:18 +0100 Subject: gnu: geomyidae: Update to 0.31. * gnu/packages/web.scm (geomyidae): Update to 0.31. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1cf426b5c0..ceb7d9b7c7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6274,7 +6274,7 @@ (define-public perl-html-tidy (define-public geomyidae (package (name "geomyidae") - (version "0.29") + (version "0.31") (source (origin (method url-fetch) @@ -6282,7 +6282,7 @@ (define-public geomyidae "geomyidae-" version ".tar.bz2")) (sha256 (base32 - "0qxgxp6psfrgfqhndyq2z54nb1qrmvvljddnxdwp207jbz366bja")))) + "1ih7220c6mgq4r7blm4kx3pxbl53sph58lqgwci6cmi3c0sq5c3x")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "CC=gcc" -- cgit v1.2.3