diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-06-13 15:27:30 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-13 15:27:30 +0200 |
| commit | f388f4a5687b64795719a8db67486ec963083c3e (patch) | |
| tree | be02118802f56993c89b8fbbed33009373abf11d /gnu/packages/databases.scm | |
| parent | 3745909dc9f810844d169e5e2089707df8174462 (diff) | |
| parent | 2a9d89afb6fb869dd2bdf1e9f710f487786930fc (diff) | |
| download | guix-f388f4a5687b64795719a8db67486ec963083c3e.tar.gz | |
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/databases.scm')
| -rw-r--r-- | gnu/packages/databases.scm | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 09a262d139..55f7a46dc5 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -612,7 +612,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.1.38") + (version "10.1.40") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.org/f/" @@ -620,7 +620,7 @@ Language.") name "-" version ".tar.gz")) (sha256 (base32 - "0zq77w3ff9q781fn8cv46vy1v4ggb8vjarjvk51k653x4gyg9wfa")) + "19375bnq0yg52kqh6cy00s5rglcxdrs5bb2hy7dqv2xqa9z7lxci")) (patches (search-patches "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet @@ -802,15 +802,14 @@ as a drop-in replacement of MySQL.") (define-public postgresql (package (name "postgresql") - (version "10.7") - (replacement postgresql-10.8) + (version "10.8") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "1piyfcrcqscjhnnwn91kdvr764s7d0qz4lgygf9bl6qc71ji1vdz")) + "0pfdmy4w95b49w9rkn8dwvzmi2brpqfvbxd04y0k0s0xvymc565i")) (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))) (build-system gnu-build-system) (arguments @@ -846,22 +845,6 @@ TIMESTAMP. It also supports storage of binary large objects, including pictures, sounds, or video.") (license (license:x11-style "file://COPYRIGHT")))) -;; This release fixes CVE-2019-10129 and CVE-2019-10130. See -;; <https://www.postgresql.org/about/news/1939/> for details. -;; TODO: Remove this in the next rebuild cycle. -(define-public postgresql-10.8 - (package - (inherit postgresql) - (version "10.8") - (source (origin - (method url-fetch) - (uri (string-append "https://ftp.postgresql.org/pub/source/v" - version "/postgresql-" version ".tar.bz2")) - (sha256 - (base32 - "0pfdmy4w95b49w9rkn8dwvzmi2brpqfvbxd04y0k0s0xvymc565i")) - (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))))) - (define-public postgresql-9.6 (package (inherit postgresql) |