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:
parent
f1fe5283c9
commit
2d7c4ae3ee
|
@ -478,7 +478,7 @@ BED, GFF/GTF, VCF.")
|
||||||
(inputs
|
(inputs
|
||||||
`(("bedtools" ,bedtools-2.18)
|
`(("bedtools" ,bedtools-2.18)
|
||||||
("samtools" ,samtools-0.1)
|
("samtools" ,samtools-0.1)
|
||||||
("r" ,r)
|
("r-minimal" ,r-minimal)
|
||||||
("r-foreach" ,r-foreach)
|
("r-foreach" ,r-foreach)
|
||||||
("r-xnomial" ,r-xnomial)
|
("r-xnomial" ,r-xnomial)
|
||||||
("r-domc" ,r-domc)
|
("r-domc" ,r-domc)
|
||||||
|
@ -1728,7 +1728,7 @@ gene predictor designed to work with assembled, aligned RNA-seq transcripts.")
|
||||||
("python2-scipy" ,python2-scipy)
|
("python2-scipy" ,python2-scipy)
|
||||||
("python2-matplotlib" ,python2-matplotlib)))
|
("python2-matplotlib" ,python2-matplotlib)))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("r" ,r)
|
`(("r-minimal" ,r-minimal)
|
||||||
("libsvm" ,libsvm)
|
("libsvm" ,libsvm)
|
||||||
("randomjungle" ,randomjungle)))
|
("randomjungle" ,randomjungle)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
|
@ -4004,7 +4004,7 @@ partial genes, and identifies translation initiation sites.")
|
||||||
("grep" ,grep)
|
("grep" ,grep)
|
||||||
("sed" ,sed)
|
("sed" ,sed)
|
||||||
("gawk" ,gawk)
|
("gawk" ,gawk)
|
||||||
("r" ,r)
|
("r-minimal" ,r-minimal)
|
||||||
("r-ggplot2" ,r-ggplot2)
|
("r-ggplot2" ,r-ggplot2)
|
||||||
("coreutils" ,coreutils)))
|
("coreutils" ,coreutils)))
|
||||||
(home-page "http://sanger-pathogens.github.io/Roary")
|
(home-page "http://sanger-pathogens.github.io/Roary")
|
||||||
|
@ -4119,7 +4119,7 @@ phylogenies.")
|
||||||
(inputs
|
(inputs
|
||||||
`(("boost" ,boost)
|
`(("boost" ,boost)
|
||||||
("ncurses" ,ncurses)
|
("ncurses" ,ncurses)
|
||||||
("r" ,r)
|
("r-minimal" ,r-minimal)
|
||||||
("perl" ,perl)
|
("perl" ,perl)
|
||||||
("samtools" ,samtools-0.1)
|
("samtools" ,samtools-0.1)
|
||||||
("zlib" ,zlib)))
|
("zlib" ,zlib)))
|
||||||
|
@ -7636,7 +7636,7 @@ library implementing most of the pipeline's features.")
|
||||||
`("R_LIBS_SITE" ":" = (,(getenv "R_LIBS_SITE")))))
|
`("R_LIBS_SITE" ":" = (,(getenv "R_LIBS_SITE")))))
|
||||||
#t)))))
|
#t)))))
|
||||||
(inputs
|
(inputs
|
||||||
`(("r" ,r)
|
`(("r-minimal" ,r-minimal)
|
||||||
("r-rcas" ,r-rcas)
|
("r-rcas" ,r-rcas)
|
||||||
("guile-next" ,guile-next)
|
("guile-next" ,guile-next)
|
||||||
("guile-json" ,guile2.2-json)
|
("guile-json" ,guile2.2-json)
|
||||||
|
|
|
@ -2924,7 +2924,7 @@ E-Prime forbids the use of the \"to be\" form to strengthen your writing.")
|
||||||
(string-append "SHELL = " (which "sh")))))))))
|
(string-append "SHELL = " (which "sh")))))))))
|
||||||
(inputs
|
(inputs
|
||||||
`(("emacs" ,emacs-minimal)
|
`(("emacs" ,emacs-minimal)
|
||||||
("r" ,r)))
|
("r-minimal" ,r-minimal)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("perl" ,perl)
|
`(("perl" ,perl)
|
||||||
("texinfo" ,texinfo)
|
("texinfo" ,texinfo)
|
||||||
|
|
|
@ -402,7 +402,7 @@ sample proximities between pairs of cases.")
|
||||||
(inputs
|
(inputs
|
||||||
`(("python" ,python)
|
`(("python" ,python)
|
||||||
("numpy" ,python-numpy)
|
("numpy" ,python-numpy)
|
||||||
("r" ,r)
|
("r-minimal" ,r-minimal)
|
||||||
("octave" ,octave)
|
("octave" ,octave)
|
||||||
("swig" ,swig)
|
("swig" ,swig)
|
||||||
("hdf5" ,hdf5)
|
("hdf5" ,hdf5)
|
||||||
|
|
|
@ -4085,7 +4085,7 @@ operators such as union, intersection, and difference.")
|
||||||
`(("readline" ,readline)
|
`(("readline" ,readline)
|
||||||
("icu4c" ,icu4c)
|
("icu4c" ,icu4c)
|
||||||
("pcre" ,pcre)
|
("pcre" ,pcre)
|
||||||
("r" ,r)
|
("r-minimal" ,r-minimal)
|
||||||
("r-survival" ,r-survival)))
|
("r-survival" ,r-survival)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("zlib" ,zlib)))
|
`(("zlib" ,zlib)))
|
||||||
|
|
|
@ -103,9 +103,9 @@ be output in text, PostScript, PDF or HTML.")
|
||||||
;; Update this package together with the set of recommended packages: r-boot,
|
;; 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-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.
|
;; r-mass, r-matrix, r-mgcv, r-nlme, r-nnet, r-rpart, r-spatial, r-survival.
|
||||||
(define-public r
|
(define-public r-minimal
|
||||||
(package
|
(package
|
||||||
(name "r")
|
(name "r-minimal")
|
||||||
(version "3.3.3")
|
(version "3.3.3")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -538,14 +538,14 @@ definition of Surv objects, Kaplan-Meier and Aalen-Johansen (multi-state)
|
||||||
curves, Cox models, and parametric accelerated failure time models.")
|
curves, Cox models, and parametric accelerated failure time models.")
|
||||||
(license license:lgpl2.0+)))
|
(license license:lgpl2.0+)))
|
||||||
|
|
||||||
(define-public r-with-recommended-packages
|
(define-public r
|
||||||
(package (inherit r)
|
(package (inherit r-minimal)
|
||||||
(name "r-with-recommended-packages")
|
(name "r")
|
||||||
(source #f)
|
(source #f)
|
||||||
(build-system trivial-build-system)
|
(build-system trivial-build-system)
|
||||||
(arguments '(#:builder (mkdir %output)))
|
(arguments '(#:builder (mkdir %output)))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("r" ,r)
|
`(("r-minimal" ,r-minimal)
|
||||||
("r-boot" ,r-boot)
|
("r-boot" ,r-boot)
|
||||||
("r-class" ,r-class)
|
("r-class" ,r-class)
|
||||||
("r-cluster" ,r-cluster)
|
("r-cluster" ,r-cluster)
|
||||||
|
|
|
@ -62,7 +62,7 @@ release corresponding to NAME and VERSION."
|
||||||
"Return the default R package."
|
"Return the default R package."
|
||||||
;; Lazily resolve the binding to avoid a circular dependency.
|
;; Lazily resolve the binding to avoid a circular dependency.
|
||||||
(let ((r-mod (resolve-interface '(gnu packages statistics))))
|
(let ((r-mod (resolve-interface '(gnu packages statistics))))
|
||||||
(module-ref r-mod 'r)))
|
(module-ref r-mod 'r-minimal)))
|
||||||
|
|
||||||
(define* (lower name
|
(define* (lower name
|
||||||
#:key source inputs native-inputs outputs system target
|
#:key source inputs native-inputs outputs system target
|
||||||
|
|
Loading…
Reference in New Issue