[PATCH] Fixed missing files in org-roam 2.1.0

OpenSubmitted by Adolfo De Unánue.
Details
2 participants
  • Adolfo De Unánue
  • zimoun
Owner
unassigned
Severity
normal
A
A
Adolfo De Unánue wrote on 2 Sep 08:28 +0200
(address . guix-patches@gnu.org)
877dfzebfd.fsf@unanue.mx
From d601aa318aa03255d23b82cd94a5080889636a47 Mon Sep 17 00:00:00 2001From: =?UTF-8?q?Adolfo=20De=20Un=C3=A1nue?= <adolfo+git@unanue.mx>Date: Thu, 2 Sep 2021 00:53:32 -0500Subject: [PATCH] fixed missing files in org-roam
--- gnu/packages/emacs-xyz.scm | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-)
Toggle diff (67 lines)diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scmindex c106e81fa5..e712892e34 100644--- a/gnu/packages/emacs-xyz.scm+++ b/gnu/packages/emacs-xyz.scm@@ -102,6 +102,7 @@ ;;; Copyright © 2021 Dhruvin Gandhi <contact@dhruvin.dev> ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org> ;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org>+;;; Copyright © 2021 Nanounanue <adolfo@unanue.mx> ;;; ;;; This file is part of GNU Guix. ;;;@@ -28239,6 +28240,15 @@ snippets for Emacs.") (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")))@@ -28246,23 +28256,23 @@ snippets for Emacs.") (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+ (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
A
A
Adolfo De Unánue wrote on 3 Sep 05:30 +0200
(address . 50333@debbugs.gnu.org)
87y28ecoxu.fsf@unanue.mx
Added missed revision
From d680238cdf0893f09de7b20b0aa264e163bb12b8 Mon Sep 17 00:00:00 2001From: =?UTF-8?q?Adolfo=20De=20Un=C3=A1nue?= <adolfo+git@unanue.mx>Date: Thu, 2 Sep 2021 22:23:58 -0500Subject: [PATCH] Fixed missing files in org-roam v2.1.0
--- gnu/packages/emacs-xyz.scm | 92 +++++++++++++++++++++----------------- 1 file changed, 51 insertions(+), 41 deletions(-)
Toggle diff (116 lines)diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scmindex 030809f5ac..64f7e011d9 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 Nanounanue <adolfo@unanue.mx> ;;; ;;; This file is part of GNU Guix. ;;;@@ -28219,51 +28220,60 @@ 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 (string-append "v" "2.1.0"))+ (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
A
A
Adolfo De Unánue wrote on 3 Sep 05:57 +0200
(address . 50333@debbugs.gnu.org)
87v93icnst.fsf@unanue.mx
Wrong patch! (I am so sorry for this, my first time with this workflow)
From a99fa75c0f5d3025827d99c3ef6a2c71c85e0be5 Mon Sep 17 00:00:00 2001From: =?UTF-8?q?Adolfo=20De=20Un=C3=A1nue?= <adolfo+git@unanue.mx>Date: Thu, 2 Sep 2021 22:23:58 -0500Subject: [PATCH] Fixed missing files in org-roam v2.1.0
--- gnu/packages/emacs-xyz.scm | 94 +++++++++++++++++++++----------------- 1 file changed, 53 insertions(+), 41 deletions(-)
Toggle diff (118 lines)diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scmindex 030809f5ac..431444c255 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 Nanounanue <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
Z
Z
zimoun wrote on 14 Sep 14:26 +0200
(name . Adolfo De Unánue)(address . adolfo@unanue.mx)(address . 50333@debbugs.gnu.org)
86ilz3tkai.fsf@gmail.com
Hi,
You are asking in http://issues.guix.gnu.org/issue/50374 about thisone. Well, I am not an expert and I am not an Emacs Roam user.
On Thu, 02 Sep 2021 at 22:57, Adolfo De Unánue <adolfo@unanue.mx> wrote:
Toggle quote (5 lines)>>From a99fa75c0f5d3025827d99c3ef6a2c71c85e0be5 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] Fixed missing files in org-roam v2.1.0
The commit message should be:
Toggle snippet (6 lines)gnu: emacs-org-roam: Adding extensions.
* guix/emacs-xyz.scm (emacs-org-roam)[arguments]: Add phases to installextensions.
Or something along these lines.
Toggle quote (14 lines)> ---> 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..431444c255 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 Nanounanue <adolfo@unanue.mx>
Since you submit with this name “Adolfo De Unánue“, the Copyright shouldbe the same instead of a nick name. From my point of view, nickname ascopyright holder should be avoided; if possible, obviously. :-)
Toggle quote (2 lines)> + (let ((commit "f819720c510185af713522c592833ec9f2934251")
Usually, the package uses tagged version instead of random commit. Whenit is not possible because upstream do not tag, it seems good to providean explanation why the lasted tagged version cannot be used;explanations as a comment or in the cover letter.
Another reason is because for instance it changes all the indentationand makes ‘git log/blame’ harder to investigate.
Toggle quote (10 lines)> + (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))
Patch#50333 will install the extensions with “guix installemacs-org-roam”. Instead the attempt of patch#50374 is to install with“guix install emacs-org-roam-extensions”. Well, I do not know ifpatch#50374 is correct, though.
Because I am not an Org-Roam user, I do not have an opinion about thisextensions. Maybe it is better to distribute them along the packageemacs-org-roam or in a separate package, I do not know. WDYT?
All the best,simon
A
A
Adolfo De Unánue wrote on 15 Sep 00:10 +0200
(name . zimoun)(address . zimon.toutoune@gmail.com)(address . 50333@debbugs.gnu.org)
87o88ureh9.fsf@unanue.mx
Thank you for your comments and advices.


zimoun <zimon.toutoune@gmail.com> writes:
Toggle quote (31 lines)> Hi,>> You are asking in <http://issues.guix.gnu.org/issue/50374> about > this> one. Well, I am not an expert and I am not an Emacs Roam user.>> On Thu, 02 Sep 2021 at 22:57, Adolfo De Unánue > <adolfo@unanue.mx> wrote:>>>>From a99fa75c0f5d3025827d99c3ef6a2c71c85e0be5 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] Fixed missing files in org-roam v2.1.0>> The commit message should be:>> --8<---------------cut > here---------------start------------->8---> gnu: emacs-org-roam: Adding extensions.>> * guix/emacs-xyz.scm (emacs-org-roam)[arguments]: Add phases to > install> extensions.> --8<---------------cut > here---------------end--------------->8--->> Or something along these lines.>
Should I apply your suggested changes, commit them, use this commitmessage, create the patch and send them again?
Toggle quote (22 lines)>> --->> 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..431444c255 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 Nanounanue <adolfo@unanue.mx>>> Since you submit with this name “Adolfo De Unánue“, the > Copyright should> be the same instead of a nick name. From my point of view, > nickname as> copyright holder should be avoided; if possible, obviously. :-)
I will do, makes complete sense

