From patchwork Fri Apr 18 14:12:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 41769 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 CDCB427BC4A; Fri, 18 Apr 2025 15:15:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A03E827BC49 for ; Fri, 18 Apr 2025 15:15:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5mUS-00045T-Oz; Fri, 18 Apr 2025 10:14:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u5mTr-0003xv-Px for guix-patches@gnu.org; Fri, 18 Apr 2025 10:14:18 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5mTr-0006aH-82 for guix-patches@gnu.org; Fri, 18 Apr 2025 10:14:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=EfiTuFEOKZP/yyi0bViOdQayHFUzwH4yxzi4FxqZ590=; b=nb6ngELI9DwPLwDhrducFmuoSNQGl4rtGHMtJFHA9QIiPBnlpwkVGVU0ftPUL5dnwVhpMnszyLprq9tTQ6VZgUB/9aPj6Zr2Zcd9OLQVZ2w3ZrVxPMIvbwi+eBSToglkmMBnd+X+X208zubjyq9mjn5Agqf1imlJA7EbW1rTARkedtMCvRjZBtPYpn7btn4TU7Nfle/mszi9Mk7QsUqj8oFp6i81WoDq/h/5ZfDu2n92a5antHP2vKHA1vGc8HWSbcPVv6RA1KYPsqdIm8XD60Xd719GfPjy4mIw4A96QWXRTmsiGWA0PYi2EegobfvZGiX50JsaCD5sw2B5MXbv3Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5mTo-0000He-Td; Fri, 18 Apr 2025 10:14:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77899] [PATCH] gnu: Add valkey. References: <86jz7hvabb.fsf@163.com> In-Reply-To: <86jz7hvabb.fsf@163.com> Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 18 Apr 2025 14:14:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77899@debbugs.gnu.org Cc: Zhu Zihao , Sharlatan Hellseher X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by 77899-submit@debbugs.gnu.org id=B77899.1744985606830 (code B ref 77899); Fri, 18 Apr 2025 14:14:08 +0000 Received: (at 77899) by debbugs.gnu.org; 18 Apr 2025 14:13:26 +0000 Received: from localhost ([127.0.0.1]:52360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5mT0-0000Ci-OJ for submit@debbugs.gnu.org; Fri, 18 Apr 2025 10:13:24 -0400 Received: from [117.135.210.4] (port=46434 helo=m16.mail.163.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5mSZ-00008F-PQ for 77899@debbugs.gnu.org; Fri, 18 Apr 2025 10:13:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version: Content-Type; bh=EfiTuFEOKZP/yyi0bViOdQayHFUzwH4yxzi4FxqZ590=; b=XxMG/C1r+XfIMz0tupxgYbhVpvu8PSDRhaDb5avpTFQb8OeegSdYnigURZa1qn SvFzdYA10fYSO2v1KrR3hwPCHBF4pUjR7W81kNBM/nioqoBBGvwhXMnigPXsLrmk x8kUSMOxgdioho+pYQW/kNQheTa6fDd3kYmDjf/OE5HtE= Received: from localhost.localdomain (unknown []) by gzga-smtp-mtada-g0-1 (Coremail) with SMTP id _____wD3X_fFXQJoE+rRAw--.45162S2; Fri, 18 Apr 2025 22:12:35 +0800 (CST) From: Zhu Zihao Date: Fri, 18 Apr 2025 22:12:17 +0800 Message-ID: <1318262bde022227b21cc0b13bfa8e9561016d9c.1744984437.git.all_but_last@163.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-CM-TRANSID: _____wD3X_fFXQJoE+rRAw--.45162S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxuF4UuF18tr1kZFy7CrWfZrb_yoWrGr4xpr WFkw13tr4rJF93KasxXF4UA34Fg3Z5Kr1jywn3Zw4xKwsxWrW09rW8tFW3GFy7tr1xCa1U Wa10qFW3WF45G3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0JUylkxUUUUU= X-Originating-IP: [113.100.121.38] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBgAEzr2gCXLwXEgAAsS 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/database.scm(valkey): New variable. Change-Id: Ia1899ee41ecdd372d659c02940cc7ca9fbc011d8 --- gnu/packages/databases.scm | 74 +++++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) base-commit: 54cc9c96ec0877b2afa24871c3acd8af27b0d500 diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 32973d3896..16593af4f7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -54,7 +54,7 @@ ;;; Copyright © 2021 Alexandre Hannud Abdo ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Foo Chuan Wei -;;; Copyright © 2022 Zhu Zihao +;;; Copyright © 2022, 2025 Zhu Zihao ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2022 muradm ;;; Copyright © 2022 Thomas Albers Raviola @@ -2881,6 +2881,78 @@ (define-public redis (properties `((lint-hidden-cve . ("CVE-2022-3647" "CVE-2022-33105")))) (license license:bsd-3))) +(define-public valkey + (package + (name "valkey") + (version "8.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/valkey-io/valkey") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bd4jhh2hp75996mz62p6l31c0zkr3i9cw3v6va6j94srn9y8v1m")) + (modules '((guix build utils))) + (snippet + ;; Delete bundled jemalloc, as the package will use the libc one + #~(begin (delete-file-recursively "deps/jemalloc"))))) + (build-system gnu-build-system) + (arguments + (list + #:modules '((ice-9 ftw) + (guix build utils) + (guix build gnu-build-system)) + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + "MALLOC=libc" + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* "runtest" + (("^TCLSH=.*") + (string-append "TCLSH=" (which "tclsh")))) + (substitute* "tests/support/server.tcl" + (("/usr/bin/env") + (which "env"))))) + (add-after 'unpack 'adjust-tests + (lambda _ + ;; Disable failing tests. + ;; Valkey search test directories for tests. + (with-directory-excursion "tests" + ;; The AOF tests cause the test suite to hang waiting for a + ;; "background AOF rewrite to finish", perhaps because dead + ;; processes persist as zombies in the build environment. + (delete-file "unit/aofrw.tcl") + (delete-file "integration/aof-multi-part.tcl") + + ;; The OOM score tests try to raise the current OOM score, but + ;; our build environment already sets it for all children to + ;; the highest possible one (1000). We can't lower it because + ;; we don't have CAP_SYS_RESOURCE. + (delete-file "unit/oom-score-adj.tcl") + + (delete-file "integration/failover.tcl") + + (with-directory-excursion "integration" + (for-each + delete-file + (scandir "." (lambda (filename) + (string-prefix? "replication" filename)))) + (delete-file "dual-channel-replication.tcl") + (delete-file "cross-version-replication.tcl")))))))) + (native-inputs (list pkg-config procps tcl which)) + (home-page "https://valkey.io/") + (synopsis "Free high-performance key/value datastore") + (description + "Valkey is an free high-performance key/value datastore that supports a +variety of workloads such as caching, message queues, and can act as a primary +database.") + (license license:bsd-3))) + (define-public hiredis (package (name "hiredis")