[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/16: gnu: MariaDB: Remove workaround package.
From: |
guix-commits |
Subject: |
06/16: gnu: MariaDB: Remove workaround package. |
Date: |
Sun, 19 Jan 2020 16:42:42 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit ca69163cc5aac9ff15a358449ed229631434a4fa
Author: Marius Bakke <address@hidden>
AuthorDate: Sun Jan 19 10:36:55 2020 +0100
gnu: MariaDB: Remove workaround package.
* gnu/packages/databases.scm (mariadb)[arguments]: Add substitution for the
'mysql_install_db' script.
(mariadb/fixed-install-db): Remove variable.
(libdbi-drivers)[native-inputs]: Change from MARIADB/FIXED-INSTALL-DB to
MARIADB.
---
gnu/packages/databases.scm | 34 ++++++----------------------------
1 file changed, 6 insertions(+), 28 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index ca15c77..283c892 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -879,6 +879,11 @@ Language.")
(rename-file (string-append out "/bin/mysql_config")
(string-append dev "/bin/mysql_config"))
+
+ (substitute* (string-append out "/bin/mysql_install_db")
+ (("\\$basedir/share/mysql")
+ (string-append lib "/share/mysql")))
+
;; Embed an absolute reference to OpenSSL in mysql_config
;; and the pkg-config file to avoid propagation.
(substitute* (list (string-append dev "/bin/mysql_config")
@@ -914,33 +919,6 @@ Language.")
as a drop-in replacement of MySQL.")
(license license:gpl2)))
-;; TODO: mysql_install_db is broken in MariaDB. This package is here as
-;; a workaround for packages that need it. Merge with 'mariadb' in the next
-;; rebuild cycle.
-(define-public mariadb/fixed-install-db
- (hidden-package
- (package/inherit
- mariadb
- (name "mariadb-fixed")
- (native-inputs '())
- (inputs
- `(("mariadb" ,mariadb)
- ("mariadb:lib" ,mariadb "lib")))
- (outputs '("out"))
- (build-system trivial-build-system)
- (arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules ((guix build utils)))
- (let ((out (assoc-ref %outputs "out")))
- (copy-recursively (assoc-ref %build-inputs "mariadb") out)
- (substitute* (string-append out "/bin/mysql_install_db")
- (("\\$basedir/share/mysql")
- (string-append (assoc-ref %build-inputs "mariadb:lib")
- "/share/mysql")))
- #t)))))))
-
;; Don't forget to update the other postgresql packages when upgrading this
one.
(define-public postgresql
(package
@@ -3278,7 +3256,7 @@ simultaneous database connections by using this
framework.")
`(;; For tests.
("inetutils" ,inetutils)
("glibc-locales" ,glibc-locales)
- ("mariadb" ,mariadb/fixed-install-db)))
+ ("mariadb" ,mariadb)))
(inputs
`(("libdbi" ,libdbi)
("mariadb:dev" ,mariadb "dev")
- branch staging updated (6e332fd -> 25b8d67), guix-commits, 2020/01/19
- 01/16: gnu: source-highlight: Update to 3.1.9., guix-commits, 2020/01/19
- 03/16: gnu: nss, nss-certs: Update to 3.49.1., guix-commits, 2020/01/19
- 04/16: gnu: cups: Update to 2.3.1., guix-commits, 2020/01/19
- 05/16: gnu: cups-filters: Update to 1.26.2., guix-commits, 2020/01/19
- 02/16: gnu: procps: Update to 3.3.16., guix-commits, 2020/01/19
- 06/16: gnu: MariaDB: Remove workaround package.,
guix-commits <=
- 08/16: gnu: libinput: Update to 1.15.0., guix-commits, 2020/01/19
- 09/16: gnu: libva: Update to 2.6.1., guix-commits, 2020/01/19
- 07/16: gnu: OpenSSL@1.0: Update to 1.0.2u., guix-commits, 2020/01/19
- 10/16: gnu: mesa: Update to 19.3.2., guix-commits, 2020/01/19
- 12/16: gnu: libxkbcommon: Update to 0.10.0., guix-commits, 2020/01/19
- 11/16: gnu: libwebp: Update to 1.1.0., guix-commits, 2020/01/19
- 13/16: gnu: libical: Update to 3.0.7., guix-commits, 2020/01/19
- 15/16: gnu: python-pygments: Update to 2.5.2., guix-commits, 2020/01/19
- 16/16: gnu: ImageMagick: Update to 6.9.10-87., guix-commits, 2020/01/19
- 14/16: gnu: dejagnu: Update to 1.6.2., guix-commits, 2020/01/19