X-Loop: help-debbugs@HIDDEN
Subject: [bug#75148] [PATCH] * gnu/packages/guile-xyz.scm (guile-dbi): Update to 2.1.9.
Resent-From: Yarl Baudig <yarl-baudig@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 27 Dec 2024 21:04:02 +0000
Resent-Message-ID: <handler.75148.B.173533340727515 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 75148
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 75148 <at> debbugs.gnu.org
Cc: Yarl Baudig <yarl-baudig@HIDDEN>, jjbigorra@HIDDEN
X-Debbugs-Original-To: guix-patches@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.173533340727515
(code B ref -1); Fri, 27 Dec 2024 21:04:02 +0000
Received: (at submit) by debbugs.gnu.org; 27 Dec 2024 21:03:27 +0000
Received: from localhost ([127.0.0.1]:47773 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tRHUU-00079g-L3
for submit <at> debbugs.gnu.org; Fri, 27 Dec 2024 16:03:27 -0500
Received: from lists.gnu.org ([209.51.188.17]:54006)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <yarl-baudig@HIDDEN>) id 1tRHUS-00079O-1T
for submit <at> debbugs.gnu.org; Fri, 27 Dec 2024 16:03:24 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <yarl-baudig@HIDDEN>)
id 1tRHUO-0000JX-It
for guix-patches@HIDDEN; Fri, 27 Dec 2024 16:03:20 -0500
Received: from msg-1.mailo.com ([213.182.54.11] helo=mailo.com)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <yarl-baudig@HIDDEN>)
id 1tRHUM-0002PC-89
for guix-patches@HIDDEN; Fri, 27 Dec 2024 16:03:20 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailoo.org; s=mailo;
t=1735333393; bh=IeR9xfGv/HP+29YL+NVzHQu6IMkY3uOuUMoCpiA2oXE=;
h=X-EA-Auth:From:To:Cc:Subject:Date:Message-ID:MIME-Version:
Content-Transfer-Encoding;
b=eM08LMF1LCFUOdJmSnhzB2WiRcTCxOujW/Zs2a/1axWmxt8xx+HwLKC7aGd9q3OdK
4JcJw9XXwyr4/W0/ekHKaJ1+5/wh2RS9H9KlOdLYAEx/wpxFb0fqleh467uIcBFVhQ
9OeagJVx/dqoJX7FTcUixVeGVt5zVt+cfkr+97vk=
Received: by b221-3.in.mailobj.net [192.168.90.23] with ESMTP
via ip-20.mailobj.net [213.182.54.20]
Fri, 27 Dec 2024 22:03:13 +0100 (CET)
X-EA-Auth: bK5la7cSnyu4T+TfwT/QjC8z5tl7LxEYej39A/2tzhbQXs4jAshoLnRUL/ppTMeNb8QOd7phkcD9I+35KSVDiAPRvP7Ar1o8wlVE5PjQQg4=
From: Yarl Baudig <yarl-baudig@HIDDEN>
Date: Fri, 27 Dec 2024 22:02:34 +0100
Message-ID: <20241227210235.136392-1-yarl-baudig@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=213.182.54.11;
envelope-from=yarl-baudig@HIDDEN; helo=mailo.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,
SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)
Along with guile-dbd-sqlite3, guile-dbd-postgresql and
guile-dbd-mysql. Transition to guile3. With guix style.
Change-Id: I7199030cec603a038f1b1cdab714127336a795c5
---
gnu/packages/guile-xyz.scm | 130 ++++++++++++++++++++-----------------
1 file changed, 71 insertions(+), 59 deletions(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index dd0f620133..59e3e9e98d 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1969,16 +1969,16 @@ (define-public guile-yamlpp
(define-public guile-dbi
(package
(name "guile-dbi")
- (version "2.1.8")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/opencog/guile-dbi")
- (commit (string-append "guile-dbi-" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "123m4j82bi60s1v95pjh4djb7bh6zdwmljbpyg7zq8ni2gyal7lw"))))
+ (version "2.1.9")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/opencog/guile-dbi")
+ (commit (string-append "guile-dbi-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1i0vsg173499jsvimzqb81lqrw6r8l77qkjmsdha442r933nq473"))))
(build-system gnu-build-system)
(arguments
`(#:modules (((guix build guile-build-system)
@@ -1986,30 +1986,42 @@ (define-public guile-dbi
,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
,@%default-gnu-imported-modules)
- #:configure-flags
- (list (string-append
- "--with-guile-site-dir=" %output "/share/guile/site/"
- (target-guile-effective-version (assoc-ref %build-inputs "guile"))))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'chdir
- (lambda _
- ;; The upstream Git repository contains all the code, so change
- ;; to the directory specific to guile-dbi.
- (chdir "guile-dbi")))
- (add-after 'install 'patch-extension-path
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (dbi.scm (string-append out "/share/guile/site/"
- (target-guile-effective-version
- (assoc-ref inputs "guile"))
- "/dbi/dbi.scm"))
- (ext (string-append out "/lib/libguile-dbi")))
- (substitute* dbi.scm (("libguile-dbi") ext))))))))
- (native-inputs
- (list autoconf automake libtool perl texinfo))
- (propagated-inputs
- (list guile-2.2))
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _
+ ;; The upstream Git repository contains all the code, so change
+ ;; to the directory specific to guile-dbi.
+ (chdir "guile-dbi")))
+ (add-after 'chdir 'patch-Makefile
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (datadir (string-append out "/share/guile/site/"
+ (target-guile-effective-version
+ (assoc-ref inputs
+ "guile")))))
+ (substitute* "src/dbi/Makefile.am"
+ (("\\$\\(GUILE_SITE\\)")
+ datadir)))))
+ (add-after 'install 'patch-extension-path
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (dbi.scm (string-append out "/share/guile/site/"
+ (target-guile-effective-version
+ (assoc-ref inputs
+ "guile"))
+ "/dbi/dbi.scm"))
+ (ext (string-append out "/lib/libguile-dbi")))
+ (substitute* dbi.scm
+ (("libguile-dbi")
+ ext))))))))
+ (native-inputs (list autoconf
+ automake
+ pkg-config
+ libtool
+ perl
+ texinfo
+ guile-3.0-latest))
+ (inputs (list guile-3.0-latest libltdl))
(synopsis "Guile database abstraction layer")
(home-page "https://github.com/opencog/guile-dbi")
(description
@@ -2036,13 +2048,11 @@ (define-public guile-dbd-sqlite3
;; 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
- (list sqlite zlib))
- (native-inputs
- (modify-inputs (package-native-inputs guile-dbi)
- (prepend guile-dbi ; only required for headers
- pkg-config)))
+ (delete 'patch-extension-path)
+ (delete 'patch-Makefile)))))
+ (native-inputs (modify-inputs (package-native-inputs guile-dbi)
+ (prepend guile-dbi)))
+ (inputs (list sqlite zlib libltdl))
(synopsis "Guile DBI driver for SQLite")
(description
"guile-dbi is a library for Guile that provides a convenient interface to
@@ -2064,14 +2074,15 @@ (define-public guile-dbd-postgresql
(add-after 'chdir 'patch-src
(lambda _
(substitute* "src/guile-dbd-postgresql.c"
- (("postgresql/libpq-fe\\.h") "libpq-fe.h"))))
- (delete 'patch-extension-path)))))
+ (("postgresql/libpq-fe\\.h")
+ "libpq-fe.h"))))
+ (delete 'patch-extension-path)
+ (delete 'patch-Makefile)))))
+ (native-inputs (modify-inputs (package-native-inputs guile-dbi)
+ (prepend guile-dbi)))
(inputs
- (list postgresql zlib))
- (native-inputs
- (modify-inputs (package-native-inputs guile-dbi)
- (prepend guile-dbi ; only required for headers
- )))
+ ;; openssl to satisfy pkg-config, postgresql built with openssl
+ (list postgresql zlib libltdl openssl))
(synopsis "Guile DBI driver for PostgreSQL")
(description
"@code{guile-dbi} is a library for Guile that provides a convenient
@@ -2094,19 +2105,20 @@ (define-public guile-dbd-mysql
(add-after 'chdir 'patch-src
(lambda _
(substitute* "configure.ac"
- (("mariadbclient") "mariadb"))
+ (("mariadbclient")
+ "mariadb"))
(substitute* "src/guile-dbd-mysql.c"
- (("<mariadb/") "<mysql/"))))
- (delete 'patch-extension-path)))))
- (inputs
- (list `(,mariadb "dev")
- `(,mariadb "lib") zlib))
- (native-inputs
- (modify-inputs (package-native-inputs guile-dbi)
- (prepend guile-dbi ; only required for headers
- )))
+ (("<mariadb/")
+ "<mysql/"))))
+ (delete 'patch-extension-path)
+ (delete 'patch-Makefile)))))
+ (native-inputs (modify-inputs (package-native-inputs guile-dbi)
+ (prepend guile-dbi)))
+ (inputs (list `(,mariadb "dev")
+ `(,mariadb "lib") zlib libltdl))
(synopsis "Guile DBI driver for MySQL")
- (description "@code{guile-dbi} is a library for Guile that provides a
+ (description
+ "@code{guile-dbi} is a library for Guile that provides a
convenient interface to SQL databases. This package implements the interface
for MySQL.")
(license license:gpl2+)))
--
2.46.0
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Yarl Baudig <yarl-baudig@HIDDEN> Subject: bug#75148: Acknowledgement ([PATCH] * gnu/packages/guile-xyz.scm (guile-dbi): Update to 2.1.9.) Message-ID: <handler.75148.B.173533340727515.ack <at> debbugs.gnu.org> References: <20241227210235.136392-1-yarl-baudig@HIDDEN> X-Gnu-PR-Message: ack 75148 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 75148 <at> debbugs.gnu.org Date: Fri, 27 Dec 2024 21:04:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 75148 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 75148: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D75148 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.