[PATCH] gnu: r-devtools: Update to 1.10.0.

[PATCH] gnu: r-devtools: Update to 1.10.0.

[Roel Janssen]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-r-devtools-Update-to-1.10.0.patch --]
[-- Type: text/x-patch, Size: 2593 bytes --]

From 30c0938b1d1239fc1a1c894d6706c4f322395a9e Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Tue, 29 Mar 2016 14:00:57 +0200
Subject: [PATCH] gnu: r-devtools: Update to 1.10.0.

* gnu/packages/statistics.scm (r-devtools): Update to 1.10.0.
* gnu/packages/statistics.scm (r-withr): New variable.
---
 gnu/packages/statistics.scm | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 15c6823..aea3faa 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1234,13 +1234,13 @@ informative error messages when it's not available.")
 (define-public r-devtools
   (package
     (name "r-devtools")
-    (version "1.9.1")
+    (version "1.10.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "devtools" version))
               (sha256
                (base32
-                "10ycx3kkiz5x8nmgw31d9wa5hhlx2fhda2nqzxfrczqpz1jik6ci"))))
+                "11x51bqhjwypbxv5sfnrnxx06b92k8kzmmx7zrwk3537r072b6pa"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-curl" ,r-curl)
@@ -1253,13 +1253,34 @@ informative error messages when it's not available.")
        ("r-roxygen2" ,r-roxygen2)
        ("r-rstudioapi" ,r-rstudioapi)
        ("r-rversions" ,r-rversions)
-       ("r-whisker" ,r-whisker)))
+       ("r-whisker" ,r-whisker)
+       ("r-withr" ,r-withr)))
     (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+)))
 
