diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-10-22 20:12:52 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-22 20:12:52 +0200 |
commit | 119a749db9c9847e0766860c17109b0f0b6bf349 (patch) | |
tree | 4cdbfcad285124c1abf7b3c1c94666cef55767ce /gnu/packages/web.scm | |
parent | 530d9e1555e8d0125dde6893f5f70c7a1ebc2564 (diff) | |
parent | 25669275a1a570cc266128274cb27a22f6a3a318 (diff) | |
download | guix-119a749db9c9847e0766860c17109b0f0b6bf349.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/web.scm')
-rw-r--r-- | gnu/packages/web.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 41e52756e3..c7b44fafa1 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -142,14 +142,14 @@ and its related documentation.") (name "nginx") ;; Consider updating the nginx-docs package if the nginx package is ;; updated. - (version "1.12.1") + (version "1.12.2") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "1yvnmj7vlykrqdi6amkvs63lva6qkxd98sqv0a8hz8w5ci1bz4w7")))) + "05h4rwja7170z0l979yjghy9i9ichllwhicylzpmmyyml6fkfprh")))) (build-system gnu-build-system) (inputs `(("pcre" ,pcre) ("openssl" ,openssl) @@ -3788,13 +3788,13 @@ LaTeX.") (define-public r-curl (package (name "r-curl") - (version "2.8.1") + (version "3.0") (source (origin (method url-fetch) (uri (cran-uri "curl" version)) (sha256 (base32 - "0dgfl7wn4r8inv55xnk4ybf1y2x4qmi4cbr6phr3lfi1dnjm4hsm")))) + "01m52jz2q38yc32xbnmpm48hck2xj9fyhxq262p04y67gjpf7y3v")))) (build-system r-build-system) (arguments `(#:phases |