From: Arun Isaac <arunisaac@systemreboot.net>
To: "Ludovic Courtès" <ludo@gnu.org>,
"Arun Isaac" <arunisaac@systemreboot.net>
Cc: 50476@debbugs.gnu.org
Subject: [bug#50476] [PATCH v2 06/10] gnu: guile-dbd-sqlite3: Inherit from guile-dbi.
Date: Thu, 30 Sep 2021 22:22:31 +0530 [thread overview]
Message-ID: <20210930165235.13180-7-arunisaac@systemreboot.net> (raw)
In-Reply-To: <87wnn2j9fs.fsf@gnu.org>
* 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
next prev parent reply other threads:[~2021-09-30 20:04 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-08 14:45 [bug#50476] [PATCH 00/10] Update guile-dbi and guile-dbd-* Arun Isaac
2021-09-08 14:54 ` [bug#50476] [PATCH 01/10] gnu: guile-dbi: Update upstream source Arun Isaac
2021-09-08 14:54 ` [bug#50476] [PATCH 02/10] gnu: guile-dbi: Remove hard-coded guile effective version Arun Isaac
2021-09-08 14:54 ` [bug#50476] [PATCH 03/10] gnu: guile-dbi: Search for dbd libraries using native-search-paths Arun Isaac
2021-09-21 12:53 ` [bug#50476] [PATCH 00/10] Update guile-dbi and guile-dbd-* Ludovic Courtès
2021-09-22 20:23 ` Arun Isaac
2021-09-27 15:59 ` Ludovic Courtès
2021-09-30 16:52 ` [bug#50476] [PATCH v2 " Arun Isaac
2021-10-02 14:04 ` Ludovic Courtès
2021-10-03 15:03 ` bug#50476: " Arun Isaac
2021-09-30 16:52 ` [bug#50476] [PATCH v2 01/10] gnu: guile-dbi: Update upstream source Arun Isaac
2021-09-30 16:52 ` [bug#50476] [PATCH v2 02/10] gnu: guile-dbi: Remove hard-coded guile effective version Arun Isaac
2021-09-30 16:52 ` [bug#50476] [PATCH v2 03/10] gnu: guile-dbi: Search for dbd libraries using native-search-paths Arun Isaac
2021-09-30 16:52 ` [bug#50476] [PATCH v2 04/10] gnu: guile-dbi: Do not return #t from custom phases Arun Isaac
2021-09-30 16:52 ` [bug#50476] [PATCH v2 05/10] gnu: guile-dbi: Update to 2.1.8 Arun Isaac
2021-09-30 16:52 ` Arun Isaac [this message]
2021-09-30 16:52 ` [bug#50476] [PATCH v2 07/10] gnu: guile-dbd-postgresql: Inherit from guile-dbi Arun Isaac
2021-09-30 16:52 ` [bug#50476] [PATCH v2 08/10] gnu: guile-dbi-bootstrap: Remove package Arun Isaac
2021-09-30 16:52 ` [bug#50476] [PATCH v2 09/10] gnu: Add guile-dbd-mysql Arun Isaac
2021-09-08 14:54 ` [bug#50476] [PATCH 04/10] gnu: guile-dbi: Do not return #t from custom phases Arun Isaac
2021-09-08 14:54 ` [bug#50476] [PATCH 05/10] gnu: guile-dbi: Update to 2.1.8 Arun Isaac
2021-09-08 14:54 ` [bug#50476] [PATCH 06/10] gnu: guile-dbd-sqlite3: Inherit from guile-dbi Arun Isaac
2021-09-08 14:54 ` [bug#50476] [PATCH 07/10] gnu: guile-dbd-postgresql: " Arun Isaac
2021-09-08 14:54 ` [bug#50476] [PATCH 08/10] gnu: guile-dbi-bootstrap: Remove package Arun Isaac
2021-09-08 14:54 ` [bug#50476] [PATCH 09/10] gnu: Add guile-dbd-mysql Arun Isaac
2021-09-08 14:54 ` [bug#50476] [PATCH 10/10] gnu: guile-dbd-sqlite3: Use normal variable instead of @ reference Arun Isaac
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210930165235.13180-7-arunisaac@systemreboot.net \
--to=arunisaac@systemreboot.net \
--cc=50476@debbugs.gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).