From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 08 10:45:38 2021 Received: (at submit) by debbugs.gnu.org; 8 Sep 2021 14:45:38 +0000 Received: from localhost ([127.0.0.1]:33249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNypV-0007gu-Ua for submit@debbugs.gnu.org; Wed, 08 Sep 2021 10:45:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:42110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNypU-0007gm-7O for submit@debbugs.gnu.org; Wed, 08 Sep 2021 10:45:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNypT-0006SR-ML for guix-patches@gnu.org; Wed, 08 Sep 2021 10:45:35 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:46090) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNypQ-00034g-01 for guix-patches@gnu.org; Wed, 08 Sep 2021 10:45:35 -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=zDb66k9qfeJiotUnSJViYM+w5EcQWEX9358uoE7PE+o=; b=eDuaQLW3YYNbwczc/4AN5QZ6bv c8wZvkL+CHkRJMUI0dcEakXw2miT91nDhYGEIyNGsvxQOCG5ddsNcrEUEFfzMBjZuZR01391PQkYC 8svSkHXMTlqvlnxA5F7Hcq/tmlFg0BgmcbNCumdIuuUWc/qMUZuZi8rrSif6jQXmEKNM5ennwx7Mq YdZw2i7eObS5QEKdEZ6Z3pBxz3EXxsC8TLR2JxXKxAD6hw0vQEnAy80/Bt4LWMvnolVP343aHjkEr TnRrjA99M2bAv9A1kdkWVNLHDcU+kH8A0fqmja1i9ge2reYsFO5lBj3QCbMBXBtDe/OLV68SPhnZ3 Y5ofBpIQ==; Received: from [192.168.2.1] (port=57120 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 1mNypH-000W69-4r; Wed, 08 Sep 2021 20:15:23 +0530 From: Arun Isaac To: guix-patches@gnu.org Subject: [PATCH 00/10] Update guile-dbi and guile-dbd-* Date: Wed, 8 Sep 2021 20:15:20 +0530 Message-Id: <20210908144520.2883-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=139.59.75.54; envelope-from=arunisaac@systemreboot.net; helo=mugam.systemreboot.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Arun Isaac X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Hi, This patchset improves our guile-dbi and guile-dbd-* packages. The two most significant ones are: 1. It updates guile-dbi and guile-dbd-* upstream to https://github.com/opencog/guile-dbi . It simplifies and deduplicates the package definitions of guile-dbd-* by inheriting from guile-dbi. 2. Additionally, it removes the tight LDFLAGS coupling between guile-dbi and guile-dbd-*. With this patchset, guile-dbd-* are not inputs of guile-dbi. They are picked up from the profile using the LD_LIBRARY_PATH environment variable specified in native-search-paths. This way, the user can choose to only install the specific guile-dbd- package that they are interested in and not pull in all guile-dbd-* packages. Regards, Arun Arun Isaac (10): gnu: guile-dbi: Update upstream source. gnu: guile-dbi: Remove hard-coded guile effective version. gnu: guile-dbi: Search for dbd libraries using native-search-paths. gnu: guile-dbi: Do not return #t from custom phases. gnu: guile-dbi: Update to 2.1.8. gnu: guile-dbd-sqlite3: Inherit from guile-dbi. gnu: guile-dbd-postgresql: Inherit from guile-dbi. gnu: guile-dbi-bootstrap: Remove package. gnu: Add guile-dbd-mysql. gnu: guile-dbd-sqlite3: Use normal variable instead of @ reference. gnu/packages/guile-xyz.scm | 209 +++++++++++++++++++------------------ 1 file changed, 109 insertions(+), 100 deletions(-) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 08 10:54:21 2021 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 To: 50476@debbugs.gnu.org Subject: [PATCH 05/10] gnu: guile-dbi: Update to 2.1.8. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: Arun Isaac X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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")) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 08 10:54:22 2021 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 To: 50476@debbugs.gnu.org Subject: [PATCH 03/10] gnu: guile-dbi: Search for dbd libraries using native-search-paths. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: Arun Isaac X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 08 10:54:22 2021 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 To: 50476@debbugs.gnu.org Subject: [PATCH 02/10] gnu: guile-dbi: Remove hard-coded guile effective version. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: Arun Isaac X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 08 10:54:25 2021 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 To: 50476@debbugs.gnu.org Subject: [PATCH 04/10] gnu: guile-dbi: Do not return #t from custom phases. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: Arun Isaac X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 08 10:54:26 2021 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 To: 50476@debbugs.gnu.org Subject: [PATCH 06/10] gnu: guile-dbd-sqlite3: Inherit from guile-dbi. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: Arun Isaac X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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") -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 08 10:54:26 2021 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 To: 50476@debbugs.gnu.org Subject: [PATCH 01/10] gnu: guile-dbi: Update upstream source. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: Arun Isaac X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 08 10:54:27 2021 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 To: 50476@debbugs.gnu.org Subject: [PATCH 07/10] gnu: guile-dbd-postgresql: Inherit from guile-dbi. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: Arun Isaac X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 08 10:54:27 2021 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 To: 50476@debbugs.gnu.org Subject: [PATCH 08/10] gnu: guile-dbi-bootstrap: Remove package. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: Arun Isaac X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 08 10:54:27 2021 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 To: 50476@debbugs.gnu.org Subject: [PATCH 10/10] gnu: guile-dbd-sqlite3: Use normal variable instead of @ reference. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: Arun Isaac X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 08 10:54:32 2021 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 To: 50476@debbugs.gnu.org Subject: [PATCH 09/10] gnu: Add guile-dbd-mysql. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: Arun Isaac X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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" + ((") id 1mSfHZ-0002KG-Su for submit@debbugs.gnu.org; Tue, 21 Sep 2021 08:53:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mSfHX-0002K1-VZ for 50476@debbugs.gnu.org; Tue, 21 Sep 2021 08:53:56 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:48528) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mSfHR-0006j8-JL; Tue, 21 Sep 2021 08:53:49 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=47304 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mSfHR-0001aI-AZ; Tue, 21 Sep 2021 08:53:49 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Arun Isaac Subject: Re: bug#50476: [PATCH 00/10] Update guile-dbi and guile-dbd-* References: <20210908145413.4652-1-arunisaac@systemreboot.net> <20210908145413.4652-3-arunisaac@systemreboot.net> Date: Tue, 21 Sep 2021 14:53:47 +0200 In-Reply-To: <20210908145413.4652-3-arunisaac@systemreboot.net> (Arun Isaac's message of "Wed, 8 Sep 2021 20:24:06 +0530") Message-ID: <87ilyuks2s.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50476 Cc: 50476@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello! Arun Isaac skribis: > * gnu/packages/guile-xyz.scm (guile-dbi)[arguments]: Do not set LDFLAGS a= nd > RPATH in #:make-flags. > [inputs]: Remove guile-dbd-sqlite3 and guile-dbd-postgresql. > [native-search-paths]: Add LD_LIBRARY_PATH. [...] > + (native-search-paths > + (list (search-path-specification > + (variable "LD_LIBRARY_PATH") > + (files '("lib"))))))) I think we should not add LD_LIBRARY_PATH as a search path spec as it can have undesirable side effects; it=E2=80=99s just too broad and risky. The difficulty here is that we want guile-dbi to be able to find its guile-dbd-* plugins, right? The previous method, which was to set the RUNPATH of guile-dbi pointing to guile-dbd-*, sounds preferable to me: it=E2=80=99s localized and does the job. The downside of the RUNPATH method is that these are no longer really =E2=80=9Cplugins=E2=80=9D: you end up pulling them whether or not you use t= hem. Perhaps you were concerned about the closure size? If that really is a concern, I=E2=80=99d recommend taking a different appro= ach, such as using/defining a dedicated search path variable. WDYT? Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 22 16:23:34 2021 Received: (at 50476) by debbugs.gnu.org; 22 Sep 2021 20:23:34 +0000 Received: from localhost ([127.0.0.1]:51795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mT8mE-0000Sw-MB for submit@debbugs.gnu.org; Wed, 22 Sep 2021 16:23:34 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37708) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mT8mA-0000Si-2u for 50476@debbugs.gnu.org; Wed, 22 Sep 2021 16:23:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding: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=QoXrSnDHLKUlg8KIWyif5mN3SIZHeT3/Z6NOqRULrzM=; b=c3Re1NLdjRDym6GydeCLu45ZvA vVXa7UirU3x7hBPMWc6SvSsXQ00LBo9UQP70cjRmUMCoeKA5uAKhV3G41u4zmdUuD8yrYgF03m5+P WxCGED8kCsqkBLLprR/1wPb/DD/FVnc2ndWjIj29/df2MIEmOvX0DWwlJPB0VJqoxitOnU8gkkKWc csrcFKt7hBS0wk99I6zlDp/TpOFhmLSiFhVdkKLIEG6Bu+R+9m1gAV7E8GLLFwpYqjpCA6DSJjwrv TdlDlC1fXSc9a29Sq/t7fypLn9XMngDJa+A4/LdSgJl86Zr3fsXu5JCfQ/LGGWDoFDLm0pefccuMz GB6r8IYw==; Received: from [192.168.2.1] (port=48064 helo=steel) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mT8m7-000EdZ-12; Thu, 23 Sep 2021 01:53:27 +0530 From: Arun Isaac To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#50476: [PATCH 00/10] Update guile-dbi and guile-dbd-* In-Reply-To: <87ilyuks2s.fsf_-_@gnu.org> References: <20210908145413.4652-1-arunisaac@systemreboot.net> <20210908145413.4652-3-arunisaac@systemreboot.net> <87ilyuks2s.fsf_-_@gnu.org> Date: Thu, 23 Sep 2021 01:53:11 +0530 Message-ID: <87r1dgjr68.fsf@systemreboot.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: 50476@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Ludo, >> + (native-search-paths >> + (list (search-path-specification >> + (variable "LD_LIBRARY_PATH") >> + (files '("lib"))))))) > > I think we should not add LD_LIBRARY_PATH as a search path spec as it > can have undesirable side effects; it=E2=80=99s just too broad and risky. This makes sense. > The difficulty here is that we want guile-dbi to be able to find its > guile-dbd-* plugins, right? The previous method, which was to set the > RUNPATH of guile-dbi pointing to guile-dbd-*, sounds preferable to me: > it=E2=80=99s localized and does the job. > > The downside of the RUNPATH method is that these are no longer really > =E2=80=9Cplugins=E2=80=9D: you end up pulling them whether or not you use= them. Perhaps > you were concerned about the closure size? Yes, I was concerned about the closure size, but not merely about the closure size in MB, but also the closure size in number of packages. It does look a bit awkward when we're pulling in dependencies that are not really required. > If that really is a concern, I=E2=80=99d recommend taking a different app= roach, > such as using/defining a dedicated search path variable. That sounds good. How about I create a GUILE_DBD_LD_LIBRARY_PATH environment variable? Regards, Arun --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFPBAEBCAA5FiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAmFLkK8bHGFydW5pc2Fh Y0BzeXN0ZW1yZWJvb3QubmV0AAoJEC4l7othgCuzamEIALFToTUmAND+fgWde1Y9 6zaXyTzgqAOWMWYTThcJzrYbhSeVuxQZs/HR7yZPuIc7eqnq4g4Mt8wE/boTcOHE yD5zGskt+QqZ5vvzSm0k14kYAaroLzlUFrAzs3bv//hGI/PMnNgf/eK4MEM7mUkV BVC9ko5tIyzTccxp8TeUxYNZgAzT/0Gu6SsKR1ofNxkt5Evtl1yfSqBx1Mxd2Dcq vqYiuafWMOPoCFJM6qu1yfcDgPHvuPw5lr6bIxpDW6UHPl0rRTfdUpwd7EN9chGU NmsMtmG0nc88VimqKRqZYm5pFe8kiT+S1QU4CZGzd6s9tErbUa5zjaX9gwiZOQFJ QcE= =bcAe -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 27 12:00:22 2021 Received: (at 50476) by debbugs.gnu.org; 27 Sep 2021 16:00:22 +0000 Received: from localhost ([127.0.0.1]:42602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUt31-0004aK-DU for submit@debbugs.gnu.org; Mon, 27 Sep 2021 12:00:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUt2y-0004YB-Qr for 50476@debbugs.gnu.org; Mon, 27 Sep 2021 12:00:05 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60562) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUt2r-0001lw-VU; Mon, 27 Sep 2021 11:59:58 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=36390 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUt2m-0005TG-Bm; Mon, 27 Sep 2021 11:59:56 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Arun Isaac Subject: Re: bug#50476: [PATCH 00/10] Update guile-dbi and guile-dbd-* References: <20210908145413.4652-1-arunisaac@systemreboot.net> <20210908145413.4652-3-arunisaac@systemreboot.net> <87ilyuks2s.fsf_-_@gnu.org> <87r1dgjr68.fsf@systemreboot.net> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 6 =?utf-8?Q?Vend=C3=A9miaire?= an 230 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 27 Sep 2021 17:59:51 +0200 In-Reply-To: <87r1dgjr68.fsf@systemreboot.net> (Arun Isaac's message of "Thu, 23 Sep 2021 01:53:11 +0530") Message-ID: <87wnn2j9fs.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50476 Cc: 50476@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Arun Isaac skribis: >> If that really is a concern, I=E2=80=99d recommend taking a different ap= proach, >> such as using/defining a dedicated search path variable. > > That sounds good. How about I create a GUILE_DBD_LD_LIBRARY_PATH > environment variable? Or just GUILE_DBD_PATH? But yes, that=E2=80=99d be great. Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 30 12:52:46 2021 Received: (at 50476) by debbugs.gnu.org; 30 Sep 2021 16:52:46 +0000 Received: from localhost ([127.0.0.1]:53823 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzIc-0008Bs-1D for submit@debbugs.gnu.org; Thu, 30 Sep 2021 12:52:46 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzIY-0008BS-6g 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=30JISxWMP0Nh7xt87O9B5mNujTmrbxFuGmV1f8ciI8w=; b=ZTSrVh9L21csyG6ciI68Khjr63 0CcQv/uIwOEQR8u6ok7SmNJpEqGoXeBQIbD0hmA60G4BIS9pq1WZH2qF0hT0oM47uQ2Fhr95XmxxK +qI7x7m68rKXCAmvsUMBWTA0qrlyyFQ7ZdFskgAdXbRiRFd7+6GGJWsRxHr0aAhvE9uLSskYsTI9i IBw8GbhaNSvTf57AwmVFCNNcPsRSm1NQ45C/gD53ZlIFobq7iP9dMPCLuVkmczhuI4qDHLA/8KBjS V4gOsf4bMG50sKhd9c90mXEYvA23BU/IUhDkJTrO7/0o7BwfLu475LK4bi/WrVHKk7/d3J/Xi8bK7 vOm8NAUA==; 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 1mVzIU-000mG6-S7; Thu, 30 Sep 2021 22:22:38 +0530 From: Arun Isaac To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Arun Isaac Subject: [PATCH v2 00/10] Update guile-dbi and guile-dbd-* Date: Thu, 30 Sep 2021 22:22:25 +0530 Message-Id: <20210930165235.13180-1-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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: 50476@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Ludo, The fix was surprisingly simple. It turns out that guile-dbi already supports a GUILE_DBD_PATH environment variable. See line 312 of guile-dbi/src/guile-dbi.c. So, I just had to fix patch 03/10 to set GUILE_DBD_PATH in the native-search-paths of the guile-dbi package. Otherwise, this patchset is the same. Regards, Arun Arun Isaac (10): gnu: guile-dbi: Update upstream source. gnu: guile-dbi: Remove hard-coded guile effective version. gnu: guile-dbi: Search for dbd libraries using native-search-paths. gnu: guile-dbi: Do not return #t from custom phases. gnu: guile-dbi: Update to 2.1.8. gnu: guile-dbd-sqlite3: Inherit from guile-dbi. gnu: guile-dbd-postgresql: Inherit from guile-dbi. gnu: guile-dbi-bootstrap: Remove package. gnu: Add guile-dbd-mysql. gnu: guile-dbd-sqlite3: Use normal variable instead of @ reference. gnu/packages/guile-xyz.scm | 209 +++++++++++++++++++------------------ 1 file changed, 109 insertions(+), 100 deletions(-) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 30 12:52:46 2021 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 To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Arun Isaac Subject: [PATCH v2 01/10] gnu: guile-dbi: Update upstream source. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: 50476@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 30 12:52:46 2021 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 To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Arun Isaac Subject: [PATCH v2 02/10] gnu: guile-dbi: Remove hard-coded guile effective version. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: 50476@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 30 12:53:12 2021 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 To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Arun Isaac Subject: [PATCH v2 08/10] gnu: guile-dbi-bootstrap: Remove package. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: 50476@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 30 12:53:12 2021 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 To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Arun Isaac Subject: [PATCH v2 03/10] gnu: guile-dbi: Search for dbd libraries using native-search-paths. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: 50476@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 30 12:53:12 2021 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 To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Arun Isaac Subject: [PATCH v2 05/10] gnu: guile-dbi: Update to 2.1.8. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: 50476@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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")) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 30 12:53:13 2021 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 To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Arun Isaac Subject: [PATCH v2 06/10] gnu: guile-dbd-sqlite3: Inherit from guile-dbi. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: 50476@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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") -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 30 12:53:13 2021 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 To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Arun Isaac Subject: [PATCH v2 07/10] gnu: guile-dbd-postgresql: Inherit from guile-dbi. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: 50476@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 30 12:53:13 2021 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 To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Arun Isaac Subject: [PATCH v2 04/10] gnu: guile-dbi: Do not return #t from custom phases. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: 50476@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 30 12:53:15 2021 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 To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Arun Isaac Subject: [PATCH v2 09/10] gnu: Add guile-dbd-mysql. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476 Cc: 50476@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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" + ((") id 1mWfcq-0003qs-NV for submit@debbugs.gnu.org; Sat, 02 Oct 2021 10:04:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWfco-0003qg-Vy for 50476@debbugs.gnu.org; Sat, 02 Oct 2021 10:04:27 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:53486) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWfci-0003ZG-G9; Sat, 02 Oct 2021 10:04:20 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=36476 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWfcg-0000Pv-GZ; Sat, 02 Oct 2021 10:04:20 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Arun Isaac Subject: Re: [PATCH v2 00/10] Update guile-dbi and guile-dbd-* References: <87wnn2j9fs.fsf@gnu.org> <20210930165235.13180-1-arunisaac@systemreboot.net> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 11 =?utf-8?Q?Vend=C3=A9miaire?= an 230 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sat, 02 Oct 2021 16:04:17 +0200 In-Reply-To: <20210930165235.13180-1-arunisaac@systemreboot.net> (Arun Isaac's message of "Thu, 30 Sep 2021 22:22:25 +0530") Message-ID: <87v92fy13y.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50476 Cc: 50476@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Arun, Arun Isaac skribis: > The fix was surprisingly simple. It turns out that guile-dbi already supp= orts > a GUILE_DBD_PATH environment variable. See line 312 of > guile-dbi/src/guile-dbi.c. So, I just had to fix patch 03/10 to set > GUILE_DBD_PATH in the native-search-paths of the guile-dbi package. Other= wise, > this patchset is the same. Wonderful. > gnu: guile-dbi: Update upstream source. > gnu: guile-dbi: Remove hard-coded guile effective version. > gnu: guile-dbi: Search for dbd libraries using native-search-paths. > gnu: guile-dbi: Do not return #t from custom phases. > gnu: guile-dbi: Update to 2.1.8. > gnu: guile-dbd-sqlite3: Inherit from guile-dbi. > gnu: guile-dbd-postgresql: Inherit from guile-dbi. > gnu: guile-dbi-bootstrap: Remove package. > gnu: Add guile-dbd-mysql. > gnu: guile-dbd-sqlite3: Use normal variable instead of @ reference. LGTM! Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 03 11:04:10 2021 Received: (at 50476-done) by debbugs.gnu.org; 3 Oct 2021 15:04:10 +0000 Received: from localhost ([127.0.0.1]:34720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mX32A-0001r1-BI for submit@debbugs.gnu.org; Sun, 03 Oct 2021 11:04:10 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:54608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mX326-0001qp-EE for 50476-done@debbugs.gnu.org; Sun, 03 Oct 2021 11:04:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding: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=bwv2KPHvvJ9+WDNQ8moUY7pDGixIAALKTvx7QxDEW88=; b=Ymg7CWarqyNXK8ufrhBU7RoPYH APjGUAYH1b6ZU+7z5lruzgSlCt73/imUGDSQcSxd3p8nE7yHd46v9eaa7SnXsVU2n5JaE90+y6oZF gWREHcBTR6+kldDSXCBlwrU4P30wbEKNfrcqxXAyYYUtCIvuKmh1wQvQgBa0knmjsDWL4V9HKq+RN W+JjwsXRWhb9U8aeK915ugZwPHIZluXmLXzu8b6gIWBv+tARKhZ737/Jrg5KR+D/ROv686xFLCq3+ C0hTakxSH7YpLrdNnSqda4dxPkit7vB1JP5pDeKwlTbqDmY6TG1T9qr/T/qoNDBGDxKtlRykb5Yb/ fz1OLqzw==; Received: from [192.168.2.1] (port=53360 helo=steel) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mX323-0002uI-Dj; Sun, 03 Oct 2021 20:34:03 +0530 From: Arun Isaac To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [PATCH v2 00/10] Update guile-dbi and guile-dbd-* In-Reply-To: <87v92fy13y.fsf@gnu.org> References: <87wnn2j9fs.fsf@gnu.org> <20210930165235.13180-1-arunisaac@systemreboot.net> <87v92fy13y.fsf@gnu.org> Date: Sun, 03 Oct 2021 20:33:56 +0530 Message-ID: <87tuhygnfn.fsf@systemreboot.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50476-done Cc: 50476-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Pushed to master, thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFPBAEBCAA5FiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAmFZxl0bHGFydW5pc2Fh Y0BzeXN0ZW1yZWJvb3QubmV0AAoJEC4l7othgCuzmsIH+wQdfrDlrGxpaFgk/SAR eAVCBHdBiYXDM+5nw7h42spKUqEN7/tQfO0Ro0wda8vZ9em/mazbXQX0zyyHkl2+ aJXSVLLEVDrCsHJyr/L8aaCV1pA2VKllNuVqRsV/VCZfRDDMFJ/m4xf70yxTlxYX 4yelStTfx7Opvn552UMvjgzufpmofBdB9STZUI4rRAFULFY+h93Ur1N8JdaulKq+ 8++8Vs+Yd4nt4hLqB6aYUwCZ9Evpcx5Ah5Bpr6MAlRY1utGTe8KVepCyRdn6JFmI j3iP3c1LQmzCGjy8QH1RVg1npHVPU3Kimit+IIBmcFwj4a7lE3XsVhignDhtBvu6 7E0= =QWXU -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 11:42:42 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 01 Nov 2021 11:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator