gnu: r-minimal: Update to 3.5.0.

* gnu/packages/statistics.scm (r-with-tests): New variable derived from
r-minimal; update to 3.5.0.
[arguments]: Build recommended packages.
(r-minimal): Inherit from r-with-tests.
[arguments]: Disable recommended packages and tests.
This commit is contained in:
Ricardo Wurmus 2018-06-01 17:10:48 +02:00 committed by Ricardo Wurmus
parent d5452aa201
commit d22546cf80
No known key found for this signature in database
GPG key ID: 197A5888235FACAC

View file

@ -113,10 +113,10 @@ (define-public pspp
;; Update this package together with the set of recommended packages: r-boot,
;; r-class, r-cluster, r-codetools, r-foreign, r-kernsmooth, r-lattice,
;; r-mass, r-matrix, r-mgcv, r-nlme, r-nnet, r-rpart, r-spatial, r-survival.
(define-public r-minimal
(define r-with-tests
(package
(name "r-minimal")
(version "3.4.4")
(name "r-with-tests")
(version "3.5.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://cran/src/base/R-"
@ -124,7 +124,7 @@ (define-public r-minimal
version ".tar.gz"))
(sha256
(base32
"0dq3jsnwsb5j3fhl0wi3p5ycv8avf8s5j1y4ap3d2mkjmcppvsdk"))))
"0w38865laqg28cdhikxdxhx4rfp0kgcn72gakwypsy91br9ja5zx"))))
(build-system gnu-build-system)
(arguments
`(#:disallowed-references (,tzdata-for-tests)
@ -217,11 +217,9 @@ (define-public r-minimal
(add-after 'build 'install-info
(lambda _ (zero? (system* "make" "install-info")))))
#:configure-flags
`(;; Do not build the recommended packages. The build system creates
;; random temporary directories and embeds their names in some
;; package files. We build these packages with the r-build-system
;; instead.
"--without-recommended-packages"
`(;; We build the recommended packages here, because they are needed in
;; order to run the test suite. We disable them in the r-minimal
;; package.
"--with-cairo"
"--with-blas=-lopenblas"
"--with-libpng"
@ -292,6 +290,19 @@ (define-public r-minimal
available, greatly increasing its breadth and scope.")
(license license:gpl3+)))
(define-public r-minimal
(package (inherit r-with-tests)
(name "r-minimal")
(arguments
`(#:tests? #f
,@(substitute-keyword-arguments (package-arguments r-with-tests)
((#:configure-flags flags)
;; Do not build the recommended packages. The build system creates
;; random temporary directories and embeds their names in some
;; package files. We build these packages with the r-build-system
;; instead.
`(cons "--without-recommended-packages" ,flags)))))))
(define-public rmath-standalone
(package (inherit r-minimal)
(name "rmath-standalone")