From patchwork Fri Apr 4 13:21:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cayetano Santos X-Patchwork-Id: 41266 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F1F5127BBEA; Fri, 4 Apr 2025 14:25:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 38D7627BBE2 for ; Fri, 4 Apr 2025 14:25:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u0h2l-0007Ov-AQ; Fri, 04 Apr 2025 09:25:11 -0400 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 1u0h2i-0007Oh-MW for guix-patches@gnu.org; Fri, 04 Apr 2025 09:25:08 -0400 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 1u0h2h-0006hZ-Ox for guix-patches@gnu.org; Fri, 04 Apr 2025 09:25:08 -0400 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=JZOq+/dfCC126jbCHjRFI0ycZ/dHd6KqLqAUEgxIxtE=; b=LSuuTX8cW3lK98nRvJH8B0Ufhbi99IbTxTgmcltQNESgn8dgGDCAnHadowXVTjDM+D6DmxhtW9Xct2Vp7+tEGYlAMbt04pS05JYQST40t6OPWG0hlXO4c7J4PMPu1cgIYGN8rM0DmnqHY4X+Ofc5eDo9gnsFS7HSiSlxZHVaTbKbUcFVHEecn+/BGzWWXwOg0VxXbfgQVPj6h99xMD93CP4xI6URXFCRRgeVpzDhV5emb0IKBkqk/wGA47yLayJ90rQZGm/uWttfd0VTBFFpMMiMlTNQDsaOOTa/lSAWb5EuYMSu0rrGWgE6Kfza2iwuP1+uuwoDy0fle01+b/+Eeg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u0h2b-0008AP-TF; Fri, 04 Apr 2025 09:25:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77532] [PATCH] gnu: emacs-emacsql: Update to 4.3.0. Resent-From: Cayetano Santos Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, csantosb@inventati.org, divya@subvertising.org, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 04 Apr 2025 13:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77532 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77532@debbugs.gnu.org Cc: Cayetano Santos , Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by submit@debbugs.gnu.org id=B.174377306531304 (code B ref -1); Fri, 04 Apr 2025 13:25:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Apr 2025 13:24:25 +0000 Received: from localhost ([127.0.0.1]:37436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u0h21-00088q-33 for submit@debbugs.gnu.org; Fri, 04 Apr 2025 09:24:25 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58776) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u0h1y-00088X-IU for submit@debbugs.gnu.org; Fri, 04 Apr 2025 09:24:23 -0400 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 1u0h1s-0007Jm-E8 for guix-patches@gnu.org; Fri, 04 Apr 2025 09:24:16 -0400 Received: from devianza.investici.org ([2c0f:f930:0:4::108]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u0h1p-0006PU-TE for guix-patches@gnu.org; Fri, 04 Apr 2025 09:24:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1743773046; bh=JZOq+/dfCC126jbCHjRFI0ycZ/dHd6KqLqAUEgxIxtE=; h=From:To:Cc:Subject:Date:From; b=k1d6qBqMNpFUR9mZiAZFAjU3OJqrJTmVUUCCnZ1d4rOrDFqNuamVHtRd7E/DhHugC HSgTDqjRUzRVEoAtrreTJkAH8kzfsl0JYnyinIkGAvPitqJLWu43InP9vWVw//Alf+ J/N1WuzaTK6Hu/xUn2mlXiL6OJMZlNBptx4LsZ5Y= Received: from mx2.investici.org (unknown [127.0.0.1]) by devianza.investici.org (Postfix) with ESMTP id 4ZTfT200dhz6vJq; Fri, 4 Apr 2025 13:24:05 +0000 (UTC) Received: from [198.167.222.108] (mx2.investici.org [198.167.222.108]) (Authenticated sender: cayetano.santos@inventati.org) by localhost (Postfix) with ESMTPSA id 4ZTfT15Y1jz6vJN; Fri, 4 Apr 2025 13:24:05 +0000 (UTC) Date: Fri, 4 Apr 2025 15:21:35 +0200 Message-ID: <50eeffad29082215e9b0190212744f3a86f87be3.1743772895.git.csantosb@inventati.org> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2c0f:f930:0:4::108; envelope-from=csantosb@inventati.org; helo=devianza.investici.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_DNSWL_LOW=-0.7, 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: Cayetano Santos X-ACL-Warn: , Cayetano Santos via Guix-patches X-Patchwork-Original-From: Cayetano Santos via Guix-patches via From: Cayetano Santos Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-emacsql): Update to 4.3.0. Change-Id: Ib1cce5b0ca4709f774819a2602c2e6b96604e8ba --- - updated - fix license - fix tests - fix executable-paths - fix inputs Checked by building all dependent packages. gnu/packages/emacs-xyz.scm | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) base-commit: f664a9377deed2c9e644b53a0b497153c7e7a41f -- 2.49.0 diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0c49bb5d4d..0796aa1970 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25450,7 +25450,7 @@ (define-public emacs-finalize (define-public emacs-emacsql (package (name "emacs-emacsql") - (version "4.2.0") + (version "4.3.0") (source (origin (method git-fetch) @@ -25459,34 +25459,31 @@ (define-public emacs-emacsql (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "08zc3x6cgbn2x67xajz8rnika3bhd86yb6h77q8wg1dxyh1ib2m9")))) + (base32 "0bjw4qbm254r51kgl0bg4scblk998p0y3m140k5lmrdb7k4pnxq2")))) (build-system emacs-build-system) (arguments (list - #:tests? #true - #:test-command #~(list "emacs" "-Q" "--batch" - "-L" "tests" - "-L" "." - "-l" "tests/emacsql-compiler-tests.el" - "-l" "tests/emacsql-external-tests.el" - "-f" "ert-run-tests-batch-and-exit") + #:tests? #t + #:test-command #~(list "make" "test") #:phases #~(modify-phases %standard-phases - (add-before 'install 'patch-elisp-shell-shebangs - (lambda _ - (substitute* (find-files "." "\\.el") - (("/bin/sh") (which "sh")))))))) - (inputs - (list emacs-minimal `(,mariadb "dev") `(,mariadb "lib") postgresql)) - (propagated-inputs - (list emacs-finalize emacs-pg emacs-sqlite3-api)) + (add-after 'unpack 'fix-executable-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((mdb (assoc-ref inputs "mariadb")) + (psql (assoc-ref inputs "postgresql"))) + (emacs-substitute-variables "emacsql-psql.el" + ("emacsql-psql-executable" (string-append psql "/bin/psql"))) + (emacs-substitute-variables "emacsql-mysql.el" + ("emacsql-mysql-executable" (string-append mdb "/bin/mysql"))))))))) + (inputs (list mariadb postgresql)) + (native-inputs (list emacs-sqlite3-api)) (home-page "https://github.com/magit/emacsql") (synopsis "Emacs high-level SQL database front-end") (description "Any readable Lisp value can be stored as a value in EmacSQL, including numbers, strings, symbols, lists, vectors, and closures. EmacSQL has no concept of @code{TEXT} values; it's all just Lisp objects. The Lisp object @code{nil} corresponds 1:1 with @code{NULL} in the database.") - (license license:gpl3+))) + (license license:unlicense))) (define-public emacs-closql (package