From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 4BlrDkPPOGGR/QAAgWs5BA (envelope-from ) for ; Wed, 08 Sep 2021 16:57:07 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id oD+8CUPPOGHLagAA1q6Kng (envelope-from ) for ; Wed, 08 Sep 2021 14:57:07 +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 B0B852DCCE for ; Wed, 8 Sep 2021 16:57:06 +0200 (CEST) Received: from localhost ([::1]:55290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNz0b-0001Jz-Rh for larch@yhetil.org; Wed, 08 Sep 2021 10:57:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNyye-00061Y-Av for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNyye-0002mw-0V for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNyyd-00088L-Vo for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH 06/10] gnu: guile-dbd-sqlite3: Inherit from guile-dbi. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Sep 2021 14:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50476 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50476@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163111286631117 (code B ref 50476); Wed, 08 Sep 2021 14:55:03 +0000 Received: (at 50476) by debbugs.gnu.org; 8 Sep 2021 14:54:26 +0000 Received: from localhost ([127.0.0.1]:33317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyy1-00085i-Pn for submit@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:26 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37686) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyxu-00084D-AE for 50476@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=bGfE/r7MQJ86tNQt4QdJRRJDWQXW1mjsmPo2SC/CUh4=; b=VadTIEr2nNbVbmsIIuikbki7Ha wxP4i8EtGxUZU6FRGB25pChcEpbLmJRPzvQ/3cJwoyFpvDqiOrrr5j8CyyDS/3bPIK3ADIdOUGoai CMA/4peHUTPp5n/9LBUuhm/AP8DV+kclyWEd5+wkhngOWjc/yz7A2ij/leWFBqL1kk2iIP8Et5nZ4 bC23GoQV0cW42AYFnyS7R20F7dBO2hwrbAZj5onJexzwQuPb68BiLDh9gLTmctBAj59MNEz6JK8mg Jj5cacEQpgu89m2QeNPNdS/bNlbQI3uHoBeCI32CZGmxyIo9Jhc3szWhqkXC0xMcu5nvggbq+7CtP YdgMzIfA==; Received: from [192.168.2.1] (port=55638 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mNyxr-000W6b-Uw; Wed, 08 Sep 2021 20:24:16 +0530 From: Arun Isaac Date: Wed, 8 Sep 2021 20:24:09 +0530 Message-Id: <20210908145413.4652-6-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210908145413.4652-1-arunisaac@systemreboot.net> References: <20210908145413.4652-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+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=1631113026; 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=bGfE/r7MQJ86tNQt4QdJRRJDWQXW1mjsmPo2SC/CUh4=; b=ew/1KmhRJ0MSaOJAGUYImp/k7eijSj/XKA5RQrAwO5jVgfAwLGFxVJglr+ifaXrHOgNEhi mU96Cpg5KBARemZud/sz6iX89yIsztY69aYRRYmyIzzUJ2d71JqKc9SbjX6BRwU02B61F+ snXPm5RKO0NNFa8hJuJPvyxrafMW3NFrYnDx03csIKmGXf/o/XIyOScXEW5phaqm1IheMi 3hnrLtZDAw2pps+tbl62uyzo9h6YEm1yPxSWr2MfPS3w7Ja3nhNjPHXIxnTDhl0X0m0CM1 vQY7OPL4+flTX4Q9YV+un0BOi1YHJN201R1BG/cfo9sY8SMwMsn+FiR+vBWgvQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631113026; a=rsa-sha256; cv=none; b=KvItLP4QoKSQO5D0+uRb6M4293FLOf+Ib/QMfXaSXuL+u7eSiQH2SsnnQwDpKVECa6+5O8 vEqTxD9zMteunQ+QApJ+B9X3PlRhh+Cq7r3A+YAAC7kzeDWsswOTO6Eq1YVYpdDuzfq6Q4 zqfW9+EBbYagc++hjnMoI7hX7gawmB04UDKtLkmiNMkv4cAcG2tANmXDzkJX6Do/wkP6So N0iMhHh/o4k2zDSMmRLOZAiWAnNhx2o9qNkXxKjWfMKAkfkmo8ypMzGhMIa/NhGYE0uds8 qb/sOsVW3jey/P7NTuSwzRqEcbTekhTi6qVAaP/8KZmxM/mVaAiCeuU1uz1+TA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b=VadTIEr2; 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.69 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b=VadTIEr2; 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: B0B852DCCE X-Spam-Score: 3.69 X-Migadu-Scanner: scn0.migadu.com X-TUID: otdchUVH/9zf * 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