From patchwork Mon Aug 19 20:50:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thanos Apollo X-Patchwork-Id: 30206 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 A93E527BBE2; Mon, 19 Aug 2024 21:51:34 +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_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 1C59D27BBE9 for ; Mon, 19 Aug 2024 21:51:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sg9LW-0008FX-Pu; Mon, 19 Aug 2024 16:51:22 -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 1sg9LU-0008FG-RE for guix-patches@gnu.org; Mon, 19 Aug 2024 16:51:21 -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 1sg9LU-0002G4-IK for guix-patches@gnu.org; Mon, 19 Aug 2024 16:51:20 -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=BxwV7WU0gyePRQIBU0ZQxMkBMg2fXbJh/S7XyzGxJsY=; b=F9fbkMC7NTDy1aCCcSUrcBfg5uneOD4dUCu5A1x4Q2br4rZwjLxu/zKsGfrhsDAgT01Ky6NJyCDc+3ukVhkauDXWLXttdkSBVZRcFyaeJndl4m3ONxX8DbSDNw5rBPyO/WM7ti88n1xPlnKjBmVJthnk1OUN3sZOoEZKNkxodZ+9QEChBObqsqqH7c6XFjQ4fI3H7rpZH39Kp7voYtEpiXprAljwVJRXVWINbC3w0XAvA1XtIyPePnZeySH8Jgc+h3ZhMDvT5tAReT95gkHyEerxXAuygWFV/oNO1XMSCfPRo+uRBNucGZMjbB44RD5HPnJfZ/OQbOS6NpcGOhohmw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sg9MA-00005x-F9; Mon, 19 Aug 2024 16:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72718] [PATCH 1/3] gnu: emacsql: Update to 4.0.1. Resent-From: Thanos Apollo Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 19 Aug 2024 20:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72718 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72718@debbugs.gnu.org Cc: Thanos Apollo , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by submit@debbugs.gnu.org id=B.1724100721356 (code B ref -1); Mon, 19 Aug 2024 20:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Aug 2024 20:52:01 +0000 Received: from localhost ([127.0.0.1]:59317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sg9M8-00005g-NI for submit@debbugs.gnu.org; Mon, 19 Aug 2024 16:52:01 -0400 Received: from lists.gnu.org ([209.51.188.17]:41388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sg9M6-00005W-PE for submit@debbugs.gnu.org; Mon, 19 Aug 2024 16:51:59 -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 1sg9LQ-0008Eh-3M for guix-patches@gnu.org; Mon, 19 Aug 2024 16:51:16 -0400 Received: from smtp.forwardemail.net ([164.92.70.200]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sg9LN-0002Cq-Te for guix-patches@gnu.org; Mon, 19 Aug 2024 16:51:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thanosapollo.org; h=Content-Transfer-Encoding: Content-Type: MIME-Version: Message-ID: Date: Subject: Cc: To: From; q=dns/txt; s=fe-4dbabb00f3; t=1724100667; bh=BxwV7WU0gyePRQIBU0ZQxMkBMg2fXbJh/S7XyzGxJsY=; b=Q958e0Ggx3EQNT6ud1xTtWBBWwY23hkTemxP7nBnim1fwIAfY7Dr3haCQHPOSeRpZw8IYdo6J 2a5Ob/BNKMkQlHp5WEvUqQH6wfiDT9TPN2MWg8uVkdYHjiXOt9NLSq59Y0pGahMl4XM6gRoUbE/ auPR4MU1N7vEVPIIKcKZ8hE= Date: Mon, 19 Aug 2024 23:50:48 +0300 Message-ID: <9ce244da4b575fa8b7f67178a889b05a1b446326.1724100637.git.public@thanosapollo.org> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Report-Abuse-To: abuse@forwardemail.net X-Report-Abuse: abuse@forwardemail.net X-Complaints-To: abuse@forwardemail.net X-ForwardEmail-Version: 0.4.40 X-ForwardEmail-Sender: rfc822; public@thanosapollo.org, smtp.forwardemail.net, 164.92.70.200 X-ForwardEmail-ID: 66c3b03760cc4481bc86cbdc Received-SPF: pass client-ip=164.92.70.200; envelope-from=SRS0=a137=PT=thanosapollo.org=public@fe-bounces.thanosapollo.org; helo=smtp.forwardemail.net 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: Thanos Apollo X-ACL-Warn: , Thanos Apollo via Guix-patches X-Patchwork-Original-From: Thanos Apollo via Guix-patches via From: Thanos Apollo 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.0.1. * Update to version 4.0.1, which deprecates much of the previous functionality outside of emacs-emacsqlite and focuses on utilizing the built-in SQLite capabilities of Emacss, thus the change of the recipe. Change-Id: Ibc0ee0a1d2a9b5bc4b07e5b5f31c073f2366744d --- gnu/packages/emacs-xyz.scm | 120 ++++++++++++++++++------------------- 1 file changed, 57 insertions(+), 63 deletions(-) base-commit: aeafd92ca5b23d243f5bc834c5804e720bd1a80b diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9f9d9934cd..54586b8f3a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23510,71 +23510,65 @@ (define-public emacs-finalize (license license:unlicense))) (define-public emacs-emacsql - (let ((commit "efddd69c5e69214dbbe921fbf90f938501414894") - (revision "2")) - (package - (name "emacs-emacsql") - (version (git-version "3.1.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/emacsql") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1abwc7kzlmk6z68glnya6kxffrrqrhgpwrpzqpjc1l179gg1i1rg")))) - (build-system emacs-build-system) - (arguments - (list - #:tests? #true - #:test-command #~(list "emacs" "-Q" "--batch" - "-L" "tests" - "-L" "." - "-l" "tests/emacsql-tests.el" - "-f" "ert-run-tests-batch-and-exit") - #:modules '((guix build emacs-build-system) - (guix build utils) - (guix build emacs-utils) - (srfi srfi-26)) - #:phases - #~(modify-phases %standard-phases - (add-before 'install 'patch-elisp-shell-shebangs - (lambda _ - (substitute* (find-files "." "\\.el") - (("/bin/sh") (which "sh"))))) - (add-after 'patch-elisp-shell-shebangs 'setenv-shell - (lambda _ - (setenv "SHELL" "sh"))) - (add-after 'setenv-shell 'build-emacsql-sqlite - (lambda _ - (invoke "make" "binary" (string-append "CC=" #$(cc-for-target))))) - (add-after 'build-emacsql-sqlite 'install-emacsql-sqlite - ;; This build phase installs emacs-emacsql binary. - (lambda _ - (install-file "sqlite/emacsql-sqlite" - (string-append #$output "/bin")))) - (add-after 'install-emacsql-sqlite 'patch-emacsql-sqlite.el - ;; This build phase removes interactive prompts - ;; and makes sure Emacs look for binaries in the right places. - (lambda _ - (emacs-substitute-variables "emacsql-sqlite.el" - ("emacsql-sqlite-executable" - (string-append #$output "/bin/emacsql-sqlite")) - ;; Make sure Emacs looks for ‘GCC’ binary in the right place. - ("emacsql-sqlite-c-compilers" - `(list ,(which "gcc"))))))))) - (inputs - (list emacs-minimal `(,mariadb "dev") `(,mariadb "lib") postgresql)) - (propagated-inputs - (list emacs-finalize emacs-pg 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 + (package + (name "emacs-emacsql") + (version "4.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/emacsql") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf")))) + (build-system emacs-build-system) + (arguments + (list + #:tests? #true + #:test-command #~(list "emacs" "-Q" "--batch" + "-L" "tests" + "-L" "." + "-l" "tests/emacsql-tests.el" + "-f" "ert-run-tests-batch-and-exit") + #:modules '((guix build emacs-build-system) + (guix build utils) + (guix build emacs-utils) + (srfi srfi-26)) + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'patch-elisp-shell-shebangs + (lambda _ + (substitute* (find-files "." "\\.el") + (("/bin/sh") (which "sh"))))) + (add-after 'patch-elisp-shell-shebangs 'setenv-shell + (lambda _ + (setenv "SHELL" "sh"))) + (add-after 'build-emacsql-sqlite 'install-emacsql-sqlite + ;; This build phase installs emacs-emacsql binary. + (lambda _ + (install-file "sqlite/emacsql-sqlite" + (string-append #$output "/bin")))) + (add-after 'install-emacsql-sqlite 'patch-emacsql-sqlite.el + ;; This build phase removes interactive prompts + ;; and makes sure Emacs look for binaries in the right places. + (lambda _ + (emacs-substitute-variables "emacsql-sqlite.el" + ("emacsql-sqlite-executable" + (string-append #$output "/bin/emacsql-sqlite")) + ;; Make sure Emacs looks for ‘GCC’ binary in the right place. + ("emacsql-sqlite-c-compilers" + `(list ,(which "gcc"))))))))) + (inputs + (list emacs-minimal `(,mariadb "dev") `(,mariadb "lib") postgresql)) + (propagated-inputs + (list emacs-finalize emacs-pg emacs-sqlite3-api)) + (home-page "https://github.com/magit/emacsql") + (synopsis "Emacs high-level SQL database front-end") + (description "EmacSQL is a high-level Emacs Lisp front-end for SQLite. PostgreSQL and MySQL are also supported, but use of these connectors is not recommended. 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:gpl3+))) (define-public emacs-closql (package