* [PATCH 1/2] gnu: r-htmltools: Ensure temporary files can be deleted.
@ 2016-09-08 12:51 Ricardo Wurmus
2016-09-08 12:51 ` [PATCH 2/2] gnu: r-rmarkdown: " Ricardo Wurmus
2016-09-13 5:48 ` [PATCH 1/2] gnu: r-htmltools: " Leo Famulari
0 siblings, 2 replies; 4+ messages in thread
From: Ricardo Wurmus @ 2016-09-08 12:51 UTC (permalink / raw)
To: guix-devel
* gnu/packages/web.scm (r-htmltools)[arguments]: Add phase
"copy-files-without-mode".
---
gnu/packages/web.scm | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 321a250..a682e6d 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -3125,6 +3125,20 @@ directory.")
(base32
"0j9bf80grd6gwh7116m575pycv87c0wcwkxsz3gzzfs4aw3pxyr9"))))
(build-system r-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ ;; See https://github.com/rstudio/htmltools/pull/68
+ ;; The resource files are in the store and have mode 444. After
+ ;; copying the files R fails to remove them again because it doesn't
+ ;; have write access to them.
+ (add-after 'unpack 'copy-files-without-mode
+ (lambda _
+ (substitute* "R/html_dependency.R"
+ (("file.copy\\(from, to, " prefix)
+ (string-append prefix
+ "copy.mode = FALSE, ")))
+ #t)))))
(propagated-inputs
`(("r-digest" ,r-digest)
("r-rcpp" ,r-rcpp)))
--
2.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] gnu: r-rmarkdown: Ensure temporary files can be deleted.
2016-09-08 12:51 [PATCH 1/2] gnu: r-htmltools: Ensure temporary files can be deleted Ricardo Wurmus
@ 2016-09-08 12:51 ` Ricardo Wurmus
2016-09-13 5:48 ` Leo Famulari
2016-09-13 5:48 ` [PATCH 1/2] gnu: r-htmltools: " Leo Famulari
1 sibling, 1 reply; 4+ messages in thread
From: Ricardo Wurmus @ 2016-09-08 12:51 UTC (permalink / raw)
To: guix-devel
* gnu/packages/statistics.scm (r-rmarkdown)[arguments]: Add phase
"copy-files-without-mode".
---
gnu/packages/statistics.scm | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index a9aa83b..da64f66 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2097,6 +2097,20 @@ encoder/decoder, round-off-error-free sum and cumsum, etc.")
"09ajq5miqzz46q0i9svvbh93dbi7xbjn4702d6z3scdz272gx7l2"))))
(properties `((upstream-name . "rmarkdown")))
(build-system r-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ ;; See https://github.com/rstudio/rmarkdown/pull/800
+ ;; The resource files are in the store and have mode 444. After
+ ;; copying the files R fails to remove them again because it doesn't
+ ;; have write access to them.
+ (add-after 'unpack 'copy-files-without-mode
+ (lambda _
+ (substitute* "R/render.R"
+ (("file.copy\\(from = from," prefix)
+ (string-append prefix
+ " copy.mode = FALSE, ")))
+ #t)))))
(propagated-inputs
`(("r-catools" ,r-catools)
("r-htmltools" ,r-htmltools)
--
2.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] gnu: r-htmltools: Ensure temporary files can be deleted.
2016-09-08 12:51 [PATCH 1/2] gnu: r-htmltools: Ensure temporary files can be deleted Ricardo Wurmus
2016-09-08 12:51 ` [PATCH 2/2] gnu: r-rmarkdown: " Ricardo Wurmus
@ 2016-09-13 5:48 ` Leo Famulari
1 sibling, 0 replies; 4+ messages in thread
From: Leo Famulari @ 2016-09-13 5:48 UTC (permalink / raw)
To: Ricardo Wurmus; +Cc: guix-devel
On Thu, Sep 08, 2016 at 02:51:04PM +0200, Ricardo Wurmus wrote:
> * gnu/packages/web.scm (r-htmltools)[arguments]: Add phase
> "copy-files-without-mode".
LGTM
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-13 5:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-08 12:51 [PATCH 1/2] gnu: r-htmltools: Ensure temporary files can be deleted Ricardo Wurmus
2016-09-08 12:51 ` [PATCH 2/2] gnu: r-rmarkdown: " Ricardo Wurmus
2016-09-13 5:48 ` Leo Famulari
2016-09-13 5:48 ` [PATCH 1/2] gnu: r-htmltools: " Leo Famulari
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).