From patchwork Thu Sep 30 16:52:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 33466 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 4643B27BBE4; Thu, 30 Sep 2021 21:04:43 +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 B72CD27BBE3 for ; Thu, 30 Sep 2021 21:04:42 +0100 (BST) Received: from localhost ([::1]:37600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mW2IL-0005sp-P8 for patchwork@mira.cbaines.net; Thu, 30 Sep 2021 16:04:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVzIs-0005gB-Sz for guix-patches@gnu.org; Thu, 30 Sep 2021 12:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42289) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVzIs-0003Hn-LM for guix-patches@gnu.org; Thu, 30 Sep 2021 12:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVzIs-0008DS-Ik for guix-patches@gnu.org; Thu, 30 Sep 2021 12:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH v2 01/10] gnu: guile-dbi: Update upstream source. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Sep 2021 16:53: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: Ludovic =?utf-8?q?Court=C3=A8s?= , Arun Isaac Cc: 50476@debbugs.gnu.org Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163302076631502 (code B ref 50476); Thu, 30 Sep 2021 16:53:02 +0000 Received: (at 50476) by debbugs.gnu.org; 30 Sep 2021 16:52:46 +0000 Received: from localhost ([127.0.0.1]:53825 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzIc-0008Bv-7m for submit@debbugs.gnu.org; Thu, 30 Sep 2021 12:52:46 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzIY-0008BT-6c for 50476@debbugs.gnu.org; Thu, 30 Sep 2021 12:52:44 -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=64Dnj8HcmKamG1WfmXW0ZxZmyHtHI6oZP2JaCoAHKkM=; b=g4eD4+HsJ2WUsjALmeBaLSh6Dw ua3aiO1piv2JT5s4o71PWlXivonsBghjgifVRRiTvH9GKJQ0VfBQs3D3w9ac0/zaPe+7/DIWy1fP2 MfFzaa6FADnSOTPNJQM6rBQ77XfSXXpcSJvjhG1UPgsn/crowI7R+Mbsv1TuDTUcFv7Tm6s4ujFbz zM2ne/zBBbZ5THb0846tt6W0A5PXMoApzDZBuh8jFUAu0BGhVeLGltRYJ7en01YdS61f066IVMyvt 1ayQJ4ZG0h+PmGTsBoDLqWAw0J03HFvrQ+fT/E4bYvMtzhVmktCpV+Ls2DwZWMLbG3avN5TuJvXnc CmG4UOPw==; Received: from [192.168.2.1] (port=15514 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 1mVzIV-000mG6-21; Thu, 30 Sep 2021 22:22:39 +0530 From: Arun Isaac Date: Thu, 30 Sep 2021 22:22:26 +0530 Message-Id: <20210930165235.13180-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <87wnn2j9fs.fsf@gnu.org> References: <87wnn2j9fs.fsf@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 30 Sep 2021 16:04:16 -0400 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 7188058b42..d50212fb66 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 Thu Sep 30 16:52:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 33764 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 5E0D527BBE3; Thu, 30 Sep 2021 21:04:33 +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 CC1DD27BBE1 for ; Thu, 30 Sep 2021 21:04:32 +0100 (BST) Received: from localhost ([::1]:36724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mW2IB-0005G3-S9 for patchwork@mira.cbaines.net; Thu, 30 Sep 2021 16:04:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVzIt-0005gN-Af for guix-patches@gnu.org; Thu, 30 Sep 2021 12:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42290) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVzIt-0003IB-1m for guix-patches@gnu.org; Thu, 30 Sep 2021 12:53:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVzIs-0008DZ-W5 for guix-patches@gnu.org; Thu, 30 Sep 2021 12:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH v2 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: Thu, 30 Sep 2021 16:53: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: Ludovic =?utf-8?q?Court=C3=A8s?= , Arun Isaac Cc: 50476@debbugs.gnu.org Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163302076731514 (code B ref 50476); Thu, 30 Sep 2021 16:53:02 +0000 Received: (at 50476) by debbugs.gnu.org; 30 Sep 2021 16:52:47 +0000 Received: from localhost ([127.0.0.1]:53827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzIc-0008C3-J9 for submit@debbugs.gnu.org; Thu, 30 Sep 2021 12:52:46 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37718) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzIY-0008BU-7F for 50476@debbugs.gnu.org; Thu, 30 Sep 2021 12:52:44 -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=2+1Vib024xB2NXE74ubJ7YrfUT1kaYv84TlZbWOWdeE=; b=HklekqdqxXtkD5fd8Hskwgk4pw h+wjFGUNWDbMXe7DZ3aEvZyPkjawCBCJvryKnSm2n/RpAP4+pJALvdjB0Ub3z4C1lbO82bZytDkWb HZQZg7jufzteBPwd+ZXD/MQF0UxQVjI+yor/KMQQgjIcyhFGocaqQflJxdalNBRMi4thoAmhrnwxQ 0YD+vM9bB3xD+9BPf+kBjHHpDga+Bo8Ic7Xv+xcI3DmwdJSrZffNDO6wwoNTPzV60y1jQS4DQAz+I Bi+Wvg/Gk0+tLVoHqfIhV055IZkt3jgZZn0cdiBbVhQNVLMu9Azkt9E1oA0lrhEjbfJl6TwXCfQ5x ESVzvRvQ==; Received: from [192.168.2.1] (port=15514 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 1mVzIV-000mG6-80; Thu, 30 Sep 2021 22:22:39 +0530 From: Arun Isaac Date: Thu, 30 Sep 2021 22:22:27 +0530 Message-Id: <20210930165235.13180-3-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <87wnn2j9fs.fsf@gnu.org> References: <87wnn2j9fs.fsf@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 30 Sep 2021 16:04:16 -0400 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 d50212fb66..bc7bf63dc5 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 Thu Sep 30 16:52:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 33469 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 17D4527BBE1; Thu, 30 Sep 2021 21:04:55 +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 AE3E727BBE3 for ; Thu, 30 Sep 2021 21:04:54 +0100 (BST) Received: from localhost ([::1]:38044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mW2IX-0006Bt-Rn for patchwork@mira.cbaines.net; Thu, 30 Sep 2021 16:04:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVzJq-00060f-Vm for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42306) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVzJq-00047Q-Nv for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVzJq-0008Fs-Lz for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH v2 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: Thu, 30 Sep 2021 16:54: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: Ludovic =?utf-8?q?Court=C3=A8s?= , Arun Isaac Cc: 50476@debbugs.gnu.org Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163302079231634 (code B ref 50476); Thu, 30 Sep 2021 16:54:02 +0000 Received: (at 50476) by debbugs.gnu.org; 30 Sep 2021 16:53:12 +0000 Received: from localhost ([127.0.0.1]:53841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzJ2-0008E4-DI for submit@debbugs.gnu.org; Thu, 30 Sep 2021 12:53:12 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37722) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzIc-0008Bt-Tr for 50476@debbugs.gnu.org; Thu, 30 Sep 2021 12:52:47 -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=kzDqgXm3TLDdFTEbJclH4q98WcaFgb1lNUqUCD32lSM=; b=KqWPZP1wY3+O2Pwtdl58IJQyJL ZD7X4F+BhfetT2qas6CsHcYiv1cEphB6ujW7IrRZnLbzsXBaomUurroGdiRLAVIMyfBwBzE5DTSKi syRzo6tkNLGvrhi47hERvRf/F3IzuZpnP3l3oYA1Yx4QLYaYbiApqH50/Eh60/XCPjQcjC4xc1TsU 6rNriy7qL/Ob/vuV2UwNa1wxpJxdahLLWKybjANWyBjYy0U2Olfar227ieW+iJ+FVzG34wKpFiZeN 2M+RdYOyk0jWSP7Ix86UAO9voZLQ9TNp8cFMFzrFPqjAu7tID6e6B+xDfbJSS546AiClcE5Dm3oQD 0K2t3vhg==; Received: from [192.168.2.1] (port=15514 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 1mVzIV-000mG6-Fc; Thu, 30 Sep 2021 22:22:39 +0530 From: Arun Isaac Date: Thu, 30 Sep 2021 22:22:28 +0530 Message-Id: <20210930165235.13180-4-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <87wnn2j9fs.fsf@gnu.org> References: <87wnn2j9fs.fsf@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 30 Sep 2021 16:04:16 -0400 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 GUILE_DBD_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 bc7bf63dc5..098988bc1a 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 "GUILE_DBD_PATH") + (files '("lib"))))))) (define guile-dbi-bootstrap (package From patchwork Thu Sep 30 16:52:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 33471 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 440BD27BBE3; Thu, 30 Sep 2021 21:06:05 +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 0196F27BBE1 for ; Thu, 30 Sep 2021 21:06:05 +0100 (BST) Received: from localhost ([::1]:38678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mW2Jg-0006d9-4C for patchwork@mira.cbaines.net; Thu, 30 Sep 2021 16:06:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVzJs-00061C-JE for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42310) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVzJs-00049F-Bu for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVzJs-0008GN-9L for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH v2 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: Thu, 30 Sep 2021 16:54: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: Ludovic =?utf-8?q?Court=C3=A8s?= , Arun Isaac Cc: 50476@debbugs.gnu.org Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163302079431663 (code B ref 50476); Thu, 30 Sep 2021 16:54:04 +0000 Received: (at 50476) by debbugs.gnu.org; 30 Sep 2021 16:53:14 +0000 Received: from localhost ([127.0.0.1]:53849 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzJ3-0008EX-KZ for submit@debbugs.gnu.org; Thu, 30 Sep 2021 12:53:13 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzIe-0008CC-G8 for 50476@debbugs.gnu.org; Thu, 30 Sep 2021 12:52:49 -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=cQ9rT4UmPuOMi7/BPoVZJI+Q8Vq14P+qpiDMug1z+ow=; b=Wh3MRjMVYHdZ3polTLf99hQRCo VkB2J89XLdO+dF5W+pS4HfJ+XDSWbfki8GSKC/k5CgyWNrIKyk3KglKZxu6PwyuENMqgGN5X450kQ UOSRpyL9aLSJmEhjDDXy0OtcxT/5bmd5p77HK1b9HNLmAWR+8hYg8jJdZA/z6+BkEQyzr7JIl0c7y GbS/zBQjcmEKh1frNAtoORLyBk774juBZF+KuADNWFe9BMkCF2Q5dNNBngUXoumK0UNqJtzio7RvE 9JOsuAEyEqFJYTmyVVy6VXqRQmoz6r1rzLZmt0FiwsIsTEI7kiG98/aEhf0E9EvG6PsfUParCy1B1 2GrQLbWQ==; Received: from [192.168.2.1] (port=15514 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 1mVzIV-000mG6-Ld; Thu, 30 Sep 2021 22:22:39 +0530 From: Arun Isaac Date: Thu, 30 Sep 2021 22:22:29 +0530 Message-Id: <20210930165235.13180-5-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <87wnn2j9fs.fsf@gnu.org> References: <87wnn2j9fs.fsf@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 30 Sep 2021 16:04:17 -0400 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 098988bc1a..1d56bbfede 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 Thu Sep 30 16:52:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 33470 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 489E727BBE3; Thu, 30 Sep 2021 21:05:02 +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 0A88227BBE1 for ; Thu, 30 Sep 2021 21:05:02 +0100 (BST) Received: from localhost ([::1]:38454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mW2If-0006TO-3O for patchwork@mira.cbaines.net; Thu, 30 Sep 2021 16:05:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVzJr-00060p-EL for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42307) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVzJr-00047p-40 for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVzJr-0008Fz-2H for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH v2 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: Thu, 30 Sep 2021 16:54: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: Ludovic =?utf-8?q?Court=C3=A8s?= , Arun Isaac Cc: 50476@debbugs.gnu.org Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163302079331641 (code B ref 50476); Thu, 30 Sep 2021 16:54:03 +0000 Received: (at 50476) by debbugs.gnu.org; 30 Sep 2021 16:53:13 +0000 Received: from localhost ([127.0.0.1]:53843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzJ2-0008EB-Kt for submit@debbugs.gnu.org; Thu, 30 Sep 2021 12:53:12 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzId-0008C8-Da for 50476@debbugs.gnu.org; Thu, 30 Sep 2021 12:52:47 -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=2UjDCxb45DTjhLf4cY3wRaFrzZ9oq1s/Ubu2ChxOYTg=; b=CQP5Cz+w/7Zn8zBn8nOW0yjlwS Ebe+rtay2LkU3Hr8q+Bn+Sr7zffYeUC/ngk5Y71Z6fRX85ovEwFeMw5q6CHDRLCey0PldvuPQh4VF KkRUl7tTuWmbHuyitPMfSKuasHqL2Tp4SELawjgKDm/0KdNj4Jivv28JjczaOQj25jiWroBuPHPX3 1v2dNjCKIA3DoO0SYTKap2jDHslkHdsvtidrUWvIDOtCCWbwnH2k2Tsgp2+Z24QKaA4iGVffQc4w1 9XSYCRgas2pTLXRJXd/p04t4wzHcIN6jHOa09D0k8cwtearCxVsM8hFhgFI0T8SIuh3/K13g1fr2e nE57zprw==; Received: from [192.168.2.1] (port=15514 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 1mVzIV-000mG6-RF; Thu, 30 Sep 2021 22:22:39 +0530 From: Arun Isaac Date: Thu, 30 Sep 2021 22:22:30 +0530 Message-Id: <20210930165235.13180-6-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <87wnn2j9fs.fsf@gnu.org> References: <87wnn2j9fs.fsf@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 30 Sep 2021 16:04:16 -0400 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 1d56bbfede..e250d4d1f2 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 Thu Sep 30 16:52:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 33465 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 6E03027BBE3; Thu, 30 Sep 2021 21:04:34 +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 68B5027BBE1 for ; Thu, 30 Sep 2021 21:04:33 +0100 (BST) Received: from localhost ([::1]:36786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mW2IC-0005Ji-FL for patchwork@mira.cbaines.net; Thu, 30 Sep 2021 16:04:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVzJr-00060w-OR for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42308) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVzJr-00048S-H0 for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVzJr-0008G7-F0 for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH v2 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: Thu, 30 Sep 2021 16:54: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: Ludovic =?utf-8?q?Court=C3=A8s?= , Arun Isaac Cc: 50476@debbugs.gnu.org Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163302079331649 (code B ref 50476); Thu, 30 Sep 2021 16:54:03 +0000 Received: (at 50476) by debbugs.gnu.org; 30 Sep 2021 16:53:13 +0000 Received: from localhost ([127.0.0.1]:53845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzJ2-0008EI-Sp for submit@debbugs.gnu.org; Thu, 30 Sep 2021 12:53:13 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzId-0008CD-Fq for 50476@debbugs.gnu.org; Thu, 30 Sep 2021 12:52:48 -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=DRuG42VV6Avh3L9k4XbVCjcYKpQSxDPlO3OJnmctZwM=; b=oEF47Gj0RFbjBQRvvO2iwlRval 2C24uR3mcrOfY2PELp9IgyUCIr+GVjj9vhpFCw5sTFgkT7RP0HL5OVE1m/IW4qAP/vbbH/eVxQiYt PUkNUzgWZTjjEdsaUtPaOEVRK6Ae7aD55dIGAOgBYW9rkA/vhNlFf23jbNtv+dJMt+cfQRb7qsmss ptHWhPGWT9R7Zc5ooL94UNzU3AaLItTrovInZHJXdijEMsGgePlnec5o6fqU3seqKy6ARoc0GDeen ni/Jhp7uuP62cpGhyVNe+uUhseszR0pa3IIETqQtOdmW4jK6TFw5vQjWMKlXQVoYangBHaXtw8avz X3AIgulQ==; Received: from [192.168.2.1] (port=15514 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 1mVzIW-000mG6-1d; Thu, 30 Sep 2021 22:22:40 +0530 From: Arun Isaac Date: Thu, 30 Sep 2021 22:22:31 +0530 Message-Id: <20210930165235.13180-7-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <87wnn2j9fs.fsf@gnu.org> References: <87wnn2j9fs.fsf@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 30 Sep 2021 16:04:17 -0400 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 e250d4d1f2..96182d7362 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 Thu Sep 30 16:52:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 33467 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 88AD027BBE3; Thu, 30 Sep 2021 21:04:43 +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 9540927BBE1 for ; Thu, 30 Sep 2021 21:04:42 +0100 (BST) Received: from localhost ([::1]:37596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mW2IL-0005si-Nf for patchwork@mira.cbaines.net; Thu, 30 Sep 2021 16:04:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVzJs-000614-4q for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42309) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVzJr-00048r-Sr for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVzJr-0008GE-Rg for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH v2 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: Thu, 30 Sep 2021 16:54: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: Ludovic =?utf-8?q?Court=C3=A8s?= , Arun Isaac Cc: 50476@debbugs.gnu.org Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163302079331656 (code B ref 50476); Thu, 30 Sep 2021 16:54:03 +0000 Received: (at 50476) by debbugs.gnu.org; 30 Sep 2021 16:53:13 +0000 Received: from localhost ([127.0.0.1]:53847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzJ3-0008EQ-72 for submit@debbugs.gnu.org; Thu, 30 Sep 2021 12:53:13 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzId-0008CE-GA for 50476@debbugs.gnu.org; Thu, 30 Sep 2021 12:52:48 -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=WVQ9zsozNF+CvqJJNccqu/aWXAqyUhAlPltSXrDFLqc=; b=TjMiKnQmtEH+Dzmy2i+HZpkta8 WjsvP4xyPugmVjo3WaltUNnRfoXTt5k+3BuQ/z0g7jyeQvyAIQcu1xzZ8d0Sogpxqt59MMP9VSjQL uzGbXYFL2Z880dP3rEoAYYST/Oeot6KhMzVX1qPg82YOBzeOf/mUNrWTcTsRIHKh3I8cMLbytG20G HcNRR4396bzcX2ZTpCzwnLobSHnJd8w5DlDwidvEHIlxslGeTxh+KxOIJioapobkcUxNzn1cO0NaJ LCFhImCdfzXOU2Rf1FqsMw7X+P0BvW/1qle/Yczib3kLnbFhXlDIV2XYC8a6yoa3e5iSQUpEhtVI7 yiIfX2rw==; Received: from [192.168.2.1] (port=15514 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 1mVzIW-000mG6-Ef; Thu, 30 Sep 2021 22:22:40 +0530 From: Arun Isaac Date: Thu, 30 Sep 2021 22:22:32 +0530 Message-Id: <20210930165235.13180-8-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <87wnn2j9fs.fsf@gnu.org> References: <87wnn2j9fs.fsf@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 30 Sep 2021 16:04:16 -0400 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 96182d7362..bc86bf3f68 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 Thu Sep 30 16:52:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 33464 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 04FDB27BBE3; Thu, 30 Sep 2021 21:04:34 +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 36D4627BBE4 for ; Thu, 30 Sep 2021 21:04:33 +0100 (BST) Received: from localhost ([::1]:36764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mW2IC-0005HK-7B for patchwork@mira.cbaines.net; Thu, 30 Sep 2021 16:04:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVzJq-00060Y-Kf for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42305) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVzJq-000473-BK for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVzJq-0008Fl-9v for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH v2 08/10] gnu: guile-dbi-bootstrap: Remove package. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Sep 2021 16:54: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: Ludovic =?utf-8?q?Court=C3=A8s?= , Arun Isaac Cc: 50476@debbugs.gnu.org Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163302079231627 (code B ref 50476); Thu, 30 Sep 2021 16:54:02 +0000 Received: (at 50476) by debbugs.gnu.org; 30 Sep 2021 16:53:12 +0000 Received: from localhost ([127.0.0.1]:53839 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzJ1-0008E1-Uq for submit@debbugs.gnu.org; Thu, 30 Sep 2021 12:53:12 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzId-0008C9-EC for 50476@debbugs.gnu.org; Thu, 30 Sep 2021 12:52:47 -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=ISulmZ5Y8E/OGwg86d+DLg4lhWytOO8HiyUkdB3bmL8=; b=QoP5n4L9hS8MvIVLvPdaywU5+t hmkdKCXrGoa7Nl11T6/nDStdo9TQY9Y2UEQwlvsMtrdiTf6m9SnqwvcGxI3wbhSjyFHrUmJqEPVhl RBGG+Q/UdhtGeA4YAP3QF0l2TE71auV42DY8AKWC19Bgdhkva/dTTda1r8cJiMy7t77snpiupiCfu mL5N90QQ0eYHufc0BcpSnYqx1JZ7ajRAxj8IgIJJDO+jANcJbP9ZDFYUkHZZAa3qv9YVdoz++jcjA cyu6/fxiXEzsjYlSf3QLkXRYP3Pd4DQk26mMICmauzjhiGRsLuiZzFDvyZghDGRAv2a7shBTDb28c IszZJzTA==; Received: from [192.168.2.1] (port=15514 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 1mVzIW-000mG6-Mi; Thu, 30 Sep 2021 22:22:40 +0530 From: Arun Isaac Date: Thu, 30 Sep 2021 22:22:33 +0530 Message-Id: <20210930165235.13180-9-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <87wnn2j9fs.fsf@gnu.org> References: <87wnn2j9fs.fsf@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 30 Sep 2021 16:04:16 -0400 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 bc86bf3f68..b321df93a5 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 "GUILE_DBD_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 Thu Sep 30 16:52:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 33468 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 C2BCE27BBE4; Thu, 30 Sep 2021 21:04: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=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 85E4E27BBE1 for ; Thu, 30 Sep 2021 21:04:54 +0100 (BST) Received: from localhost ([::1]:38052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mW2IX-0006C5-Ke for patchwork@mira.cbaines.net; Thu, 30 Sep 2021 16:04:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVzJt-00061I-1H for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42311) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVzJs-00049K-PE for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVzJs-0008GV-Na for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH v2 09/10] gnu: Add guile-dbd-mysql. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Sep 2021 16:54: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: Ludovic =?utf-8?q?Court=C3=A8s?= , Arun Isaac Cc: 50476@debbugs.gnu.org Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163302079531672 (code B ref 50476); Thu, 30 Sep 2021 16:54:04 +0000 Received: (at 50476) by debbugs.gnu.org; 30 Sep 2021 16:53:15 +0000 Received: from localhost ([127.0.0.1]:53851 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzJ3-0008Ee-Sh for submit@debbugs.gnu.org; Thu, 30 Sep 2021 12:53:15 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzId-0008CA-ER for 50476@debbugs.gnu.org; Thu, 30 Sep 2021 12:52:52 -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=ax8YHb7R1WX7CA7NEJoDoLj7zNBy0+y39ssXVirKNCY=; b=d3OKRnZe/wzlzR9HwE5BueM24q WkXh0Oo2wCUSmuAgNPbY/d40oU5aX73lGou4mCzbdqufmYslbvEHaisBWjlsONGRZtbno7vN0aeFv AHBZxosQqOhAPDJ/TvTVrdX4rq8pE261WIn/2m0Vfb6gvDKKX8b9e3Cf7t11TVQkYLYKmVuLrD+4E s1tbALQCdXaXC16erbgEOnMd49Oz8AbgfFiqIuwAH8ZY8QRZt+BeDMphu/akhAyPoXEHzrlwHtqar SWGhQXZQBr5BjY0k9NsbxJ1FgbR5Cgtbh3XbAlecF5RdbhdZpdbxboGDT+85fK8JRIxWnKGrtiadW csvEVntw==; Received: from [192.168.2.1] (port=15514 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 1mVzIW-000mG6-T7; Thu, 30 Sep 2021 22:22:40 +0530 From: Arun Isaac Date: Thu, 30 Sep 2021 22:22:34 +0530 Message-Id: <20210930165235.13180-10-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <87wnn2j9fs.fsf@gnu.org> References: <87wnn2j9fs.fsf@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 30 Sep 2021 16:04:17 -0400 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 b321df93a5..07e3f6ba2b 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" + (("