diff mbox series

[bug#50333,v4] gnu: emacs-org-roam: Adding extensions.

Message ID 87lf3l9nul.fsf@unanue.mx
State Accepted
Headers show
Series [bug#50333,v4] gnu: emacs-org-roam: Adding extensions. | expand

Checks

Context Check Description
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Adolfo De Unánue Sept. 25, 2021, 6:16 a.m. UTC 
Following suggestions from zimoun <zimon.toutoune@gmail.com>, I 
cleaned
my git commit history, use my name instead of my nickname in the
copyright and fixed the subject so is easier to follow.
--
- A

Comments

Nicolas Goaziou Jan. 16, 2022, 11:30 p.m. UTC | #1 
Hello,

Adolfo De Unánue <adolfo@unanue.mx> writes:

> Subject: [PATCH v4] gnu: emacs-org-roam: Adding extensions.

Thank you for the patch.

However, extensions for Org Roam are installed since bug#50287.

Therefore, I'm closing this bug report. Feel free to re-open it if you
think something is missing.

Regards,
diff mbox series

Patch

From dee5956e0dbe43327c6fdeee06bdb623e618f448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adolfo=20De=20Un=C3=A1nue?= <adolfo+git@unanue.mx>
Date: Thu, 2 Sep 2021 22:23:58 -0500
Subject: [PATCH v4] gnu: emacs-org-roam: Adding extensions.

* guix/emacs-xyz.scm (emacs-org-roam)[arguments]: Add phases to install
extensions.
---
 gnu/packages/emacs-xyz.scm | 94 +++++++++++++++++++++-----------------
 1 file changed, 53 insertions(+), 41 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 030809f5ac..ba25c98591 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -103,6 +103,7 @@ 
 ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
 ;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org>
 ;;; Copyright © 2021 Simon South <simon@simonsouth.net>
+;;; Copyright © 2021 Adolfo De Unánue <adolfo@unanue.mx>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28219,51 +28220,62 @@  snippets for Emacs.")
       (license license:expat))))
 
 (define-public emacs-org-roam
-  (package
-    (name "emacs-org-roam")
-    (version "2.1.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/org-roam/org-roam")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "092xn0sqc7b7f6pdf7m6c3giqqbh6fq02mfz8qrg0wmx4ds1isqp"))))
-    (build-system emacs-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'install-image
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (install-file "doc/images/org-ref-citelink.png"
-                             (string-append out "/share/info/images")))))
-         (add-after 'install-image 'make-info
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (with-directory-excursion "doc"
-                 (invoke "makeinfo" "-o" "org-roam.info" "org-roam.texi")
-                 (install-file "org-roam.info"
-                               (string-append out "/share/info")))))))))
-       (native-inputs
-        `(("texinfo" ,texinfo)))
-       (propagated-inputs
-        `(("emacs-dash" ,emacs-dash)
-          ("emacs-emacsql-sqlite3" ,emacs-emacsql-sqlite3)
-          ("emacs-f" ,emacs-f)
-          ("emacs-magit" ,emacs-magit)
-          ("emacs-org" ,emacs-org)
-          ("emacs-s" ,emacs-s)))
-       (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
+  (let ((commit "f819720c510185af713522c592833ec9f2934251")
+        (revision "1"))
+    (package
+      (name "emacs-org-roam")
+      (version (git-version "2.1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/org-roam/org-roam")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "092xn0sqc7b7f6pdf7m6c3giqqbh6fq02mfz8qrg0wmx4ds1isqp"))))
+      (build-system emacs-build-system)
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-after 'install 'install-image
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((out (assoc-ref outputs "out")))
+                 (install-file "doc/images/org-ref-citelink.png"
+                               (string-append out "/share/info/images")))))
+           (add-after 'install 'install-extensions
+             (lambda* (#:key outputs #:allow-other-keys)
+               (copy-recursively
+                "extensions"
+                (string-append (assoc-ref outputs "out")
+                               (string-append
+                                "/share/emacs/site-lisp/org-roam-"
+                                ,version)))
+               #t))
+           (add-after 'install-image 'make-info
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((out (assoc-ref outputs "out")))
+                 (with-directory-excursion "doc"
+                   (invoke "makeinfo" "-o" "org-roam.info" "org-roam.texi")
+                   (install-file "org-roam.info"
+                                 (string-append out "/share/info")))))))))
+      (native-inputs
+       `(("texinfo" ,texinfo)))
+      (propagated-inputs
+       `(("emacs-dash" ,emacs-dash)
+         ("emacs-emacsql-sqlite3" ,emacs-emacsql-sqlite3)
+         ("emacs-f" ,emacs-f)
+         ("emacs-magit" ,emacs-magit)
+         ("emacs-org" ,emacs-org)
+         ("emacs-s" ,emacs-s)))
+      (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
 by tags.  Notes can be found and created quickly.  Org Roam should also work
 as a plug-and-play solution for anyone already using Org mode for their
 personal wiki.")
-       (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public emacs-org-roam-bibtex
   (package
-- 
2.33.0