From patchwork Mon Dec 28 18:45:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 26066 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0C4E327BC04; Mon, 28 Dec 2020 18:47:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BC2241794D for ; Mon, 28 Dec 2020 18:47:12 +0000 (GMT) Received: from localhost ([::1]:60550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktxXz-00066Q-W4 for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 13:47:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktxWs-0005fB-G5 for guix-patches@gnu.org; Mon, 28 Dec 2020 13:46:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53589) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktxWs-0007qb-8g for guix-patches@gnu.org; Mon, 28 Dec 2020 13:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktxWs-00012x-6s for guix-patches@gnu.org; Mon, 28 Dec 2020 13:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45470] [PATCH 1/2] gnu: redis: Update to 6.0.9. References: <20201227164945.10190-1-vincent.legoll@gmail.com> In-Reply-To: <20201227164945.10190-1-vincent.legoll@gmail.com> Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45470 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45470@debbugs.gnu.org Received: via spool by 45470-submit@debbugs.gnu.org id=B45470.16091811433979 (code B ref 45470); Mon, 28 Dec 2020 18:46:02 +0000 Received: (at 45470) by debbugs.gnu.org; 28 Dec 2020 18:45:43 +0000 Received: from localhost ([127.0.0.1]:36899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktxWZ-000127-IB for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:45:43 -0500 Received: from mail-wr1-f53.google.com ([209.85.221.53]:37642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktxWX-00011p-FO for 45470@debbugs.gnu.org; Mon, 28 Dec 2020 13:45:42 -0500 Received: by mail-wr1-f53.google.com with SMTP id i9so12214809wrc.4 for <45470@debbugs.gnu.org>; Mon, 28 Dec 2020 10:45:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZI+e5m4xhtHcoMwWNiov4f5+7+ptxEfkW15INrWckZ4=; b=sXUuOpDMKdqKufEjtt68LENOq9wqopewxtPAndtAywc7Iy21Xp8g4ahdKfpDLHJL+Z Iy6dBymYzi0cV0MPWMcldUH0ILffQa6gqsMRRGmJPKW3tXHeqN8LpK3WEWV38TpWoyAF e1ScE0Y2Emb3705NktVDzoPSyRsQ7ZBo2aZT3cSToXFTeT1EQtwLma1NEGt3lzIodsXS 3dZfWgNHgV859wWLZNkp0PVVby8QKPhrqULYrYJ+z7gyqf+XPDy+NzGNm6UC6TcZg38g u4PiG8fNWIxDnT717GsClZeTwZWUoK4YMLFkOJTljslu72aO209gRzvpmla/IhYcc4+h muRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZI+e5m4xhtHcoMwWNiov4f5+7+ptxEfkW15INrWckZ4=; b=ccyQBazE8FLT1ExSR2VKEfV6DOFCEw2wbosGCNJ7jAUYaio3mDYS+4yFpcrgKgThiJ awUClgGkFvH8lvvkcF5OSKkv7SRoMLP7b3wxng3aRTG2oKC2Iyw9PhlTh6QZYoZ646gX J/HIcIWz0MWptdyE0myujXA6Kyf4cAQG4yW8mHbksuqbJiMFL4DGEBYTuSQJFW9065L0 NfoukaUs7poGHKsrXw5igvjXyfjXB3yFxsfe128FDUP9zYkRrAljEie0ui4vNM7gEENm t2CbZha1eqLc3SMXCqJh/GwjIpWdUkI7zPTECrhKz7hHXCE3LTlxahGlTyQgTEy5CwTO 4OGQ== X-Gm-Message-State: AOAM533xHNbx/xAZt6Pp4gFp9HELX259jDKFAC+C0xkGtRtmrkhZRx0b criAS2txBQIV4NCOFqid4cs2LP+CeYI= X-Google-Smtp-Source: ABdhPJyu/ZToeKbRYqsjlMIa6rU1eIAG1n2JPzwQDqsqrMR0LYTPpDdTJFq5ofcoE7KIk2rhWuPMmA== X-Received: by 2002:a5d:5005:: with SMTP id e5mr51036348wrt.279.1609181135640; Mon, 28 Dec 2020 10:45:35 -0800 (PST) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id q1sm55526655wrj.8.2020.12.28.10.45.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Dec 2020 10:45:34 -0800 (PST) From: Vincent Legoll Date: Mon, 28 Dec 2020 19:45:24 +0100 Message-Id: <20201228184525.21537-1-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vincent Legoll Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 ;;; 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 From patchwork Mon Dec 28 18:45:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 26065 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F17FE27BC04; Mon, 28 Dec 2020 18:46:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B90E31794D for ; Mon, 28 Dec 2020 18:46:29 +0000 (GMT) Received: from localhost ([::1]:59636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktxXI-0005gZ-Ty for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 13:46:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktxWs-0005fC-Ty for guix-patches@gnu.org; Mon, 28 Dec 2020 13:46:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53590) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktxWs-0007qf-MD for guix-patches@gnu.org; Mon, 28 Dec 2020 13:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktxWs-000135-K8 for guix-patches@gnu.org; Mon, 28 Dec 2020 13:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45470] [PATCH 2/2] gnu: redis: Unbundle jemalloc & reinstate most of the tests Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45470 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45470@debbugs.gnu.org Received: via spool by 45470-submit@debbugs.gnu.org id=B45470.16091811483990 (code B ref 45470); Mon, 28 Dec 2020 18:46:02 +0000 Received: (at 45470) by debbugs.gnu.org; 28 Dec 2020 18:45:48 +0000 Received: from localhost ([127.0.0.1]:36901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktxWd-00012I-QL for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:45:48 -0500 Received: from mail-wr1-f49.google.com ([209.85.221.49]:37639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktxWY-00011r-4v for 45470@debbugs.gnu.org; Mon, 28 Dec 2020 13:45:43 -0500 Received: by mail-wr1-f49.google.com with SMTP id i9so12214868wrc.4 for <45470@debbugs.gnu.org>; Mon, 28 Dec 2020 10:45:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gne9dPtJ7vraC94RZoxnboDMqF2LESHWOLNXLX9dp/Y=; b=o2ArgPeh7zmwXAyHXF4HR5z7U04z8wSTrZ0WFz/7wMIK5ru/WTLOUWKRLO4j6kyYHr 3AQ+ujPLh3vwxJpXgHWmUZ9tz3loOGb8q7rYPgGT5OHrrez1edj5KaG+O0UimCrYYnSg xeJj2WkmyC0lkM2eJ9oFManI4fcQjM8Gr8J85zUuw7ANihagE2aLS4HZ7EUkKfo89k9r 0nujkJlC3lDcj40HlW0VDATiXc020QQRrc8KGW9jrtJE8dPWkZWzdmR4KvO7dahQJrg8 qMijYw6I9YbcCEGycoqS0wu+otA0+tz/SYD7R2XiLlA/eX9SYtUYDQLJ3aisbEGbiEPM ffAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gne9dPtJ7vraC94RZoxnboDMqF2LESHWOLNXLX9dp/Y=; b=MuYEQdwqphKbLsIH8iEoTqSjHeuQOXoSyRbtPWpS1kQYx7qVGNBTRNZsodtQXdSTRY Xa4YTVutI5OFSBPekQqZEVuT8o+7Hff4BnMXV7L6LkYGpAy18RjBpggqjiJPFw4IPkTS zcYSgeyT17J+NtznV6OZ8sAk9gQpZCCN7DapMpIHO2v5tf4jZ6xeCioUJFcoUeJJYuGa 7Py32McpU1LbVReH/ILmhnjsZ2dCT3qu6rHV5K1dGHHuq7vT8K11JtVzN33CHQd95DId Pa132izHk8jroV0oco6bOH7Rcm5tzsj570GtSJDe0FZj6dOAJpEAlf9vPnwyaLTsFV0J e8MA== X-Gm-Message-State: AOAM533IBapdEfVTCtTO24NkH1I3a4Jm/j4OACG1jATEgd38xDegIydw Uced+qyg7bPT/1IN+de87ap70/hVQO4= X-Google-Smtp-Source: ABdhPJzIWcI6g5ObhNZLCMlHxBPrbOLOvP3ifYie2ICcBf9aIq0xRn8DC4N1Wa2yTCVV/3Spd8lGpw== X-Received: by 2002:adf:ba49:: with SMTP id t9mr52686909wrg.183.1609181136594; Mon, 28 Dec 2020 10:45:36 -0800 (PST) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id q1sm55526655wrj.8.2020.12.28.10.45.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Dec 2020 10:45:36 -0800 (PST) From: Vincent Legoll Date: Mon, 28 Dec 2020 19:45:25 +0100 Message-Id: <20201228184525.21537-2-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228184525.21537-1-vincent.legoll@gmail.com> References: <20201228184525.21537-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vincent Legoll Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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"