~ruther/guix-local

2d7c4ae3ee83841ef827a160b0d23c1d10d2570d — Ricardo Wurmus 9 years ago f1fe528
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".
M gnu/packages/bioinformatics.scm => gnu/packages/bioinformatics.scm +5 -5
@@ 478,7 478,7 @@ BED, GFF/GTF, VCF.")
    (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 @@ gene predictor designed to work with assembled, aligned RNA-seq transcripts.")
       ("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 @@ partial genes, and identifies translation initiation sites.")
       ("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 @@ phylogenies.")
    (inputs
     `(("boost" ,boost)
       ("ncurses" ,ncurses)
       ("r" ,r)
       ("r-minimal" ,r-minimal)
       ("perl" ,perl)
       ("samtools" ,samtools-0.1)
       ("zlib" ,zlib)))


@@ 7636,7 7636,7 @@ library implementing most of the pipeline's features.")
                 `("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)

M gnu/packages/emacs.scm => gnu/packages/emacs.scm +1 -1
@@ 2924,7 2924,7 @@ E-Prime forbids the use of the \"to be\" form to strengthen your writing.")
                (string-append "SHELL = " (which "sh")))))))))
    (inputs
     `(("emacs" ,emacs-minimal)
       ("r" ,r)))
       ("r-minimal" ,r-minimal)))
    (native-inputs
     `(("perl" ,perl)
       ("texinfo" ,texinfo)

M gnu/packages/machine-learning.scm => gnu/packages/machine-learning.scm +1 -1
@@ 402,7 402,7 @@ sample proximities between pairs of cases.")
    (inputs
     `(("python" ,python)
       ("numpy" ,python-numpy)
       ("r" ,r)
       ("r-minimal" ,r-minimal)
       ("octave" ,octave)
       ("swig" ,swig)
       ("hdf5" ,hdf5)

M gnu/packages/python.scm => gnu/packages/python.scm +1 -1
@@ 4085,7 4085,7 @@ operators such as union, intersection, and difference.")
     `(("readline" ,readline)
       ("icu4c" ,icu4c)
       ("pcre" ,pcre)
       ("r" ,r)
       ("r-minimal" ,r-minimal)
       ("r-survival" ,r-survival)))
    (native-inputs
     `(("zlib" ,zlib)))

M gnu/packages/statistics.scm => gnu/packages/statistics.scm +6 -6
@@ 103,9 103,9 @@ be output in text, PostScript, PDF or HTML.")
;; 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 @@ definition of Surv objects, Kaplan-Meier and Aalen-Johansen (multi-state)
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)

M guix/build-system/r.scm => guix/build-system/r.scm +1 -1
@@ 62,7 62,7 @@ release corresponding to NAME and VERSION."
  "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