aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Isaac <arunisaac@systemreboot.net>2021-09-08 19:52:18 +0530
committerArun Isaac <arunisaac@systemreboot.net>2021-10-03 19:32:50 +0530
commit8f1d146033357c6175dec17ea35ba5dabb6b1903 (patch)
tree5ccd622e02332272ef2d87378d54409cacbff12b
parentc4698e50f2a0bb38f171bf85ed0c99db8fb6e2f1 (diff)
downloadguix-8f1d146033357c6175dec17ea35ba5dabb6b1903.tar
guix-8f1d146033357c6175dec17ea35ba5dabb6b1903.tar.gz
gnu: guile-dbd-postgresql: Inherit from guile-dbi.
* 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.
-rw-r--r--gnu/packages/guile-xyz.scm72
1 files changed, 23 insertions, 49 deletions
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 5ebc49a39c..f6073ea6c5 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1612,60 +1612,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