[bug#40402] [PATCH] gnu: emacs-modus-themes: Update to 0.7.0.

[bug#40402] [PATCH] gnu: emacs-modus-themes: Update to 0.7.0.

[Dimos Dimakakos]

From: Dimakakos Dimos <me@bendersteed.tech>

* gnu/packages/emacs-xyz.scm (emacs-modus-themes): Update to 0.7.0.
---
 gnu/packages/emacs-xyz.scm | 63 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 61 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 782d8650dd..d1b34ccc03 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -20278,7 +20278,7 @@ Emacs that integrate with major modes like Org-mode.")
 (define-public emacs-modus-themes
   (package
     (name "emacs-modus-themes")
-    (version "0.6.0")
+    (version "0.7.0")
     (source
      (origin
        (method git-fetch)
@@ -20287,7 +20287,7 @@ Emacs that integrate with major modes like Org-mode.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "15z6qq0b0npp7hscmh04i3mi10bynzdy52fv2b160nji264zvcwa"))))
+        (base32 "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0"))))
     (build-system emacs-build-system)
     (home-page "https://gitlab.com/protesilaos/modus-themes")
     (synopsis "Emacs themes designed for colour-contrast accessibility")
@@ -21760,3 +21760,62 @@ enables modal editing and composition of commands, too.  It combines ideas of
 other Editors like Vim or Kakoune and tries to align them with regular Emacs
 conventions.")
     (license license:gpl3+)))
