From 46130b7bee382c6f9de8f80fb0f067253fcd9ca9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 14:03:26 +0100 Subject: [PATCH] gnu: r-scales: Move to (gnu packages cran). * gnu/packages/statistics.scm (r-scales): Move variable from here... * gnu/packages/cran.scm (r-scales): ...to here. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ gnu/packages/statistics.scm | 26 -------------------------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7715b1cf63..947d60721f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016, 2017 Ben Woodcroft ;;; Copyright © 2017, 2018 Roel Janssen ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice @@ -95,6 +96,32 @@ (define-public r-clipr the system clipboards.") (license license:gpl3))) +(define-public r-scales + (package + (name "r-scales") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "scales" version)) + (sha256 + (base32 "0353dkh3d7x78463c6ds80hcml59lrqwr8rlv82a8dnkxla4l7qc")))) + (build-system r-build-system) + (propagated-inputs + `(("r-labeling" ,r-labeling) + ("r-munsell" ,r-munsell) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-rcpp" ,r-rcpp) + ("r-r6" ,r-r6) + ("r-viridislite" ,r-viridislite))) + (home-page "https://github.com/hadley/scales") + (synopsis "Scale functions for visualization") + (description + "This package provides graphical scales that map data to aesthetics, and +provides methods for automatically determining breaks and labels for axes and +legends.") + (license license:expat))) + (define-public r-ellipsis (package (name "r-ellipsis") diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 655e404b73..ea91126c74 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1108,32 +1108,6 @@ (define-public r-reshape2 using just two functions: melt and dcast (or acast).") (license license:expat))) -(define-public r-scales - (package - (name "r-scales") - (version "1.0.0") - (source - (origin - (method url-fetch) - (uri (cran-uri "scales" version)) - (sha256 - (base32 "0353dkh3d7x78463c6ds80hcml59lrqwr8rlv82a8dnkxla4l7qc")))) - (build-system r-build-system) - (propagated-inputs - `(("r-labeling" ,r-labeling) - ("r-munsell" ,r-munsell) - ("r-rcolorbrewer" ,r-rcolorbrewer) - ("r-rcpp" ,r-rcpp) - ("r-r6" ,r-r6) - ("r-viridislite" ,r-viridislite))) - (home-page "https://github.com/hadley/scales") - (synopsis "Scale functions for visualization") - (description - "This package provides graphical scales that map data to aesthetics, and -provides methods for automatically determining breaks and labels for axes and -legends.") - (license license:expat))) - (define-public r-ggplot2 (package (name "r-ggplot2")