[PATCH] Towards r-devtools.

[PATCH] Towards r-devtools.

[Ricardo Wurmus]

[-- Attachment #1: Type: text/plain, Size: 645 bytes --]

Hi Guix,

attached is a first batch of dependent packages for r-devtools.  The
second batch still needs cleaning up; in particular that’s because
r-git2r bundles the sources of libgit2, which I think should really have
its own package.

This set of patches is quite harmless.  Some notes:

* I did not place r-httr in web.scm because it depends on stuff from
  web.scm as well as statistics.scm, resulting in circular module
  dependencies.  To avoid this I put r-httr with the other R packages in
  statistics.scm.

* Similar reasons apply to why I didn’t place r-xml2 in xml.scm.

And now ... the patches!

~~ Ricardo


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-r-curl.patch --]
[-- Type: text/x-patch, Size: 1648 bytes --]

From db404c103cf63cac5ef3382e337372e4af3fcb48 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Tue, 10 Nov 2015 15:55:51 +0100
Subject: [PATCH 1/7] gnu: Add r-curl.

* gnu/packages/web.scm (r-curl): New variable.
---
 gnu/packages/web.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 4d526fc..2ecda35 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -2977,3 +2977,28 @@ directory.")
 various contexts including the R console, R Markdown documents, and Shiny web
 applications.")
     (license l:expat)))
+
+(define-public r-curl
+  (package
+    (name "r-curl")
+    (version "0.9.3")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "curl" version))
+              (sha256
+               (base32
+                "02p9s1jlk8dcbvn71ivn4xnrqh9dwqyhgn4s1fzcfmnmfxhl5gld"))))
+    (build-system r-build-system)
+    (inputs
+     `(("libcurl" ,curl)))
+    (home-page "https://github.com/jeroenooms/curl")
+    (synopsis "HTTP client for R")
+    (description
+     "The @code{curl()} and @code{curl_download()} functions provide highly
+configurable drop-in replacements for base @code{url()} and
+@code{download.file()} with better performance, support for encryption, gzip
+compression, authentication, and other @code{libcurl} goodies.  The core of
+the package implements a framework for performing fully customized requests
+where data can be processed either in memory, on disk, or streaming via the
+callback or connection interfaces.")
+    (license l:expat)))
-- 
2.1.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-Add-r-xml2.patch --]
[-- Type: text/x-patch, Size: 1690 bytes --]

From 6bb0ed5c5f0dabd654618f377a8903a804580baa Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Tue, 10 Nov 2015 16:10:09 +0100
Subject: [PATCH 2/7] gnu: Add r-xml2.

* gnu/packages/statistics.scm (r-xml2): New variable.
---
 gnu/packages/statistics.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 0c0464c..cbcb05c 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -41,6 +41,7 @@
   #:use-module (gnu packages texlive)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages zip)
   #:use-module (srfi srfi-1))
@@ -1053,3 +1054,27 @@ inference for statistical models.")
       (native-inputs
        `(("python2-setuptools" ,python2-setuptools)
          ,@(package-native-inputs stats))))))
+
+(define-public r-xml2
+  (package
+    (name "r-xml2")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "xml2" version))
+       (sha256
+        (base32
+         "0jjilz36h7vbdbkpvjnja1vgjf6d1imql3z4glqn2m2b74w5qm4c"))))
+    (build-system r-build-system)
+    (inputs
+     `(("libxml2" ,libxml2)))
+    (propagated-inputs
+     `(("r-rcpp" ,r-rcpp)
+       ("r-bh" ,r-bh)))
+    (home-page "https://github.com/hadley/xml2")
+    (synopsis "Parse XML with R")
+    (description
+     "This package provides a simple, consistent interface to working with XML
+files in R.  It is built on top of the libxml2 C library.")
+    (license license:gpl2+)))
-- 
2.1.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-gnu-Add-r-rversions.patch --]
[-- Type: text/x-patch, Size: 1865 bytes --]

From 31040b8e361b3bf928b1f4ee6cfc91c55046a474 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Tue, 10 Nov 2015 16:17:34 +0100
Subject: [PATCH 3/7] gnu: Add r-rversions.

* gnu/packages/statistics.scm (r-rversions): New variable.
---
 gnu/packages/statistics.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index cbcb05c..a0ae5c1 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -41,6 +41,7 @@
   #:use-module (gnu packages texlive)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages zip)
@@ -1078,3 +1079,25 @@ inference for statistical models.")
      "This package provides a simple, consistent interface to working with XML
 files in R.  It is built on top of the libxml2 C library.")
     (license license:gpl2+)))
+
+(define-public r-rversions
+  (package
+    (name "r-rversions")
+    (version "1.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "rversions" version))
+              (sha256
+               (base32
+                "0xmi461g1rf5ngb7r1sri798jn6icld1xq25wj9jii2ca8j8xv68"))))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-curl" ,r-curl)
+       ("r-xml2" ,r-xml2)))
+    (home-page "https://github.com/metacran/rversions")
+    (synopsis "Query R versions, including 'r-release' and 'r-oldrel'")
+    (description
+     "This package provides functions to query the main R repository to find
+the versions that @code{r-release} and @code{r-oldrel} refer to, and also all
+previous R versions and their release dates.")
+    (license license:expat)))
-- 
2.1.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0004-gnu-Add-r-whisker.patch --]
[-- Type: text/x-patch, Size: 1373 bytes --]