+
+(define-public emacs-emacsql-sqlite
+  (package
+    (name "emacs-emacsql-sqlite")
+    (version "20190727.1710")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "https://melpa.org/packages/emacsql-sqlite-"
+               version
+               ".tar"))
+        (sha256
+          (base32
+            "1lx06hlbj9yfflv7nw6ngsm3vhchyzqbm1wlzfxrwx9zi54xm7h4"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+      `(("emacs-emacsql" ,emacs-emacsql)))
+    (home-page "https://github.com/skeeto/emacsql")
+    (synopsis "EmacSQL back-end for SQLite")
+    (description
+      "During package installation EmacSQL will attempt to compile a
+custom native binary for communicating with a SQLite database.
+")
+    (license #f)))
+
+(define-public emacs-org-roam
+  (package
+    (name "emacs-org-roam")
+    (version "20200329.1330")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "https://melpa.org/packages/org-roam-"
+               version
+               ".tar"))
+        (sha256
+          (base32
+            "166sxsv259iclvzr4p9ip4lprmrsydwjcr4rvg3xz144pld4qwf3"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+      `(("emacs-dash" ,emacs-dash)
+        ("emacs-f" ,emacs-f)
+        ("emacs-s" ,emacs-s)
+        ("emacs-org" ,emacs-org)
+        ("emacs-emacsql" ,emacs-emacsql)
+        ("emacs-emacsql-sqlite" ,emacs-emacsql-sqlite)))
+    (home-page
+      "https://github.com/jethrokuan/org-roam")
+    (synopsis "Roam Research replica with Org-mode")
+    (description
+      "This library is an attempt at injecting Roam functionality into Org-mode.
+This is achieved primarily through building caches for forward links,
+backward links, and file titles.
+")
+    (license #f)))
+
+
-- 
2.26.0

[bug#40402] [PATCH] gnu: emacs-modus-themes: Update to 0.7.0.

[Dimos Dimakakos]

From: Dimakakos Dimos <me@bendersteed.tech>

* gnu/packages/emacs-xyz.scm (emacs-modus-themes): Update to 0.7.0.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 782d8650dd..90d0ecbd83 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -20278,7 +20278,7 @@ Emacs that integrate with major modes like Org-mode.")
 (define-public emacs-modus-themes
   (package
     (name "emacs-modus-themes")
-    (version "0.6.0")
+    (version "0.7.0")
     (source
      (origin
        (method git-fetch)
@@ -20287,7 +20287,7 @@ Emacs that integrate with major modes like Org-mode.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "15z6qq0b0npp7hscmh04i3mi10bynzdy52fv2b160nji264zvcwa"))))
+        (base32 "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0"))))
     (build-system emacs-build-system)
     (home-page "https://gitlab.com/protesilaos/modus-themes")
     (synopsis "Emacs themes designed for colour-contrast accessibility")
-- 
2.26.0

[bug#40402] [PATCH] gnu: emacs-modus-themes: Update to 0.7.0.

[Nicolas Goaziou]

Hello,

Dimos Dimakakos <me@bendersteed.tech> writes:

> * gnu/packages/emacs-xyz.scm (emacs-modus-themes): Update to 0.7.0.

Thank you.

I was also considering updating this package. However, the themes are
also available on GNU ELPA, as two separate packages:

    https://elpa.gnu.org/packages/modus-operandi-theme.html
    https://elpa.gnu.org/packages/modus-vivendi-theme.html

So I was wondering if we should switch instead to GNU ELPA releases, for
easier updates (there is an updater for GNU ELPA packages). If we do,
I wonder if we should deprecate the current package, and make it point
to either of the themes.

What do Guix folks think?

Regards,

-- 
Nicolas Goaziou

[bug#40402] [PATCH] gnu: emacs-modus-themes: Update to 0.7.0.

[Dimos Dimakakos]

Nicolas Goaziou writes:

> So I was wondering if we should switch instead to GNU ELPA releases, for
> easier updates (there is an updater for GNU ELPA packages). If we do,
> I wonder if we should deprecate the current package, and make it point
> to either of the themes.

Sounds fine to me. Would you like me to update my patch?  I would add
emacs-modus-operandi-theme and emacs-modus-vivendi-theme from elpa, and
then emacs-modus-themes could propagate these two.

I could send the patch later today if we're ok with this.

Thanks!

[bug#40402] [PATCH] gnu: emacs-modus-themes: Update to 0.7.0.

[Nicolas Goaziou]

> Sounds fine to me. Would you like me to update my patch?  I would add
> emacs-modus-operandi-theme and emacs-modus-vivendi-theme from elpa,
> and

Sure!

> then emacs-modus-themes could propagate these two.

I'm not sure about that one. Is there any reason to keep this one around
if Guix provides the two themes separately? Deprecating the initial
package altogether may sound better. The package would still be
available but would point to either theme.

WDYT?

[bug#40402] [PATCH] gnu: emacs-modus-themes: Update to 0.7.0.

[Dimos Dimakakos]

Nicolas Goaziou writes:

>> then emacs-modus-themes could propagate these two.
>
> I'm not sure about that one. Is there any reason to keep this one around
> if Guix provides the two themes separately? Deprecating the initial
> package altogether may sound better. The package would still be
> available but would point to either theme.
>
> WDYT?

Sure, that sounds reasonable! I will send a revised patch a bit later.
Thanks for your guidance.

[bug#40402] [PATCH 0/3] Deprecate emacs-modus-themes

[Dimakis Dimakakos]

From: Dimakakos Dimos <me@bendersteed.tech>

This is series of patches to add emacs-modus-vivendi-theme and
emacs-modus-operandi-theme as separate variables, grabbed from elpa,
and deprecate emacs-modus-theme so that it links to
emacs-modus-operandi-theme.

Hope this is acceptable!  Thanks.

Dimakakos Dimos (3):
  gnu: Add emacs-modus-vivendi-theme.
  gnu: Add emacs-modus-operandi-theme.
  gnu: Deprecate emacs-modus-themes.

 gnu/packages/emacs-xyz.scm | 73 ++++++++++++++++++++++++++------------
 1 file changed, 50 insertions(+), 23 deletions(-)

-- 
2.26.0

[bug#40402] [PATCH 1/3] gnu: Add emacs-modus-vivendi-theme.

[Dimakis Dimakakos]

From: Dimakakos Dimos <me@bendersteed.tech>

* gnu/packages/emacs-xyz.scm (emacs-modus-vivendi-theme): New variable.
---
 gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c0ece8b94e..c28ab8ef49 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -20690,6 +20690,31 @@ is cast on a light backdrop (Modus Operandi) and another where light text is
 displayed against a dark background (Modus Vivendi).")
     (license license:gpl3+)))
 
+(define-public emacs-modus-vivendi-theme
+  (package
+  (name "emacs-modus-vivendi-theme")
+  (version "0.7.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://elpa.gnu.org/packages/modus-vivendi-theme-"
+             version
+             ".el"))
+      (sha256
+        (base32
+          "1w4vrg39dghghkvll3h4kmzykc3zpp6pbychb39gcc13z2b06v8g"))))
+  (build-system emacs-build-system)
+  (home-page
+    "https://gitlab.com/protesilaos/modus-themes")
+  (synopsis "Accessible dark theme (WCAG AAA)")
+  (description
+   "Modus vivendi is the dark version of the modus accessible
+themes for GNU Emacs. The contrast ratio between foreground and background
+values should always be >= 7:1, which conforms with the WCAG AAA accessibility
+standard. This is the highest standard of its kind.")
+  (license license:gpl3+)))
+
 (define-public emacs-punpun-theme
   (let ((commit "2f78125609277b2478abdebd8f9d5ee10a823b65")
         (revision "0"))
-- 
2.26.0

[bug#40402] [PATCH 2/3] gnu: Add emacs-modus-operandi-theme.

[Dimakis Dimakakos]

From: Dimakakos Dimos <me@bendersteed.tech>

* gnu/packages/emacs-xyz.scm (emacs-modus-operandi-theme): New variable.
---
 gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c28ab8ef49..edccff3378 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -20690,6 +20690,31 @@ is cast on a light backdrop (Modus Operandi) and another where light text is
 displayed against a dark background (Modus Vivendi).")
     (license license:gpl3+)))
 
+(define-public emacs-modus-operandi-theme
+  (package
+  (name "emacs-modus-operandi-theme")
+  (version "0.7.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://elpa.gnu.org/packages/modus-operandi-theme-"
+             version
+             ".el"))
+      (sha256
+        (base32
+          "17zvcqplbl3rk39k61v43ganzv06j49rlyickanwll5m1a3iibw2"))))
+  (build-system emacs-build-system)
+  (home-page
+    "https://gitlab.com/protesilaos/modus-themes")
+  (synopsis "Accessible light theme (WCAG AAA)")
+  (description
+   "Modus operandi is the light version of the modus accessible
+themes for GNU Emacs. The contrast ratio between foreground and background
+values should always be >= 7:1, which conforms with the WCAG AAA accessibility
+standard. This is the highest standard of its kind.")
+  (license license:gpl3+)))
+
 (define-public emacs-modus-vivendi-theme
   (package
   (name "emacs-modus-vivendi-theme")
-- 
2.26.0

[bug#40402] [PATCH 3/3] gnu: Deprecate emacs-modus-themes.

[Dimakis Dimakakos]

From: Dimakakos Dimos <me@bendersteed.tech>

* gnu/package/emacs-xyz.scm (emacs-modus-themes): Deprecate it.
---
 gnu/packages/emacs-xyz.scm | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index edccff3378..141994e336 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -20664,32 +20664,6 @@ Emacs that integrate with major modes like Org-mode.")
       (home-page "https://github.com/hlissner/emacs-doom-themes")
       (license license:expat))))
 
-(define-public emacs-modus-themes
-  (package
-    (name "emacs-modus-themes")
-    (version "0.6.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://gitlab.com/protesilaos/modus-themes.git")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "15z6qq0b0npp7hscmh04i3mi10bynzdy52fv2b160nji264zvcwa"))))
-    (build-system emacs-build-system)
-    (home-page "https://gitlab.com/protesilaos/modus-themes")
-    (synopsis "Emacs themes designed for colour-contrast accessibility")
-    (description
-     "This is a set of accessible themes for GNU Emacs.  The contrast ratio
-between foreground and background values should always be >= 7:1, which
-conforms with the WCAG AAA accessibility standard.
-
-The Modus themes project consists of two standalone items, one where dark text
-is cast on a light backdrop (Modus Operandi) and another where light text is
-displayed against a dark background (Modus Vivendi).")
-    (license license:gpl3+)))
-
 (define-public emacs-modus-operandi-theme
   (package
   (name "emacs-modus-operandi-theme")
@@ -20740,6 +20714,9 @@ values should always be >= 7:1, which conforms with the WCAG AAA accessibility
 standard. This is the highest standard of its kind.")
   (license license:gpl3+)))
 
