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.
This commit is contained in:
Ricardo Wurmus 2017-04-06 14:29:47 +02:00
parent 133cba8cb5
commit 0685fe3c86
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
2 changed files with 3 additions and 26 deletions

View file

@ -5497,14 +5497,6 @@ (define-public r-deseq2
"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)

View file

@ -2443,32 +2443,17 @@ (define-public r-latticeextra
(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