From patchwork Thu Sep 8 12:51:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 15395 Received: (qmail 40614 invoked by uid 89); 8 Sep 2016 15:39:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=resource, Hx-languages-length:1192, sum X-Spam-Status: No, score=-3.2 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 08 Sep 2016 15:39:42 +0000 Received: from localhost ([::1]:48764 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi1QS-0003Cj-Bg for patchwork@sourceware.org; Thu, 08 Sep 2016 11:39:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhynk-0001QE-02 for guix-devel@gnu.org; Thu, 08 Sep 2016 08:51:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bhyne-0005sh-Tx for guix-devel@gnu.org; Thu, 08 Sep 2016 08:51:30 -0400 Received: from pegasus.bbbm.mdc-berlin.de ([141.80.25.20]:40921) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhyne-0005sW-Mm for guix-devel@gnu.org; Thu, 08 Sep 2016 08:51:26 -0400 Received: from localhost (localhost [127.0.0.1]) by pegasus.bbbm.mdc-berlin.de (Postfix) with ESMTP id BD464380EAB for ; Thu, 8 Sep 2016 14:51:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mdc-berlin.de; h= content-type:content-type:mime-version:references:in-reply-to :x-mailer:message-id:date:date:subject:subject:from:from :received:received:received; s=mdc; t=1473339080; x=1475153481; bh=FLuxBL8yu4IgRenGKBhNtShmLypuD2Ylgu2oEpHMPNE=; b=GG+QHzT5FheN J4FrMnpvm71k2lJfF6GKXbTV9rKBneERlzxn7wdd/2VOhV22ATcbepZmmuIcT5m9 YsDI4Gz6VaxO3Rmh2fiEyACLVfdEN0+NMADOdMhReUILIrPGYF0sjWTNQTXy2DuX tpV53OfNg1PWRjWYM7uR+hm0p5I0bUs= X-Virus-Scanned: amavisd-new at mdc-berlin.de Received: from pegasus.bbbm.mdc-berlin.de ([127.0.0.1]) by localhost (pegasus.bbbm.mdc-berlin.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VoAWSWHe6nlX for ; Thu, 8 Sep 2016 14:51:20 +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 pegasus.bbbm.mdc-berlin.de (Postfix) with ESMTPS for ; Thu, 8 Sep 2016 14:51:20 +0200 (CEST) Received: from localhost (141.80.180.135) by HTCATWO.mdc-berlin.net (141.80.180.125) with Microsoft SMTP Server (TLS) id 14.3.294.0; Thu, 8 Sep 2016 14:51:20 +0200 From: Ricardo Wurmus To: Subject: [PATCH 2/2] gnu: r-rmarkdown: Ensure temporary files can be deleted. Date: Thu, 8 Sep 2016 14:51:05 +0200 Message-ID: <20160908125105.8435-2-ricardo.wurmus@mdc-berlin.de> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160908125105.8435-1-ricardo.wurmus@mdc-berlin.de> References: <20160908125105.8435-1-ricardo.wurmus@mdc-berlin.de> MIME-Version: 1.0 X-Originating-IP: [141.80.180.135] X-TM-AS-Product-Ver: SMEX-11.0.0.4283-8.000.1202-22562.007 X-TM-AS-Result: No--7.431600-0.000000-31 X-TM-AS-MatchedID: 703786-704421-303277-862883-703529-188019-105630-700499-7 06561-139705-701437-139504-106420-701461-700398-709908-188198-702118-709251 -701384-148004-148036-42000-42003 X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 141.80.25.20 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list 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+patchwork=sourceware.org@gnu.org Sender: "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)