Toggle quote (11 lines)>>> + (let ((commit "f819720c510185af713522c592833ec9f2934251")>> Usually, the package uses tagged version instead of random > commit. When> it is not possible because upstream do not tag, it seems good to > provide> an explanation why the lasted tagged version cannot be used;> explanations as a comment or in the cover letter.>
As you guessed, org-roam has not tagged this new (breaking) change,that's why I am using the commit


Toggle quote (28 lines)> Another reason is because for instance it changes all the > indentation> and makes ‘git log/blame’ harder to investigate.>>> + (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))>> Patch#50333 will install the extensions with “guix install> emacs-org-roam”. Instead the attempt of patch#50374 is to > install with> “guix install emacs-org-roam-extensions”. Well, I do not know > if> patch#50374 is correct, though.>> Because I am not an Org-Roam user, I do not have an opinion > about this> extensions. Maybe it is better to distribute them along the > package> emacs-org-roam or in a separate package, I do not know. WDYT?>
I mean, structurally the upstream owner just moved some files to a newfolder, my guess is that it shouldn't be a different packages since itis still part of org-roam.

Toggle quote (4 lines)> All the best,> simon

Again thank you, it was super helpful!
--- A
Z
Z
zimoun wrote on 15 Sep 07:03 +0200
(name . Adolfo De Unánue)(address . adolfo@unanue.mx)(address . 50333@debbugs.gnu.org)
8635q6e8gg.fsf@gmail.com
Hi,
On Tue, 14 Sep 2021 at 17:10, Adolfo De Unánue <adolfo@unanue.mx> wrote:
Toggle quote (20 lines)> zimoun <zimon.toutoune@gmail.com> writes:
>>> Subject: [PATCH] Fixed missing files in org-roam v2.1.0>>>> The commit message should be:>>>> --8<---------------cut here---------------start------------->8--->> gnu: emacs-org-roam: Adding extensions.>>>> * guix/emacs-xyz.scm (emacs-org-roam)[arguments]: Add phases to >> install>> extensions.>> --8<---------------cut here---------------end--------------->8--->>>> Or something along these lines.>> Should I apply your suggested changes, commit them, use this > commit> message, create the patch and send them again?
Yeah, you can address and send then an updated patch. Doing so, pleaseincrement the re-roll count which eases to know that patch is the last.
For instance, the ones you sent looks like:
Toggle snippet (5 lines)[ Adolfo De Unánue ] [bug#50333] [PATCH] Fixed missing files in org-roam 2.1.0 [ Adolfo De Unánue ] [ Adolfo De Unánue ]
and the reviewer has to open all 3 to know what happens. Compare withfor instance:
Toggle snippet (12 lines)[ Marius Bakke ] [bug#50377] [PATCH 0/2] Support 'git describe' … [ Marius Bakke ] [bug#50377] [PATCH 1/2] git: 'resolve-refer … [ Marius Bakke ] [bug#50377] [PATCH 2/2] transformations … [ Marius Bakke ] [bug#50377] [PATCH v2 1/2] git: 'resolv … [ Marius Bakke ] [bug#50377] [PATCH v3 0/2] Support 'git des … [ Marius Bakke ] [bug#50377] [PATCH v3 1/2] git: 'resolv … [ Ludovic Courtès ] [bug#50377] [PATCH 0/2] Support … [ Marius Bakke ] [bug#50377] [PATCH v3 2/2] transformati … [ Ludovic Courtès ] [bug#50377] [PATCH 0/2] Support … [ Xinglu Chen ] [bug#50377] [PATCH v3 0/2] Support 'git …
Well, I suggest you to use “git format-patch -v4”. :-)

Toggle quote (14 lines)>>> + (let ((commit "f819720c510185af713522c592833ec9f2934251")>>>> Usually, the package uses tagged version instead of random >> commit. When>> it is not possible because upstream do not tag, it seems good to >> provide>> an explanation why the lasted tagged version cannot be used;>> explanations as a comment or in the cover letter.>>>> As you guessed, org-roam has not tagged this new (breaking) > change,> that's why I am using the commit
Yeah, but is it released? Or simply the development version? If it isthe development version, usually it is on per user basis, i.e., you canuse a package transformation. Inclusion of releases is preferred.
Toggle quote (29 lines)>>> + (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))>>>> Patch#50333 will install the extensions with “guix install>> emacs-org-roam”. Instead the attempt of patch#50374 is to >> install with>> “guix install emacs-org-roam-extensions”. Well, I do not know >> if>> patch#50374 is correct, though.>>>> Because I am not an Org-Roam user, I do not have an opinion >> about this>> extensions. Maybe it is better to distribute them along the >> package>> emacs-org-roam or in a separate package, I do not know. WDYT?>> I mean, structurally the upstream owner just moved some files to a > new> folder, my guess is that it shouldn't be a different packages > since it> is still part of org-roam.
Note that some packages are only one upstream source but indeeddifferent packages. For instance, notmuch and emacs-notmuch (for themost recent :-)). Another example, IIRC, some time ago, Org-contrib wasa folder under Org but distributed by 2 packages. Well, it is sometimethe same package and simply that upstream reorganize stuff. :-)
BTW, why is it needed to explicitly copy the “extensions” files?Without this added phase, does it not work?
All the best,simon
A
A
Adolfo De Unánue wrote on 25 Sep 08:16 +0200
[PATCH v4] gnu: emacs-org-roam: Adding extensions.
(address . 50333@debbugs.gnu.org)
87lf3l9nul.fsf@unanue.mx
Following suggestions from zimoun <zimon.toutoune@gmail.com>, I cleanedmy git commit history, use my name instead of my nickname in thecopyright and fixed the subject so is easier to follow.
From dee5956e0dbe43327c6fdeee06bdb623e618f448 Mon Sep 17 00:00:00 2001From: =?UTF-8?q?Adolfo=20De=20Un=C3=A1nue?= <adolfo+git@unanue.mx>Date: Thu, 2 Sep 2021 22:23:58 -0500Subject: [PATCH v4] gnu: emacs-org-roam: Adding extensions.
* guix/emacs-xyz.scm (emacs-org-roam)[arguments]: Add phases to installextensions.--- gnu/packages/emacs-xyz.scm | 94 +++++++++++++++++++++----------------- 1 file changed, 53 insertions(+), 41 deletions(-)
Toggle diff (118 lines)diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scmindex 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
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send email to 50333@debbugs.gnu.org