From 9aba9b127840a116c806a2cbac901cf8077abcd0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Aug 2018 15:53:20 +0200 Subject: Migrate search.cpan.org home pages to metacpan.org. The venerable search.cpan.org has retired[0]. [0]: https://log.perl.org/2018/05/goodbye-search-dot-cpan-dot-org.html * guix/import/cpan.scm (cpan-home): Generate metacpan.org home page URIs. Update all previously generated ones in (gnu packages) to their canonical new homes. --- gnu/packages/databases.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 7b056eb13b..4b576e25b7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1135,7 +1135,7 @@ extremely small.") (build-system perl-build-system) (synopsis "Database independent interface for Perl") (description "This package provides an database interface for Perl.") - (home-page "http://search.cpan.org/dist/DBI") + (home-page "https://metacpan.org/release/DBI") (license license:perl-license))) (define-public perl-dbix-class @@ -1181,7 +1181,7 @@ extremely small.") ("perl-sub-name" ,perl-sub-name) ("perl-text-balanced" ,perl-text-balanced) ("perl-try-tiny" ,perl-try-tiny))) - (home-page "http://search.cpan.org/dist/DBIx-Class") + (home-page "https://metacpan.org/release/DBIx-Class") (synopsis "Extensible and flexible object <-> relational mapper") (description "An SQL to OO mapper with an object API inspired by Class::DBI (with a compatibility layer as a springboard for porting) and a @@ -1213,7 +1213,7 @@ single query, \"JOIN\", \"LEFT JOIN\", \"COUNT\", \"DISTINCT\", \"GROUP BY\", (propagated-inputs `(("perl-carp-clan" ,perl-carp-clan) ("perl-dbix-class" ,perl-dbix-class))) - (home-page "http://search.cpan.org/dist/DBIx-Class-Cursor-Cached") + (home-page "https://metacpan.org/release/DBIx-Class-Cursor-Cached") (synopsis "Cursor with built-in caching support") (description "DBIx::Class::Cursor::Cached provides a cursor class with built-in caching support.") @@ -1236,7 +1236,7 @@ built-in caching support.") `(("perl-module-install" ,perl-module-install))) (propagated-inputs `(("perl-dbix-class" ,perl-dbix-class))) - (home-page "http://search.cpan.org/dist/DBIx-Class-IntrospectableM2M") + (home-page "https://metacpan.org/release/DBIx-Class-IntrospectableM2M") (synopsis "Introspect many-to-many relationships") (description "Because the many-to-many relationships are not real relationships, they can not be introspected with DBIx::Class. Many-to-many @@ -1295,7 +1295,7 @@ introspected and examined.") ("perl-sub-name" ,perl-sub-name) ("perl-try-tiny" ,perl-try-tiny))) (arguments `(#:tests? #f)) ;TODO: t/20invocations.t fails - (home-page "http://search.cpan.org/dist/DBIx-Class-Schema-Loader") + (home-page "https://metacpan.org/release/DBIx-Class-Schema-Loader") (synopsis "Create a DBIx::Class::Schema based on a database") (description "DBIx::Class::Schema::Loader automates the definition of a DBIx::Class::Schema by scanning database table definitions and setting up the @@ -1320,7 +1320,7 @@ columns, primary keys, unique constraints and relationships.") (propagated-inputs `(("perl-dbi" ,perl-dbi) ("postgresql" ,postgresql))) - (home-page "http://search.cpan.org/dist/DBD-Pg") + (home-page "https://metacpan.org/release/DBD-Pg") (synopsis "DBI PostgreSQL interface") (description "This package provides a PostgreSQL driver for the Perl5 @dfn{Database Interface} (DBI).") @@ -1345,7 +1345,7 @@ columns, primary keys, unique constraints and relationships.") (propagated-inputs `(("perl-dbi" ,perl-dbi) ("mysql" ,mysql))) - (home-page "http://search.cpan.org/dist/DBD-mysql") + (home-page "https://metacpan.org/release/DBD-mysql") (synopsis "DBI MySQL interface") (description "This package provides a MySQL driver for the Perl5 @dfn{Database Interface} (DBI).") @@ -1372,7 +1372,7 @@ the entire thing in the distribution. So in order to get a fast transaction capable RDBMS working for your Perl project you simply have to install this module, and nothing else.") (license license:perl-license) - (home-page "http://search.cpan.org/~ishigaki/DBD-SQLite/lib/DBD/SQLite.pm"))) + (home-page "https://metacpan.org/release/DBD-SQLite"))) (define-public perl-sql-abstract (package @@ -1397,7 +1397,7 @@ module, and nothing else.") ("perl-moo" ,perl-moo) ("perl-mro-compat" ,perl-mro-compat) ("perl-text-balanced" ,perl-text-balanced))) - (home-page "http://search.cpan.org/dist/SQL-Abstract") + (home-page "https://metacpan.org/release/SQL-Abstract") (synopsis "Generate SQL from Perl data structures") (description "This module was inspired by the excellent DBIx::Abstract. While based on the concepts used by DBIx::Abstract, the concepts used have @@ -1427,7 +1427,7 @@ time your data changes.") ("perl-list-moreutils" ,perl-list-moreutils) ("perl-regexp-common" ,perl-regexp-common) ("perl-sql-tokenizer" ,perl-sql-tokenizer))) - (home-page "http://search.cpan.org/dist/SQL-SplitStatement") + (home-page "https://metacpan.org/release/SQL-SplitStatement") (synopsis "Split SQL code into atomic statements") (description "This module tries to split any SQL code, even including non-standard extensions, into the atomic statements it is composed of.") @@ -1446,7 +1446,7 @@ non-standard extensions, into the atomic statements it is composed of.") (base32 "1qa2dfbzdlr5qqdam9yn78z5w3al5r8577x06qan8wv58ay6ka7s")))) (build-system perl-build-system) - (home-page "http://search.cpan.org/dist/SQL-Tokenizer") + (home-page "https://metacpan.org/release/SQL-Tokenizer") (synopsis "SQL tokenizer") (description "SQL::Tokenizer is a tokenizer for SQL queries. It does not claim to be a parser or query verifier. It just creates sane tokens from a @@ -1689,7 +1689,7 @@ database. Various higher level database abstractions.") (substitute* "config.in" (("/usr/local/BerkeleyDB") (assoc-ref inputs "bdb"))) #t))))) - (home-page "http://search.cpan.org/dist/DB_File") + (home-page "https://metacpan.org/release/DB_File") (synopsis "Perl5 access to Berkeley DB version 1.x") (description -- cgit v1.2.3 From b432c052034d529b27d6094b899f0c9583fc6f55 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Aug 2018 15:29:18 +0200 Subject: gnu: memcached: Update to 1.5.10. * gnu/packages/databases.scm (memcached): Update to 1.5.10. --- 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 4b576e25b7..c148ba4999 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -398,7 +398,7 @@ mapping from string keys to string values.") (define-public memcached (package (name "memcached") - (version "1.5.8") + (version "1.5.10") (source (origin (method url-fetch) @@ -406,7 +406,7 @@ mapping from string keys to string values.") "https://memcached.org/files/memcached-" version ".tar.gz")) (sha256 (base32 - "1ppnhsqv9047vm0rrmqla56y972f8qqjdb780iz6v922jjcc723k")))) + "0jqw3z0408yx0lzc6ykn4d29n02dk31kqnmq9b3ldmcnpl6hck29")))) (build-system gnu-build-system) (inputs `(("libevent" ,libevent) -- cgit v1.2.3 From 61d996b92171edd5086682f9acadb61870792376 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Aug 2018 15:29:51 +0200 Subject: gnu: memcached: Fix typos in description. * gnu/packages/databases.scm (memcached)[synopsis, description]: Hyphenate. --- 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 c148ba4999..acea7daf84 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -412,8 +412,8 @@ mapping from string keys to string values.") `(("libevent" ,libevent) ("cyrus-sasl" ,cyrus-sasl))) (home-page "https://memcached.org/") - (synopsis "In memory caching service") - (description "Memcached is a in memory key value store. It has a small + (synopsis "In-memory caching service") + (description "Memcached is an in-memory key-value store. It has a small and generic API, and was originally intended for use with dynamic web applications.") (license license:bsd-3))) -- cgit v1.2.3 From 34ba1b8fc539c75fd7d03e44a242e023be82b2ab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Aug 2018 21:21:19 +0200 Subject: gnu: perl-db-file: Update to 1.842. * gnu/packages/databases.scm (perl-db-file): Update to 1.842. --- 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 acea7daf84..04b9085e50 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1667,7 +1667,7 @@ database. Various higher level database abstractions.") (define-public perl-db-file (package (name "perl-db-file") - (version "1.841") + (version "1.842") (source (origin (method url-fetch) @@ -1677,7 +1677,7 @@ database. Various higher level database abstractions.") ".tar.gz")) (sha256 (base32 - "11fks42kgscpia0mxx4lc9krm7q4gv6w7m5h3m2jr3dl7viv36hn")))) + "0w2d99vs9qarng2f9fpg3gchfdzy6an13507jhclcl8wv183h5hg")))) (build-system perl-build-system) (inputs `(("bdb" ,bdb))) (native-inputs `(("perl-test-pod" ,perl-test-pod))) -- cgit v1.2.3 From 7bcc34050b2e1dc4bc3aa832b08ec123129d71be Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 14 Aug 2018 22:17:24 +0100 Subject: gnu: clementine: Fix creating initial database. It seems a recent version of sqlite broke Clementine's first startup. It turns out we can patch clementine to fix the problem instead of providing a different sqlite package: * gnu/packages/databases.scm (sqlite-with-fts3): Remove. * gnu/packages/music.scm (clementine)[inputs]: Replace sqlite-with-fts3 with sqlite. [source]: Add clementine-fix-sqlite.patch. * gnu/packages/patches/clementine-fix-sqlite.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Leo Famulari --- gnu/packages/databases.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 04b9085e50..dc2c85b961 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017, 2018 Ben Woodcroft ;;; Copyright © 2017 Rutger Helling -;;; Copyright © 2017 Pierre Langlois +;;; Copyright © 2017, 2018 Pierre Langlois ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017 Kristofer Buffington ;;; Copyright © 2018 Amirouche Boubekki @@ -1069,20 +1069,6 @@ is in the public domain.") ((#:configure-flags flags) `(cons "--enable-fts5" ,flags)))))) -;; This is used by Clementine. -(define-public sqlite-with-fts3 - (package (inherit sqlite) - (name "sqlite-with-fts3") - (arguments - (substitute-keyword-arguments (package-arguments sqlite) - ((#:configure-flags flags) - `(list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " - "-DSQLITE_ENABLE_UNLOCK_NOTIFY " - "-DSQLITE_ENABLE_DBSTAT_VTAB " - "-DSQLITE_ENABLE_FTS3 " - "-DSQLITE_ENABLE_FTS3_PARENTHESIS " - "-DSQLITE_ENABLE_FTS3_TOKENIZER"))))))) - (define-public tdb (package (name "tdb") -- cgit v1.2.3 From 7fe3a57ac541fb71d5a88ebece6dc19a236c8d9c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Aug 2018 23:12:31 +0200 Subject: gnu: mysql: Use HTTPS. * gnu/packages/databases.scm (mysql)[source, home-page]: Use HTTPS. --- gnu/packages/databases.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index dc2c85b961..87c925a6b7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -555,11 +555,11 @@ RDBMS systems (which are deep in functionality).") (source (origin (method url-fetch) (uri (list (string-append - "http://dev.mysql.com/get/Downloads/MySQL-" + "https://dev.mysql.com/get/Downloads/MySQL-" (version-major+minor version) "/" name "-" version ".tar.gz") (string-append - "http://downloads.mysql.com/archives/get/file/" + "https://downloads.mysql.com/archives/get/file/" name "-" version ".tar.gz"))) (sha256 (base32 @@ -616,7 +616,7 @@ RDBMS systems (which are deep in functionality).") ("ncurses" ,ncurses) ("openssl" ,openssl) ("zlib" ,zlib))) - (home-page "http://www.mysql.com/") + (home-page "https://www.mysql.com/") (synopsis "Fast, easy to use, and popular database") (description "MySQL is a fast, reliable, and easy to use relational database -- cgit v1.2.3 From 0a1f520d4028fcc806cca789e0406eba229bfe16 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Aug 2018 17:39:10 +0200 Subject: gnu: r-rmysql: Add missing dependency on OpenSSL. * gnu/packages/databases.scm (r-rmysql)[inputs]: Add OPENSSL. --- gnu/packages/databases.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ceeb4052f3..59dc5e58cc 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2181,6 +2181,9 @@ and web services platform functionality.") `(("pkg-config" ,pkg-config))) (inputs `(("mariadb" ,mariadb) + ;; FIXME: This should be propagated from MariaDB, but add it here + ;; for now to prevent a large rebuild. + ("openssl" ,openssl) ("zlib" ,zlib))) (propagated-inputs `(("r-dbi" ,r-dbi))) -- cgit v1.2.3 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 8327ffcc7f3be866e1890ab3abd54ca5ea8421f9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Aug 2018 21:21:16 +0200 Subject: gnu: unixodbc: Update to 2.3.7. * gnu/packages/databases.scm (unixodbc): Update to 2.3.7. --- 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..ac2e5a19ab 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1532,7 +1532,7 @@ valid SQL query.") (define-public unixodbc (package (name "unixodbc") - (version "2.3.6") + (version "2.3.7") (source (origin (method url-fetch) (uri @@ -1540,7 +1540,7 @@ valid SQL query.") "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-" version ".tar.gz")) (sha256 - (base32 "0sads5b8cmmj526gyjba7ccknl1vbhkslfqshv1yqln08zv3gdl8")))) + (base32 "0xry3sg497wly8f7715a7gwkn2k36bcap0mvzjw74jj53yx6kwa5")))) (build-system gnu-build-system) (synopsis "Data source abstraction library") (description "Unixodbc is a library providing an API with which to access -- 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 From 22f5c0762423f7363c1e44f0a2d00fb6e7e81bd5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 15:52:45 +0200 Subject: gnu: mariadb: Propagate OpenSSL. * gnu/packages/databases.scm (mariadb)[inputs]: Move OPENSSL ... [propagated-inputs]: ... here. (r-rmysql)[inputs]: Remove OPENSSL. --- gnu/packages/databases.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ac2e5a19ab..3116c86377 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -792,11 +792,13 @@ Language.") ("libaio" ,libaio) ("libxml2" ,libxml2) ("ncurses" ,ncurses) - ("openssl" ,openssl) ("pcre" ,pcre) ("snappy" ,snappy) ("xz" ,xz) ("zlib" ,zlib))) + (propagated-inputs + ;; mariadb.pc says -lssl -lcrypto, so propagate it. + `(("openssl" ,openssl))) ;; 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 @@ -2167,9 +2169,6 @@ and web services platform functionality.") `(("pkg-config" ,pkg-config))) (inputs `(("mariadb" ,mariadb) - ;; FIXME: This should be propagated from MariaDB, but add it here - ;; for now to prevent a large rebuild. - ("openssl" ,openssl) ("zlib" ,zlib))) (propagated-inputs `(("r-dbi" ,r-dbi))) -- cgit v1.2.3 From 43cec3fb1ea54dedee8a5f613c833958c76892f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 17:52:40 +0200 Subject: gnu: mariadb: Remove huge mysql_embedded executable. * gnu/packages/databases.scm (mariadb)[arguments]: Adjust deletion regex. --- 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 3116c86377..a87cea212a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -779,8 +779,8 @@ Language.") (for-each delete-file-recursively '("data" "mysql-test" "sql-bench" "share/man/man1/mysql-test-run.pl.1")) - ;; Delete huge mysqltest executables. - (for-each delete-file (find-files "bin" "test")) + ;; Delete huge and unnecessary executables. + (for-each delete-file (find-files "bin" "(test|embedded)")) ;; And static libraries. (for-each delete-file (find-files "lib" "\\.a$"))) #t)))))) -- cgit v1.2.3 From 58927996d9171aa7054d20de7dbd393ebd7a3efa Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 22 Aug 2018 15:39:14 -0400 Subject: gnu: perl-dbd-mysql: Update to 4.046. * gnu/packages/databases.scm (perl-dbd-mysql): Update to 4.046. [source]: Update URL. Remove 'perl-dbd-mysql-CVE-2017-10788.patch'. * gnu/packages/patches/perl-dbd-mysql-CVE-2017-10788.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/packages/databases.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9dca5f4e62..4e64fb78b4 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1472,16 +1472,15 @@ columns, primary keys, unique constraints and relationships.") (define-public perl-dbd-mysql (package (name "perl-dbd-mysql") - (version "4.043") + (version "4.046") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/M/MI/MICHIELB/" + (uri (string-append "mirror://cpan/authors/id/C/CA/CAPTTOFU/" "DBD-mysql-" version ".tar.gz")) (sha256 (base32 - "16bg7l28n65ngi1abjxvwk906a80i2vd5vzjn812dx8phdg8d7v2")) - (patches (search-patches "perl-dbd-mysql-CVE-2017-10788.patch")))) + "1xziv9w87cl3fbl1mqkdrx28mdqly3gs6gs1ynbmpl2rr4p6arb1")))) (build-system perl-build-system) ;; Tests require running MySQL server (arguments `(#:tests? #f)) -- cgit v1.2.3 From 444488fc1b0d12190bf751b58191daea90ab243c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 24 Aug 2018 00:33:34 +0200 Subject: gnu: boost: Move 1.59.0 definition to boost.scm. Fixes a regression introduced in commit 7cbf06d8c2935abfc6c688cf3f9b99e0e5393960 where the top-level code of these two modules would depend on each other, leading to "boost: unbound variable" kind of errors in some circumstances. * gnu/packages/databases.scm (boost-for-mysql): Move to... * gnu/packages/boost.scm (boost-for-mysql): ... here. Make public and add 'properties' field. --- gnu/packages/databases.scm | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 4e64fb78b4..ecc14c259a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -549,20 +549,6 @@ 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 -- cgit v1.2.3