diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
| commit | 8d59c262ada2e2167196a8fb8cbebd9c329a79dd (patch) | |
| tree | 85a74de8cc23a2f0179c0b9f0adfa4c274449a0c /gnu/packages/databases.scm | |
| parent | e7f0835b07d868fd447aa64c873174fa385e1699 (diff) | |
| parent | a068ed6a5f5b3535fce49ac4eca1fec82edd6fdc (diff) | |
| download | guix-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: gnu/local.mk gnu/packages/algebra.scm gnu/packages/bioinformatics.scm gnu/packages/curl.scm gnu/packages/docbook.scm gnu/packages/emacs-xyz.scm gnu/packages/maths.scm gnu/packages/plotutils.scm gnu/packages/python-web.scm gnu/packages/python-xyz.scm gnu/packages/radio.scm gnu/packages/readline.scm gnu/packages/tls.scm gnu/packages/xml.scm gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/databases.scm')
| -rw-r--r-- | gnu/packages/databases.scm | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index bc508aadf4..3d99ef08e6 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -51,6 +51,7 @@ ;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz> ;;; Copyright © 2021 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com> +;;; Copyright © 2021 Simon Streit <simon@netpanic.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2135,14 +2136,14 @@ similar to BerkeleyDB, LevelDB, etc.") (define-public redis (package (name "redis") - (version "6.0.11") + (version "6.2.4") (source (origin (method url-fetch) (uri (string-append "http://download.redis.io/releases/redis-" version".tar.gz")) (sha256 (base32 - "0prwqap452m581nyc3cz642d1z3x9nd81896hlqdm3z8238z49y9")) + "0vp1d9mlfsppry3nsj9f7bmh9wjgsy3jggp24sac1hhgl43c8cms")) (modules '((guix build utils))) (snippet ;; Delete bundled jemalloc, as the package will use the libc one @@ -2150,8 +2151,8 @@ similar to BerkeleyDB, LevelDB, etc.") #t)))) (build-system gnu-build-system) (native-inputs - `(("procps" ,procps) ; for tests - ("tcl" ,tcl))) ; for tests + `(("procps" ,procps) ; for tests + ("tcl" ,tcl))) ; for tests (arguments '(#:phases (modify-phases %standard-phases @@ -2168,9 +2169,10 @@ similar to BerkeleyDB, LevelDB, etc.") (lambda _ ;; Disable failing tests (substitute* "tests/test_helper.tcl" - ((" integration/replication[^-]") "") - ((" integration/replication-4") "") - ((" integration/replication-psync") "")) + (("integration/failover") "") + (("integration/replication-4") "") + (("integration/replication-psync") "") + (("integration/replication[^-]") "")) #t))) #:make-flags `("CC=gcc" "MALLOC=libc" @@ -2383,7 +2385,7 @@ database.") (define-public lmdb (package (name "lmdb") - (version "0.9.28") + (version "0.9.29") (source (origin (method git-fetch) @@ -2392,7 +2394,7 @@ database.") (commit (string-append "LMDB_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "012a8bs49cswsnzw7k4piis5b6dn4by85w7a7mai9i04xcjyy9as")))) + (base32 "0airps4cd0d91nbgy7hgvifa801snxwxzwxyr6pdv61plsi7h8l3")))) (build-system gnu-build-system) (arguments `(#:test-target "test" |