TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: MariaDB: Update to 10.5.8.

Browse source 
* gnu/packages/databases.scm (mariadb): Update to 10.5.8.
[arguments]: Adjust #:configure-flags to not install tests; remove code for
the same.  Adjust phases for upstream test changes.  Add workaround.
This commit is contained in:
Marius Bakke 2020-11-29 20:09:32 +01:00
parent 6223566971
commit ce29031a23
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/databases.scm
View file

@ -898,7 +898,7 @@ (define-public mysql
(define-public mariadb
(package
(name "mariadb")
(version "10.5.6")
(version "10.5.8")
(source (origin
(method url-fetch)
(uri (string-append "https://downloads.mariadb.com/MariaDB"
@ -906,7 +906,7 @@ (define-public mariadb
version ".tar.gz"))
(sha256
(base32
"1i257h0zdypdfj5wkg6ck9pxlkph0jvjs92k22pjr6gnx5lxs1gz"))
"1s3vfm73911cddjhgpcbkya6nz7ag2zygg56qqzwscn5ybv28j7b"))
(modules '((guix build utils)))
(snippet
'(begin
@ -956,6 +956,11 @@ (define-public mariadb
"-DDEFAULT_COLLATION=utf8_general_ci"
"-DMYSQL_DATADIR=/var/lib/mysql"
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
;; Do not install the tests or benchmark suite.
"-DINSTALL_MYSQLTESTDIR=false"
"-DINSTALL_SQLBENCHDIR=false"
(string-append "-DCMAKE_INSTALL_PREFIX=" (assoc-ref %outputs "lib"))
(string-append "-DCMAKE_INSTALL_RPATH=" (assoc-ref %outputs "lib")
"/lib")
@ -1005,8 +1010,15 @@ (define-public mariadb
"main.explain_non_select"
"main.stat_tables"
"main.stat_tables_innodb"
"main.upgrade_MDEV-19650"
"roles.acl_statistics"
;; FIXME: This test checks various table encodings and
;; fails because Guix defaults to UTF8 instead of the
;; upstream default latin1_swedish_ci. It's not easily
;; substitutable because several encodings are tested.
"main.sp2"
;; This file contains a time bomb which makes it fail after
;; 2030-12-31. See <https://bugs.gnu.org/34351> for details.
"main.mysqldump"))
@ -1077,12 +1089,15 @@ (define-public mariadb
(("\\$basedir/share/mysql")
(string-append lib "/share/mysql")))
;; Remove unneeded files for testing.
(with-directory-excursion lib
(for-each delete-file-recursively
'("mysql-test" "sql-bench"))
;; And static libraries.
;; FIXME: Something creates an empty gnu/store/xxx-mariadb/bin
;; directory at the root of the lib output. It's not present
;; in the installation log. This started occuring between
;; 10.5.6 and 10.5.8. How to prevent it?
(delete-file-recursively "gnu")
;; Remove static libraries.
(for-each delete-file (find-files "lib" "\\.a$")))
(with-directory-excursion out
(delete-file "share/man/man1/mysql-test-run.pl.1")
;; Delete huge and unnecessary executables.