[bug#72718] [PATCH 1/3] gnu: emacsql: Update to 4.0.1.

[bug#72718] [PATCH 1/3] gnu: emacsql: Update to 4.0.1.

[Thanos Apollo via Guix-patches via]

* 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

[bug#72719] [PATCH 2/3] gnu: org-roam: Update to 2.2.2-1-0b9f.

[Thanos Apollo via Guix-patches via]

* gnu/packages/emacs-xyz.scm (emacs-org-roam): Update to 2.2.2-1-0b9f.

Change-Id: I23a28f576ee8e8a242f4afc6906ef051a943c8f1
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 54586b8f3a..8374ee5d7d 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -37675,8 +37675,8 @@ (define-public emacs-orca
       (license license:gpl3+))))
 
 (define-public emacs-org-roam
-  (let ((commit "74422df546a515bc984c2f3d3a681c09d6f43916")
-        (revision "0"))
+  (let ((commit "0b9fcbc97b65b349826e63bad89ca121a08fd2be")
+        (revision "1"))
     (package
       (name "emacs-org-roam")
       (version (git-version "2.2.2" revision commit))
@@ -37688,7 +37688,7 @@ (define-public emacs-org-roam
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0vhl69y6yk2zzfixjdwr8vxl2k921h0syshk5123r1nm9jp3i1s9"))))
+          (base32 "04vqwrsb71jdb66fkahmxwvx8cssgqamrradbdgp3ygf8alwc7ml"))))
       (build-system emacs-build-system)
       (arguments
        (list
-- 
2.45.2

bug#72719: [PATCH 2/3] gnu: org-roam: Update to 2.2.2-1-0b9f.

[Nicolas Goaziou via Guix-patches via]

Hello,

Thanos Apollo via Guix-patches via <guix-patches@gnu.org> writes:

> * gnu/packages/emacs-xyz.scm (emacs-org-roam): Update to 2.2.2-1-0b9f.

Applied. Thank you.

I discarded the other patches in the set because I had made the
corresponding updates a short while ago. Sorry for the duplicate work.

Regards,
-- 
Nicolas Goaziou

[bug#72719] [PATCH 2/3] gnu: org-roam: Update to 2.2.2-1-0b9f.

[Thanos Apollo via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:


[...]
> Applied. Thank you.
>
> I discarded the other patches in the set because I had made the
> corresponding updates a short while ago. Sorry for the duplicate work.
>

No worries, thank you!

Cheers,

-- 
Thanos Apollo
https://thanosapollo.org

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 865 bytes --]

[bug#72719] [PATCH 3/3] gnu: emacs-gnosis: Update to 0.4.1.

[Thanos Apollo via Guix-patches via]

* gnu/packages/emacs-xyz.scm (emacs-gnosis): Update to 0.4.1.

Change-Id: I075e9f4cb0aef565af044efa8b32b8b45cd254fe
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 8374ee5d7d..5de814b5f4 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -18226,11 +18226,11 @@ (define-public emacs-gn-mode
     (license license:bsd-3)))
 
 (define-public emacs-gnosis
-  (let ((commit "1c3eafb6efb05d52a8b01c463d1b47efc1fb2c8e")
+  (let ((commit "4fe415d70277046f6b81a00e8e012634e4f0ac05")
         (revision "0"))
     (package
       (name "emacs-gnosis")
-      (version (git-version "0.4.0" revision commit))
+      (version (git-version "0.4.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -18239,7 +18239,7 @@ (define-public emacs-gnosis
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "1nzgzf2109h20gigk11y5686pni4l4wx1bgdmprfz6vyjdhzmz7z"))))
+          (base32 "0c8gal7lfibaryb5w85zcmzpmvifdjp959v5bcjxjl37cdws0cnd"))))
       (build-system emacs-build-system)
       (propagated-inputs (list emacs-compat emacs-emacsql))
       (home-page "https://github.com/emacsorphanage/ac-ispell")
-- 
2.45.2

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

[Nicolas Goaziou via Guix-patches via]

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