diff options
Diffstat (limited to 'gnu/packages/databases.scm')
| -rw-r--r-- | gnu/packages/databases.scm | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index cd760ee5ef..3d99ef08e6 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -719,6 +719,8 @@ Language.") (sha256 (base32 "1s3vfm73911cddjhgpcbkya6nz7ag2zygg56qqzwscn5ybv28j7b")) + (patches (search-patches "mariadb-CVE-2021-27928.patch" + "mariadb-cmake-compat.patch")) (modules '((guix build utils))) (snippet '(begin @@ -739,7 +741,6 @@ Language.") (append (find-files "extra/wolfssl") (find-files "zlib"))) #t)))) - (replacement mariadb/fixed) (build-system cmake-build-system) (outputs '("out" "lib" "dev")) (arguments @@ -975,13 +976,6 @@ Language.") as a drop-in replacement of MySQL.") (license license:gpl2))) -(define mariadb/fixed - (package - (inherit mariadb) - (source (origin - (inherit (package-source mariadb)) - (patches (search-patches "mariadb-CVE-2021-27928.patch")))))) - (define-public mariadb-connector-c (package (name "mariadb-connector-c") @@ -1037,14 +1031,14 @@ and high-availability (HA).") (package (name "postgresql") (replacement postgresql-13.3) - (version "13.1") + (version "13.2") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "07z6zwr58dckaa97yl9ml240z83d1lhgaxw9aq49i8lsp21mqd0j")) + "1z5d847jnajcfr3wa6jn52a8xjhamvwzmz18xlm5nvxqip8grmsz")) (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))) (build-system gnu-build-system) (arguments @@ -1063,6 +1057,12 @@ and high-availability (HA).") "src/bin/psql/command.c") (("/bin/sh") (which "sh"))) #t)) + (add-before 'configure 'set-socket-dir + (lambda _ + (substitute* '("src/include/pg_config_manual.h") + (("DEFAULT_PGSOCKET_DIR[^\n]*") + "DEFAULT_PGSOCKET_DIR \"/var/run/postgresql\"")) + #t)) (add-after 'build 'build-contrib (lambda _ (invoke "make" "-C" "contrib"))) @@ -2793,11 +2793,7 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.") (description "Orator provides a simple ActiveRecord-like Object Relational Mapping implementation for Python.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-orator)))))) - -(define-public python2-orator - (package-with-python2 (strip-python2-variant python-orator))) + (license license:expat))) (define-public virtuoso-ose (package |