diff options
author | Marius Bakke <marius@gnu.org> | 2020-10-12 17:23:11 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-10-13 23:48:16 +0200 |
commit | 997abda92b75a1173130f45ea840c390db2b1a23 (patch) | |
tree | f97fe2ec32173665ff28122d29fbeddc5356e20d | |
parent | 171c1f5ab339502e50caf0cdf56e89342aef661e (diff) | |
download | guix-997abda92b75a1173130f45ea840c390db2b1a23.tar.gz guix-997abda92b75a1173130f45ea840c390db2b1a23.zip |
gnu: Remove redundant MariaDB inputs.
For well-behaved build systems, including the "dev" output suffices.
* gnu/packages/bioinformatics.scm (kentutils)[inputs]: Remove MARIADB:LIB.
* gnu/packages/cran.scm (r-rmysql)[inputs]: Likewise.
* gnu/packages/databases.scm (python-mysqlclient, soci)[inputs]: Likewise.
* gnu/packages/qt.scm (qt-4, qtbase): Likewise.
* gnu/packages/ruby.scm (ruby-mysql2)[inputs]: Likewise.
-rw-r--r-- | gnu/packages/bioinformatics.scm | 1 | ||||
-rw-r--r-- | gnu/packages/cran.scm | 3 | ||||
-rw-r--r-- | gnu/packages/databases.scm | 6 | ||||
-rw-r--r-- | gnu/packages/kodi.scm | 2 | ||||
-rw-r--r-- | gnu/packages/qt.scm | 2 | ||||
-rw-r--r-- | gnu/packages/ruby.scm | 3 |
6 files changed, 5 insertions, 12 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b0edfa8403..0d5e6e3d20 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11154,7 +11154,6 @@ models. TADbit is complemented by TADkit for visualizing 3D models.") ("tcsh" ,tcsh) ("perl" ,perl) ("libpng" ,libpng) - ("mariadb" ,mariadb "lib") ("mariadb-dev" ,mariadb "dev") ("openssl" ,openssl-1.0))) (home-page "https://genome.cse.ucsc.edu/index.html") diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 59a409f8e9..463e9d4279 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3327,8 +3327,7 @@ dimensioned arrays.") (properties `((upstream-name . "RMySQL"))) (build-system r-build-system) (inputs - `(("mariadb" ,mariadb "lib") - ("mariadb-dev" ,mariadb "dev") + `(("mariadb-dev" ,mariadb "dev") ("zlib" ,zlib))) (propagated-inputs `(("r-dbi" ,r-dbi))) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 7bce37c3e9..2d4b5cf129 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2990,8 +2990,7 @@ database).") (build-system python-build-system) (arguments '(#:tests? #f)) ;XXX: requires a live database (inputs - `(("mysql" ,mariadb "lib") - ("mysql-dev" ,mariadb "dev"))) + `(("mysql-dev" ,mariadb "dev"))) (home-page "https://github.com/PyMySQL/mysqlclient-python") (synopsis "MySQLdb is an interface to the popular MySQL database server for Python") (description "MySQLdb is an interface to the popular MySQL database server @@ -3672,8 +3671,7 @@ The drivers officially supported by @code{libdbi} are: ("sqlite" ,sqlite) ("odbc" ,unixodbc) ("boost" ,boost) - ("mariadb:dev" ,mariadb "dev") - ("mariadb:lib" ,mariadb "lib"))) + ("mariadb:dev" ,mariadb "dev"))) (arguments `(#:tests? #f ; Tests may require running database management systems. #:phases diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 2edf5c0614..9ccdea46ef 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -435,7 +435,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") ("libxrender" ,libxrender) ("libxslt" ,libxslt) ("lzo" ,lzo) - ("mariadb" ,mariadb "lib") + ("mariadb-dev" ,mariadb "lib") ("mariadb-dev" ,mariadb "dev") ("openssl" ,openssl) ("pcre" ,pcre) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a596ca4ce6..aabbdc308f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -195,7 +195,6 @@ system, and the core design of Django is reused in Grantlee.") ("libxslt" ,libxslt) ("libxtst" ,libxtst) ("mtdev" ,mtdev) - ("mariadb" ,mariadb "lib") ("mariadb-dev" ,mariadb "dev") ("nss" ,nss) ("postgresql" ,postgresql) @@ -406,7 +405,6 @@ developers using C++ or QML, a CSS & JavaScript like language.") ("libxslt" ,libxslt) ("libxtst" ,libxtst) ("mtdev" ,mtdev) - ("mariadb" ,mariadb "lib") ("mariadb-dev" ,mariadb "dev") ("nss" ,nss) ("openssl" ,openssl) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7348f29eb1..cd452f88d3 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3795,8 +3795,7 @@ specs for Ruby implementations in ruby/spec.") (invoke "rspec")) #t))))) (inputs - `(("mariadb" ,mariadb "lib") - ("mariadb-dev" ,mariadb "dev") + `(("mariadb-dev" ,mariadb "dev") ("zlib" ,zlib))) (native-inputs `(("ruby-rspec" ,ruby-rspec) |