From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wG8mDlwYVmEnJgEAgWs5BA (envelope-from ) for ; Thu, 30 Sep 2021 22:04:44 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id WFG7CVwYVmF7SAAAbx9fmQ (envelope-from ) for ; Thu, 30 Sep 2021 20:04:44 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E26822A921 for ; Thu, 30 Sep 2021 22:04:38 +0200 (CEST) Received: from localhost ([::1]:37596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mW2II-0005si-1U for larch@yhetil.org; Thu, 30 Sep 2021 16:04:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVzJs-000614-4q for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42309) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVzJr-00048r-Sr for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVzJr-0008GE-Rg for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH v2 07/10] gnu: guile-dbd-postgresql: Inherit from guile-dbi. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Sep 2021 16:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50476 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Arun Isaac Cc: 50476@debbugs.gnu.org Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163302079331656 (code B ref 50476); Thu, 30 Sep 2021 16:54:03 +0000 Received: (at 50476) by debbugs.gnu.org; 30 Sep 2021 16:53:13 +0000 Received: from localhost ([127.0.0.1]:53847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzJ3-0008EQ-72 for submit@debbugs.gnu.org; Thu, 30 Sep 2021 12:53:13 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzId-0008CE-GA for 50476@debbugs.gnu.org; Thu, 30 Sep 2021 12:52:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=WVQ9zsozNF+CvqJJNccqu/aWXAqyUhAlPltSXrDFLqc=; b=TjMiKnQmtEH+Dzmy2i+HZpkta8 WjsvP4xyPugmVjo3WaltUNnRfoXTt5k+3BuQ/z0g7jyeQvyAIQcu1xzZ8d0Sogpxqt59MMP9VSjQL uzGbXYFL2Z880dP3rEoAYYST/Oeot6KhMzVX1qPg82YOBzeOf/mUNrWTcTsRIHKh3I8cMLbytG20G HcNRR4396bzcX2ZTpCzwnLobSHnJd8w5DlDwidvEHIlxslGeTxh+KxOIJioapobkcUxNzn1cO0NaJ LCFhImCdfzXOU2Rf1FqsMw7X+P0BvW/1qle/Yczib3kLnbFhXlDIV2XYC8a6yoa3e5iSQUpEhtVI7 yiIfX2rw==; Received: from [192.168.2.1] (port=15514 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mVzIW-000mG6-Ef; Thu, 30 Sep 2021 22:22:40 +0530 From: Arun Isaac Date: Thu, 30 Sep 2021 22:22:32 +0530 Message-Id: <20210930165235.13180-8-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <87wnn2j9fs.fsf@gnu.org> References: <87wnn2j9fs.fsf@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 30 Sep 2021 16:04:16 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1633032279; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=WVQ9zsozNF+CvqJJNccqu/aWXAqyUhAlPltSXrDFLqc=; b=VCZ2qy2Fim83rmMEtvj21zI7nQLUEisEfzKS8RsprCo8jHpo5S4PzKi+czrFluPdlvIQwR G0rKGJLpKtNa0TW87v6E3MsWPNPp6B0v1+6p9u3wtKq1+oKUTIiaDNfn3mQzAlwn0a9qUK JVIs9RnCWUzeT7XmcfseN0TDnqpK84ytXma9pn2fMMYj4JfPLunuLCsICw7dPW7gQqRkF5 qhVeeRDFTQzQfqnM9V9rkrU3LLtILz7njc3PaphP0k2A7NEvlTwo+EyeUKldtEIPB2hDt1 irGfQRmhEovJeHtiuLaIGSUbcy3tPeHbXYTAUa98cWTgS1HnSG53bnzHxOnN7A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633032279; a=rsa-sha256; cv=none; b=boZYZFZHPNQ7CfHfEaR6HhLVb5OLP3UArRqod5UnfeCM8XsfqDxg1X61tVQ2PHp7IlzeFU OjkFmg65WY+5AXD7J5tc6nFMA1T1CBdyLyh7F4s5hGLw8Zx8Cj0sHUy9j72ysU32EesbWc X0EEKnG5he26F3ndkg1UDH3mG8G/S+ktrb40dA6Oei7bD3etxW2Xr8repulZkKzW9wTuDE HJmtduVl0q6eoiP8ZtnYluzN7lyC9mnwDUuOnOhdF65xpYNTJ9Gs8yEJ/oHPWgN3t3aUy7 RbGfBzA1aUaIZehSes3AugpGJWLLFbpCT0lwxU6XDKvuICdoBWQJ2JfusGM/Ow== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b=TjMiKnQm; dmarc=fail reason="SPF not aligned (relaxed)" header.from=systemreboot.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.70 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b=TjMiKnQm; dmarc=fail reason="SPF not aligned (relaxed)" header.from=systemreboot.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: E26822A921 X-Spam-Score: 3.70 X-Migadu-Scanner: scn0.migadu.com X-TUID: cZvDdc08ECTC * 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