diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-12-09 22:37:05 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-12-11 01:14:37 +0100 |
| commit | ab0cb26f1a068a8ff31f058f01f25f8d51729cf2 (patch) | |
| tree | 15ef4baf4d6cb8d3f2a3aa2762b2f4c95e86e5c2 /gnu/packages/databases.scm | |
| parent | ddf31e9a49dffab297946f15cc8625a8984845cb (diff) | |
| download | guix-patches-ab0cb26f1a068a8ff31f058f01f25f8d51729cf2.tar guix-patches-ab0cb26f1a068a8ff31f058f01f25f8d51729cf2.tar.gz | |
gnu: MariaDB: Update to 10.1.43.
* gnu/packages/databases.scm (mariadb): Update to 10.1.43.
[arguments]: Disable new test.
[inputs]: Add LINUX-PAM.
Diffstat (limited to 'gnu/packages/databases.scm')
| -rw-r--r-- | gnu/packages/databases.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index cb843672af..581f7b79a5 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -686,7 +686,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.1.41") + (version "10.1.43") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.com/MariaDB" @@ -694,7 +694,7 @@ Language.") version ".tar.gz")) (sha256 (base32 - "1wh0073lqw3d9xs150bf2q3qvjwa6886mfi9khmsn7p8vapw6irb")) + "1pxyq37q4p7515by7k8hs3l3css68f3bm3akx99vw4m1rxwwbm63")) (patches (search-patches "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet @@ -815,6 +815,12 @@ Language.") disabled-tests) (close-port unstable-tests) + ;; XXX: This test fails because it expects a latin1 charset and + ;; collation. See <https://jira.mariadb.org/browse/MDEV-21264>. + (substitute* "mysql-test/r/gis_notembedded.result" + (("latin1_swedish_ci") "utf8_general_ci") + (("\tlatin1") "\tutf8")) + (substitute* "mysql-test/mysql-test-run.pl" (("/bin/ls") (which "ls")) (("/bin/sh") (which "sh"))) @@ -883,6 +889,7 @@ Language.") ("libaio" ,libaio) ("libxml2" ,libxml2) ("ncurses" ,ncurses) + ("pam" ,linux-pam) ("pcre" ,pcre) ("xz" ,xz) ("zlib" ,zlib))) |