From e63da346cf2961fc2da084393e88883292c06f08 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 20 Aug 2018 16:13:45 +0200 Subject: gnu: Update virtuoso-ose to 7.2.5. * gnu/packages/databases.scm (virtuoso-ose): Update to 7.2.5. --- 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 15bd7f1efb..3e427fe513 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2120,7 +2120,7 @@ implementation for Python.") (define-public virtuoso-ose (package (name "virtuoso-ose") - (version "7.2.4.2") + (version "7.2.5") (source (origin (method url-fetch) @@ -2128,7 +2128,7 @@ implementation for Python.") "https://github.com/openlink/virtuoso-opensource/releases/" "download/v" version "/virtuoso-opensource-" version ".tar.gz")) (sha256 - (base32 "12dqam1gc1v93l0bj0vlpvjqppki6y1hqrlznywxnw0rrz9pb002")))) + (base32 "0r1xakclkfi69pzh8z2k16z3x0m49pxp764icj0ad4w4bb97fr42")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; Tests require a network connection. -- cgit v1.2.3 From db4e76416c423a32d83274b9ffecf5e4825c45b5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Aug 2018 15:28:59 +0200 Subject: gnu: perl-dbd-sqlite: Update to 1.58. * gnu/packages/databases.scm (perl-dbd-sqlite): Update to 1.58. --- 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 3e427fe513..3f9e89f03e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1430,7 +1430,7 @@ columns, primary keys, unique constraints and relationships.") (define-public perl-dbd-sqlite (package (name "perl-dbd-sqlite") - (version "1.54") + (version "1.58") (source (origin (method url-fetch) (uri (string-append @@ -1438,7 +1438,7 @@ columns, primary keys, unique constraints and relationships.") version ".tar.gz")) (sha256 (base32 - "0sbj9lx9syzpknvjv8cz9jndg32qz775vy2prgq305npv3dsca9r")))) + "0fqx386jgs9mmrknr7smmzapf07izgivza7x08lfm39ks2cxs83i")))) (build-system perl-build-system) (inputs `(("sqlite" ,sqlite))) (propagated-inputs `(("perl-dbi" ,perl-dbi))) -- cgit v1.2.3 From 28635e5266779cf7a843d422a814f250c7459dd1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Aug 2018 15:21:53 +0200 Subject: gnu: python-mysqlclient: Update to 1.3.13. * gnu/packages/databases.scm (python-mysqlclient): Update to 1.3.13. --- 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 3f9e89f03e..df87adf172 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2534,14 +2534,14 @@ database).") (define-public python-mysqlclient (package (name "python-mysqlclient") - (version "1.3.10") + (version "1.3.13") (source (origin (method url-fetch) (uri (pypi-uri "mysqlclient" version)) (sha256 (base32 - "0qkj570x4rbsblji6frvsvp2v1ap32dqzj1lq62zp9515ffsyaj5")))) + "0kv4a1icwdav8jpl7qvnr931lw5h3v22ids6lwq6qpi1hjzf33pz")))) (build-system python-build-system) (native-inputs `(("mariadb" ,mariadb) -- cgit v1.2.3 From 725449bd7ae6c8882d54fd4e0b6c5b3339b34627 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Aug 2018 15:17:55 +0200 Subject: gnu: python-pyodbc: Update to 4.0.24. * gnu/packages/databases.scm (python-pyodbc): Update to 4.0.24. --- 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 df87adf172..37fd88f97b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1953,14 +1953,14 @@ for ODBC.") (define-public python-pyodbc (package (name "python-pyodbc") - (version "4.0.21") + (version "4.0.24") (source (origin (method url-fetch) (uri (pypi-uri "pyodbc" version)) (sha256 (base32 - "0a83zwz3h1agshnsc6r7al6q83222w8601gpzzzjvjz5m56ghmcn")) + "1m311vi7vpay1j7rkq71fpsk0gb7454k4lldk5b63hyy6yvsn9j3")) (file-name (string-append name "-" version ".tar.gz")))) (build-system python-build-system) (inputs -- cgit v1.2.3 From 7cbf06d8c2935abfc6c688cf3f9b99e0e5393960 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Aug 2018 23:26:39 +0200 Subject: gnu: mysql: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MySQL demands boost@1.59.0, and lying about it no longer works: sql/item_geofunc_internal.cc: In function ‘void handle_gis_exception(const char*)’: sql/item_geofunc_internal.cc:37:81: error: expected unqualified-id before ‘&’ token catch (const boost::geometry::detail::self_get_turn_points::self_ip_exception &) ^ [...] * gnu/packages/databases.scm (boost-for-mysql): New variable. (mysql)[inputs]: Use that instead of the regular boost. [arguments]: Remove now-unnecessary ‘patch-boost-version’ phase. --- gnu/packages/databases.scm | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 37fd88f97b..934af5017d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -548,6 +548,22 @@ RDBMS systems (which are deep in functionality).") ;; Some parts are licensed under the Apache License license:asl2.0)))) +(define boost-for-mysql + (package + (inherit boost) + (version "1.59.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/boost/boost/" version "/boost_" + (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version) + ".tar.bz2")) + (sha256 + (base32 + "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj")))))) + +;; XXX When updating, check whether boost-for-mysql is still needed. +;; It might suffice to patch ‘cmake/boost.cmake’ as done in the past. (define-public mysql (package (name "mysql") @@ -588,15 +604,6 @@ RDBMS systems (which are deep in functionality).") "-DINSTALL_MYSQLTESTDIR=" "-DINSTALL_SQLBENCHDIR=") #:phases (modify-phases %standard-phases - (add-after - 'unpack 'patch-boost-version - (lambda _ - ;; Mysql wants boost-1.59.0 specifically - (substitute* "cmake/boost.cmake" - (("59") - ,(match (string-split (package-version boost) #\.) - ((_ minor . _) minor)))) - #t)) (add-after 'install 'remove-extra-binaries (lambda* (#:key outputs #:allow-other-keys) @@ -611,7 +618,7 @@ RDBMS systems (which are deep in functionality).") `(("bison" ,bison) ("perl" ,perl))) (inputs - `(("boost" ,boost) + `(("boost" ,boost-for-mysql) ("libaio" ,libaio) ("ncurses" ,ncurses) ("openssl" ,openssl) -- cgit v1.2.3 From 8ecf3f7ea515d555e978bea3c1610d44345a44ee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Aug 2018 00:38:46 +0200 Subject: gnu: mysql: Update to 5.7.23. * gnu/packages/databases.scm (mysql): Update to 5.7.23. --- 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 934af5017d..9f3b22384f 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -567,7 +567,7 @@ RDBMS systems (which are deep in functionality).") (define-public mysql (package (name "mysql") - (version "5.7.21") + (version "5.7.23") (source (origin (method url-fetch) (uri (list (string-append @@ -579,7 +579,7 @@ RDBMS systems (which are deep in functionality).") name "-" version ".tar.gz"))) (sha256 (base32 - "1dq9bgnajf7cq3mrjkwv6w5nwslhs26lkrw56i7w4fbsq9wm087s")))) + "0rbc3xsc11lq2dm0ip6gxa16c06hi74scb97x5cw7yhbabaz4c07")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 9763102bd7fbb5435c4e2b03001b518c310db2b3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Jul 2018 23:04:19 +0200 Subject: gnu: Add python-pymysql. * gnu/packages/databases.scm (python-pymysql, python2-pymysql): New public variables. --- gnu/packages/databases.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9f3b22384f..b1d187f801 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -84,6 +84,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages rdf) #:use-module (gnu packages readline) #:use-module (gnu packages ruby) @@ -872,6 +873,34 @@ pictures, sounds, or video.") (base32 "0biy8j69dbvdmrag55pdszpc0702agzqhhcwdx21xp02mzim4ydr")))))) +(define-public python-pymysql + (package + (name "python-pymysql") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyMySQL" version)) + (sha256 + (base32 + "0gvi63f1zq1bbd30x28kqyx351hal1yc323ckp0mihainb5n1iwy")))) + (build-system python-build-system) + (native-inputs + `(("python-unittest2" ,python-unittest2))) + (inputs + `(("python-cryptography" ,python-cryptography))) + (arguments + `(#:tests? #f)) ; tests expect a running MySQL + (home-page "https://github.com/PyMySQL/PyMySQL/") + (synopsis "Pure-Python MySQL driver") + (description + "PyMySQL is a pure-Python MySQL client library, based on PEP 249. +Most public APIs are compatible with @command{mysqlclient} and MySQLdb.") + (license license:expat))) + +(define-public python2-pymysql + (package-with-python2 python-pymysql)) + (define-public qdbm (package (name "qdbm") -- cgit v1.2.3 From 311f06c94abf019b1de16b7ebcaa054a8fd43015 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Jul 2018 23:05:14 +0200 Subject: gnu: Add sqlcrush. * gnu/packages/databases.smc (sqlcrush): New public variable. --- gnu/packages/databases.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b1d187f801..9dca5f4e62 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1147,6 +1147,37 @@ for example from a shell script.") ;; others (like sparql-query.c) contain a GPLv2+ license header. (license (list license:gpl3+)))) +(define-public sqlcrush + ;; Unfortunately, there is no proper upstream release and may never be. + (let ((commit "b5f6868f189566a26eecc78d0f0659813c1aa98a") + (revision "1")) + (package + (name "sqlcrush") + (version (git-version "0.1.5" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/coffeeandscripts/sqlcrush.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0x3wy40r93p0jv3nbwj9a77wa4ff697d13r0wffmm7q9h3mzsww8")))) + (build-system python-build-system) + (inputs + `(("python-cryptography" ,python-cryptography) + ("python-psycopg2" ,python-psycopg2) + ("python-pymysql" ,python-pymysql) + ("python-sqlalchemy" ,python-sqlalchemy))) + (home-page "https://github.com/coffeeandscripts/sqlcrush") + (synopsis "Text console-based database viewer and editor") + (description + "SQLcrush lets you view and edit a database directly from the text +console through an ncurses interface. You can explore each table's structure, +browse and edit the contents, add and delete entries, all while tracking your +changes.") + (license license:gpl3+)))) ; no headers, see README.md + (define-public sqlite (package (name "sqlite") -- cgit v1.2.3