From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH] Add r-devtools. Date: Wed, 11 Nov 2015 14:13:37 +0100 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44096) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwVDm-0001b6-AS for guix-devel@gnu.org; Wed, 11 Nov 2015 08:13:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZwVDj-0006Vs-27 for guix-devel@gnu.org; Wed, 11 Nov 2015 08:13:54 -0500 Received: from sinope.bbbm.mdc-berlin.de ([141.80.25.23]:38971) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwVDi-0006Uy-Kd for guix-devel@gnu.org; Wed, 11 Nov 2015 08:13:50 -0500 Received: from localhost (localhost [127.0.0.1]) by sinope.bbbm.mdc-berlin.de (Postfix) with ESMTP id 3383B280480 for ; Wed, 11 Nov 2015 14:13:48 +0100 (CET) Received: from sinope.bbbm.mdc-berlin.de ([127.0.0.1]) by localhost (sinope.bbbm.mdc-berlin.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uRqkx8IzGF58 for ; Wed, 11 Nov 2015 14:13:41 +0100 (CET) Received: from HTCAONE.mdc-berlin.net (mab.citx.mdc-berlin.de [141.80.36.102]) by sinope.bbbm.mdc-berlin.de (Postfix) with ESMTP for ; Wed, 11 Nov 2015 14:13:41 +0100 (CET) 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: "guix-devel@gnu.org" --=-=-= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Guix, here=E2=80=99s the second batch of R packages to give us =E2=80=9Cdevtool= s=E2=80=9D. I noticed that =E2=80=9Cgit2r=E2=80=9D contains *modified* sources of libgit2, so w= e cannot link it against libgit2 itself. The git2r README says this: The libgit2 library has been modified, e.g. to use the R printing and error routines, and to use runif instead of rand. In other places it says that libgit2 was modified to build it as an R package. As I don=E2=80=99t know what this means I=E2=80=99ve submitted = a bug report to ask if linking against an external libgit2 would be possible: https://github.com/ropensci/git2r/issues/187 I also added a note to the package recipe stating that the package contains modified sources of libgit2. ~~ Ricardo --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename="0001-gnu-Add-r-git2r.patch" >From 853cd47952dad86f69d7ed9389174cc77eed17e9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 11 Nov 2015 14:07:24 +0100 Subject: [PATCH 1/3] gnu: Add r-git2r. * gnu/packages/statistics.scm (r-git2r): New variable. --- gnu/packages/statistics.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 9c277b4..870e41a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -38,8 +38,10 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages readline) + #:use-module (gnu packages ssh) #:use-module (gnu packages texlive) #:use-module (gnu packages texinfo) + #:use-module (gnu packages tls) #:use-module (gnu packages base) #:use-module (gnu packages web) #:use-module (gnu packages xml) @@ -1189,3 +1191,29 @@ demands of modern web APIs. It provides useful tools for working with HTTP organised by HTTP verbs (@code{GET()}, @code{POST()}, etc). Configuration functions make it easy to control additional request components.") (license license:expat))) + +(define-public r-git2r + (package + (name "r-git2r") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (cran-uri "git2r" version)) + (sha256 + (base32 + "1h5ag8sm512jsn2sp4yhiqspc7hjq5y8z0kqz24sdznxa3b7rpn9")))) + (build-system r-build-system) + ;; This R package contains modified sources of libgit2. This modified + ;; version of libgit2 is built as the package is built. Hence libgit2 is + ;; not among the inputs of this package. + (inputs + `(("libssh2" ,libssh2) + ("openssl" ,openssl) + ("zlib" ,zlib))) + (home-page "https://github.com/ropensci/git2r") + (synopsis "Access git repositories with R") + (description + "This package provides an R interface to the libgit2 library, which is a +pure C implementation of the Git core methods.") + ;; GPLv2 only with linking exception. + (license license:gpl2))) -- 2.1.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename="0002-gnu-Add-r-rstudioapi.patch" >From a8df74bb8cfc34b5ea0f62b56f8fa9ede46c622c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 11 Nov 2015 14:07:47 +0100 Subject: [PATCH 2/3] gnu: Add r-rstudioapi. * gnu/packages/statistics.scm (r-rstudioapi): New variable. --- gnu/packages/statistics.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 870e41a..fd0434d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1217,3 +1217,21 @@ functions make it easy to control additional request components.") pure C implementation of the Git core methods.") ;; GPLv2 only with linking exception. (license license:gpl2))) + +(define-public r-rstudioapi + (package + (name "r-rstudioapi") + (version "0.3.1") + (source (origin + (method url-fetch) + (uri (cran-uri "rstudioapi" version)) + (sha256 + (base32 + "0q7671d924nzqsqhs8d9p7l907bcam56wjwm7vvz44xgj0saj8bs")))) + (build-system r-build-system) + (home-page "http://cran.r-project.org/web/packages/rstudioapi") + (synopsis "Safely access the RStudio API") + (description + "This package provides functions to access the RStudio API and provide +informative error messages when it's not available.") + (license license:expat))) -- 2.1.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename="0003-gnu-Add-r-devtools.patch" >From 9491af491f85afe7f317309946cea34f63af8221 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 11 Nov 2015 14:08:46 +0100 Subject: [PATCH 3/3] gnu: Add r-devtools. * gnu/packages/statistics.scm (r-devtools): New variable. --- gnu/packages/statistics.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index fd0434d..478338f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1235,3 +1235,32 @@ pure C implementation of the Git core methods.") "This package provides functions to access the RStudio API and provide informative error messages when it's not available.") (license license:expat))) + +(define-public r-devtools + (package + (name "r-devtools") + (version "1.9.1") + (source (origin + (method url-fetch) + (uri (cran-uri "devtools" version)) + (sha256 + (base32 + "10ycx3kkiz5x8nmgw31d9wa5hhlx2fhda2nqzxfrczqpz1jik6ci")))) + (build-system r-build-system) + (propagated-inputs + `(("r-curl" ,r-curl) + ("r-digest" ,r-digest) + ("r-evaluate" ,r-evaluate) + ("r-git2r" ,r-git2r) + ("r-httr" ,r-httr) + ("r-jsonlite" ,r-jsonlite) + ("r-memoise" ,r-memoise) + ("r-roxygen2" ,r-roxygen2) + ("r-rstudioapi" ,r-rstudioapi) + ("r-rversions" ,r-rversions) + ("r-whisker" ,r-whisker))) + (home-page "https://github.com/hadley/devtools") + (synopsis "Tools to make developing R packages easier") + (description "The devtools package is a collection of package development +tools to simplify the devolpment of R packages.") + (license license:gpl2+))) -- 2.1.0 --=-=-=--