+(define-public r-withr
+  (package
+    (name "r-withr")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "withr" version))
+              (sha256
+               (base32
+                "0zbj3rd7dc0ycknmay7y7rm1qvnh9n05jw93gjggz46j2zfmy93y"))))
+    (build-system r-build-system)
+    (home-page "https://github.com/jimhester/withr")
+    (synopsis "Run code with temporarily modified global state")
+    (description
+     "A set of functions to run code 'with' safely and temporarily modified
+global state.  Many of these functions were originally a part of the 'devtools'
+package, this provides a simple package with limited dependencies to provide
+access to these functions.")
+    (license license:gpl2+)))
+
 (define-public r-readr
   (package
     (name "r-readr")
-- 
2.5.5


[-- Attachment #2: Type: text/plain, Size: 256 bytes --]

Dear Guix,

Primarily because I want to use the "install_github" function in
r-devtools, I want to update this package.

In this newer version, a new dependency was introduced (r-withr), which
I also added a package recipe for.

Kind regards,
Roel Janssen

Re: [PATCH] gnu: r-devtools: Update to 1.10.0.

[Ricardo Wurmus]

Hi Roel,

> Primarily because I want to use the "install_github" function in
> r-devtools, I want to update this package.

Sounds good to me.

> In this newer version, a new dependency was introduced (r-withr), which
> I also added a package recipe for.

Could you please split this into two separate patches?  One adding
r-withr, the other updating r-devtools and adding r-withr.

> From 30c0938b1d1239fc1a1c894d6706c4f322395a9e Mon Sep 17 00:00:00 2001
> From: Roel Janssen <roel@gnu.org>
> Date: Tue, 29 Mar 2016 14:00:57 +0200
> Subject: [PATCH] gnu: r-devtools: Update to 1.10.0.

> * gnu/packages/statistics.scm (r-devtools): Update to 1.10.0.
> * gnu/packages/statistics.scm (r-withr): New variable.

In addition to splitting these changes, please also mention that you
added r-withr to the propagated-inputs of r-devtools.

> diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
> index 15c6823..aea3faa 100644
> --- a/gnu/packages/statistics.scm
> +++ b/gnu/packages/statistics.scm
> @@ -1234,13 +1234,13 @@ informative error messages when it's not available.")
>  (define-public r-devtools
>    (package
>      (name "r-devtools")
> -    (version "1.9.1")
> +    (version "1.10.0")
>      (source (origin
>                (method url-fetch)
>                (uri (cran-uri "devtools" version))
>                (sha256
>                 (base32
> -                "10ycx3kkiz5x8nmgw31d9wa5hhlx2fhda2nqzxfrczqpz1jik6ci"))))
> +                "11x51bqhjwypbxv5sfnrnxx06b92k8kzmmx7zrwk3537r072b6pa"))))
>      (build-system r-build-system)
>      (propagated-inputs
>       `(("r-curl" ,r-curl)
> @@ -1253,13 +1253,34 @@ informative error messages when it's not available.")
>         ("r-roxygen2" ,r-roxygen2)
>         ("r-rstudioapi" ,r-rstudioapi)
>         ("r-rversions" ,r-rversions)
> -       ("r-whisker" ,r-whisker)))
> +       ("r-whisker" ,r-whisker)
> +       ("r-withr" ,r-withr)))
>      (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+)))

OK!

> +(define-public r-withr
> +  (package
> +    (name "r-withr")
> +    (version "1.0.1")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (cran-uri "withr" version))
> +              (sha256
> +               (base32
> +                "0zbj3rd7dc0ycknmay7y7rm1qvnh9n05jw93gjggz46j2zfmy93y"))))
> +    (build-system r-build-system)
> +    (home-page "https://github.com/jimhester/withr")
> +    (synopsis "Run code with temporarily modified global state")
> +    (description
> +     "A set of functions to run code 'with' safely and temporarily modified
> +global state.  Many of these functions were originally a part of the 'devtools'
> +package, this provides a simple package with limited dependencies to provide
> +access to these functions.")
> +    (license license:gpl2+)))

Please try to turn the first sentence fragment into an actual sentence,
even if it is just “This package provides [a] set of functions...”.

Aside from that I don’t understand the first sentence.  Is “with” a
function or a keyword?  If so, it should be wrapped in “@code{}”.  But
even then I have difficulties parsing the sentence.

The second sentence seems to be a combination of two sentences glued
together by a comma.  This should probably be a semicolon.

So how about this instead?

     “This package provides a set of functions to run R code in an
     environment in which global state has been temporarily modified.
     Many of these functions were originally a part of the 'devtools'
     package.”

Thanks!

~~ Ricardo

Re: [PATCH] gnu: r-devtools: Update to 1.10.0.

[Roel Janssen]

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

From c1fc1e3c0b4a5d002cf90a5fd43c0a946124a4c6 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Tue, 29 Mar 2016 14:30:38 +0200
Subject: [PATCH 1/2] gnu: Add r-withr.

* gnu/packages/statistics.scm (r-withr): 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 15c6823..28ac967 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1260,6 +1260,25 @@ informative error messages when it's not available.")
 tools to simplify the devolpment of R packages.")
     (license license:gpl2+)))
 
+(define-public r-withr
+  (package
+    (name "r-withr")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "withr" version))
+              (sha256
+               (base32
+                "0zbj3rd7dc0ycknmay7y7rm1qvnh9n05jw93gjggz46j2zfmy93y"))))
+    (build-system r-build-system)
+    (home-page "https://github.com/jimhester/withr")
+    (synopsis "Run code with temporarily modified global state")
+    (description
+     "This package provides a set of functions to run R code in an environment
+in which global state has been temporarily modified.  Many of these functions
+were originally a part of the r-devtools package.")
+    (license license:gpl2+)))
+
 (define-public r-readr
   (package
     (name "r-readr")
-- 
2.5.5


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-r-devtools-Update-to-1.10.0.patch --]
[-- Type: text/x-patch, Size: 1646 bytes --]

From 9d94cae33059e91d778466aeb6cf0b1d0ea56fdb Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Tue, 29 Mar 2016 14:32:00 +0200
Subject: [PATCH 2/2] gnu: r-devtools: Update to 1.10.0.

* gnu/packages/statistics.scm (r-devtools): Update to 1.10.0.
   (r-devtools)[propagated-inputs]: Add r-withr.
---
 gnu/packages/statistics.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 28ac967..1b114b3 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1234,13 +1234,13 @@ informative error messages when it's not available.")
 (define-public r-devtools
   (package
     (name "r-devtools")
-    (version "1.9.1")
+    (version "1.10.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "devtools" version))
               (sha256
                (base32
-                "10ycx3kkiz5x8nmgw31d9wa5hhlx2fhda2nqzxfrczqpz1jik6ci"))))
+                "11x51bqhjwypbxv5sfnrnxx06b92k8kzmmx7zrwk3537r072b6pa"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-curl" ,r-curl)
@@ -1253,7 +1253,8 @@ informative error messages when it's not available.")
        ("r-roxygen2" ,r-roxygen2)
        ("r-rstudioapi" ,r-rstudioapi)
        ("r-rversions" ,r-rversions)
-       ("r-whisker" ,r-whisker)))
+       ("r-whisker" ,r-whisker)
+       ("r-withr" ,r-withr)))
     (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
-- 
2.5.5


[-- Attachment #3: Type: text/plain, Size: 2633 bytes --]

Hello Ricardo,

Thank you for your superfast review.

Ricardo Wurmus writes:

>> In this newer version, a new dependency was introduced (r-withr), which
>> I also added a package recipe for.
>
> Could you please split this into two separate patches?  One adding
> r-withr, the other updating r-devtools and adding r-withr.

Done.

>> From 30c0938b1d1239fc1a1c894d6706c4f322395a9e Mon Sep 17 00:00:00 2001
>> From: Roel Janssen <roel@gnu.org>
>> Date: Tue, 29 Mar 2016 14:00:57 +0200
>> Subject: [PATCH] gnu: r-devtools: Update to 1.10.0.
>
>> * gnu/packages/statistics.scm (r-devtools): Update to 1.10.0.
>> * gnu/packages/statistics.scm (r-withr): New variable.
>
> In addition to splitting these changes, please also mention that you
> added r-withr to the propagated-inputs of r-devtools.

I hope the syntax for this is correct in my new patch.

>> +(define-public r-withr
>> +  (package
>> +    (name "r-withr")
>> +    (version "1.0.1")
>> +    (source (origin
>> +              (method url-fetch)
>> +              (uri (cran-uri "withr" version))
>> +              (sha256
>> +               (base32
>> +                "0zbj3rd7dc0ycknmay7y7rm1qvnh9n05jw93gjggz46j2zfmy93y"))))
>> +    (build-system r-build-system)
>> +    (home-page "https://github.com/jimhester/withr")
>> +    (synopsis "Run code with temporarily modified global state")
>> +    (description
>> +     "A set of functions to run code 'with' safely and temporarily modified
>> +global state.  Many of these functions were originally a part of the 'devtools'
>> +package, this provides a simple package with limited dependencies to provide
>> +access to these functions.")
>> +    (license license:gpl2+)))
>
> Please try to turn the first sentence fragment into an actual sentence,
> even if it is just “This package provides [a] set of functions...”.
>
> Aside from that I don’t understand the first sentence.  Is “with” a
> function or a keyword?  If so, it should be wrapped in “@code{}”.  But
> even then I have difficulties parsing the sentence.
>
> The second sentence seems to be a combination of two sentences glued
> together by a comma.  This should probably be a semicolon.
>
> So how about this instead?
>
>      “This package provides a set of functions to run R code in an
>      environment in which global state has been temporarily modified.
>      Many of these functions were originally a part of the 'devtools'
>      package.”
>
> Thanks!

Your proposed description reads fine.  Thank you for this!  I made one
small change: 'devtools' to r-devtools, because that's the Guix package
name.

Kind regards,
Roel Janssen

Re: [PATCH] gnu: r-devtools: Update to 1.10.0.

[Ricardo Wurmus]

Roel Janssen <roel@gnu.org> writes:

> Hello Ricardo,
>
> Thank you for your superfast review.
>
> Ricardo Wurmus writes:
>
>>> In this newer version, a new dependency was introduced (r-withr), which
>>> I also added a package recipe for.
>>
>> Could you please split this into two separate patches?  One adding
>> r-withr, the other updating r-devtools and adding r-withr.
>
> Done.
>
>>> From 30c0938b1d1239fc1a1c894d6706c4f322395a9e Mon Sep 17 00:00:00 2001
>>> From: Roel Janssen <roel@gnu.org>
>>> Date: Tue, 29 Mar 2016 14:00:57 +0200
>>> Subject: [PATCH] gnu: r-devtools: Update to 1.10.0.
>>
>>> * gnu/packages/statistics.scm (r-devtools): Update to 1.10.0.
>>> * gnu/packages/statistics.scm (r-withr): New variable.
>>
>> In addition to splitting these changes, please also mention that you
>> added r-withr to the propagated-inputs of r-devtools.
>
> I hope the syntax for this is correct in my new patch.
>
>>> +(define-public r-withr
>>> +  (package
>>> +    (name "r-withr")
>>> +    (version "1.0.1")
>>> +    (source (origin
>>> +              (method url-fetch)
>>> +              (uri (cran-uri "withr" version))
>>> +              (sha256
>>> +               (base32
>>> +                "0zbj3rd7dc0ycknmay7y7rm1qvnh9n05jw93gjggz46j2zfmy93y"))))
>>> +    (build-system r-build-system)
>>> +    (home-page "https://github.com/jimhester/withr")
>>> +    (synopsis "Run code with temporarily modified global state")
>>> +    (description
>>> +     "A set of functions to run code 'with' safely and temporarily modified
>>> +global state.  Many of these functions were originally a part of the 'devtools'
>>> +package, this provides a simple package with limited dependencies to provide
>>> +access to these functions.")
>>> +    (license license:gpl2+)))
>>
>> Please try to turn the first sentence fragment into an actual sentence,
>> even if it is just “This package provides [a] set of functions...”.
>>
>> Aside from that I don’t understand the first sentence.  Is “with” a
>> function or a keyword?  If so, it should be wrapped in “@code{}”.  But
>> even then I have difficulties parsing the sentence.
>>
>> The second sentence seems to be a combination of two sentences glued
>> together by a comma.  This should probably be a semicolon.
>>
>> So how about this instead?
>>
>>      “This package provides a set of functions to run R code in an
>>      environment in which global state has been temporarily modified.
>>      Many of these functions were originally a part of the 'devtools'
>>      package.”
>>
>> Thanks!
>
> Your proposed description reads fine.  Thank you for this!  I made one
> small change: 'devtools' to r-devtools, because that's the Guix package
> name.

Thank you!  They both look good to me.  I’ll push them to the repository
in a moment.

~~ Ricardo