01/05: gnu: r-rmysql: Move from databases.scm to cran.scm

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit d9bec9a87b66a2d9f27090f9fd93b3d6f9169706
Author: Ricardo Wurmus <address@hidden>
Date:   Mon Jan 7 15:39:30 2019 +0100

    gnu: r-rmysql: Move from databases.scm to cran.scm
    
    * gnu/packages/databases.scm (r-rmysql): Move from here...
    * gnu/packages/cran.scm (r-rmysql): ...to here.
---
 gnu/packages/cran.scm      | 31 +++++++++++++++++++++++++++++++
 gnu/packages/databases.scm | 31 -------------------------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 20730c5..174c2fe 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2018 Mădălin Ionel Patrașcu <address@hidden>
 ;;; Copyright © 2018 Laura Lazzati <address@hidden>
 ;;; Copyright © 2018 Leo Famulari <address@hidden>
+;;; Copyright © 2018 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37,6 +38,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
+  #:use-module (gnu packages databases)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gl)
@@ -2178,6 +2180,35 @@ a variety of functions for the manipulation and analysis 
of arbitrarily
 dimensioned arrays.")
     (license license:gpl2)))
 
+(define-public r-rmysql
+  (package
+    (name "r-rmysql")
+    (version "0.10.15")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "RMySQL" version))
+       (sha256
+        (base32
+         "0bmc7w5fnkjaf333sgc0hskiy332m9gmfaxg0yzkjxscpizdw43n"))))
+    (properties `((upstream-name . "RMySQL")))
+    (build-system r-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("mariadb" ,mariadb)
+       ("zlib" ,zlib)))
+    (propagated-inputs
+     `(("r-dbi" ,r-dbi)))
+    (home-page "https://github.com/r-dbi/RMySQL";)
+    (synopsis "Database interface and MySQL driver for R")
+    (description
+     "This package provides a DBI interface to MySQL / MariaDB.  The RMySQL
+package contains an old implementation based on legacy code from S-PLUS which
+is being phased out.  A modern MySQL client based on Rcpp is available from
+the RMariaDB package.")
+    (license license:gpl2)))
+
 (define-public r-geometry
   (package
     (name "r-geometry")
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 3691105..161a062 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -89,7 +89,6 @@
   #:use-module (gnu packages readline)
   #:use-module (gnu packages ruby)
   #:use-module (gnu packages serialization)
-  #:use-module (gnu packages statistics)
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages terminals)
   #:use-module (gnu packages textutils)
@@ -107,7 +106,6 @@
   #:use-module (guix build-system python)
   #:use-module (guix build-system ruby)
   #:use-module (guix build-system cmake)
-  #:use-module (guix build-system r)
   #:use-module (guix build-system scons)
   #:use-module ((guix build utils) #:hide (which))
   #:use-module (guix utils)
@@ -2235,35 +2233,6 @@ and web services platform functionality.")
     (supported-systems '("x86_64-linux" "mips64el-linux" "aarch64-linux"))
     (license license:gpl2)))
 
-(define-public r-rmysql
-  (package
-    (name "r-rmysql")
-    (version "0.10.15")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (cran-uri "RMySQL" version))
-       (sha256
-        (base32
-         "0bmc7w5fnkjaf333sgc0hskiy332m9gmfaxg0yzkjxscpizdw43n"))))
-    (properties `((upstream-name . "RMySQL")))
-    (build-system r-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (inputs
-     `(("mariadb" ,mariadb)
-       ("zlib" ,zlib)))
-    (propagated-inputs
-     `(("r-dbi" ,r-dbi)))
-    (home-page "https://github.com/r-dbi/RMySQL";)
-    (synopsis "Database interface and MySQL driver for R")
-    (description
-     "This package provides a DBI interface to MySQL / MariaDB.  The RMySQL
-package contains an old implementation based on legacy code from S-PLUS which
-is being phased out.  A modern MySQL client based on Rcpp is available from
-the RMariaDB package.")
-    (license license:gpl2)))
-
 (define-public python-ccm
   (package
     (name "python-ccm")