+(define-public emacs-modus-themes
+  (deprecated-package "emacs-modus-themes" emacs-modus-operandi-theme))
+
 (define-public emacs-punpun-theme
   (let ((commit "2f78125609277b2478abdebd8f9d5ee10a823b65")
         (revision "0"))
-- 
2.26.0

bug#40402: [PATCH 0/3] Deprecate emacs-modus-themes

[Nicolas Goaziou]

Hello,

Dimakis Dimakakos <me@bendersteed.tech> writes:

> This is series of patches to add emacs-modus-vivendi-theme and
> emacs-modus-operandi-theme as separate variables, grabbed from elpa,
> and deprecate emacs-modus-theme so that it links to
> emacs-modus-operandi-theme.
>
> Hope this is acceptable!  Thanks.

Great!

I fixed the indentation (you may want to use Emacs or
"etc/indent-code.el" script in repository) added two spaces between
sentences in the description, as required by Texinfo, and applied the
three patches, with the references:

   51d4587a6998af30598de153fd7ed5ca1baae6d0
   56ec01132e4dae2abf575195bf605f080c96fb21
   cdbbb94c69e954cc179949b6bb49fedd3d2c3468

Thank you!

Regards,

-- 
Nicolas Goaziou

[bug#40402] [PATCH 0/3] Deprecate emacs-modus-themes

[Dimos Dimakakos]

Nicolas Goaziou writes:


> I fixed the indentation (you may want to use Emacs or
> "etc/indent-code.el" script in repository) added two spaces between
> sentences in the description, as required by Texinfo, and applied the
> three patches, with the references:
>
>    51d4587a6998af30598de153fd7ed5ca1baae6d0
>    56ec01132e4dae2abf575195bf605f080c96fb21
>    cdbbb94c69e954cc179949b6bb49fedd3d2c3468

Well, I already use emacs, so I'll take a look at "etc/indent-code.el".
Thanks for the notice.  And I always forget those double spaces, I think
I'll start using them more every day to get used to them.

Anyways, thanks for accepting my patch!