diff options
Diffstat (limited to 'gnu/packages/databases.scm')
-rw-r--r-- | gnu/packages/databases.scm | 68 |
1 files changed, 54 insertions, 14 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c75e1421d5..b519aa91fb 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2017, 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> -;;; Copyright © 2017, 2018 Pierre Langlois <pierre.langlois@gmx.com> +;;; Copyright © 2017, 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2015, 2017, 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Kristofer Buffington <kristoferbuffington@gmail.com> ;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net> @@ -36,7 +36,6 @@ ;;; Copyright © 2019 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com> -;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2019, 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2020, 2021 Nicolò Balzarotti <nicolo@nixo.xyz> @@ -53,6 +52,7 @@ ;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com> ;;; Copyright © 2021 Simon Streit <simon@netpanic.org> ;;; Copyright © 2021 Alexandre Hannud Abdo <abdo@member.fsf.org> +;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -90,6 +90,7 @@ #:use-module (gnu packages emacs) #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gawk) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -695,6 +696,29 @@ auto-completion and syntax highlighting.") (for-each delete-file (find-files (string-append out "/bin") "_embedded$")) + #t))) + (add-after + 'install 'wrap-mysql_helpers + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (awk (assoc-ref inputs "gawk")) + (coreutils (assoc-ref inputs "coreutils")) + (grep (assoc-ref inputs "grep")) + (ps (assoc-ref inputs "procps")) + (sed (assoc-ref inputs "sed"))) + (wrap-program (string-append bin "/mysql_config") + `("PATH" ":" suffix + (,(string-append awk "/bin") + ,(string-append coreutils "/bin") + ,(string-append sed "/bin")))) + (wrap-program (string-append bin "/mysqld_safe") + `("PATH" ":" suffix + (,(string-append awk "/bin") + ,(string-append coreutils "/bin") + ,(string-append grep "/bin") + ,(string-append ps "/bin") + ,(string-append sed "/bin")))) #t)))))) (native-inputs `(("bison" ,bison) @@ -702,11 +726,16 @@ auto-completion and syntax highlighting.") ("pkg-config" ,pkg-config))) (inputs `(("boost" ,boost-for-mysql) + ("coreutils" ,coreutils) + ("gawk" ,gawk) + ("grep" ,grep) ("libaio" ,libaio) ("libtirpc" ,libtirpc) ("ncurses" ,ncurses) ("openssl" ,openssl) + ("procps" ,procps) ("rpcsvc-proto" ,rpcsvc-proto) ; rpcgen + ("sed" ,sed) ("zlib" ,zlib))) (home-page "https://www.mysql.com/") (synopsis "Fast, easy to use, and popular database") @@ -2951,18 +2980,20 @@ Database API 2.0T.") (define-public python-sqlalchemy (package (name "python-sqlalchemy") - (version "1.3.20") + (version "1.4.23") (source (origin (method url-fetch) (uri (pypi-uri "SQLAlchemy" version)) (sha256 - (base32 "18b9am7bsqc4nj3d2h5r93i002apczxfvpfpcqbd6f0385zmrwnj")))) + (base32 "10vm8hm8w4yfsab076ak8r4vp5v1jqdi71cky6dhha7mh5l29zvn")))) (build-system python-build-system) (native-inputs `(("python-cython" ,python-cython) ; for C extensions ("python-pytest" ,python-pytest) ("python-mock" ,python-mock))) ; for tests + (propagated-inputs + `(("python-greenlet" ,python-greenlet))) (arguments `(#:phases (modify-phases %standard-phases @@ -3097,13 +3128,13 @@ this library provides functions to facilitate such comparisons.") (define-public python-alembic (package (name "python-alembic") - (version "1.4.3") + (version "1.7.1") (source (origin (method url-fetch) (uri (pypi-uri "alembic" version)) (sha256 - (base32 "0if2dgb088clk738p26bwk50735h6jpd2kacdgc5capv2hiz6d2k")))) + (base32 "1ys0a44gh544xpbzz6r5xvz3msim74f9qklyfnw0bhn9vk9n9adf")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -3115,6 +3146,7 @@ this library provides functions to facilitate such comparisons.") ("python-pytest-cov" ,python-pytest-cov))) (propagated-inputs `(("python-dateutil" ,python-dateutil) + ("python-importlib-resources" ,python-importlib-resources) ;Python < 3.9 ("python-sqlalchemy" ,python-sqlalchemy) ("python-mako" ,python-mako) ("python-editor" ,python-editor))) @@ -3125,9 +3157,6 @@ this library provides functions to facilitate such comparisons.") SQLAlchemy Database Toolkit for Python.") (license license:expat))) -(define-public python2-alembic - (package-with-python2 python-alembic)) - (define-public python-pickleshare (package (name "python-pickleshare") @@ -3316,20 +3345,31 @@ designed to be easy and intuitive to use.") (define-public python-sadisplay (package (name "python-sadisplay") - (version "0.4.8") + (version "0.4.9") (source (origin (method url-fetch) (uri (pypi-uri "sadisplay" version)) (sha256 (base32 - "01d9lxhmgpb68gy8rd6zj6fcwp84n2qq210n1qsk3qbsir79bzh4")))) + "15jxwgla3q4xsp6rw8inqaiy1kdzc8l2cixj8amqcf0ji47icrxg")))) (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (setenv "PYTHONPATH" + (string-append ".:" (or (getenv "PYTHONPATH") + ""))) + (invoke "pytest" "-vv")) + (format #t "test suite not run~%"))))))) (propagated-inputs `(("python-sqlalchemy" ,python-sqlalchemy))) (native-inputs ;; For tests. - `(("python-nose" ,python-nose))) + `(("python-pytest" ,python-pytest))) (home-page "https://bitbucket.org/estin/sadisplay") (synopsis "SQLAlchemy schema displayer") (description "This package provides a program to build Entity @@ -3624,13 +3664,13 @@ provides support for parsing, splitting and formatting SQL statements.") (define-public python-sql (package (name "python-sql") - (version "1.0.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (pypi-uri "python-sql" version)) (sha256 - (base32 "05ni936y0ia9xmryl7mlhbj9i80nnvq1bi4zxhb96rv7yvpb3fqb")))) + (base32 "0xnimfzlxj1ddrb5xj3s4gaii278a0gpxrvwmdmrdxgjfdi3lq4x")))) (build-system python-build-system) (home-page "https://python-sql.tryton.org/") (synopsis "Library to write SQL queries in a pythonic way") |