* [bug#42608] [PATCH] gnu: emacs-org-roam: Update to 1.2.1.
@ 2020-07-29 23:50 Pierre Langlois
2020-08-02 13:15 ` Oleg Pykhalov
0 siblings, 1 reply; 5+ messages in thread
From: Pierre Langlois @ 2020-07-29 23:50 UTC (permalink / raw)
To: 42608
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-emacs-emacsql-sqlite3.patch --]
[-- Type: text/x-patch, Size: 2254 bytes --]
From 15c2cf35e094c9ca89f2520e34865b1082616326 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-emacs-org-roam-Update-to-1.2.1.patch --]
[-- Type: text/x-patch, Size: 2044 bytes --]
From 75ff6fb8691bb20274c14fe6c663ac3b249424cd Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#42608] [PATCH] gnu: emacs-org-roam: Update to 1.2.1.
2020-07-29 23:50 [bug#42608] [PATCH] gnu: emacs-org-roam: Update to 1.2.1 Pierre Langlois
@ 2020-08-02 13:15 ` Oleg Pykhalov
2020-08-02 13:43 ` Pierre Langlois
0 siblings, 1 reply; 5+ messages in thread
From: Oleg Pykhalov @ 2020-08-02 13:15 UTC (permalink / raw)
To: Pierre Langlois; +Cc: 42608
[-- Attachment #1: Type: text/plain, Size: 113 bytes --]
Hi,
Could you take a look on running the test-suite inside
emacsql-sqlite3-test.el file, please?
Thanks,
Oleg.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#42608] [PATCH] gnu: emacs-org-roam: Update to 1.2.1.
2020-08-02 13:15 ` Oleg Pykhalov
@ 2020-08-02 13:43 ` Pierre Langlois
2020-08-02 13:50 ` [bug#42608] fixup! Pierre Langlois
0 siblings, 1 reply; 5+ messages in thread
From: Pierre Langlois @ 2020-08-02 13:43 UTC (permalink / raw)
To: Oleg Pykhalov; +Cc: Pierre Langlois, 42608
[-- Attachment #1: Type: text/plain, Size: 453 bytes --]
Hi Oleg, thanks for taking a look!
Oleg Pykhalov writes:
> Hi,
>
> Could you take a look on running the test-suite inside
> emacsql-sqlite3-test.el file, please?
Oh yes good idea! I hadn't noticed there were tests.
See attached patch, I copied the test invocation from
https://github.com/cireu/emacsql-sqlite3/blob/master/.github/workflows/main.yml#L40.
I've also removed the ".git" from the origin url, to make 'guix lint'
happy.
Thanks!
Pierre
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-emacs-emacsql-sqlite3.patch --]
[-- Type: text/x-patch, Size: 2521 bytes --]
From e35c09f4741fe4a8e61b3c1e7da45434ede63a09 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
Date: Thu, 30 Jul 2020 00:20:43 +0100
Subject: [PATCH] gnu: Add emacs-emacsql-sqlite3.
* gnu/packages/emacs-xyz.scm (emacs-emacsql-sqlite3): New variable.
---
gnu/packages/emacs-xyz.scm | 39 ++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index a90d789d7a..fa9e259485 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13572,6 +13572,45 @@ 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")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1yy9y27rckm776jnl2rh1fz3bh09690xwzq7102vlw7xkb9s7jhj"))))
+ (build-system emacs-build-system)
+ (native-inputs
+ `(("ert-runner" ,emacs-ert-runner)))
+ (inputs
+ `(("sqlite" ,sqlite)))
+ (propagated-inputs
+ `(("emacs-emacsql" ,emacs-emacsql)))
+ (arguments
+ `(#:tests? #t
+ #:test-command '("emacs" "-Q" "--batch" "-L" "."
+ "--load" "emacsql-sqlite3-test.el"
+ "-f" "ert-run-tests-batch-and-exit")
+ #: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.28.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#42608] fixup!
2020-08-02 13:43 ` Pierre Langlois
@ 2020-08-02 13:50 ` Pierre Langlois
2020-08-02 15:04 ` bug#42608: fixup! Oleg Pykhalov
0 siblings, 1 reply; 5+ messages in thread
From: Pierre Langlois @ 2020-08-02 13:50 UTC (permalink / raw)
To: Oleg Pykhalov; +Cc: Pierre Langlois, 42608
[-- Attachment #1: Type: text/plain, Size: 644 bytes --]
Pierre Langlois writes:
> Hi Oleg, thanks for taking a look!
>
> Oleg Pykhalov writes:
>
>> Hi,
>>
>> Could you take a look on running the test-suite inside
>> emacsql-sqlite3-test.el file, please?
>
> Oh yes good idea! I hadn't noticed there were tests.
>
>
> See attached patch, I copied the test invocation from
> https://github.com/cireu/emacsql-sqlite3/blob/master/.github/workflows/main.yml#L40.
> I've also removed the ".git" from the origin url, to make 'guix lint'
> happy.
Whoops, I forgot to run the indent-code.el script, see new patch which
adds a couple of adjustments. I really need to setup emacs properly for
scheme... :-)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-emacs-emacsql-sqlite3.patch --]
[-- Type: text/x-patch, Size: 2518 bytes --]
From ccf27c4094fca5bed2ce29e5e129b8a4d86f2dec Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
Date: Thu, 30 Jul 2020 00:20:43 +0100
Subject: [PATCH] gnu: Add emacs-emacsql-sqlite3.
* gnu/packages/emacs-xyz.scm (emacs-emacsql-sqlite3): New variable.
---
gnu/packages/emacs-xyz.scm | 39 ++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index a90d789d7a..b8807528e0 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13572,6 +13572,45 @@ 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")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1yy9y27rckm776jnl2rh1fz3bh09690xwzq7102vlw7xkb9s7jhj"))))
+ (build-system emacs-build-system)
+ (native-inputs
+ `(("ert-runner" ,emacs-ert-runner)))
+ (inputs
+ `(("sqlite" ,sqlite)))
+ (propagated-inputs
+ `(("emacs-emacsql" ,emacs-emacsql)))
+ (arguments
+ `(#:tests? #t
+ #:test-command '("emacs" "-Q" "--batch" "-L" "."
+ "--load" "emacsql-sqlite3-test.el"
+ "-f" "ert-run-tests-batch-and-exit")
+ #: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.28.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#42608: fixup!
2020-08-02 13:50 ` [bug#42608] fixup! Pierre Langlois
@ 2020-08-02 15:04 ` Oleg Pykhalov
0 siblings, 0 replies; 5+ messages in thread
From: Oleg Pykhalov @ 2020-08-02 15:04 UTC (permalink / raw)
To: Pierre Langlois; +Cc: 42608-done
[-- Attachment #1: Type: text/plain, Size: 150 bytes --]
OK, also I deleted .git from https://github.com/org-roam/org-roam.git
because of guix lint reports a HTTP redirect.
Pushed to master.
Thanks,
Oleg.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-08-02 15:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-29 23:50 [bug#42608] [PATCH] gnu: emacs-org-roam: Update to 1.2.1 Pierre Langlois
2020-08-02 13:15 ` Oleg Pykhalov
2020-08-02 13:43 ` Pierre Langlois
2020-08-02 13:50 ` [bug#42608] fixup! Pierre Langlois
2020-08-02 15:04 ` bug#42608: fixup! Oleg Pykhalov
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).