Subject: [PATCH] gnu: emacs-org-roam: Update to 1.2.1.
From: Pierre Langlois <[email-masked]>
To: [email-masked]
Date: Thu, 30 Jul 2020 00:50:18 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Hello Guix!

Here's an update for the emacs-org-roam package. I've had to include the
emacsql-sqlite3 package as a new dependency first (see
https://github.com/org-roam/org-roam/pull/701).

Thanks!
Pierre

From 15c2cf35e094c9ca89f2520e34865b1082616326 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <[email-masked]>
Date: Thu, 30 Jul 2020 00:20:43 +0100
Subject: [PATCH 1/2] gnu: Add emacs-emacsql-sqlite3.

* gnu/packages/emacs-xyz.scm (emacs-emacsql-sqlite3): New variable.
---
 gnu/packages/emacs-xyz.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f8080b6556..ebb25263b8 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13548,6 +13548,39 @@ 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+)))

+(define-public emacs-emacsql-sqlite3
+  (package
+    (name "emacs-emacsql-sqlite3")
+    (version "1.0.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/cireu/emacsql-sqlite3.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1yy9y27rckm776jnl2rh1fz3bh09690xwzq7102vlw7xkb9s7jhj"))))
+    (build-system emacs-build-system)
+    (inputs
+     `(("sqlite" ,sqlite)))
+    (propagated-inputs
+     `(("emacs-emacsql" ,emacs-emacsql)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'embed-path-to-sqlite3
+           (lambda _
+             (substitute* "emacsql-sqlite3.el"
+               (("\\(executable-find \"sqlite3\"\\)")
+                 (string-append "\"" (which "sqlite3") "\"")))
+             #t)))))
+    (home-page "https://github.com/cireu/emacsql-sqlite3")
+    (synopsis "EmacSQL backend for SQLite")
+    (description "This is yet another EmacSQL backend for SQLite which uses
+official @command{sqlite3} executable to access SQL database.")
+    (license license:gpl3+)))
+
 (define-public emacs-closql
   ;; Take a commit newer than 1.0.0 release because of Emacs upgrade to 26.3.
   (let ((commit "70b98dbae53611d10a461d9b4a6f71086910dcef"))
--
2.27.0

From 75ff6fb8691bb20274c14fe6c663ac3b249424cd Mon Sep 17 00:00:00 2001
From: Pierre Langlois <[email-masked]>
Date: Sun, 28 Jun 2020 14:17:34 +0200
Subject: [PATCH 2/2] gnu: emacs-org-roam: Update to 1.2.1.

* gnu/packages/emacs.scm (emacs-org-roam): Update to 1.2.1.
[source]: Update URL.
[propagated-inputs]: Replace emacs-emacsql with emacs-emacsql-sqlite3.
[home-page]: Update URL.
---
 gnu/packages/emacs-xyz.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ebb25263b8..20e4c760b9 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -23884,25 +23884,25 @@ snippets for Emacs.")
 (define-public emacs-org-roam
   (package
     (name "emacs-org-roam")
-    (version "1.0.0")
+    (version "1.2.1")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jethrokuan/org-roam")
+             (url "https://github.com/org-roam/org-roam.git")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "08pfa63k194dpk0y2gfa0nzn5lig81q0l9axkq5j4ibj6ifaap4a"))))
+        (base32 "10s7mcyshgj6yva4k1j086xm61k9zck3r586f1maar5b2z6hwvsa"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-company" ,emacs-company)
        ("emacs-dash" ,emacs-dash)
-       ("emacs-emacsql-sqlite" ,emacs-emacsql)
+       ("emacs-emacsql-sqlite3" ,emacs-emacsql-sqlite3)
        ("emacs-f" ,emacs-f)
        ("emacs-org-ref" ,emacs-org-ref)
        ("emacs-s" ,emacs-s)))
-    (home-page "https://github.com/jethrokuan/org-roam/")
+    (home-page "https://github.com/org-roam/org-roam/")
     (synopsis "Non-hierarchical note-taking with Org mode")
     (description "Emacs Org Roam is a solution for taking non-hierarchical
 notes with Org mode.  Notes are captured without hierarchy and are connected
--
2.27.0