From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH 1/2] gnu: r-htmltools: Ensure temporary files can be deleted. Date: Thu, 8 Sep 2016 14:51:04 +0200 Message-ID: <20160908125105.8435-1-ricardo.wurmus@mdc-berlin.de> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhynd-0001LO-O3 for guix-devel@gnu.org; Thu, 08 Sep 2016 08:51:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bhynZ-0005rI-Jc for guix-devel@gnu.org; Thu, 08 Sep 2016 08:51:25 -0400 Received: from venus.bbbm.mdc-berlin.de ([141.80.25.30]:44392) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhynZ-0005qM-9g for guix-devel@gnu.org; Thu, 08 Sep 2016 08:51:21 -0400 Received: from localhost (localhost [127.0.0.1]) by venus.bbbm.mdc-berlin.de (Postfix) with ESMTP id D935C380ECA for ; Thu, 8 Sep 2016 14:51:19 +0200 (CEST) Received: from venus.bbbm.mdc-berlin.de ([127.0.0.1]) by localhost (venus.bbbm.mdc-berlin.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ISRKkTYOICEy for ; Thu, 8 Sep 2016 14:51:14 +0200 (CEST) Received: from HTCATWO.mdc-berlin.net (puck.citx.mdc-berlin.de [141.80.36.101]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by venus.bbbm.mdc-berlin.de (Postfix) with ESMTPS for ; Thu, 8 Sep 2016 14:51:14 +0200 (CEST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * 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