* [bug#34327] [PATCH] gnu: Add guile-dbd-postgresql.
@ 2019-02-05 9:23 Christopher Baines
2019-02-05 10:38 ` Ricardo Wurmus
0 siblings, 1 reply; 3+ messages in thread
From: Christopher Baines @ 2019-02-05 9:23 UTC (permalink / raw)
To: 34327
Currently, there are packages for guile-dbi and guile-dbd-sqlite3, but the
PostgreSQL and MySQL parts are not packaged. As GNA which did host the release
archives for guile-dbi no longer exists, this package definition uses the
upstream Git repository.
* gnu/packages/guile-xyz.scm (guile-dbd-postgresql): New variable.
(guile-dbi)[arguments]: Add guile-dbd-postgresql to the rpath through the
[inputs]: Add guile-dbd-postgresql.
---
gnu/packages/guile-xyz.scm | 67 ++++++++++++++++++++++++++++++++++++--
1 file changed, 64 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 9640d17c3c..e959275318 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -45,6 +45,7 @@
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages databases)
#:use-module (gnu packages disk)
#:use-module (gnu packages ed)
#:use-module (gnu packages emacs)
@@ -63,6 +64,7 @@
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages networking)
+ #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages readline)
@@ -1046,8 +1048,10 @@ library}.")
(list (string-append
"--with-guile-site-dir=" %output "/share/guile/site/2.2"))
#:make-flags
- (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib:"
- (assoc-ref %build-inputs "guile-dbd-sqlite3") "/lib"))
+ (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
@@ -1059,7 +1063,8 @@ library}.")
(substitute* dbi.scm (("libguile-dbi") ext))
#t))))))
(inputs
- `(("guile-dbd-sqlite3" ,guile-dbd-sqlite3))) ; only shared library, no scheme files
+ `(("guile-dbd-sqlite3" ,guile-dbd-sqlite3)
+ ("guile-dbd-postgresql" ,guile-dbd-postgresql))) ; only shared library, no scheme files
(propagated-inputs
`(("guile" ,guile-2.2)))
(synopsis "Guile database abstraction layer")
@@ -1106,6 +1111,62 @@ It currently supports MySQL, Postgres and SQLite3.")
SQL databases. This package implements the interface for SQLite.")
(license license:gpl2+)))
+(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.git")
+ (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
+ (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
+ (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
+interface to SQL databases. This package implements the interface for
+PostgreSQL.")
+ (license license:gpl2+))))
+
(define-public guile-config
(package
(name "guile-config")
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#34327] [PATCH] gnu: Add guile-dbd-postgresql.
2019-02-05 9:23 [bug#34327] [PATCH] gnu: Add guile-dbd-postgresql Christopher Baines
@ 2019-02-05 10:38 ` Ricardo Wurmus
2019-02-05 15:44 ` bug#34327: " Christopher Baines
0 siblings, 1 reply; 3+ messages in thread
From: Ricardo Wurmus @ 2019-02-05 10:38 UTC (permalink / raw)
To: Christopher Baines; +Cc: 34327
Christopher Baines <mail@cbaines.net> writes:
> Currently, there are packages for guile-dbi and guile-dbd-sqlite3, but the
> PostgreSQL and MySQL parts are not packaged. As GNA which did host the release
> archives for guile-dbi no longer exists, this package definition uses the
> upstream Git repository.
>
> * gnu/packages/guile-xyz.scm (guile-dbd-postgresql): New variable.
> (guile-dbi)[arguments]: Add guile-dbd-postgresql to the rpath through the
> [inputs]: Add guile-dbd-postgresql.
“to the rpath through the” …?
The rest looks good to me.
--
Ricardo
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#34327: [PATCH] gnu: Add guile-dbd-postgresql.
2019-02-05 10:38 ` Ricardo Wurmus
@ 2019-02-05 15:44 ` Christopher Baines
0 siblings, 0 replies; 3+ messages in thread
From: Christopher Baines @ 2019-02-05 15:44 UTC (permalink / raw)
To: Ricardo Wurmus; +Cc: 34327-done
[-- Attachment #1: Type: text/plain, Size: 783 bytes --]
Ricardo Wurmus <rekado@elephly.net> writes:
> Christopher Baines <mail@cbaines.net> writes:
>
>> Currently, there are packages for guile-dbi and guile-dbd-sqlite3, but the
>> PostgreSQL and MySQL parts are not packaged. As GNA which did host the release
>> archives for guile-dbi no longer exists, this package definition uses the
>> upstream Git repository.
>>
>> * gnu/packages/guile-xyz.scm (guile-dbd-postgresql): New variable.
>> (guile-dbi)[arguments]: Add guile-dbd-postgresql to the rpath through the
>> [inputs]: Add guile-dbd-postgresql.
>
> “to the rpath through the” …?
How odd, it was meant to say "to the rpath through the #:make-flags".
> The rest looks good to me.
Thanks for taking a look, I've updated the commit message and pushed.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-06 2:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-05 9:23 [bug#34327] [PATCH] gnu: Add guile-dbd-postgresql Christopher Baines
2019-02-05 10:38 ` Ricardo Wurmus
2019-02-05 15:44 ` bug#34327: " Christopher Baines
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).