From a121665057d98e037753053e80c4e7f88651efee Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Tue, 10 Nov 2015 16:19:16 +0100
Subject: [PATCH 4/7] gnu: Add r-whisker.

* gnu/packages/statistics.scm (r-whisker): 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 a0ae5c1..a5be5d9 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1101,3 +1101,21 @@ files in R.  It is built on top of the libxml2 C library.")
 the versions that @code{r-release} and @code{r-oldrel} refer to, and also all
 previous R versions and their release dates.")
     (license license:expat)))
+
+(define-public r-whisker
+  (package
+    (name "r-whisker")
+    (version "0.3-2")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "whisker" version))
+              (sha256
+               (base32
+                "0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"))))
+    (build-system r-build-system)
+    (home-page "http://github.com/edwindj/whisker")
+    (synopsis "Logicless mustache templating for R")
+    (description
+     "This package provides logicless templating, with a syntax that is not
+limited to R.")
+    (license license:gpl3+)))
-- 
2.1.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #6: 0005-gnu-Add-r-brew.patch --]
[-- Type: text/x-patch, Size: 1451 bytes --]

From ae025aec833c2c7e8c28f20de53d81e99fc9675e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Tue, 10 Nov 2015 16:20:25 +0100
Subject: [PATCH 5/7] gnu: Add r-brew.

* gnu/packages/statistics.scm (r-brew): New variable.
---
 gnu/packages/statistics.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index a5be5d9..5ab13d1 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1119,3 +1119,22 @@ previous R versions and their release dates.")
      "This package provides logicless templating, with a syntax that is not
 limited to R.")
     (license license:gpl3+)))
+
+(define-public r-brew
+  (package
+    (name "r-brew")
+    (version "1.0-6")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "brew" version))
+              (sha256
+               (base32
+                "1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"))))
+    (build-system r-build-system)
+    (home-page "http://cran.r-project.org/web/packages/brew")
+    (synopsis "Templating framework for report generation")
+    (description
+     "The brew package implements a templating framework for mixing text and R
+code for report generation.  The template syntax is similar to PHP, Ruby's erb
+module, Java Server Pages, and Python's psp module.")
+    (license license:gpl2+)))
-- 
2.1.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #7: 0006-gnu-Add-r-roxygen2.patch --]
[-- Type: text/x-patch, Size: 1544 bytes --]

From 1f18aad5ead9716829678ee6da7e914eaa2eb19e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Tue, 10 Nov 2015 16:28:23 +0100
Subject: [PATCH 6/7] gnu: Add r-roxygen2.

* gnu/packages/statistics.scm (r-roxygen2): New variable.
---
 gnu/packages/statistics.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 5ab13d1..8062a51 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1138,3 +1138,27 @@ limited to R.")
 code for report generation.  The template syntax is similar to PHP, Ruby's erb
 module, Java Server Pages, and Python's psp module.")
     (license license:gpl2+)))
+
+(define-public r-roxygen2
+  (package
+    (name "r-roxygen2")
+    (version "5.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "roxygen2" version))
+              (sha256
+               (base32
+                "0xjdphjs7l1v71lylmqgp76cbcxzvm9z1a40jgkdwvz072nn08vr"))))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-brew" ,r-brew)
+       ("r-digest" ,r-digest)
+       ("r-rcpp" ,r-rcpp)
+       ("r-stringi" ,r-stringi)
+       ("r-stringr" ,r-stringr)))
+    (home-page "https://github.com/klutometis/roxygen")
+    (synopsis "In-source documentation system for R")
+    (description
+     "Roxygen2 is a Doxygen-like in-source documentation system for Rd,
+collation, and NAMESPACE files.")
+    (license license:gpl2+)))
-- 
2.1.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #8: 0007-gnu-Add-r-httr.patch --]
[-- Type: text/x-patch, Size: 1744 bytes --]

From 5e2fd15e7b3595f476a531b4b4bd47608ba3ec96 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Tue, 10 Nov 2015 16:40:04 +0100
Subject: [PATCH 7/7] gnu: Add r-httr.

* gnu/packages/statistics.scm (r-httr): New variable.
---
 gnu/packages/statistics.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 8062a51..9c277b4 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1162,3 +1162,30 @@ module, Java Server Pages, and Python's psp module.")
      "Roxygen2 is a Doxygen-like in-source documentation system for Rd,
 collation, and NAMESPACE files.")
     (license license:gpl2+)))
+
+(define-public r-httr
+  (package
+    (name "r-httr")
+    (version "1.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "httr" version))
+              (sha256
+               (base32
+                "1yprw8p4g8026jhravgg1hdwj1g51cpdgycyr5a58jwm4i5f79cq"))))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-curl" ,r-curl)
+       ("r-digest" ,r-digest)
+       ("r-jsonlite" ,r-jsonlite)
+       ("r-mime" ,r-mime)
+       ("r-r6" ,r-r6)
+       ("r-stringr" ,r-stringr)))
+    (home-page "https://github.com/hadley/httr")
+    (synopsis "Tools for working with URLs and HTTP")
+    (description
+     "The aim of httr is to provide a wrapper for RCurl customised to the
+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)))
-- 
2.1.0

Re: [PATCH] Towards r-devtools.

[Ricardo Wurmus]

Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> writes:

> attached is a first batch of dependent packages for r-devtools.

I’m going to push the patches in a couple of minutes.  “guix lint” is
happy with them, and so am I :)

~~ Ricardo