64/67: gnu: r-rcpparmadillo: Update to 0.7.700.0.0.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit 0685fe3c86a5fe1ed78b71ae4e41acd841f38da4
Author: Ricardo Wurmus <address@hidden>
Date:   Thu Apr 6 14:29:47 2017 +0200

    gnu: r-rcpparmadillo: Update to 0.7.700.0.0.
    
    * gnu/packages/statistics.scm (r-rcpparmadillo): Update to 0.7.700.0.0.
    [source]: Do not delete bundled armadillo sources, because upstream no 
longer
    hosts previous versions.
    [propagated-inputs]: Remove "armadillo-for-rcpparmadillo".
    [arguments]: Remove because we no longer need to link with the armadillo
    library.
    * gnu/packages/bioinformatics.scm (r-deseq2)[arguments]: Remove because we 
no
    longer need to link with armadillo library.
---
 gnu/packages/bioinformatics.scm |  8 --------
 gnu/packages/statistics.scm     | 21 +++------------------
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 6885a74..e540627 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -5497,14 +5497,6 @@ high-throughput sequencing experiments.")
          "1walwkqryn1gnwz7zryr5764a0p6ia7ag4w6w9n8fskg8dkg0fqs"))))
     (properties `((upstream-name . "DESeq2")))
     (build-system r-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'link-against-armadillo
-           (lambda _
-             (substitute* "src/Makevars"
-               (("PKG_LIBS =" prefix)
-                (string-append prefix "-larmadillo"))))))))
     (propagated-inputs
      `(("r-biobase" ,r-biobase)
        ("r-biocgenerics" ,r-biocgenerics)
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 6b05f85..fcc7e30 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2443,32 +2443,17 @@ well as additional utilities such as panel and axis 
annotation functions.")
 (define-public r-rcpparmadillo
   (package
     (name "r-rcpparmadillo")
-    (version "0.7.600.1.0")
+    (version "0.7.700.0.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "RcppArmadillo" version))
               (sha256
                (base32
-                "0k1wniip184j0ckcg9kcjy2q4mcfj5jpd1nkk4l0ab75ad8znywv"))
-              (modules '((guix build utils)))
-              ;; Remove bundled armadillo sources
-              (snippet
-               '(begin
-                  (delete-file-recursively "inst/include/armadillo_bits")
-                  (delete-file "inst/include/armadillo")))))
+                "03cvl2xgmvh4sylw7ff7s020y7k2wzyj34l0zngm09qs44pa9q0m"))))
     (properties `((upstream-name . "RcppArmadillo")))
     (build-system r-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'link-against-armadillo
-           (lambda _
-             (substitute* "src/Makevars"
-               (("PKG_LIBS=" prefix)
-                (string-append prefix "-larmadillo"))))))))
     (propagated-inputs
-     `(("r-rcpp" ,r-rcpp)
-       ("armadillo" ,armadillo-for-rcpparmadillo)))
+     `(("r-rcpp" ,r-rcpp)))
     (home-page "https://github.com/RcppCore/RcppArmadillo";)
     (synopsis "Rcpp integration for the Armadillo linear algebra library")
     (description