GNU bug report logs - #72720
[PATCH 1/3] gnu: emacsql: Update to 4.0.1.

Previous Next

Package: guix-patches;

Reported by: Thanos Apollo <public <at> thanosapollo.org>

Date: Mon, 19 Aug 2024 21:21:02 UTC

Severity: normal

Tags: patch

Merged with 72718

Done: Cayetano Santos <csantosb <at> inventati.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 72720 in the body.
You can then email your comments to 72720 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to andrew <at> trop.in, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org:
bug#72720; Package guix-patches. (Mon, 19 Aug 2024 21:21:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Thanos Apollo <public <at> thanosapollo.org>:
New bug report received and forwarded. Copy sent to andrew <at> trop.in, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org. (Mon, 19 Aug 2024 21:21:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Thanos Apollo <public <at> thanosapollo.org>
To: guix-patches <at> gnu.org
Cc: Thanos Apollo <public <at> thanosapollo.org>
Subject: [PATCH 1/3] gnu: emacsql: Update to 4.0.1.
Date: Tue, 20 Aug 2024 00:19:53 +0300
* 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(-)

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

base-commit: aeafd92ca5b23d243f5bc834c5804e720bd1a80b
-- 
2.45.2





Information forwarded to guix-patches <at> gnu.org:
bug#72720; Package guix-patches. (Thu, 05 Sep 2024 17:38:01 GMT) Full text and rfc822 format available.

Message #8 received at 72720 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: 72720 <at> debbugs.gnu.org
Cc: Thanos Apollo <public <at> thanosapollo.org>
Subject: Re: [PATCH 1/3] gnu: emacsql: Update to 4.0.1.
Date: Thu, 05 Sep 2024 19:35:57 +0200
Hello,

> * 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.

It seems this patch is no longer applicable since the Emacs package is
already at 4.0.1. I couldn't spot any difference besides changes to its
description.

Do you think it's still worth modifying the description, or shall we
close this bug report along with 72718, which seems to be a duplicate?

Regards,
-- 
Nicolas Goaziou






Merged 72718 72720. Request was from Ludovic Courtès <ludo <at> gnu.org> to control <at> debbugs.gnu.org. (Thu, 12 Sep 2024 17:02:02 GMT) Full text and rfc822 format available.

Information forwarded to guix-patches <at> gnu.org:
bug#72720; Package guix-patches. (Tue, 25 Mar 2025 09:17:02 GMT) Full text and rfc822 format available.

Message #13 received at 72720 <at> debbugs.gnu.org (full text, mbox):

From: Cayetano Santos <csantosb <at> inventati.org>
To: 72720-done <at> debbugs.gnu.org
Cc: public <at> thanosapollo.org, 72720 <at> debbugs.gnu.org, mail <at> nicolasgoaziou.fr
Subject: Re: [bug#72720] [PATCH 1/3] gnu: emacsql: Update to 4.0.1.
Date: Tue, 25 Mar 2025 10:16:25 +0100
[Message part 1 (text/plain, inline)]
Closing, as not applicable any more, we have 4.2.0 in the repos.
[signature.asc (application/pgp-signature, inline)]

Reply sent to Cayetano Santos <csantosb <at> inventati.org>:
You have taken responsibility. (Tue, 25 Mar 2025 09:17:03 GMT) Full text and rfc822 format available.

Notification sent to Thanos Apollo <public <at> thanosapollo.org>:
bug acknowledged by developer. (Tue, 25 Mar 2025 09:17:03 GMT) Full text and rfc822 format available.

Reply sent to Cayetano Santos <csantosb <at> inventati.org>:
You have taken responsibility. (Tue, 25 Mar 2025 09:17:03 GMT) Full text and rfc822 format available.

Notification sent to Thanos Apollo <public <at> thanosapollo.org>:
bug acknowledged by developer. (Tue, 25 Mar 2025 09:17:03 GMT) Full text and rfc822 format available.

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Wed, 30 Apr 2025 11:24:07 GMT) Full text and rfc822 format available.

This bug report was last modified 48 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.