From patchwork Wed Sep 8 14:54:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 32708 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 4BCD527BBE3; Wed, 8 Sep 2021 15:56:46 +0100 (BST) 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_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 0792927BBE1 for ; Wed, 8 Sep 2021 15:56:46 +0100 (BST) Received: from localhost ([::1]:53778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNz0H-0000Ip-1k for patchwork@mira.cbaines.net; Wed, 08 Sep 2021 10:56:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNyye-00062O-Jg for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50019) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNyye-0002nK-CY for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNyye-00088T-CB for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH 01/10] gnu: guile-dbi: Update upstream source. References: <20210908144520.2883-1-arunisaac@systemreboot.net> In-Reply-To: <20210908144520.2883-1-arunisaac@systemreboot.net> Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Sep 2021 14:55:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50476 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50476@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163111286631129 (code B ref 50476); Wed, 08 Sep 2021 14:55:04 +0000 Received: (at 50476) by debbugs.gnu.org; 8 Sep 2021 14:54:26 +0000 Received: from localhost ([127.0.0.1]:33319 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyy2-00085q-42 for submit@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:26 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyxu-000848-1g for 50476@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Vkacf7vCcx0EjdzpxeVdmM12Z/+8iw5j9dGeGpXrv7M=; b=Xb88EYrwRIuMPPXAUC7VfxXWUX Beg3clQlpIfGsjumseWhIP0yqwrlUJHaIJYFWSbj+JueW4zGUPv/GQC1OLdzgZmHLwUPHoSkJvuzF 0Tqunm349J6v5yIrSF4l6dGPczjP3BD2RXeLPaRPBJDBK72w9VyYocbS1gAujJJfg/1zEPwdOjI/c kBzs7qKGvB6aua2zg5t+gQIBr6LccpUqLm/lWbq16zLHVy8ztmhzlXy6BLDanNlGm6PBp7izIu4F2 jkNVWTxVrGo+5oMeKPkli453M6x7gm7vGxqjEsVGGaAIAevZkGOtU+nNQG10r/dFqGLneeivfZzx3 KWXHSHNg==; Received: from [192.168.2.1] (port=55638 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mNyxq-000W6b-R3; Wed, 08 Sep 2021 20:24:14 +0530 From: Arun Isaac Date: Wed, 8 Sep 2021 20:24:04 +0530 Message-Id: <20210908145413.4652-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile-xyz.scm (guile-dbi)[source]: Use git-fetch. Update URI. [home-page]: Update URI. [native-inputs]: Add autoconf, automake, libtool, perl and texinfo. --- gnu/packages/guile-xyz.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 457701a436..26623b7770 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1495,12 +1495,12 @@ library}.") (source (origin (method git-fetch) (uri (git-reference - (url "https://example.org") ;only hosted on Software Heritage - (commit "e19b019e9683faf66c3f385b20fcc112e65f8c6e"))) + (url "https://github.com/opencog/guile-dbi") + (commit (string-append "guile-dbi-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "09ys5hj7gnj5w1iv1m194j06jk6b8sdhc8j6hcv3bprq1428kyxw")))) + "0nswd067gvpy9pnig409ympkw29akh9lb2i6g3w7r18g1s0ivah2")))) (build-system gnu-build-system) (arguments '(#:configure-flags @@ -1524,10 +1524,16 @@ library}.") (inputs `(("guile-dbd-sqlite3" ,guile-dbd-sqlite3) ("guile-dbd-postgresql" ,guile-dbd-postgresql))) ; only shared library, no scheme files + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("perl" ,perl) + ("texinfo" ,texinfo))) (propagated-inputs `(("guile" ,guile-2.2))) (synopsis "Guile database abstraction layer") - (home-page "https://web.archive.org/web/20160328232717/http://home.gna.org/guile-dbi/guile-dbi.html") + (home-page "https://github.com/opencog/guile-dbi") (description "guile-dbi is a library for Guile that provides a convenient interface to SQL databases. Database programming with guile-dbi is generic in that the same From patchwork Wed Sep 8 14:54:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 32711 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 0A9C627BBE3; Wed, 8 Sep 2021 15:57:00 +0100 (BST) 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_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 814E927BBE1 for ; Wed, 8 Sep 2021 15:56:59 +0100 (BST) Received: from localhost ([::1]:54760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNz0U-0000yT-Jg for patchwork@mira.cbaines.net; Wed, 08 Sep 2021 10:56:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNyyd-00060y-CQ for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNyyd-0002mO-58 for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNyyd-000885-4n for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH 02/10] gnu: guile-dbi: Remove hard-coded guile effective version. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Sep 2021 14:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50476 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50476@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163111286231080 (code B ref 50476); Wed, 08 Sep 2021 14:55:03 +0000 Received: (at 50476) by debbugs.gnu.org; 8 Sep 2021 14:54:22 +0000 Received: from localhost ([127.0.0.1]:33310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyxy-000859-5z for submit@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:22 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyxu-000849-1n for 50476@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=0smi84sY0MbiZRs/5BJj/xRBjH7C0Q3MykFm04xS4W0=; b=p0GusWmSM6lDRjxK2GI6L5Dwu2 BkVXcobKc8DaWVLU7vnXF+otmrc4M/kQyMjTujfUqO3DMekWdsqZeWz3ZWL4U1FlJx3c9l7AULSOT SjtsMtBAe6B3Izu5+VxcqosaRPN4gwvU+z5aQWFg6aTF3QWXUWb6Zk/rRbvTMqhwUS45p3Wfiy8/n hrOkWmOXa8UOx5rXGJDHOB07vCiDSGh9XJ43TaVnocrlraQ9CARuDAlX1yDvv+7L7lUsFGyE6pY3b 61luo2Klp04MvqF7Dl62ZxzedZNqcWRuLt7S6LJlkDa5RKahPbU5VGkFfmK5yg5qg8TkV8RUcp147 itLphyxA==; Received: from [192.168.2.1] (port=55638 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mNyxr-000W6b-04; Wed, 08 Sep 2021 20:24:15 +0530 From: Arun Isaac Date: Wed, 8 Sep 2021 20:24:05 +0530 Message-Id: <20210908145413.4652-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210908145413.4652-1-arunisaac@systemreboot.net> References: <20210908145413.4652-1-arunisaac@systemreboot.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile-xyz.scm (guile-dbi)[arguments]: Import target-guile-effective-version from (guix build guile-build-system). Use target-guile-effective-version to determine the guile effective version. --- gnu/packages/guile-xyz.scm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 26623b7770..c40eea07a9 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1503,9 +1503,15 @@ library}.") "0nswd067gvpy9pnig409ympkw29akh9lb2i6g3w7r18g1s0ivah2")))) (build-system gnu-build-system) (arguments - '(#:configure-flags + `(#:modules (((guix build guile-build-system) + #:select (target-guile-effective-version)) + ,@%gnu-build-system-modules) + #:imported-modules ((guix build guile-build-system) + ,@%gnu-build-system-modules) + #:configure-flags (list (string-append - "--with-guile-site-dir=" %output "/share/guile/site/2.2")) + "--with-guile-site-dir=" %output "/share/guile/site/" + (target-guile-effective-version (assoc-ref %build-inputs "guile")))) #:make-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib:" @@ -1514,11 +1520,13 @@ library}.") #:phases (modify-phases %standard-phases (add-after 'install 'patch-extension-path - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dbi.scm (string-append - out "/share/guile/site/2.2/dbi/dbi.scm")) - (ext (string-append out "/lib/libguile-dbi"))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dbi.scm (string-append out "/share/guile/site/" + (target-guile-effective-version + (assoc-ref inputs "guile")) + "/dbi/dbi.scm")) + (ext (string-append out "/lib/libguile-dbi"))) (substitute* dbi.scm (("libguile-dbi") ext)) #t)))))) (inputs From patchwork Wed Sep 8 14:54:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 32709 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 6101D27BBE3; Wed, 8 Sep 2021 15:56:50 +0100 (BST) 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_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 24C2427BBE1 for ; Wed, 8 Sep 2021 15:56:50 +0100 (BST) Received: from localhost ([::1]:54112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNz0L-0000Wn-7J for patchwork@mira.cbaines.net; Wed, 08 Sep 2021 10:56:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNyyd-00060a-2e for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50015) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNyyc-0002lt-Pk for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNyyc-00087w-Op for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH 03/10] gnu: guile-dbi: Search for dbd libraries using native-search-paths. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Sep 2021 14:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50476 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50476@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163111286231074 (code B ref 50476); Wed, 08 Sep 2021 14:55:02 +0000 Received: (at 50476) by debbugs.gnu.org; 8 Sep 2021 14:54:22 +0000 Received: from localhost ([127.0.0.1]:33308 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyxx-000851-RP for submit@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:22 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyxu-00084A-1w for 50476@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ivl+dC37gdyW33XmDW/GEzMA5sqzC9k5Y5v5SCFalug=; b=Rxt9/d63StvjfnOTDSAOAUv3bk TylxujSiq8sQMtDqeg1Uq/guXVNPSJYU1Wl6cNIfc/VFWrAwJsFcFOwcN2xEcpOopmR+iapSdNjRk 83gDccvigclY0jAEdLXFelQ2ORKMSU+LNEB2tCXQUmkerZQunlUKw2F/fgf8xGMCjtIGwFYlPVV1b f66q5jqqT8n4YRVUElxCGQyVrcZ3HwMGk46rwFhMD7IIqfgtJIP2YW9Sbvu1hyv7uYpomzmnuWr8I 6fGpogbEAZd9huC6huZ25ziZugSkLyx1F4XX7ek7WJ7yDLijn/5Wap9cZ4lXrPIGgT3673bKyJvg/ Bir/trSQ==; Received: from [192.168.2.1] (port=55638 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mNyxr-000W6b-56; Wed, 08 Sep 2021 20:24:15 +0530 From: Arun Isaac Date: Wed, 8 Sep 2021 20:24:06 +0530 Message-Id: <20210908145413.4652-3-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210908145413.4652-1-arunisaac@systemreboot.net> References: <20210908145413.4652-1-arunisaac@systemreboot.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile-xyz.scm (guile-dbi)[arguments]: Do not set LDFLAGS and RPATH in #:make-flags. [inputs]: Remove guile-dbd-sqlite3 and guile-dbd-postgresql. [native-search-paths]: Add LD_LIBRARY_PATH. --- gnu/packages/guile-xyz.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index c40eea07a9..e8a7fded14 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1512,11 +1512,6 @@ library}.") (list (string-append "--with-guile-site-dir=" %output "/share/guile/site/" (target-guile-effective-version (assoc-ref %build-inputs "guile")))) - #:make-flags - (list (string-append - "LDFLAGS=-Wl,-rpath=" %output "/lib:" - (assoc-ref %build-inputs "guile-dbd-sqlite3") "/lib" ":" - (assoc-ref %build-inputs "guile-dbd-postgresql") "/lib")) #:phases (modify-phases %standard-phases (add-after 'install 'patch-extension-path @@ -1529,9 +1524,6 @@ library}.") (ext (string-append out "/lib/libguile-dbi"))) (substitute* dbi.scm (("libguile-dbi") ext)) #t)))))) - (inputs - `(("guile-dbd-sqlite3" ,guile-dbd-sqlite3) - ("guile-dbd-postgresql" ,guile-dbd-postgresql))) ; only shared library, no scheme files (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -1547,7 +1539,11 @@ library}.") SQL databases. Database programming with guile-dbi is generic in that the same programming interface is presented regardless of which database system is used. It currently supports MySQL, Postgres and SQLite3.") - (license license:gpl2+))) + (license license:gpl2+) + (native-search-paths + (list (search-path-specification + (variable "LD_LIBRARY_PATH") + (files '("lib"))))))) (define guile-dbi-bootstrap (package From patchwork Wed Sep 8 14:54:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 32715 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 5603B27BBE3; Wed, 8 Sep 2021 15:57:21 +0100 (BST) 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_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 2261427BBE1 for ; Wed, 8 Sep 2021 15:57:21 +0100 (BST) Received: from localhost ([::1]:55734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNz0q-0001ck-3Q for patchwork@mira.cbaines.net; Wed, 08 Sep 2021 10:57:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNyyd-000610-QI for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50017) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNyyd-0002mo-IU for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNyyd-00088E-Hz for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH 04/10] gnu: guile-dbi: Do not return #t from custom phases. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Sep 2021 14:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50476 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50476@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163111286531109 (code B ref 50476); Wed, 08 Sep 2021 14:55:03 +0000 Received: (at 50476) by debbugs.gnu.org; 8 Sep 2021 14:54:25 +0000 Received: from localhost ([127.0.0.1]:33315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyy1-00085f-HG for submit@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:25 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyxu-00084B-1s for 50476@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=u+61DY/FNeU6SvC6WM1voO2WQDDPaYchwYZqSsW934g=; b=NyxUrHcdHuYngH/vd2qhfzKqBP ljuHSXtRJq5z1b1S7GnF+9FeQ8oySfnbvnNkQHqwIVBq5WGToL1uuRdUFMPH6DBAQYhtV0wWj894H zqLKantX+u3WAVFC16Pi7vb0zbLGZ5PcbD1dkqBXkEmrG2VbDqhKfcPUa29rv45SY8wCyAHGEdg5t PhFuQIKNty9hDn+JaiZETyHsGXrN+wg9loX+sIqVAS4qfzoLHU+tQk+tb536WV0SXl5Dh6WftzXV5 plRoRc9GxY4E34c3Y7n//+NJiiIp3c2IUTBOvTZ24sfKssn2INFB0P1yfWqeMKQyd8z90qfaeGjzg a6w+oasQ==; Received: from [192.168.2.1] (port=55638 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mNyxr-000W6b-9x; Wed, 08 Sep 2021 20:24:15 +0530 From: Arun Isaac Date: Wed, 8 Sep 2021 20:24:07 +0530 Message-Id: <20210908145413.4652-4-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210908145413.4652-1-arunisaac@systemreboot.net> References: <20210908145413.4652-1-arunisaac@systemreboot.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile-xyz.scm (guile-dbi)[arguments]: Do not return #t from custom phases. --- gnu/packages/guile-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index e8a7fded14..80267287d1 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1522,8 +1522,7 @@ library}.") (assoc-ref inputs "guile")) "/dbi/dbi.scm")) (ext (string-append out "/lib/libguile-dbi"))) - (substitute* dbi.scm (("libguile-dbi") ext)) - #t)))))) + (substitute* dbi.scm (("libguile-dbi") ext)))))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) From patchwork Wed Sep 8 14:54:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 32713 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 427E627BBE3; Wed, 8 Sep 2021 15:57:13 +0100 (BST) 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_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 0472B27BBE1 for ; Wed, 8 Sep 2021 15:57:13 +0100 (BST) Received: from localhost ([::1]:55262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNz0g-0001J3-Jf for patchwork@mira.cbaines.net; Wed, 08 Sep 2021 10:57:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNyyc-00060H-Kb for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50014) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNyyc-0002lL-C3 for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNyyc-00087o-Ag for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH 05/10] gnu: guile-dbi: Update to 2.1.8. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Sep 2021 14:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50476 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50476@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163111286131066 (code B ref 50476); Wed, 08 Sep 2021 14:55:02 +0000 Received: (at 50476) by debbugs.gnu.org; 8 Sep 2021 14:54:21 +0000 Received: from localhost ([127.0.0.1]:33306 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyxx-00084u-Bv for submit@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:21 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37684) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyxu-00084C-2V for 50476@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=cnsTT0Wk+2Jd/qhSLjXIPjlm1bivxUz7R9NqR5W1TNo=; b=H8Zrp1aleI3g7euwdGoV7AIrkI vfaD+OQavwzPWZ/nKRZOv9ACVo4Kq834sUUIfcq+kj3o2lQ9Gg6o8rZtMCYYKJhLDjX6d6Oh6hBeW S63wkCsBUqJPAzBrh/JPCiZC6QLPqwfVKuYtsetJDOMYv4z4i4MFx3fKdPTamknNrZS9M3KItoHDI t6SvWFvy1oE0fIdDSWw9OMAdcThtKChKMLdhOzNQZKja2nP1O4eyRXWm4pU+eV1r2ubDxnOk7NV7G CXNmmyS91Y1RXXKvZBPrZLiN+npuc+q5SpTd8TFUg4iYcsERr+VbSFW7UzXPoehFrhZit07i8kNCp Auhec00w==; Received: from [192.168.2.1] (port=55638 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mNyxr-000W6b-Ks; Wed, 08 Sep 2021 20:24:15 +0530 From: Arun Isaac Date: Wed, 8 Sep 2021 20:24:08 +0530 Message-Id: <20210908145413.4652-5-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210908145413.4652-1-arunisaac@systemreboot.net> References: <20210908145413.4652-1-arunisaac@systemreboot.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile-xyz.scm (guile-dbi): Update to 2.1.8. [arguments]: Add chdir phase. --- gnu/packages/guile-xyz.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 80267287d1..baf245c865 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1491,7 +1491,7 @@ library}.") (define-public guile-dbi (package (name "guile-dbi") - (version "2.1.6") + (version "2.1.8") (source (origin (method git-fetch) (uri (git-reference @@ -1500,7 +1500,7 @@ library}.") (file-name (git-file-name name version)) (sha256 (base32 - "0nswd067gvpy9pnig409ympkw29akh9lb2i6g3w7r18g1s0ivah2")))) + "123m4j82bi60s1v95pjh4djb7bh6zdwmljbpyg7zq8ni2gyal7lw")))) (build-system gnu-build-system) (arguments `(#:modules (((guix build guile-build-system) @@ -1514,6 +1514,11 @@ library}.") (target-guile-effective-version (assoc-ref %build-inputs "guile")))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + ;; The upstream Git repository contains all the code, so change + ;; to the directory specific to guile-dbi. + (chdir "guile-dbi"))) (add-after 'install 'patch-extension-path (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) From patchwork Wed Sep 8 14:54:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 32712 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 38DBB27BBE3; Wed, 8 Sep 2021 15:57:10 +0100 (BST) 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_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 EA3B827BBE1 for ; Wed, 8 Sep 2021 15:57:09 +0100 (BST) Received: from localhost ([::1]:55290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNz0e-0001Jz-SS for patchwork@mira.cbaines.net; Wed, 08 Sep 2021 10:57:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNyye-00061Y-Av for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNyye-0002mw-0V for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNyyd-00088L-Vo for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH 06/10] gnu: guile-dbd-sqlite3: Inherit from guile-dbi. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Sep 2021 14:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50476 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50476@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163111286631117 (code B ref 50476); Wed, 08 Sep 2021 14:55:03 +0000 Received: (at 50476) by debbugs.gnu.org; 8 Sep 2021 14:54:26 +0000 Received: from localhost ([127.0.0.1]:33317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyy1-00085i-Pn for submit@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:26 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37686) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyxu-00084D-AE for 50476@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=bGfE/r7MQJ86tNQt4QdJRRJDWQXW1mjsmPo2SC/CUh4=; b=VadTIEr2nNbVbmsIIuikbki7Ha wxP4i8EtGxUZU6FRGB25pChcEpbLmJRPzvQ/3cJwoyFpvDqiOrrr5j8CyyDS/3bPIK3ADIdOUGoai CMA/4peHUTPp5n/9LBUuhm/AP8DV+kclyWEd5+wkhngOWjc/yz7A2ij/leWFBqL1kk2iIP8Et5nZ4 bC23GoQV0cW42AYFnyS7R20F7dBO2hwrbAZj5onJexzwQuPb68BiLDh9gLTmctBAj59MNEz6JK8mg Jj5cacEQpgu89m2QeNPNdS/bNlbQI3uHoBeCI32CZGmxyIo9Jhc3szWhqkXC0xMcu5nvggbq+7CtP YdgMzIfA==; Received: from [192.168.2.1] (port=55638 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mNyxr-000W6b-Uw; Wed, 08 Sep 2021 20:24:16 +0530 From: Arun Isaac Date: Wed, 8 Sep 2021 20:24:09 +0530 Message-Id: <20210908145413.4652-6-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210908145413.4652-1-arunisaac@systemreboot.net> References: <20210908145413.4652-1-arunisaac@systemreboot.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile-xyz.scm (guile-dbd-sqlite3): Inherit from guile-dbi. Remove version, source, build-system, home-page and license fields. [arguments]: Replace chdir phase. Delete patch-extension-path phase. [native-inputs]: Replace guile-dbi-bootstrap with guile-dbi. --- gnu/packages/guile-xyz.scm | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index baf245c865..1a3ddcf25d 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1560,32 +1560,29 @@ It currently supports MySQL, Postgres and SQLite3.") (define-public guile-dbd-sqlite3 (package + (inherit guile-dbi) (name "guile-dbd-sqlite3") - (version "2.1.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://example.org") ;only hosted on Software Heritage - (commit "0758c615e9e85ad76d153d5dc6179881f1f50089"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1rwf3z6ib6nkhfnk2nw8p6fqirdx2pparcrlmsm0i2ii62plpqhb")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("guile-dbi-bootstrap" ,guile-dbi-bootstrap))) ; only required for headers + (arguments + (substitute-keyword-arguments (package-arguments guile-dbi) + ((#:phases phases) + `(modify-phases ,phases + (replace 'chdir + (lambda _ + ;; The upstream Git repository contains all the code, so change + ;; to the directory specific to guile-dbd-sqlite3. + (chdir "guile-dbd-sqlite3"))) + (delete 'patch-extension-path))))) (inputs `(("sqlite" ,sqlite) ("zlib" ,(@ (gnu packages compression) zlib)))) + (native-inputs + `(("guile-dbi" ,guile-dbi) ; only required for headers + ("pkg-config" ,pkg-config) + ,@(package-native-inputs guile-dbi))) (synopsis "Guile DBI driver for SQLite") - ;; Unofficial home-page. - ;; Added by b9cbfa52f71505de8447fefabd97f16d0a9cbde6 (2016-06) - (home-page "https://github.com/jkalbhenn/guile-dbd-sqlite3") (description "guile-dbi is a library for Guile that provides a convenient interface to -SQL databases. This package implements the interface for SQLite.") - (license license:gpl2+))) +SQL databases. This package implements the interface for SQLite."))) (define-public guile-dbd-postgresql (let ((commit "e97589b6b018b206c901e4cc24db463407a4036b") From patchwork Wed Sep 8 14:54:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 32714 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 CCEFB27BBE3; Wed, 8 Sep 2021 15:57:20 +0100 (BST) 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_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 4DDDF27BBE1 for ; Wed, 8 Sep 2021 15:57:20 +0100 (BST) Received: from localhost ([::1]:55698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNz0p-0001bR-CD for patchwork@mira.cbaines.net; Wed, 08 Sep 2021 10:57:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNyyh-00062y-3j for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50020) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNyye-0002nj-Rf for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNyye-00088a-QP for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH 07/10] gnu: guile-dbd-postgresql: Inherit from guile-dbi. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Sep 2021 14:55:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50476 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50476@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163111286731138 (code B ref 50476); Wed, 08 Sep 2021 14:55:04 +0000 Received: (at 50476) by debbugs.gnu.org; 8 Sep 2021 14:54:27 +0000 Received: from localhost ([127.0.0.1]:33321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyy2-000862-KA for submit@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:26 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37688) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyxu-00084F-Jh for 50476@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=N3nybh1xuiLlfS6Lj8cu1C+RKaYMgsUT3GVZrbhMxfE=; b=DoRFOSWJzfTXZBAE8geA7WJWZ7 r5ED++GMV9FLqqFEQz45kGM94Riann5KfMhqpKzFqCF95PjvGZPLRXphUPFoSOtgKZF9t3bKRvFjD fzhnI66w2HadVf8xDy1pGZpWidQO6y18Ia9oAZ/3YAvJS3QDgWmShtmqSf3pYMwdRa9qwxNeFvDzr gJgjDZ6bQW+0GaCwGgxU88BGgLmPiX8KD11z/zXUEngdxjBuwQlT9u/SWvtr+lrVp/SSnH0TbpBFv ckR6kUeQ/+mqzZ4VRPVgI//Q48LWiqJYY+8wrbECKRq65nL2DX3wHLorYJbPKgI8ZRLU/M4o0dfw3 7a7uRv8w==; Received: from [192.168.2.1] (port=55638 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mNyxs-000W6b-7q; Wed, 08 Sep 2021 20:24:16 +0530 From: Arun Isaac Date: Wed, 8 Sep 2021 20:24:10 +0530 Message-Id: <20210908145413.4652-7-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210908145413.4652-1-arunisaac@systemreboot.net> References: <20210908145413.4652-1-arunisaac@systemreboot.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile-xyz.scm (guile-dbd-postgresql): Inherit from guile-dbi. Remove version, source, build-system, home-page and license fields. [arguments]: Remove patch-src/Makefile.am phase. Do not return #t from phases. [native-inputs]: Replace guile-dbi-bootstrap with guile-dbi. --- gnu/packages/guile-xyz.scm | 72 ++++++++++++-------------------------- 1 file changed, 23 insertions(+), 49 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 1a3ddcf25d..c59e7e51c8 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1585,60 +1585,34 @@ It currently supports MySQL, Postgres and SQLite3.") SQL databases. This package implements the interface for SQLite."))) (define-public guile-dbd-postgresql - (let ((commit "e97589b6b018b206c901e4cc24db463407a4036b") - (revision 0)) - (package - (name "guile-dbd-postgresql") - (version (string-append - "2.1.6-" (number->string revision) "." (string-take commit 7))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/opencog/guile-dbi") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0n1gv9a0kdys10a4qmnrwvg5sydwb03880asri4gqdchcj3fimni")))) - (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir + (package + (inherit guile-dbi) + (name "guile-dbd-postgresql") + (arguments + (substitute-keyword-arguments (package-arguments guile-dbi) + ((#:phases phases) + `(modify-phases ,phases + (replace 'chdir (lambda _ ;; The upstream Git repository contains all the code, so change - ;; to the relevant directory. - (chdir "guile-dbd-postgresql") - #t)) - (add-after 'chdir 'patch-src/Makefile.am - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/Makefile.am" - (("/usr/include") - (string-append (assoc-ref inputs "postgresql") "/include"))) - #t)) - (add-after 'patch-src/Makefile.am 'patch-src + ;; to the directory specific to guile-dbd-mysql. + (chdir "guile-dbd-postgresql"))) + (add-after 'chdir 'patch-src (lambda _ (substitute* "src/guile-dbd-postgresql.c" - (("postgresql/libpq-fe\\.h") "libpq-fe.h")) - #t))))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("automake" ,automake) - ("autoconf" ,autoconf) - ("perl" ,perl) - ("libtool" ,libtool) - ("guile-dbi-bootstrap" ,guile-dbi-bootstrap))) - (inputs - `(("postgresql" ,postgresql) - ("zlib" ,zlib))) - (synopsis "Guile DBI driver for PostgreSQL") - (home-page - "https://github.com/opencog/guile-dbi/tree/master/guile-dbd-postgresql") - (description - "@code{guile-dbi} is a library for Guile that provides a convenient + (("postgresql/libpq-fe\\.h") "libpq-fe.h")))) + (delete 'patch-extension-path))))) + (inputs + `(("postgresql" ,postgresql) + ("zlib" ,zlib))) + (native-inputs + `(("guile-dbi" ,guile-dbi) ; only required for headers + ,@(package-native-inputs guile-dbi))) + (synopsis "Guile DBI driver for PostgreSQL") + (description + "@code{guile-dbi} is a library for Guile that provides a convenient interface to SQL databases. This package implements the interface for -PostgreSQL.") - (license license:gpl2+)))) +PostgreSQL."))) (define-public guile-config (package From patchwork Wed Sep 8 14:54:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 32707 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 7E70727BBE3; Wed, 8 Sep 2021 15:55:26 +0100 (BST) 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_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 4576327BBE1 for ; Wed, 8 Sep 2021 15:55:26 +0100 (BST) Received: from localhost ([::1]:50000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNyyz-0006A0-27 for patchwork@mira.cbaines.net; Wed, 08 Sep 2021 10:55:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNyyh-000630-4j for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50021) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNyyf-0002o9-9j for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNyyf-00088h-8n for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH 08/10] gnu: guile-dbi-bootstrap: Remove package. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Sep 2021 14:55:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50476 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50476@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163111286731147 (code B ref 50476); Wed, 08 Sep 2021 14:55:05 +0000 Received: (at 50476) by debbugs.gnu.org; 8 Sep 2021 14:54:27 +0000 Received: from localhost ([127.0.0.1]:33323 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyy3-00086B-0x for submit@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:27 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyxz-00085L-Lw for 50476@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=DvGa7tSEfUiGCFEvnjmn2C3ehs+zN5dx/F3FiSbe3OE=; b=BACpOGoriO5jPDDv5JslRMHAFN 0EhfT86wlUOmsaBIsfUwpYAhe6S0Ij5qbXtmXdxH+VNp9YRF3TzXTdU0/zoWWEJgHyUAau0F8Qzqc AcvXBfZhyjTd5jxri8NBl8iivbqSd4TqHlH96b3aTPzxxLG/lS9YyguYuKxIYcYB3owFOttCsWPjo gFFbRWtAC//tDMV5RAWpCUUNIZbbbsz8avZtap1NVCCW7ZHzI3IC2ayEnnMhdiQ2YnHG5892yc5Iw 1kl2a5ROyfE9WVDVno58ZeKE19s653B336s5mtr31Zv9AObQGPaqjypBe2PQfWywgftw6BTv0vBP8 3Wn3EVdA==; Received: from [192.168.2.1] (port=55638 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mNyxs-000W6b-Gf; Wed, 08 Sep 2021 20:24:16 +0530 From: Arun Isaac Date: Wed, 8 Sep 2021 20:24:11 +0530 Message-Id: <20210908145413.4652-8-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210908145413.4652-1-arunisaac@systemreboot.net> References: <20210908145413.4652-1-arunisaac@systemreboot.net> 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" X-getmail-retrieved-from-mailbox: Patches guile-dbi-bootstrap was formerly used by guile-dbd-sqlite3 and guile-dbd-postgresql. It is no longer required now that guile-dbi uses native-search-paths to find guile-dbd-* libraries. * gnu/packages/guile-xyz.scm (guile-dbi-bootstrap): Delete variable. --- gnu/packages/guile-xyz.scm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index c59e7e51c8..15dc8b1219 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1549,15 +1549,6 @@ It currently supports MySQL, Postgres and SQLite3.") (variable "LD_LIBRARY_PATH") (files '("lib"))))))) -(define guile-dbi-bootstrap - (package - (inherit guile-dbi) - (name "guile-dbi-bootstrap") - (inputs '()) - (arguments - (substitute-keyword-arguments (package-arguments guile-dbi) - ((#:make-flags _) '(list)))))) - (define-public guile-dbd-sqlite3 (package (inherit guile-dbi) From patchwork Wed Sep 8 14:54:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 32710 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 C2C6C27BBE4; Wed, 8 Sep 2021 15:56:54 +0100 (BST) 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_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham 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 8ACA127BBE3 for ; Wed, 8 Sep 2021 15:56:54 +0100 (BST) Received: from localhost ([::1]:54446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNz0P-0000lU-JY for patchwork@mira.cbaines.net; Wed, 08 Sep 2021 10:56:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNyyh-000632-Ad for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50023) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNyyg-0002p9-3W for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNyyg-00088x-1d for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH 09/10] gnu: Add guile-dbd-mysql. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Sep 2021 14:55:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50476 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50476@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163111287331167 (code B ref 50476); Wed, 08 Sep 2021 14:55:06 +0000 Received: (at 50476) by debbugs.gnu.org; 8 Sep 2021 14:54:33 +0000 Received: from localhost ([127.0.0.1]:33327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyy8-00086d-L8 for submit@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:32 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyxz-00085M-MW for 50476@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ay9KKbF8fmw2EEPS4DejSM+WtU5vFGqVpnu0TSkBBiA=; b=iaimaB92lVxU43YAaRoSJYpLC2 7V/7IChIrv2QzKa3isVrqMiba2EgPdbdSJx6k0lZzW59SBeLxcBdx2wrmHecIjFAG2ltlbIJ7XlEo VGJvPikjuRNp9791bFKy8C+jMneYnEiUw6RW6t4FiATRxREsxoXYSakv2DAYSc7KXJTm6ygDheGcG YsUUi08B63di+lYbXV05/4hGjvs0LiTIcbwkiIHM+hNnOuV2zA5tjofIPwPIZIJXen7c/13rXoVOJ b8jsvyAfZKlGLrjTb9u7Mut/zeZKkTLLiVO/d3pygQkVlRF9DGGEClJum55nfqNlLsUsejLfiaZDZ zAXRHNwg==; Received: from [192.168.2.1] (port=55638 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mNyxs-000W6b-OL; Wed, 08 Sep 2021 20:24:16 +0530 From: Arun Isaac Date: Wed, 8 Sep 2021 20:24:12 +0530 Message-Id: <20210908145413.4652-9-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210908145413.4652-1-arunisaac@systemreboot.net> References: <20210908145413.4652-1-arunisaac@systemreboot.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile-xyz.scm (guile-dbd-mysql): New variable. --- gnu/packages/guile-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 15dc8b1219..a5166ec46c 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1605,6 +1605,39 @@ SQL databases. This package implements the interface for SQLite."))) interface to SQL databases. This package implements the interface for PostgreSQL."))) +(define-public guile-dbd-mysql + (package + (inherit guile-dbi) + (name "guile-dbd-mysql") + (arguments + (substitute-keyword-arguments (package-arguments guile-dbi) + ((#:phases phases) + `(modify-phases ,phases + (replace 'chdir + (lambda _ + ;; The upstream Git repository contains all the code, so change + ;; to the directory specific to guile-dbd-mysql. + (chdir "guile-dbd-mysql"))) + (add-after 'chdir 'patch-src + (lambda _ + (substitute* "configure.ac" + (("mariadbclient") "mariadb")) + (substitute* "src/guile-dbd-mysql.c" + ((" X-Patchwork-Id: 32716 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 BF20727BBE3; Wed, 8 Sep 2021 15:57:29 +0100 (BST) 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_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 8440D27BBE1 for ; Wed, 8 Sep 2021 15:57:29 +0100 (BST) Received: from localhost ([::1]:56178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNz0y-0001ue-Mw for patchwork@mira.cbaines.net; Wed, 08 Sep 2021 10:57:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNyyh-000631-AZ for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50022) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNyyf-0002oa-ME for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNyyf-00088p-LG for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH 10/10] gnu: guile-dbd-sqlite3: Use normal variable instead of @ reference. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Sep 2021 14:55:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50476 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50476@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163111286731153 (code B ref 50476); Wed, 08 Sep 2021 14:55:05 +0000 Received: (at 50476) by debbugs.gnu.org; 8 Sep 2021 14:54:27 +0000 Received: from localhost ([127.0.0.1]:33325 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyy3-00086J-Ad for submit@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:27 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyy0-00085R-7F for 50476@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=87zGBo2Cj5c/qySRL4Jlp0Rn2r77Q5nt1AhWNeyMwuQ=; b=GL4gpMj+UqMvwmdPFkY7UBQTSr oDAbD5WszkMdTYvWMHz54EFCjmzO4dImHjsU8VYY/XCorVrwW2MBdzrVVuapMb0YvnFsKxEuY1Uew 6lE5uRJfFJgF1DRK2HSYvfJO9ws8JhEdYBPsdYHPthO/7nOwMROvTtk8fKysh4IwABTctlv5RAF+K oD7g1BVfoPXkDt4SjuQmdjqlg7xkIItjbgALysVQZE911q0eKqEB5jFpIbUlfZsRXXjUiZg51Xwna omsXzTPdkaVQM2rUe+Qlutjkq9foN+TD+UcX/IXmJ+B41CoGwfxu/Gl6VMwsl22K9JSluTe/coTKa 9pOb+S+Q==; Received: from [192.168.2.1] (port=55638 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mNyxt-000W6b-14; Wed, 08 Sep 2021 20:24:17 +0530 From: Arun Isaac Date: Wed, 8 Sep 2021 20:24:13 +0530 Message-Id: <20210908145413.4652-10-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210908145413.4652-1-arunisaac@systemreboot.net> References: <20210908145413.4652-1-arunisaac@systemreboot.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile-xyz.scm (guile-dbd-sqlite3)[inputs]: Replace (@ (gnu packages compression) zlib) with zlib. --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index a5166ec46c..0633446442 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1565,7 +1565,7 @@ It currently supports MySQL, Postgres and SQLite3.") (delete 'patch-extension-path))))) (inputs `(("sqlite" ,sqlite) - ("zlib" ,(@ (gnu packages compression) zlib)))) + ("zlib" ,zlib))) (native-inputs `(("guile-dbi" ,guile-dbi) ; only required for headers ("pkg-config" ,pkg-config)