From patchwork Mon Apr 17 13:32:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 49221 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 72D181791A; Mon, 17 Apr 2023 14:33: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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 3B9241780E for ; Mon, 17 Apr 2023 14:33:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poOz1-0004hy-K0; Mon, 17 Apr 2023 09:33:27 -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 1poOyd-0004gi-Eb for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1poOyd-0003AY-08 for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poOyc-0004do-LO for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62903] [PATCH 1/8] gnu: sysbench: Build with mariadb. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 13:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62903 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62903@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 62903-submit@debbugs.gnu.org id=B62903.168173836217724 (code B ref 62903); Mon, 17 Apr 2023 13:33:02 +0000 Received: (at 62903) by debbugs.gnu.org; 17 Apr 2023 13:32:42 +0000 Received: from localhost ([127.0.0.1]:54019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyH-0004bo-K4 for submit@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:42 -0400 Received: from mail-wr1-f51.google.com ([209.85.221.51]:46302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyF-0004bS-Em for 62903@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:40 -0400 Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-2f917585b26so1148117f8f.0 for <62903@debbugs.gnu.org>; Mon, 17 Apr 2023 06:32:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681738353; x=1684330353; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=Vja2iaAu6m35lIeY/MPiMpssceoMWhQAK5ZI/8Ob02A=; b=bVkphHCUeBeP8heUa4JKpogAxUeyAXSqHfysebo5zUvKk3VbeVl95MyzgzFsVmaiBR 5awZ/IJ18QtAcBW7vn34i3dk5nkFAOiTgfU9MZv5jJD+f5lM+1l2fGdzvxr8UU4R2MWO N5a0s3LXQ7aQ4m24CSpEfdbTUVfVADav4/FAHTDDVX8crgIeoicAgkZHr7aQxiho4r7t iLMZf4xDkRnVqc2wUEkvmbh02fYESgtqoCpiIrNc/Z08iv2K0WPfXiZ0AoFwHHb4ASp2 VSZgEth25oa2NIMO/BZT756fEmfIxeDmm++memBSPDFC7laRvlUq75Qd4RBvF29u2bhg 2idQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681738353; x=1684330353; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Vja2iaAu6m35lIeY/MPiMpssceoMWhQAK5ZI/8Ob02A=; b=afx9sCOnVpbAdRXdGhB0MzxwY96aptDH7xlhW3wr3+paabiQPchgXdvaZXR4MYlDKp 8oJQJKo5EQEMq67OP9JW/viHP6m59KgvmxEJQwfL1F9NGOxmkgEl7juoR30GlzQjH54D xPsWjMuvoCUYV/CrjusKicONtK1shrFQTMifOVBNb0sKRGKvXX4QkUhQ2Mzri0/bixdP Qusmx2ADZiR0K843VBoRTFaLCqWkurkA1NexddCmcayqlXmOSEJgWIuVlf8ZVCivJpSe l9EAYjodIZqcOpaNS7tJRS55T+erG7wA1xAmyfIQgNzBHRU//W6fg172hQHZ0SbZsPvu SI4g== X-Gm-Message-State: AAQBX9dEn5ZsKR4ZQXk8aENYxImCkgCoqKqgVgQW5lrpDqaiwqfNvTgi 4zWXZ313501OwOu8fCfOQDDhxL2NjKJcmg== X-Google-Smtp-Source: AKy350ar7zre6Ci80hjnen7vvwGrcjd5MloeoeYJznxCGkez/PYrHmc43Q3jImdkJqI+Mx3XDtldWg== X-Received: by 2002:adf:f0d1:0:b0:2ef:baea:e11c with SMTP id x17-20020adff0d1000000b002efbaeae11cmr5533479wro.13.1681738353102; Mon, 17 Apr 2023 06:32:33 -0700 (PDT) Received: from localhost ([2a02:ed3:911:ee00:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id e6-20020a5d5946000000b002fa5038bce8sm2939829wri.16.2023.04.17.06.32.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 06:32:32 -0700 (PDT) From: Efraim Flashner Date: Mon, 17 Apr 2023 16:32:22 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: 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: , 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/benchmark.scm (sysbench)[arguments]: Remove mysql flag. [inputs]: Remove mysql. Add mariadb:dev. --- gnu/packages/benchmark.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 0cc8def918..da2291194c 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -612,13 +612,6 @@ (define-public sysbench (arguments (list #:configure-flags #~(list "--with-pgsql" - ;; Explicitly specify the library directory of - ;; MySQL, otherwise `mysql_config` gets - ;; consulted and adds unnecessary link - ;; directives. - (string-append "--with-mysql-libs=" - #$(this-package-input "mysql") - "/lib") "--with-system-luajit" "--with-system-ck" ;; If we let the build tool select the most @@ -679,7 +672,7 @@ (define-public sysbench libxslt docbook-xml docbook-xsl)) - (inputs (list ck libaio luajit mysql postgresql)) + (inputs (list ck libaio luajit (list mariadb "dev") postgresql)) (home-page "https://github.com/akopytov/sysbench/") (synopsis "Scriptable database and system performance benchmark") (description "@command{sysbench} is a scriptable multi-threaded benchmark From patchwork Mon Apr 17 13:32:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 49219 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 B5D421790B; Mon, 17 Apr 2023 14:33:29 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable 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 9136417907 for ; Mon, 17 Apr 2023 14:33:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poOyx-0004ha-Qs; Mon, 17 Apr 2023 09:33:23 -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 1poOyd-0004gj-EL for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1poOyd-0003Ag-4H for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poOyd-0004dw-15 for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62903] [PATCH 2/8] gnu: ghc-mysql: Build with mariadb. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 13:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62903 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62903@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 62903-submit@debbugs.gnu.org id=B62903.168173836517745 (code B ref 62903); Mon, 17 Apr 2023 13:33:02 +0000 Received: (at 62903) by debbugs.gnu.org; 17 Apr 2023 13:32:45 +0000 Received: from localhost ([127.0.0.1]:54022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyK-0004c3-6k for submit@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:44 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:38856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyI-0004bZ-7g for 62903@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:42 -0400 Received: by mail-wm1-f51.google.com with SMTP id he11-20020a05600c540b00b003ef6d684102so11859481wmb.3 for <62903@debbugs.gnu.org>; Mon, 17 Apr 2023 06:32:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681738356; x=1684330356; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=p1X67UDn7TdTgTmfPm0s6u4LFzUy7AaoV0c2wg3uZb4=; b=JHoC7seJ2G39GEONZ6yl7nGIHt7/JB0pNzLZXOHtXAibdmNaA7k2wezZKyU+0g5hR2 w1wHyGKPffX5yuI/FP300M38mFtDIjT4I4CtkFPYkuF4kO15XP55Utai/6X4JvsFP+P5 vNpTTtGLOvfT2wb4T9lhvyZObLLKcCeKw/kqFXkqZdoFzmbj2zJ8q9OYeMC/Yizvna+K 5fUeoVrfZ5hNzBG00jHEFL2pj2wpI+kvsTTgQbM4RXBgKQ2oC88S/L3N9k+C4BC06J5k 5ARrerI2ta3tasjWLTvbBlIhs1OydXIo4naW6hqJk+Baa2CWZ/1VRaGuU57KS8dIPCO0 fsEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681738356; x=1684330356; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=p1X67UDn7TdTgTmfPm0s6u4LFzUy7AaoV0c2wg3uZb4=; b=cxDxDcBJqFevnUmPGXf0Ta2Pa1dNrsZaGE6bJapLWCtAJvkysZpPA/iLziBlmO8GQ8 QTz2GFREgsGIMdpevSV00pjoj9fzqXGR/O75HCH5CZAWV9YwNuJSF9OCSqjk4UH4bP9Z 2wH8FtXPmTGYXQgMRCzokyhBoxxyBLPCtzfHu+mcC13jfL1ASZX/6FSge2N5T6Y544R0 TkGbhKfAOC5YaKsaAUAIlw4s+hchDepLEQBnrQ9AkXCB70jF765e+MC9iyZ34mm0OrQi m5U2+O1L08Yl3lHjhjy4ctyzLU43xvLdd6TuE8iPVdgH79tEqulwRCJup6lJB1gJwYD2 Ts1A== X-Gm-Message-State: AAQBX9dLciTrkHT3ZFzlrO9daTKQsIRbRPJ8SZJOLRp5rsduIsnW/nvw eLEZSTnaSSCwzD5LG09kWuA1e6xIj0NoCg== X-Google-Smtp-Source: AKy350YOuYFx+oMvaLWxe5J4ZrFYj4jHya00JayIOXa/TxxZawcPXW2TpRd9EvMvQWUAAxfWRaDcxQ== X-Received: by 2002:a7b:cb81:0:b0:3f1:66a2:e640 with SMTP id m1-20020a7bcb81000000b003f166a2e640mr5957924wmi.11.1681738356516; Mon, 17 Apr 2023 06:32:36 -0700 (PDT) Received: from localhost ([2a02:ed3:911:ee00:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id y1-20020a1c4b01000000b003ef5f77901dsm11953323wma.45.2023.04.17.06.32.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 06:32:35 -0700 (PDT) From: Efraim Flashner Date: Mon, 17 Apr 2023 16:32:23 +0300 Message-Id: <1a81d1aaa2395dfc99652fd76ae93566d85d48e3.1681738065.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: 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: , 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/haskell-xyz.scm (ghc-mysql)[inputs]: Remove mysql. Add mariadb:dev. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f2cc60267b..7071a5e05d 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015, 2019 Eric Bavier ;;; Copyright © 2016, 2018, 2019, 2021 Ludovic Courtès ;;; Copyright © 2016, 2017 Nikita -;;; Copyright © 2016, 2019 Efraim Flashner +;;; Copyright © 2016, 2019, 2023 Efraim Flashner ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016, 2017 David Craven ;;; Copyright © 2017 Danny Milosavljevic @@ -14501,7 +14501,7 @@ (define-public ghc-mysql (properties '((upstream-name . "mysql"))) (arguments `(#:tests? #f)) ; TODO: Fails to connect to server. (inputs - (list mysql zlib openssl)) + (list (list mariadb "dev") zlib openssl)) (native-inputs (list ghc-hspec)) (home-page "https://github.com/paul-rouse/mysql") (synopsis "Low-level MySQL client library") From patchwork Mon Apr 17 13:32:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 49225 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 CB7571790F; Mon, 17 Apr 2023 14:34:08 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 3DAC41780E for ; Mon, 17 Apr 2023 14:34:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poOz9-0004nm-1w; Mon, 17 Apr 2023 09:33:35 -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 1poOz0-0004i2-6k for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:27 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1poOyd-0003Ax-Hz for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poOyd-0004e3-ER for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62903] [PATCH 3/8] gnu: neko: Build with mariadb. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 13:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62903 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62903@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 62903-submit@debbugs.gnu.org id=B62903.168173836817763 (code B ref 62903); Mon, 17 Apr 2023 13:33:03 +0000 Received: (at 62903) by debbugs.gnu.org; 17 Apr 2023 13:32:48 +0000 Received: from localhost ([127.0.0.1]:54026 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyO-0004cN-0J for submit@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:48 -0400 Received: from mail-wm1-f48.google.com ([209.85.128.48]:51402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyK-0004bc-7m for 62903@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:44 -0400 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-3f16b99b9a1so8032075e9.2 for <62903@debbugs.gnu.org>; Mon, 17 Apr 2023 06:32:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681738358; x=1684330358; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=9yfJZBHgRH6Wohu46QKcJDckTHZ341j+EcKqdW6fI3o=; b=a3S8RBA/5dNY/GfThL329PfjSWqytTDCi3FUmhq8qeX7lQBFHyd7qNu8m3SLyvJts6 S5wVGkXMra5BKyy+1rxYHq9yZHEKcF2YEdDYrvK7veOOHtpWLe6fs8SO220tqTpgkswg ob8XajSSqezzxpO2PrOR6MeSBPRy6o15WgBbXIz6aVc9iwcyYRwZnxRdo6iIjMnJ8l+C aLDE/ZTwWVQMwBC48wpqHHmECbDl/OuymRr3AViQBaCp/YEDlXWA7Pt3fLMY69PeEkK2 JzGFBebf5ZW2hqWPnWpyIKH0PLoaF/l1Bpe0XjVYiDdsX7mMVQ7X7dumW1LCdg+gIZG9 ReWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681738358; x=1684330358; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=9yfJZBHgRH6Wohu46QKcJDckTHZ341j+EcKqdW6fI3o=; b=heBnwyHdy0QxcqhIZ/RoOCm8+a/bhAZuQD0yov+gzv20uSXvgkEEHgUWMRIANoTCUE DnNuR7FBfdgViFLyEQVsamZzQmHZvT1R0x01j+5bsXlTSchA5QM6ujF8/e6Ax4w6UxLS 1K6SqlrvfZ3Yc5FBY6R1cORckkhW48QISRllAgy/s2cHQyXG5TB7fHzkV2otLgXcMFje ji+yQyF1cl6Fw67mL7Rx/j/nOZ7+8k4NFG9MJwmzH7/QoIJTznuax5p0octfUhItEbPa 5TZeU/0xmlADCMRsIUkoFuMpELjsdVuk99ji8Og4K61M84XiCZGqDUBh833Q8VSehcOB WAdw== X-Gm-Message-State: AAQBX9eOrjuXgYh0EKllLoiq/r+LZkWu004DzuLHccFcX0pbZqEQr736 GoPsq8A23ZZSQtwQAXU+FzJ4oMIEcqwnWw== X-Google-Smtp-Source: AKy350ZPwgZc7KSV65k3rclL1QCInu7r0kk2TcH4o1RyiWriiqFiY5UiHHddzFtc+NK3v1MZH0NGuA== X-Received: by 2002:a5d:4568:0:b0:2ee:fa23:7904 with SMTP id a8-20020a5d4568000000b002eefa237904mr5523842wrc.70.1681738358443; Mon, 17 Apr 2023 06:32:38 -0700 (PDT) Received: from localhost ([2a02:ed3:911:ee00:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id e11-20020a056000120b00b002e45f6ffe63sm10550495wrx.26.2023.04.17.06.32.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 06:32:38 -0700 (PDT) From: Efraim Flashner Date: Mon, 17 Apr 2023 16:32:24 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: 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: , 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/haxe.scm (neko)[inputs]: Remove mysql. Add mariadb:dev, mariadb:lib. --- gnu/packages/haxe.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/haxe.scm b/gnu/packages/haxe.scm index dbe8b2c19e..3e8a6a1a18 100644 --- a/gnu/packages/haxe.scm +++ b/gnu/packages/haxe.scm @@ -79,7 +79,8 @@ (define-public neko httpd libgc mbedtls-apache - mysql + (list mariadb "dev") + (list mariadb "lib") openssl pcre sqlite From patchwork Mon Apr 17 13:32:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 49226 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 2694F1790F; Mon, 17 Apr 2023 14:34:11 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 2F5EB1780E for ; Mon, 17 Apr 2023 14:34:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poOz7-0004nB-Ny; Mon, 17 Apr 2023 09:33:33 -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 1poOz0-0004hz-7r for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:27 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1poOye-0003BG-Dn for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:21 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poOye-0004eE-8M for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62903] [PATCH 4/8] gnu: inspircd: Build with mariadb. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 13:33:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62903 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62903@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 62903-submit@debbugs.gnu.org id=B62903.168173836917777 (code B ref 62903); Mon, 17 Apr 2023 13:33:04 +0000 Received: (at 62903) by debbugs.gnu.org; 17 Apr 2023 13:32:49 +0000 Received: from localhost ([127.0.0.1]:54029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyO-0004cR-Ep for submit@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:49 -0400 Received: from mail-wm1-f50.google.com ([209.85.128.50]:38860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyM-0004bm-6C for 62903@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:46 -0400 Received: by mail-wm1-f50.google.com with SMTP id he11-20020a05600c540b00b003ef6d684102so11859586wmb.3 for <62903@debbugs.gnu.org>; Mon, 17 Apr 2023 06:32:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681738360; x=1684330360; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=mzhywv6O5nZvB25Z4muArTpSfHPvcDEou094AgYmJ+A=; b=GvPPybJtQKCoXexY/gUtmRMad/FZfct1nuGBO8KwJ+nbe4334HFLJb4e6rmaC1c5D6 Jn39r6BTLLJhKR0Es/6NwmTszGmczKLML42jms7SoPtsGbOezar79UzmHtC0Cq6f1Q2q hdOphC7rQ/3CneBuyTAgmnk/uS5YhX4n0qOw2HVlMyG835sPY7ItchgBbO7VLkQ0qTFi fTl63Vr6eyN3oOpLD19rM2iphG6yqKeMuZ6nxHePBtdoPtzCFyoi/6Xo3zJlKMfIg9t7 SHf24sOYwIgGHT+0s0H4gLMgmCgxLtVSZGuVZg8VyCoDVWqd/CVj92VTvqBBj5vF9fVU CLrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681738360; x=1684330360; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=mzhywv6O5nZvB25Z4muArTpSfHPvcDEou094AgYmJ+A=; b=WuWgTE2dAxMcIvb4fdsHlNQDsClxB7+r/nOuzS4q/xlkdcuvcS06X6h3hVS4WkfoLF 39wX4Rus4pEEpLX+ohLN5ptFA91JNGQsEs5O8airdVONs8wohP8qsAEb9EraqAo32B5s VuAGssKx54wP23IwdHFIVsaQWJzmrnqaN71EkplGnWhHDzm63lZBetqBJGALnKCLcf9b mcpnJ+A6El2tWj4Q4Z/3Rf8S1rNxkn5xoR+PJCI0x9EqPUf2SSpbx5YrfOYI/w7BDE6l mhBlUs9y8LfwiEqVwwP8vpAbBAfcuEBIN7qq1FK0b3rAqvRGGqf4vxYvf4rofjbDFYWd 0BYA== X-Gm-Message-State: AAQBX9csq6oc58yj4Cxtvv4W88AubB8Zl4F0KCWD/2hVpY22lYsi0mkg Ae5csp8hmUNZIoB6TFLCWTMi1SR23eh8Zg== X-Google-Smtp-Source: AKy350aKgZp+WfnPJoiowfkXXDHIWI9tDs8HG/S4/rpZ1487xoaW2P2v2vR7rZx5LvdjHHzaHhzmRA== X-Received: by 2002:a7b:c858:0:b0:3ef:acf6:f815 with SMTP id c24-20020a7bc858000000b003efacf6f815mr10893779wml.32.1681738360369; Mon, 17 Apr 2023 06:32:40 -0700 (PDT) Received: from localhost ([2a02:ed3:911:ee00:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id p8-20020a7bcc88000000b003f04f0c5a6fsm11924186wma.26.2023.04.17.06.32.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 06:32:39 -0700 (PDT) From: Efraim Flashner Date: Mon, 17 Apr 2023 16:32:25 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: 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: , 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/irc.scm (inspircd)[inputs]: Remove mysql. Add mariadb:dev. --- gnu/packages/irc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 4bce2d2d47..e5162cc2c4 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014 Kevin Lemonnier ;;; Copyright © 2015, 2017 Ludovic Courtès -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner +;;; Copyright © 2015-2023 Efraim Flashner ;;; Copyright © 2016 Nikita ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice @@ -749,7 +749,7 @@ (define-public inspircd gnutls libmaxminddb mbedtls-apache - mysql + (list mariadb "dev") openldap openssl `(,pcre "bin") From patchwork Mon Apr 17 13:32:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 49222 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 E848B1791B; Mon, 17 Apr 2023 14:33:54 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 471A61790B for ; Mon, 17 Apr 2023 14:33:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poOz3-0004kB-1A; Mon, 17 Apr 2023 09:33:29 -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 1poOz0-0004i1-4v for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:27 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1poOyf-0003Bf-2k for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:25 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poOye-0004eR-Uf for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62903] [PATCH 5/8] gnu: ulogd: Build with mariadb. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 13:33:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62903 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62903@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 62903-submit@debbugs.gnu.org id=B62903.168173837517798 (code B ref 62903); Mon, 17 Apr 2023 13:33:04 +0000 Received: (at 62903) by debbugs.gnu.org; 17 Apr 2023 13:32:55 +0000 Received: from localhost ([127.0.0.1]:54032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyU-0004cu-Ap for submit@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:55 -0400 Received: from mail-wm1-f50.google.com ([209.85.128.50]:41766) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyN-0004bw-Td for 62903@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:48 -0400 Received: by mail-wm1-f50.google.com with SMTP id iw7-20020a05600c54c700b003f16fce55b5so2241009wmb.0 for <62903@debbugs.gnu.org>; Mon, 17 Apr 2023 06:32:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681738362; x=1684330362; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=THxjpAZ/WnVX6+CjPRB+YGtJ/5ipCWWEhTQpckmpBwY=; b=G/FfDdktTPrqi8sba3YgsDNrezYeLjDCZmAMf/8z8Y5+Zat8CUoPpT6gCRBQZ7sjzz 7EvUxl0Y8GWxQhm90zlAPrcr3CBu/UNhRJ2hMbzIyXtsMMereyKMu/W7hMyDOrOgBOEQ vZvUStpe+vm++H7gjV71eQ89L25Zu68Jj0mZESpLHVucBkUdxOn4C0eyllsX+vyUv+QB i4kyvZXvJkcSv+20SbV61P4lh6ZOs3jc4BOzmPRGCTewM4NThFpOEw21P+kvombVYvQM agBsStO8otIMW88T1+LNatDcXPSUDIvR8BiXLBfjnTF0DccCYGIC4L1weZy8aUcFk06p sxQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681738362; x=1684330362; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=THxjpAZ/WnVX6+CjPRB+YGtJ/5ipCWWEhTQpckmpBwY=; b=LoBlnIQhLklxxuESHeOcXIRWM66oZT9awjeQVtIVPYzBNTeaUz6rWP1oBtgLR9o5LB oB8OdNLMB9gUzrcTyserGTrzjKGMyi+qBnoBtuWSy1cJZdZ27TDvi2c/Cof3IkfPuhPb 8szDtiyb6zX/yvDqlcvQC8HqtjgVPaT1c+Jxy/swauf7NfPeMEAmpzwKtxBG3XlnhdfE cW3SigvNHU16p/FZ5dmyXPms0hRrGS6IDEf/loVwZXBO8KqAx7R1iAcD2YEXA6NFKlgL /SZqS0auOTKwpXBQ1MT1MWy7Bv/errM+mSidg7i8+HgYwMRsJsApPmx0tDzIrJzaEo5z 6uKw== X-Gm-Message-State: AAQBX9f5Dqd+FVDSzYnSmvN4Lu8qRVY8N+ddDWNsRFHCepAGByr5/30G +3sXOy5UZBCHVoiwmTqotB1Rcq34eqQhjw== X-Google-Smtp-Source: AKy350ZhPx2hu0EttVUEj88rElPGk+0dpSbxnDGJpkLvfM5+btAAfvkHds7B8p2zlxncGXgQ/tGBCw== X-Received: by 2002:a7b:cb44:0:b0:3f1:6458:99ba with SMTP id v4-20020a7bcb44000000b003f1645899bamr6789890wmj.29.1681738362352; Mon, 17 Apr 2023 06:32:42 -0700 (PDT) Received: from localhost ([2a02:ed3:911:ee00:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id c1-20020a056000104100b002cea9d931e6sm10529838wrx.78.2023.04.17.06.32.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 06:32:41 -0700 (PDT) From: Efraim Flashner Date: Mon, 17 Apr 2023 16:32:26 +0300 Message-Id: <58223601b0869bad623fcb6c7c9a4b02f25fca6d.1681738065.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: 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: , 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/linux.scm (ulogd)[inputs]: Remove mysql. Add mariadb:dev. [arguments]: Adjust configure-flags accordingly. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 36b35448cc..3b123257f7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2022 Efraim Flashner +;;; Copyright © 2015-2018, 2020, 2022, 2023 Efraim Flashner ;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Alex Kost @@ -8093,7 +8093,7 @@ (define-public ulogd libpcap jansson postgresql - mysql + (list mariadb "dev") zlib openssl)) (arguments @@ -8101,7 +8101,7 @@ (define-public ulogd #~(list (string-append "--with-pgsql=" (assoc-ref %build-inputs "postgresql")) (string-append "--with-mysql=" - (assoc-ref %build-inputs "mysql"))) + (assoc-ref %build-inputs "mariadb"))) #:phases #~(modify-phases %standard-phases (add-after 'install 'install-doc From patchwork Mon Apr 17 13:32:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 49224 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 230031790F; Mon, 17 Apr 2023 14:34:04 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 742D11780E for ; Mon, 17 Apr 2023 14:34:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poOz9-0004ny-Au; Mon, 17 Apr 2023 09:33:35 -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 1poOz0-0004i4-Jc for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:27 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1poOyf-0003Br-HZ for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:25 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poOyf-0004eZ-Cy for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62903] [PATCH 6/8] gnu: opensmtpd-extras: Build with mariadb. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 13:33:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62903 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62903@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 62903-submit@debbugs.gnu.org id=B62903.168173837917817 (code B ref 62903); Mon, 17 Apr 2023 13:33:05 +0000 Received: (at 62903) by debbugs.gnu.org; 17 Apr 2023 13:32:59 +0000 Received: from localhost ([127.0.0.1]:54035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyY-0004dI-8B for submit@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:58 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:42655) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyT-0004cX-ST for 62903@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:54 -0400 Received: by mail-wm1-f49.google.com with SMTP id d8-20020a05600c3ac800b003ee6e324b19so13104583wms.1 for <62903@debbugs.gnu.org>; Mon, 17 Apr 2023 06:32:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681738368; x=1684330368; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=RVQ3fcxBhuo7trquxf4EpNyPx9+agbdlxcmyt+9kzz0=; b=DmfuctHHrNxWF3W/Jhyb9lvszNSEwcX0vWOXgfrDJkwJbMqUZDhRXxSmmu8cD7nCwl MlfkyhqyLqadPEA9PLqx973G7hjsB7yf46GDs/+H15jjSTJDWRIe5XGxUcgI0LlUDD8W MZZzIDPrUXdLUvvY3qbXI/VIrGOyy4f5PF3Qvtt4Uat53BpA/OkgR9gMv8PjAfeEUB/a qJMrCQWDwmE//9eFa4TYrUU8YKL9KCPnCQfSRBKz+JsMqg7MBb/zzOrI6NvnWeu51OdY g5F4Y2oszXHahAMTxjxHlCQ57Jt0pXl0sX2PtpRO6hMPHlA11P7nGMldKJ0BXLAaR+fV K6Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681738368; x=1684330368; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=RVQ3fcxBhuo7trquxf4EpNyPx9+agbdlxcmyt+9kzz0=; b=VDdWHb+biz25B0JjebGOX3e6bXlBrEJxPl5uXawojEtnbs6ev7g/oUxWRpRhu5O2cN +YEKdY2Zdrm3Gh4LXRFPqv9rUYfxqP5wNjm8j1XK/7MHirM/Kx2tCeK6KG0qNeMhnWY+ K/ZXhz/D35kK/RPUzTFMK/ElPxGxHHWGClvuS+Z5hbZsr8Us0wnw+c31ABA84V+OnIfN BE/pqn3+5xFb5B688TBGYhYUkRqQZeEzklBE04MpryR4807n2XfmeBlsg6nukeoBbhCs HKop96IvueodpnNxMFx3fymMgpWhr0tr/6PzNWfXHCsFNLYiNiQUvMhmFAanGnCfbc8V /uYQ== X-Gm-Message-State: AAQBX9dslVk+4MczRW7K86xwKEOKxPfa6LaU08LV8og0UYCppy8HUNic OToRX+JovNGcQapjNMTKSYC4E2msple/8g== X-Google-Smtp-Source: AKy350aIIBk4lqwQC9LZESlDJ8ym78MUlivs/fbbc7oYafBbHPb7nvlO1C1MsTb1xSPQi9Ve2BuX9w== X-Received: by 2002:a05:600c:3781:b0:3f1:72db:4554 with SMTP id o1-20020a05600c378100b003f172db4554mr3161917wmr.1.1681738368176; Mon, 17 Apr 2023 06:32:48 -0700 (PDT) Received: from localhost ([2a02:ed3:911:ee00:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id r12-20020a05600c35cc00b003f175954e71sm1532508wmq.32.2023.04.17.06.32.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 06:32:47 -0700 (PDT) From: Efraim Flashner Date: Mon, 17 Apr 2023 16:32:27 +0300 Message-Id: <5ab29d19159fc557e3acd4686800d835927ede39.1681738065.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: 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: , 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/mail.scm (opensmtpd-extras)[inputs]: Remove mysql. Add mariadb:dev. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 353773de09..82a2828386 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015, 2016, 2018 Eric Bavier ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner +;;; Copyright © 2015-2023 Efraim Flashner ;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari @@ -3258,7 +3258,7 @@ (define-public opensmtpd-extras (inputs `(("libressl" ,libressl) ("libevent" ,libevent) - ("mysql" ,mysql) + ("mysql" ,mariadb "dev") ("opensmtpd" ,opensmtpd) ("postgresql" ,postgresql) ("python" ,python-2) From patchwork Mon Apr 17 13:32:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 49223 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 1274217910; Mon, 17 Apr 2023 14:33:56 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 AA40A1780E for ; Mon, 17 Apr 2023 14:33:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poOz3-0004kh-Fk; Mon, 17 Apr 2023 09:33:29 -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 1poOz0-0004i3-6k for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:27 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1poOyg-0003Co-1f for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:25 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poOyf-0004eg-Tj for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62903] [PATCH 7/8] gnu: sbcl-clsql: Build with mariadb. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 13:33:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62903 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62903@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 62903-submit@debbugs.gnu.org id=B62903.168173837917824 (code B ref 62903); Mon, 17 Apr 2023 13:33:05 +0000 Received: (at 62903) by debbugs.gnu.org; 17 Apr 2023 13:32:59 +0000 Received: from localhost ([127.0.0.1]:54037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyY-0004dK-Oa for submit@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:59 -0400 Received: from mail-wr1-f51.google.com ([209.85.221.51]:53538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyW-0004cp-AV for 62903@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:56 -0400 Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-2f625d52275so1557644f8f.3 for <62903@debbugs.gnu.org>; Mon, 17 Apr 2023 06:32:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681738371; x=1684330371; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=hUjjp76GdbEdmuq6fpYJQYEYo9H/gYZ4OGBMkMJqkEg=; b=JOMJe4xBJHva9bcXvYGOWgrOroM9xW0s2dtm6o3fIUGZfRpbXg+gBaviD5DVZPDQX2 2A759415CutPPYzcbX1sUMaWOKitSTWnoox5xlFCg40hXd6QM5dS5lzlzH5Tsk6FV1pW onC9u0LD4tpzJ0rNbivHV+djOTxRHbUBXZODqoM2XPVAGWUSGaIxWdvB82i4aI47QOKQ 5S6e8n3UJS1UyRXGS+CY7Nkqe1RSXKnNbsGFfGuVZUHxtgTZPPmHVwADGOI+kIDQiHqB P2sS13XVaGboMQnSjqfvzCHd3a8LCU8/RqNwTeS7cbdnX6qBVUdPVPk8AuYjkbHC2bEA CsgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681738371; x=1684330371; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=hUjjp76GdbEdmuq6fpYJQYEYo9H/gYZ4OGBMkMJqkEg=; b=bnW6xGxA3Wbm7Bz7mADolOSEZb7qA4CAYZz0MImkCzgoX/wYbf//PKjCimjlW5dUXo DuPrkDi313IQSAA2nlqgHI6H2lYJeK/YEisE0UaX9NZ/qqSHyLIqijPfN4OdLKNQdLV9 zq/DylxP9vnLPVpuqYNLwdPB+FO5ArwCAHBaLdkQBhVU68NRMCwPoJYrKw7ZdEYNOIpH 5qTHy731IyOXeWhEU6n2afjXF3JqCci7A9rtrtFfT3FtyS0V34ijNZ1t0cSGRNrf7CRT a8pYf8jxMlLTkPWjE+vU9Unh5CuAq4x9guHScrpXaR14740WsW1w1ukJ13mWyG7X8pwQ wBjg== X-Gm-Message-State: AAQBX9eshuvRhTlLpBKB1w2UkvongUIbKK1c4p0LRi2rfYddmRyIBrZz quQrbLxfTTAhpvhBv2Pbk+QeBxLuvL0FFQ== X-Google-Smtp-Source: AKy350aNrJDRxbSnsakdB9yytAXGIR/HEiNJvSRqf3BJhGrXTQaX/KWFhFB24DWsKtzVcaPzMtoNyw== X-Received: by 2002:a5d:574a:0:b0:2f7:7c7b:bba6 with SMTP id q10-20020a5d574a000000b002f77c7bbba6mr6319585wrw.32.1681738370632; Mon, 17 Apr 2023 06:32:50 -0700 (PDT) Received: from localhost ([2a02:ed3:911:ee00:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id d17-20020a056000115100b002fa6929eb83sm2770761wrx.21.2023.04.17.06.32.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 06:32:50 -0700 (PDT) From: Efraim Flashner Date: Mon, 17 Apr 2023 16:32:28 +0300 Message-Id: <25d0aa82bea0a54ae40f3b1914d1865d2c4b7139.1681738065.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: 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: , 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/lisp-xyz.scm (sbcl-clsql)[inputs]: Remove mysql. Add mariadb:dev, mariadb:lib. [arguments]: Adjust custom 'build-helper-library phase to build with and link to mariadb. --- gnu/packages/lisp-xyz.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5f64809b28..d1ed5629e3 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016, 2017 Andy Patterson ;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus -;;; Copyright © 2017, 2018-2020, 2022 Efraim Flashner +;;; Copyright © 2017, 2018-2020, 2022, 2023 Efraim Flashner ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong @@ -13138,7 +13138,8 @@ (define-public sbcl-clsql (inputs `(("cffi" ,sbcl-cffi) ("md5" ,sbcl-md5) - ("mysql" ,mysql) + ("mariadb-dev" ,mariadb "dev") + ("mariadb-lib" ,mariadb "lib") ("postgresql" ,postgresql) ("postmodern" ,sbcl-postmodern) ("sqlite" ,sqlite) @@ -13184,15 +13185,16 @@ (define-public sbcl-clsql lib)) (substitute* "db-mysql/mysql-loader.lisp" (("libmysqlclient" all) - (string-append (assoc-ref inputs "mysql") "/lib/" all)) + (string-append (assoc-ref inputs "mariadb-lib") "/lib/" all)) (("clsql-mysql-system::\\*library-file-dir\\*") lib))) #t)) (add-before 'build 'build-helper-library (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((mysql (assoc-ref inputs "mysql")) - (inc-dir (string-append mysql "/include/mysql")) - (lib-dir (string-append mysql "/lib")) + (let* ((mariadb-dev (assoc-ref inputs "mariadb-dev")) + (mariadb-lib (assoc-ref inputs "mariadb-lib")) + (inc-dir (string-append mariadb-dev "/include/mysql")) + (lib-dir (string-append mariadb-lib "/lib")) (shared-lib-dir (string-append (assoc-ref outputs "out") "/lib")) (shared-lib (string-append shared-lib-dir @@ -13202,7 +13204,7 @@ (define-public sbcl-clsql "-I" inc-dir "db-mysql/clsql_mysql.c" "-Wl,-soname=clsql_mysql" - "-L" lib-dir "-lmysqlclient" "-lz" + "-L" lib-dir "-lmariadb" "-lz" "-o" shared-lib) #t))) (add-after 'unpack 'fix-tests From patchwork Mon Apr 17 13:32:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 49220 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 3A1501791B; Mon, 17 Apr 2023 14:33: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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 4352617907 for ; Mon, 17 Apr 2023 14:33:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poOz3-0004kT-6V; Mon, 17 Apr 2023 09:33:29 -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 1poOz0-0004i0-7r for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:27 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1poOyg-0003D5-IN for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:25 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poOyg-0004eo-DB for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62903] [PATCH 8/8] gnu: cl-clsql: Build with mariadb. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 13:33:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62903 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62903@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 62903-submit@debbugs.gnu.org id=B62903.168173838417879 (code B ref 62903); Mon, 17 Apr 2023 13:33:06 +0000 Received: (at 62903) by debbugs.gnu.org; 17 Apr 2023 13:33:04 +0000 Received: from localhost ([127.0.0.1]:54043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyd-0004eB-QW for submit@debbugs.gnu.org; Mon, 17 Apr 2023 09:33:04 -0400 Received: from mail-wm1-f50.google.com ([209.85.128.50]:36501) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyb-0004d8-Nl for 62903@debbugs.gnu.org; Mon, 17 Apr 2023 09:33:02 -0400 Received: by mail-wm1-f50.google.com with SMTP id eo6-20020a05600c82c600b003ee5157346cso15518666wmb.1 for <62903@debbugs.gnu.org>; Mon, 17 Apr 2023 06:33:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681738376; x=1684330376; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=dBrQ3tzRPIKEV36ta26FOelL06qPC96jPyUB13B7stQ=; b=ZzvFuvItpmuTs0x+u7Zo1/BEJQfL1zK+E8sSKHUTkMpbT2Gg9aT2yGqIPjganupJsx UpzzDp90mft2nkp/Ii2bBd778DKNjI+65f0qJuyTNVzHygWIbnv3hcyUKrNd2LDpu2ZX r1EQITXD9ud2p4+9xjTyXbdvNx1rrXpA0A/BB6v/IoCjUwfEQqhZtG1QKHP7Vd4s9Fm/ +msf5BYmR6nkt5aegcVvIMRmuxYw++hWNmsA43HIinrqDoKCVgs4UjSaC1ZLLc2J50fB dCr40Tjmsbre7plhli9rSKAKwmxtsCrU9a7Sy4I2XOxUJLktYrG9fCt+Kcu7HPDHkkrs M6fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681738376; x=1684330376; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=dBrQ3tzRPIKEV36ta26FOelL06qPC96jPyUB13B7stQ=; b=fW5hukIWCVaKS0oei91ZLZFJ+mECbBUoVJxNetp5l3GyKCU1TQreIs39vYPhcIY5Y9 AdgVqE6hE9gt1tUAyBwfqUy+tGVHund9hYETwldZ/1WCmHj8n1UuqTJecXN98r1kAhZH tA3q5b9DgGqipwyD3RxF8+Y+jk45TPsuXSztvTJtgjjsqxW5z1+TCZVBgUqz30s6s/Hk rXMbia7y09y5FXr1Q0HNqtQeaWCnT5wHiYDcybjZKZ8k70An/uLXCigUKiflXa5zEuD5 1Zk4csvNykmH0aYsNQa7vSGL7WYm3VCZh2CJMjb68qC2x0fzoC4oEch+dVvIeL1jewmZ H1MA== X-Gm-Message-State: AAQBX9eEPLsxTwtMXx4E69D8W3qtE2qRfCn/onO7KifLERHCsqHkj0/0 O35BLRGaFwsHLuOrtio7yAB0BZZsqD2m0Q== X-Google-Smtp-Source: AKy350YlxEz6/0lTMqQZqhsIObrEaeBYHK7FwbUXdhOGuEM3rvPA0H/pvJgvx9/qSD8AhRqXCd5FPg== X-Received: by 2002:a7b:c5d3:0:b0:3f0:7f4b:f3c0 with SMTP id n19-20020a7bc5d3000000b003f07f4bf3c0mr11756111wmk.19.1681738375983; Mon, 17 Apr 2023 06:32:55 -0700 (PDT) Received: from localhost ([2a02:ed3:911:ee00:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id l10-20020a7bc34a000000b003eeb1d6a470sm11920604wmj.13.2023.04.17.06.32.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 06:32:52 -0700 (PDT) From: Efraim Flashner Date: Mon, 17 Apr 2023 16:32:29 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: 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: , 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/lisp-xyz.scm (cl-clsql)[inputs]: Remove mysql. Add mariadb:dev. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d1ed5629e3..7dd39c127e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13227,7 +13227,7 @@ (define-public cl-clsql (native-inputs `(("rt" ,cl-rt))) (inputs - (list mysql postgresql sqlite zlib)) + (list (list mariadb "dev") postgresql sqlite zlib)) (propagated-inputs `(("cffi" ,cl-cffi) ("md5" ,cl-md5)