From unknown Sun Jun 22 07:49:31 2025 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= From: Yarl Baudig 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-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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" - ((" In-Reply-To: <20241227210235.136392-1-yarl-baudig@mailoo.org> Resent-From: Josep Bigorra Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Jan 2025 14:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75148 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75148@debbugs.gnu.org Received: via spool by 75148-submit@debbugs.gnu.org id=B75148.173669065324850 (code B ref 75148); Sun, 12 Jan 2025 14:05:02 +0000 Received: (at 75148) by debbugs.gnu.org; 12 Jan 2025 14:04:13 +0000 Received: from localhost ([127.0.0.1]:46447 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tWyZY-0006Sj-Ne for submit@debbugs.gnu.org; Sun, 12 Jan 2025 09:04:13 -0500 Received: from mail-vk1-xa2b.google.com ([2607:f8b0:4864:20::a2b]:54293) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tWyZV-0006SV-VO for 75148@debbugs.gnu.org; Sun, 12 Jan 2025 09:04:10 -0500 Received: by mail-vk1-xa2b.google.com with SMTP id 71dfb90a1353d-51889930cb1so1128487e0c.0 for <75148@debbugs.gnu.org>; Sun, 12 Jan 2025 06:04:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736690644; x=1737295444; darn=debbugs.gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=SyeXjK9XSvMMf3SeAy7+ojfCPObjWneAU1MGc35TmxM=; b=gQ5MQ2SI6jZ9BAzk7/MYyDNIwmTPxHBw7DbSSbcBrnqApezKp/SJn7dKb68HGbtRLr o2KcPzRBK2uP80E2dZO5W6vDm7erwRGH5TNzz5RlLq+mYfmUXOz0fY/tBIP4vukTUm9e lBtAtMpNwEw2Uc8Sx/sYqtd6/0o7M59EOk9OGIy5+devk7P7wF5DiUito7p34QVTSKca qc8i9YRk5FAl7bJ7fUHgRh2wDvVI+4abpl7wyZV8qIwOuKvJsv2Avh66oRgHzAVf7KSl 49it/l0LtR1yp3ZZA5lF1YXb+LQB2skkb9Nrd7o8GzPJBrFREbApQ0KBla7Ldbew1bmP /r5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736690644; x=1737295444; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=SyeXjK9XSvMMf3SeAy7+ojfCPObjWneAU1MGc35TmxM=; b=LOdPm3pE3/MwpV2yGJvZ5yOLwugOK4db5dwDrW1xlXlKucSXqpwgwAXJIXHkVFzxDK BFtjP5FPAZxz22zd5xiFTMoZMVXBdA7IFd0UgFsDyoCd7yMmcNRPBWyZ5fy8DfkifVNy 139LK1eN/4+5xOkEpm38qBZHlbXnA/frZvrntC2YMVrOahSAke8CxWpouky3gqPf06eS 2LquvLRRjaqFxySA4wOm+00quvpH0SaMfto1IdokfhbsAdZOr0GcydjPshm041T9GYqQ JO1goQiMyHEMMpMUy9cc5sIJeX/BlHhnUPDheW9WcPxn4RGYKZ2WSpdJITd373oNpK4N xKNA== X-Gm-Message-State: AOJu0YxS8hMAUnGdSfxgIsfUryB4B29tL8Ku17ztrMirbfpikw5NOp2i jsTjB5Q0V3+KO5J16LFXJpsWDD4KwB1TextkMxvwpQH1KDm3yNOrscBMZwGfChfDQ3qGxCfdnPJ zRSqOFdnztKC5m0JSqw+MSlgQzHNb5Wg= X-Gm-Gg: ASbGncveb2C7w4/C+mvbXskN8GVZ8MgI5+qqdqJtbu4J5YbDsNYDSGk3iJLy0D3ERnv zTWVmlAiMO91cZzBAeKwLiClXCTUxn11iKJwI X-Google-Smtp-Source: AGHT+IGMDDLt80KA/0QxIvy/o4oUgU18jVuc+R7xmLfsYv5wb78ZqjZWnSzG9vF/iLNOwEV50QgFRSwvjap3It1b5qo= X-Received: by 2002:a05:6122:2529:b0:50a:c70b:9453 with SMTP id 71dfb90a1353d-51c6c5518edmr12680425e0c.10.1736690643986; Sun, 12 Jan 2025 06:04:03 -0800 (PST) MIME-Version: 1.0 From: Josep Bigorra Date: Sun, 12 Jan 2025 15:03:53 +0100 X-Gm-Features: AbW1kvbMhpDN5duvZ4S8Xjeb5HFlRnvaZFN19vMyhRU9mIPFgVH1ucKL3XMl6gQ Message-ID: Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi all, it would be so nice to have Yarl's good work of updating guile-dbi reviewed and merged in. Thanks, and best regards, Joe