summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/local.mk2
-rw-r--r--gnu/packages/cran.scm10
-rw-r--r--gnu/packages/patches/r-httpuv-1.5.5-unvendor-libuv.patch (renamed from gnu/packages/patches/r-httpuv-1.5.4-unvendor-libuv.patch)0
3 files changed, 5 insertions, 7 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 370719f4d3..c631e449d1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1581,7 +1581,7 @@ dist_patch_DATA = \
%D%/packages/patches/readline-6.2-CVE-2014-2524.patch \
%D%/packages/patches/renpy-use-system-fribidi.patch \
%D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \
- %D%/packages/patches/r-httpuv-1.5.4-unvendor-libuv.patch \
+ %D%/packages/patches/r-httpuv-1.5.5-unvendor-libuv.patch \
%D%/packages/patches/ri-li-modernize_cpp.patch \
%D%/packages/patches/ripperx-missing-file.patch \
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 1b1ad91595..4e853fc902 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1024,19 +1024,17 @@ into a pipeline of data manipulation and visualisation.")
(define-public r-httpuv
(package
(name "r-httpuv")
- (version "1.5.4")
+ (version "1.5.5")
(source (origin
(method url-fetch)
(uri (cran-uri "httpuv" version))
(sha256
(base32
- "066rprqvz9qln6xd85x1yh1wbbmzd157xjl8zq1zbgr8l6347inm"))
+ "05rir03xwamwfq5691vx0x957sgmr4i8iv5vpx5rv1f74y4wkrhb"))
;; Unvendor bundled libraries. As of 1.5.4 the vendored libuv
;; only contains fixes for building on Solaris.
- (patches (search-patches "r-httpuv-1.5.4-unvendor-libuv.patch"))
- (modules '((guix build utils)
- (ice-9 ftw)
- (srfi srfi-1)))
+ (patches (search-patches "r-httpuv-1.5.5-unvendor-libuv.patch"))
+ (modules '((guix build utils)))
(snippet
`(begin
(delete-file-recursively "src/libuv")
diff --git a/gnu/packages/patches/r-httpuv-1.5.4-unvendor-libuv.patch b/gnu/packages/patches/r-httpuv-1.5.5-unvendor-libuv.patch
index 0947718059..0947718059 100644
--- a/gnu/packages/patches/r-httpuv-1.5.4-unvendor-libuv.patch
+++ b/gnu/packages/patches/r-httpuv-1.5.5-unvendor-libuv.patch