[bug#45470] [PATCH] gnu: redis: Update to 6.0.9.

[bug#45470] [PATCH] gnu: redis: Update to 6.0.9.

[Vincent Legoll]

* gnu/packages/databases.scm (redis): Update to 6.0.9.
---
 gnu/packages/databases.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index d60fdfff17..327834ca73 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2129,14 +2129,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
-- 
2.29.2

[bug#45470] [PATCH] gnu: redis: Update to 6.0.9.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 373 bytes --]

I see there are a number of bundled libraries, included jemalloc,
linenoise and lua. Can we unbundle them? And is there some subset of the
tests we can run?

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#45470] [PATCH] gnu: redis: Update to 6.0.9.

[Vincent Legoll]

On Mon, Dec 28, 2020 at 4:45 PM Efraim Flashner <efraim@flashner.co.il> wrote:
> I see there are a number of bundled libraries, included jemalloc,
> linenoise and lua. Can we unbundle them? And is there some subset of the
> tests we can run?

I'll have a look

-- 
Vincent Legoll

[bug#45470] [PATCH] gnu: redis: Update to 6.0.9.

[Vincent Legoll]

On Mon, Dec 28, 2020 at 4:47 PM Vincent Legoll <vincent.legoll@gmail.com> wrote:
> > I see there are a number of bundled libraries, included jemalloc,
> > linenoise and lua. Can we unbundle them? And is there some subset of the
> > tests we can run?
>
> I'll have a look

The jemalloc can already be deleted as it is not used (libc malloc is).

The testsuite can be run succesfully minus the 4 ones that I disabled.

Lua is really entangled in the Makefile.

I tried to use guix's linenoise, but wasn't able to make it build.

Hiredis should be updated carefully, so I'll let redis people handle
that.

Updated patchset following...

-- 
Vincent Legoll

[bug#45470] [PATCH 1/2] gnu: redis: Update to 6.0.9.

[Vincent Legoll]

* gnu/packages/databases.scm (redis): Update to 6.0.9.
---
 gnu/packages/databases.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 <gfleury@disroot.org>
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;;
 ;;; 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
-- 
2.29.2

[bug#45470] [PATCH 2/2] gnu: redis: Unbundle jemalloc & reinstate most of the tests

[Vincent Legoll]

* 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.
---
 gnu/packages/databases.scm | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 919ec160e7..a58b4189f8 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2137,12 +2137,30 @@ 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 'tclsh
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (substitute* "runtest"
+                        (("^TCLSH=.*")
+                          (string-append "TCLSH="
+                            (assoc-ref inputs "tcl") "/bin/tclsh")))
+                      ; 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"
-- 
2.29.2

bug#45470: [PATCH 2/2] gnu: redis: Unbundle jemalloc & reinstate most of the tests

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 243 bytes --]

Looks great. Patches pushed!

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]