diff options
Diffstat (limited to 'gnu/packages/web.scm')
| -rw-r--r-- | gnu/packages/web.scm | 85 |
1 files changed, 46 insertions, 39 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 158d542d7f..f7f8e157e5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -164,17 +164,17 @@ and its related documentation.") (name "mod-wsgi") (version "4.5.22") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/GrahamDumpleton/mod_wsgi/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/GrahamDumpleton/mod_wsgi.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0n1yhmrfp8mjbsngmyjl937c6rc0069p6wdi1lknrbn1q42hzw6q")))) + "1q90xw2cbhka5gcd6yc69iir73x4gm7fm75qpkins2ryfl6w1q3f")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ;; TODO: Can't figure out if there are tests + '(#:tests? #f ; TODO: can't figure out if there are tests #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out")) @@ -413,16 +413,16 @@ APIs.") (version "1.1.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/gnosek/fcgiwrap/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/gnosek/fcgiwrap.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "07y6s4mm86cv7p1ljz94sxnqa89y9amn3vzwsnbq5hrl4vdy0zac")))) + (base32 "1ryw66h9aazi83amk8l7ha8k5g0c7qvk5g6jv376a1ws9xk2qw6f")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests included + `(#:tests? #f ; no tests included #:make-flags (list "CC=gcc"))) (native-inputs `(("autoconf" ,autoconf) @@ -620,17 +620,17 @@ project) (name "qjson") (version "0.9.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/flavio/qjson/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/flavio/qjson.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1m0h4rajj99hv9w4i381a8x81lxiv167lxk10ncvphpkfxs624p8")))) + "1f4wnxzx0qdmxzc7hqk28m0sva7z9p9xmxm6aifvjlp0ha6pmfxs")))) (build-system cmake-build-system) (arguments - ;; The tests require a X server + ;; The tests require a running X server. `(#:configure-flags '("-DQJSON_BUILD_TESTS=ON" "-DCMAKE_CXX_FLAGS=-std=gnu++11 -fPIC") #:phases @@ -747,14 +747,14 @@ current version of any major web browser.") (name "rapidjson") (version "1.1.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/miloyip/rapidjson/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/miloyip/rapidjson.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "13nrpvw8f1wx0ga7svbzld7pgrv8l172nangpipnj7jaf0lysz5z")) + "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab")) (modules '((guix build utils))) (snippet '(begin @@ -786,13 +786,14 @@ style API.") (name "libyajl") (version "2.1.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/lloyd/yajl/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/lloyd/yajl.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0nmcqpaiq4pv7dymyg3n3jsd57yhp5npxl26a1hzw3m3lmj37drz")))) + "00yj06drb6izcxfxfqlhimlrb089kka0w0x8k27pyzyiq7qzcvml")))) (build-system cmake-build-system) (arguments '(#:phases @@ -992,13 +993,14 @@ of people.") (name "websockify") (version "0.8.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/novnc/websockify/archive/v" - version "/archive.tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/novnc/websockify.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1kjq6gibsvbb6zx5gi8hgh7110x62pbwcqkwapf3k7s27w5y907h")))) + "0pcic8qs0gdwrfjgfaf893jyddaw97wcjm2mmvwn0xyhmy8mbmw1")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; FIXME: 2 out of 6 tests fail with "ImportError: No module @@ -4779,13 +4781,13 @@ deployments.") (package (name "varnish") (home-page "https://varnish-cache.org/") - (version "6.0.0") + (version "6.1.1") (source (origin (method url-fetch) (uri (string-append home-page "_downloads/varnish-" version ".tgz")) (sha256 (base32 - "1vhbdch33m6ig4ijy57zvrramhs9n7cba85wd8rizgxjjnf87cn7")))) + "0gf9hzzrr1lndbbqi8cwlfasi7l517cy3nbgna88i78lm247rvp0")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") @@ -4793,6 +4795,10 @@ deployments.") (string-append "PTHREAD_CC=" (assoc-ref %build-inputs "gcc") "/bin/gcc") + ;; XXX: Disable PCRE-JIT to work around a segmentation + ;; fault when using jemalloc 5.x: + ;; <https://github.com/varnishcache/varnish-cache/issues/2817> + "--disable-pcre-jit" "--localstatedir=/var") #:phases (modify-phases %standard-phases @@ -4827,6 +4833,7 @@ deployments.") #t)))))) (native-inputs `(("pkg-config" ,pkg-config) + ("python-sphinx" ,python-sphinx) ("rst2man" ,python-docutils))) (inputs `(("jemalloc" ,jemalloc) |