gnu: r: Rename to r-minimal.

* gnu/packages/statistics.scm (r): Rename to...
(r-minimal): ...this new variable.
(r-with-recommended-packages): Rename to...
(r): ...this.
* guix/build-system/r.scm (default-r): Reference r-minimal.
* gnu/packages/emacs.scm (emacs-ess)[inputs],
gnu/packages/machine-learning.scm (shogun)[inputs],
gnu/packages/python.scm (python-rpy2)[inputs],
gnu/packages/bioinformatics.scm (ribotaper)[inputs],
(couger)[propagated-inputs],
(roary)[inputs],
(rsem)[inputs],
(rcas-web)[inputs]: Change "r" to "r-minimal".
This commit is contained in:
Ricardo Wurmus 2017-03-17 09:42:22 +01:00
parent f1fe5283c9
commit 2d7c4ae3ee
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
6 changed files with 15 additions and 15 deletions

View file

@ -478,7 +478,7 @@ (define-public ribotaper
(inputs
`(("bedtools" ,bedtools-2.18)
("samtools" ,samtools-0.1)
("r" ,r)
("r-minimal" ,r-minimal)
("r-foreach" ,r-foreach)
("r-xnomial" ,r-xnomial)
("r-domc" ,r-domc)
@ -1728,7 +1728,7 @@ (define-public couger
("python2-scipy" ,python2-scipy)
("python2-matplotlib" ,python2-matplotlib)))
(propagated-inputs
`(("r" ,r)
`(("r-minimal" ,r-minimal)
("libsvm" ,libsvm)
("randomjungle" ,randomjungle)))
(native-inputs
@ -4004,7 +4004,7 @@ (define-public roary
("grep" ,grep)
("sed" ,sed)
("gawk" ,gawk)
("r" ,r)
("r-minimal" ,r-minimal)
("r-ggplot2" ,r-ggplot2)
("coreutils" ,coreutils)))
(home-page "http://sanger-pathogens.github.io/Roary")
@ -4119,7 +4119,7 @@ (define-public rsem
(inputs
`(("boost" ,boost)
("ncurses" ,ncurses)
("r" ,r)
("r-minimal" ,r-minimal)
("perl" ,perl)
("samtools" ,samtools-0.1)
("zlib" ,zlib)))
@ -7636,7 +7636,7 @@ (define-public rcas-web
`("R_LIBS_SITE" ":" = (,(getenv "R_LIBS_SITE")))))
#t)))))
(inputs
`(("r" ,r)
`(("r-minimal" ,r-minimal)
("r-rcas" ,r-rcas)
("guile-next" ,guile-next)
("guile-json" ,guile2.2-json)

View file

@ -2924,7 +2924,7 @@ (define-public emacs-ess
(string-append "SHELL = " (which "sh")))))))))
(inputs
`(("emacs" ,emacs-minimal)
("r" ,r)))
("r-minimal" ,r-minimal)))
(native-inputs
`(("perl" ,perl)
("texinfo" ,texinfo)

View file

@ -402,7 +402,7 @@ (define (delete-ifdefs file)
(inputs
`(("python" ,python)
("numpy" ,python-numpy)
("r" ,r)
("r-minimal" ,r-minimal)
("octave" ,octave)
("swig" ,swig)
("hdf5" ,hdf5)

View file

@ -4085,7 +4085,7 @@ (define-public python-rpy2
`(("readline" ,readline)
("icu4c" ,icu4c)
("pcre" ,pcre)
("r" ,r)
("r-minimal" ,r-minimal)
("r-survival" ,r-survival)))
(native-inputs
`(("zlib" ,zlib)))

View file

@ -103,9 +103,9 @@ (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
(define-public r-minimal
(package
(name "r")
(name "r-minimal")
(version "3.3.3")
(source (origin
(method url-fetch)
@ -538,14 +538,14 @@ (define-public r-survival
curves, Cox models, and parametric accelerated failure time models.")
(license license:lgpl2.0+)))
(define-public r-with-recommended-packages
(package (inherit r)
(name "r-with-recommended-packages")
(define-public r
(package (inherit r-minimal)
(name "r")
(source #f)
(build-system trivial-build-system)
(arguments '(#:builder (mkdir %output)))
(propagated-inputs
`(("r" ,r)
`(("r-minimal" ,r-minimal)
("r-boot" ,r-boot)
("r-class" ,r-class)
("r-cluster" ,r-cluster)

View file

@ -62,7 +62,7 @@ (define (default-r)
"Return the default R package."
;; Lazily resolve the binding to avoid a circular dependency.
(let ((r-mod (resolve-interface '(gnu packages statistics))))
(module-ref r-mod 'r)))
(module-ref r-mod 'r-minimal)))
(define* (lower name
#:key source inputs native-inputs outputs system target