diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-02-13 17:39:36 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-14 00:13:06 +0100 |
| commit | cb94d5e161a3ba80a2ca1f62590e16ac07289a25 (patch) | |
| tree | 47dd2c590280ee82188047d56820cc04b8fdf402 /gnu/packages/web.scm | |
| parent | 95991e4517de2b04ddb9f0cc27087d578e15b4e8 (diff) | |
| download | guix-cb94d5e161a3ba80a2ca1f62590e16ac07289a25.tar guix-cb94d5e161a3ba80a2ca1f62590e16ac07289a25.tar.gz | |
gnu: Varnish: Update to 6.1.1.
* gnu/packages/web.scm (varnish): Update to 6.1.1.
[native-inputs]: Add PYTHON-SPHINX.
[arguments]: Add "--disable-pcre-jit" to #:configure-flags.
Diffstat (limited to 'gnu/packages/web.scm')
| -rw-r--r-- | gnu/packages/web.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5f95fa3a23..f7f8e157e5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4781,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") @@ -4795,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 @@ -4829,6 +4833,7 @@ deployments.") #t)))))) (native-inputs `(("pkg-config" ,pkg-config) + ("python-sphinx" ,python-sphinx) ("rst2man" ,python-docutils))) (inputs `(("jemalloc" ,jemalloc) |