From fd46742dd2191c7762590a15bc054bbfd1feb3fc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Mar 2019 00:08:04 +0100 Subject: gnu: nginx: Update to 1.15.9. * gnu/packages/web.scm (nginx): Update to 1.15.9. --- gnu/packages/web.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d9b7def67b..e6f339f7b7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -194,16 +194,18 @@ (define-public mod-wsgi (define-public nginx (package (name "nginx") - ;; Consider updating the nginx-documentation package if the nginx package is - ;; updated. - (version "1.14.2") + ;; Track the ‘mainline’ branch. Upstream considers it more reliable than + ;; ’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.15.9") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "15wppq12qmq8acjs35xfj61czhf9cdc0drnl5mm8hcg3aihryb80")))) + "0hxfsz1117r91b9fb5hjddyrf1czvb36lh1z7zalqqdskfcbmkz4")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("pcre" ,pcre) -- cgit v1.2.3 From 266cd19eb93ed5e2430a3280666cb13128821749 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Mar 2019 00:23:53 +0100 Subject: gnu: nginx-documentation: Update to 2019-03-01-2345-7ef11708457e. * gnu/packages/web.scm (nginx-documentation): Update to 2019-03-01-2345-7ef11708457e. [arguments]: Simplify substitution. --- gnu/packages/web.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index e6f339f7b7..0d15981a56 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -329,13 +329,13 @@ (define nginx-xslscript (license l:bsd-2)))) (define-public nginx-documentation - ;; This documentation should be relevant for nginx@1.13.11. - (let ((revision 2131) - (changeset "dbaf3950f8e9")) + ;; This documentation should be relevant for nginx@1.15.9. + (let ((revision 2345) + (changeset "7ef11708457e")) (package (name "nginx-documentation") (version - (simple-format #f "2018-04-04-~A-~A" revision changeset)) + (simple-format #f "2019-03-01-~A-~A" revision changeset)) (source (origin (method hg-fetch) (uri (hg-reference @@ -344,7 +344,7 @@ (define-public nginx-documentation (file-name (string-append name "-" version)) (sha256 (base32 - "0acdjsdaqixzh9g9s6db552v4pan4nqrllyqapay9ns9yzh1hrp7")))) + "15975jvh53mnsgi4hhgrwdwy3by23v4kxnhy2vnkziq8v7wkmy4y")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no test suite @@ -362,8 +362,7 @@ (define-public nginx-documentation ;; banner. (substitute* "xslt/style.xslt" (("#banner \\{ background: black;") - "#banner { background: black; - display: none;")) + "#banner { display: none;")) (invoke "make") #t))) (replace 'install -- cgit v1.2.3 From dbfb24824bfc7f5cfe6913ff2ec06f7a33e49895 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Mar 2019 00:56:04 +0100 Subject: gnu: stunnel: Update to 5.50. * gnu/packages/web.scm (stunnel): Update to 5.50. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0d15981a56..463f18b7f0 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4764,15 +4764,14 @@ (define-public httptunnel (define-public stunnel (package (name "stunnel") - (version "5.48") + (version "5.50") (source (origin (method url-fetch) (uri (string-append "https://www.stunnel.org/downloads/stunnel-" version ".tar.gz")) (sha256 - (base32 - "1pxqn9ixl80nrhfq12igyi874653jclji56hh9w24snf0aixa48h")))) + (base32 "0j811iakljjxw39qchmqf235jdkwixb0i4xxjyi55f08558947cm")))) (build-system gnu-build-system) (native-inputs ;; For tests. -- cgit v1.2.3 From 22656b24d817944aa12af1444243a3f52bc00a84 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 Mar 2019 14:28:02 +0100 Subject: gnu: rapidjson: Update home page. * gnu/packages/web.scm (rapidjson)[source, home-page]: Follow redirected URL. --- 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 463f18b7f0..3c126bb941 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -751,7 +751,7 @@ (define-public rapidjson (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/miloyip/rapidjson.git") + (url "https://github.com/Tencent/rapidjson.git") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -776,7 +776,7 @@ (define-public rapidjson (("native") "armv8-a")) #t)))) '()))) - (home-page "https://github.com/miloyip/rapidjson") + (home-page "https://github.com/Tencent/rapidjson") (synopsis "JSON parser/generator for C++ with both SAX/DOM style API") (description "RapidJSON is a fast JSON parser/generator for C++ with both SAX/DOM -- cgit v1.2.3