From ab0cb26f1a068a8ff31f058f01f25f8d51729cf2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:37:05 +0100 Subject: 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. --- gnu/packages/databases.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') 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 . + (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))) -- cgit 1.4.1 From cb669c095156eef44c1ae8aecda9931a777794ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 9 Dec 2019 22:37:24 +0100 Subject: gnu: postgresql@10: Update to 10.11. * gnu/packages/databases.scm (postgresql): Update to 10.11. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 581f7b79a5..23c5ed32e0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -910,14 +910,14 @@ as a drop-in replacement of MySQL.") (define-public postgresql (package (name "postgresql") - (version "10.10") + (version "10.11") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "0lzj46dwd9cw94gnqm36bxd7jlhfdyqjrfzr3c4xd3prfn2rnkxd")) + "02fcmvbh0mhplj3s2jd24s642ysx7bggnf0h8bs5amh7dgzi8p8d")) (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 939c5b2cb6952cd8549bf17d6fd3bcbfb582f0bd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Dec 2019 16:19:23 +0100 Subject: gnu: MariaDB: Do not propagate OpenSSL. * gnu/packages/databases.scm (mariadb)[propagated-inputs]: Remove. [inputs]: Add OPENSSL-1.0. [arguments]: Add absolute references to OpenSSL in "post-install" phase. --- gnu/packages/databases.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 23c5ed32e0..0f04647a73 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -851,10 +851,11 @@ Language.") #t)) (add-after 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (dev (assoc-ref outputs "dev")) - (lib (assoc-ref outputs "lib"))) + (lib (assoc-ref outputs "lib")) + (openssl (assoc-ref inputs "openssl"))) (substitute* (string-append out "/bin/mysql_install_db") (("basedir=\"\"") (string-append "basedir=\"" out "\""))) @@ -876,6 +877,14 @@ Language.") (string-append dev "/share/pkgconfig")) (rename-file (string-append out "/bin/mysql_config") (string-append dev "/bin/mysql_config")) + + ;; 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") + (string-append dev "/share/pkgconfig/mariadb.pc")) + (("-lssl -lcrypto" all) + (string-append "-L" openssl "/lib " all))) + #t)))))) (native-inputs `(("bison" ,bison) @@ -889,13 +898,11 @@ Language.") ("libaio" ,libaio) ("libxml2" ,libxml2) ("ncurses" ,ncurses) + ("openssl" ,openssl-1.0) ("pam" ,linux-pam) ("pcre" ,pcre) ("xz" ,xz) ("zlib" ,zlib))) - (propagated-inputs - ;; mariadb.pc says -lssl -lcrypto, so propagate it. - `(("openssl" ,openssl-1.0))) ;; The test suite is very resource intensive and can take more than three ;; hours on a x86_64 system. Give slow and busy machines some leeway. (properties '((timeout . 64800))) ;18 hours -- cgit 1.4.1 From 9930beb86084a40f17f71709d41f03338876feb3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 3 Jan 2020 16:10:29 +0200 Subject: gnu: python-apsw: Don't use unstable tarball. * gnu/packages/databases.scm (python-apsw)[source]: Download using release zip archive. [native-inputs]: Add unzip. --- gnu/packages/databases.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 73b7dc7d3a..113e640739 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2016 Christopher Allan Webber -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2017, 2018 Roel Janssen ;;; Copyright © 2016 David Craven @@ -2630,13 +2630,14 @@ PickleShare.") (source (origin (method url-fetch) - (uri (string-append "https://github.com/rogerbinns/apsw/archive/" - version ".tar.gz")) - (file-name (string-append "apsw-" version ".tar.gz")) + (uri (string-append "https://github.com/rogerbinns/apsw/releases" + "/download/" version "/apsw-" version ".zip")) (sha256 (base32 - "00ai7m2pqi26qaflhz314d8k5i3syw7xzr145fhfl0crhyh6adz2")))) + "02mgxyznxg0va85r1lk6pvjh7qvar33fivj0bn534jb0yy271a9y")))) (build-system python-build-system) + (native-inputs + `(("unzip" ,unzip))) (inputs `(("sqlite" ,sqlite))) (arguments -- cgit 1.4.1 From 53a9970e3b5417f07b6d6dd741356223da40ba9f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 3 Jan 2020 16:15:58 +0200 Subject: gnu: python-apsw: Use 'replace' for 'check phase. * gnu/packages/databases.scm (python-apsw)[arguments]: Update build phase order and replace stock 'check phase. --- gnu/packages/databases.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 113e640739..cd21db8deb 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2652,8 +2652,7 @@ PickleShare.") (invoke "gcc" "-fPIC" "-shared" "-o" "./testextension.sqlext" "-I." "-Isqlite3" "src/testextension.c") #t)) - (delete 'check) - (add-after 'install 'check + (replace 'check (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) (invoke "python" "setup.py" "test") -- cgit 1.4.1 From 877aa9c3980d47c3572d50dea980774641ddab6c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 3 Jan 2020 16:19:59 +0200 Subject: gnu: python-apsw: Update to 3.28.0-r1. * gnu/packages/databases.scm (python-apsw): Update to 3.28.0-r1. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index cd21db8deb..393dbee6d0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2626,7 +2626,7 @@ PickleShare.") (define-public python-apsw (package (name "python-apsw") - (version "3.20.1-r1") + (version "3.28.0-r1") (source (origin (method url-fetch) @@ -2634,7 +2634,7 @@ PickleShare.") "/download/" version "/apsw-" version ".zip")) (sha256 (base32 - "02mgxyznxg0va85r1lk6pvjh7qvar33fivj0bn534jb0yy271a9y")))) + "0x62534l5hcgwrc4k2gxpdzc1sxlhm6m4nwlay74rnmr77qh8wly")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip))) -- cgit 1.4.1 From 2316f027f806965062fc842f0ad5be28582c54c5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Dec 2019 19:15:21 +0100 Subject: gnu: rocksdb: Update to 6.5.2. * gnu/packages/databases.scm (rocksdb): Update to 6.5.2. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 32c57f3607..ca15c77026 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1128,7 +1128,7 @@ including field and record folding."))) (define-public rocksdb (package (name "rocksdb") - (version "5.18.3") + (version "6.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -1137,7 +1137,7 @@ including field and record folding."))) (file-name (git-file-name name version)) (sha256 (base32 - "1v2slmmr1dsgf8z0qcfg1y9x1al96859rg48b66p9nsawczd5zv9")) + "01f5lcrcr809jhkkvxhv743hwpcxszj4r30hy9qy1i0mvjky02vf")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1