aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2017-04-06 14:29:47 +0200
committerRicardo Wurmus <rekado@elephly.net>2017-04-06 14:39:22 +0200
commit0685fe3c86a5fe1ed78b71ae4e41acd841f38da4 (patch)
treebdcff8f05f4ed0b302ad38b449634527b2d2db77
parent133cba8cb5c278080ae701fba1c339ae50cc124f (diff)
downloadguix-0685fe3c86a5fe1ed78b71ae4e41acd841f38da4.tar
guix-0685fe3c86a5fe1ed78b71ae4e41acd841f38da4.tar.gz
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.
-rw-r--r--gnu/packages/bioinformatics.scm8
-rw-r--r--gnu/packages/statistics.scm21
2 files changed, 3 insertions, 26 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 6885a74f7c..e540627012 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 6b05f8553e..fcc7e303a8 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