From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 2I6CFnEWb2cawAAAe85BDQ:P1 (envelope-from ) for ; Fri, 27 Dec 2024 21:04:49 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 2I6CFnEWb2cawAAAe85BDQ (envelope-from ) for ; Fri, 27 Dec 2024 22:04:49 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=pys9+qFC; dkim=fail ("headers rsa verify failed") header.d=mailoo.org header.s=mailo header.b=eM08LMF1; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735333473; h=from:from:sender:sender:reply-to: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=mefQ7p6HCo4hE/Dzwqv8UM/HkAkaPyqkVHEbrF1BKLg=; b=LXqdNwLdzolWYSA+vvJhpsvAWkxyFrVLOqQ/pb20H33tiV4RBoRV6Cz+xUASTFJwR59r3C gSruJrIywoqfB5voSSWIZGhHexDObI8B4ULwH8UlpI/6bx9STgpTuirh4bvtX+UCwozI2m J/vqs5IoMDtWNNQoxYHnF3XhVgSHpKLR8OTQIPyWn6gTbMwjnQ9dJd3hWMocIkapKJj6Zx 1DrgqtUf+/tzLVfKqScHFbvvR3Jb4Ej7qvMVza/5PZADFIrX08NgNB2O9xtXgzn5Qi6BPW 0LO1Uuy28TlTwi1Gj9PYBmDEePGR4khvCp4SLcIHg565VZL0+ig1nJ8pxwpsWA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=pys9+qFC; dkim=fail ("headers rsa verify failed") header.d=mailoo.org header.s=mailo header.b=eM08LMF1; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735333473; a=rsa-sha256; cv=none; b=kT75UIEIyTam/e0SPu1yNoMqedy6HfW5A+D85GUhy+QG7N2p/gXSiq7xROJKnh7o39n6/S eqpvD2nNrUaJ7onsBbWbokAOtzIsR3/8EGBGmagVoRC/Rxam7NZ1ODkgXMShycAcPNF81O gOCyqfKRyrM21e9WAbFP9LGZGOa0cgwF+oPctl7RRJNnNvloP4x4j6EUv2gXKqUt3ysGqP wtE4TXirW7sGngPpT0IRaU5X3h0Eublrrkx1lcvhV5XiZz/acgO/9ItG9wSXFsL7xSDseS td3oF5X7a9BIoiZYS9VVzeH43qXwnzLZzk9lUOpZNFtF7bwAPKUtNj+of0pr1w== 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 79FF3646C for ; Fri, 27 Dec 2024 22:04:33 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRHVE-0000M6-FT; Fri, 27 Dec 2024 16:04:12 -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 ) id 1tRHV6-0000LT-43 for guix-patches@gnu.org; Fri, 27 Dec 2024 16:04:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tRHV4-0002jL-WA for guix-patches@gnu.org; Fri, 27 Dec 2024 16:04:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=mefQ7p6HCo4hE/Dzwqv8UM/HkAkaPyqkVHEbrF1BKLg=; b=pys9+qFCF+8ympV3o+aKVPBMsuzF4kedaDbjEKwX98ZQwe2Jsj6O+zrOxbLF6OSRcpEZdldp8HeOi9BKGBhAHcabGrwMoFyt/RgFp+2Cp7DzGqLq5/ROulzCOjHhCJL4kBYXdNzdA6Ur8TUVle/m/CnoXC/5/rw1w3u448WYftgw1lqxjz8UC1tIPZXRbfm8mw6aqNufNTbXqyeY5WRWUnumMf2x+MGbtoy5e4MjGRlDxN1XVFq+HRQ94f2MAWazSKZoDo63DA9hEewREgTYlSLj/dydrDo3ak3gsu/fY81310IhPK36ZD4w336oF4hmYTQLF7NJJH49d30vus8FEg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tRHV4-0007Bv-PW for guix-patches@gnu.org; Fri, 27 Dec 2024 16:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75148] [PATCH] * gnu/packages/guile-xyz.scm (guile-dbi): Update to 2.1.9. Resent-From: Yarl Baudig Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Dec 2024 21:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75148 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75148@debbugs.gnu.org Cc: Yarl Baudig , jjbigorra@gmail.com X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@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 ) id 1tRHUU-00079g-L3 for submit@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 ) id 1tRHUS-00079O-1T for submit@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 ) id 1tRHUO-0000JX-It for guix-patches@gnu.org; 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 ) id 1tRHUM-0002PC-89 for guix-patches@gnu.org; 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= Date: Fri, 27 Dec 2024 22:02:34 +0100 Message-ID: <20241227210235.136392-1-yarl-baudig@mailoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=213.182.54.11; envelope-from=yarl-baudig@mailoo.org; 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-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: , Reply-to: Yarl Baudig X-ACL-Warn: , Yarl Baudig via Guix-patches From: Yarl Baudig via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -0.61 X-Spam-Score: -0.61 X-Migadu-Queue-Id: 79FF3646C X-TUID: Z1Mz8cgSfog+ 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" - (("