From 91d542496021581c11e3efba934b7b596c3ddaeb Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Wed, 23 Dec 2020 16:30:51 +0100 Subject: gnu: memcached: Update to 1.6.9. * gnu/packages/databases.scm (memcached): Update to 1.6.9. Signed-off-by: Efraim Flashner --- 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 3bd2add8ca..d60fdfff17 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -516,14 +516,14 @@ mapping from string keys to string values.") (define-public memcached (package (name "memcached") - (version "1.5.20") + (version "1.6.9") (source (origin (method url-fetch) (uri (string-append "https://memcached.org/files/memcached-" version ".tar.gz")) (sha256 - (base32 "1r511qr95q0ywdaql3pdjiwzkfqxhhfzb13ilvl7mznfm4iv1myg")))) + (base32 "1lcjy1b9krnb2gk72qd1fvivlfiyfvknfi3wngyvyk9ifzijr9nm")))) (build-system gnu-build-system) (inputs `(("libevent" ,libevent) -- cgit v1.2.3 From a7051a0e93cd6b733a0f936bd928d11422a66448 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 28 Dec 2020 19:45:24 +0100 Subject: gnu: redis: Update to 6.0.9. * gnu/packages/databases.scm (redis): Update to 6.0.9. Signed-off-by: Efraim Flashner --- gnu/packages/databases.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d60fdfff17..919ec160e7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -45,6 +45,7 @@ ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020 Vincent Legoll ;;; ;;; This file is part of GNU Guix. ;;; @@ -2129,14 +2130,14 @@ similar to BerkeleyDB, LevelDB, etc.") (define-public redis (package (name "redis") - (version "5.0.7") + (version "6.0.9") (source (origin (method url-fetch) (uri (string-append "http://download.redis.io/releases/redis-" version".tar.gz")) (sha256 (base32 - "0ax8sf3vw0yadr41kzc04917scrg5wir1d94zmbz00b8pzm79nv1")))) + "1pc6gyiylrcazlc559dp5mxqj733pk9qabnirw4ry3k23kwdqayw")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; tests related to master/slave and replication fail -- cgit v1.2.3 From 3a1cb921c9209d77ae1af38ef5bfa1620fd99899 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 28 Dec 2020 19:45:25 +0100 Subject: gnu: redis: Unbundle jemalloc & reinstate most of the tests * gnu/packages/databases.scm (redis)[source]: Delete bundled jemalloc. [native-inputs]: Add procps & tcl for the tests. [arguments]: substitute the right tclsh binary & disable failing tests. Signed-off-by: Efraim Flashner --- gnu/packages/databases.scm | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 919ec160e7..6c1bb7b34d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2137,12 +2137,36 @@ similar to BerkeleyDB, LevelDB, etc.") version".tar.gz")) (sha256 (base32 - "1pc6gyiylrcazlc559dp5mxqj733pk9qabnirw4ry3k23kwdqayw")))) + "1pc6gyiylrcazlc559dp5mxqj733pk9qabnirw4ry3k23kwdqayw")) + (modules '((guix build utils))) + (snippet + ;; Delete bundled jemalloc, as the package will use the libc one + '(begin (delete-file-recursively "deps/jemalloc") + #t)))) (build-system gnu-build-system) + (native-inputs + `(("procps" ,procps) ; for tests + ("tcl" ,tcl))) ; for tests (arguments - '(#:tests? #f ; tests related to master/slave and replication fail - #:phases (modify-phases %standard-phases - (delete 'configure)) + '(#:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'use-correct-tclsh + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "runtest" + (("^TCLSH=.*") + (string-append "TCLSH=" + (assoc-ref inputs "tcl") + "/bin/tclsh"))) + #t)) + (add-after 'unpack 'adjust-tests + (lambda _ + ;; Disable failing tests + (substitute* "tests/test_helper.tcl" + ((" integration/replication[^-]") "") + ((" integration/replication-4") "") + ((" integration/replication-psync") "")) + #t))) #:make-flags `("CC=gcc" "MALLOC=libc" "LDFLAGS=-ldl" -- cgit v1.2.3