From 3603f5536ee0223f2e15ca6c518ab922030646dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 22:32:37 +0100 Subject: gnu: wabt: Use Texinfo mark-up. * gnu/packages/web.scm (wabt)[description]: Mark up more better. --- gnu/packages/web.scm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2b9836ecc4..dc67dbd547 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1095,16 +1095,21 @@ for efficient socket-like bidirectional reliable communication channels.") (description "WABT (pronounced: wabbit) is a suite of tools for WebAssembly, including: -* wat2wasm: translate from WebAssembly text format to the WebAssembly binary - format -* wasm2wat: the inverse of wat2wasm, translate from the binary format back - to the text format (also known as a .wat) -* wasm-objdump: print information about a wasm binary. Similar to objdump. -* wasm-interp: decode and run a WebAssembly binary file using a stack-based - interpreter -* wat-desugar: parse .wat text form as supported by the spec interpreter - (s-expressions, flat syntax, or mixed) and print canonical flat format -* wasm2c: convert a WebAssembly binary file to a C source and header +@enumerate +@item @command{wat2wasm} translates from WebAssembly text format to the +WebAssembly binary format +@item @command{wasm2wat} is the inverse; it translates from the binary format +back to the text format (also known as a .wat) +@item @command{wasm-objdump} prints information about a wasm binary, similarly +to @command{objdump}. +@item @command{wasm-interp} decodes ands run a WebAssembly binary file using a +stack-based interpreter +@item @command{wat-desugar} parses .wat text form as supported by the spec +interpreter (s-expressions, flat syntax, or mixed) and prints the canonical +flat format +@item @command{wasm2c} converts a WebAssembly binary file to a C source and +header file. +@end enumerate These tools are intended for use in (or for development of) toolchains or other systems that want to manipulate WebAssembly files.") -- cgit v1.2.3 From 1f634b81597b378b99da44bf8850155d99d25476 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 21:53:40 +0100 Subject: gnu: nginx: Update to 1.17.8. * gnu/packages/web.scm (nginx): Update to 1.17.8. --- 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 dc67dbd547..2c977baf14 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -219,14 +219,14 @@ Interface} specification.") ;; ’stable’ and recommends that “in general you deploy the NGINX mainline ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/) ;; Consider updating the nginx-documentation package together with this one. - (version "1.17.7") + (version "1.17.8") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "1zwiqljhzf0ym6r3hrg6k2qfb2mxi7i0lpafg4xnkr875225c9xn")))) + "0nwn4md8sxhks2j77qq1nvk5pfz3yykfhh2b507b6l2idp7kxllp")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("pcre" ,pcre) -- cgit v1.2.3 From 90d192b2f7f060e4d2e5c827533e6fe0545a04ba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 22 Feb 2020 23:33:38 +0100 Subject: gnu: wslay: Fix build. * gnu/packages/web.scm (wslay)[arguments]: Don't build in parallel. --- gnu/packages/web.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2c977baf14..4976059203 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1163,10 +1163,13 @@ high performance.") (sha256 (base32 "0ak9a6hsanhys40yhv7c2gqkfghpm6jx36j1pnml8ajvgaky5q98")))) (build-system gnu-build-system) + (arguments + ;; Parallel builds don't reliably succeed. + `(#:parallel-build? #f)) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("cunit" ,cunit) ; For tests. + ("cunit" ,cunit) ; for tests ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx))) -- cgit v1.2.3 From bbd804b29bbb9bc7739688bca192eb83d0edb882 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Feb 2020 16:15:47 +0100 Subject: gnu: nghttp2: Add version 1.40.0. * gnu/packages/web.scm (nghttp2-1.40): New public variable. --- gnu/packages/web.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4976059203..2be3dfefe4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016 Bake Timmons ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2020 Marius Bakke ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017 Petter ;;; Copyright © 2017 Pierre Langlois @@ -7025,6 +7025,20 @@ compressed JSON header blocks. (base32 "12yfsjghbaypp4w964d45ih9vs38g6anih80wbsflaxx192idlm2")))))) +;; 'Node' requires this newer version, to be removed on the next rebuild cycle. +(define-public nghttp2-1.40 + (package/inherit + nghttp2 + (version "1.40.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/nghttp2/nghttp2/" + "releases/download/v" version "/" + "nghttp2-" version ".tar.xz")) + (sha256 + (base32 + "0wwhwv7cvi1vxpdjwvg0kpa4jzhszclpnwrwfcw728zz53a47z09")))))) + (define-public hpcguix-web (let ((commit "f39c90b35e99e4122b0866ec4337020d61c81508") (revision "4")) -- cgit v1.2.3 From a64cef121a9e3753f41c9541239c0ccfba57b3ae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 28 Feb 2020 00:47:15 +0100 Subject: gnu: nghttp2@1.40: Do not inherit the replacement field. * gnu/packages/web.scm (nghttp2-1.40): Use INHERIT instead of PACKAGE/INHERIT. --- 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 2be3dfefe4..1ada569834 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7027,8 +7027,8 @@ compressed JSON header blocks. ;; 'Node' requires this newer version, to be removed on the next rebuild cycle. (define-public nghttp2-1.40 - (package/inherit - nghttp2 + (package + (inherit nghttp2) (version "1.40.0") (source (origin (method url-fetch) -- cgit v1.2.3 From 9b17c4f7b8a7665e9c0ddce71dc5c35467c6eda1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Feb 2020 13:53:14 +0100 Subject: gnu: Add lighttpd. * gnu/packages/web.scm (lighttpd): New variable. --- gnu/packages/web.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1ada569834..c6e59cff44 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013 Aljosha Papsch ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016 Mark H Weaver -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2018 Raoul Jean Pierre Bonnal ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Eric Bavier @@ -114,12 +114,14 @@ #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) #:use-module (gnu packages libunistring) + #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages lua) #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) #:use-module (gnu packages nss) + #:use-module (gnu packages openldap) #:use-module (gnu packages openstack) #:use-module (gnu packages base) #:use-module (gnu packages package-management) @@ -548,6 +550,67 @@ supported at your website.") ;; binary: (package-license nginx))))))) +(define-public lighttpd + (package + (name "lighttpd") + (version "1.4.55") + (source (origin + (method url-fetch) + (uri (string-append "https://download.lighttpd.net/lighttpd/" + "releases-" (version-major+minor version) ".x/" + "lighttpd-" version ".tar.xz")) + (sha256 + (base32 + "09z947730yjh438wrqb3z1c5hr1dbb11a8sr92g3vk6mr7lm02va")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--with-krb5" + "--with-ldap" + "--with-libev" + "--with-libunwind" + "--with-openssl" + "--with-pam" + "--with-sasl") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'embed-/bin/sh-reference + (lambda _ + (substitute* "src/mod_ssi.c" + (("/bin/sh") (which "sh"))) + #t)) + (add-after 'unpack 'fix-tests + (lambda _ + (setenv "SHELL" (which "sh")) + ;; gethostbyaddr fails + (substitute* "tests/LightyTest.pm" + (("\\{HOSTNAME\\} = \\$name;") + "{HOSTNAME} = \"127.0.0.1\";")) + #t))))) + (inputs + `(("cyrus-sasl" ,cyrus-sasl) + ("libev" ,libev) + ("libunwind" ,libunwind) + ("linux-pam" ,linux-pam) + ("mit-krb5" ,mit-krb5) + ("openldap" ,openldap) + ("openssl" ,openssl) + ("pcre" ,pcre) + ("pcre:bin" ,pcre "bin") + ("zlib" ,zlib))) + (native-inputs + `(("perl" ,perl) ; for tests + ("pkg-config" ,pkg-config) + ("which" ,which))) + (home-page "https://www.lighttpd.net/") + (synopsis "Lightweight HTTP and reverse proxy server") + (description + "Lighttpd is a secure, fast, compliant, and very flexible web-server that +has been optimized for high-performance environments. It has a very low +memory footprint compared to other webservers. Its features include FastCGI, +CGI, authentication, output compression, URL rewriting and many more.") + (license license:bsd-3))) + (define-public fcgi (package (name "fcgi") -- cgit v1.2.3