Package: guix-patches;
Reported by: Adolfo De Unánue <adolfo <at> unanue.mx>
Date: Thu, 2 Sep 2021 10:47:02 UTC
Severity: normal
Tags: patch
Done: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 50333 in the body.
You can then email your comments to 50333 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#50333; Package guix-patches.
(Thu, 02 Sep 2021 10:47:02 GMT) Full text and rfc822 format available.Adolfo De Unánue <adolfo <at> unanue.mx>:guix-patches <at> gnu.org.
(Thu, 02 Sep 2021 10:47:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Adolfo De Unánue <adolfo <at> unanue.mx> To: guix-patches <at> gnu.org Subject: [PATCH] Fixed missing files in org-roam 2.1.0 Date: Thu, 02 Sep 2021 01:28:35 -0500
[0001-fixed-missing-files-in-org-roam.patch (text/x-diff, inline)]
From d601aa318aa03255d23b82cd94a5080889636a47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adolfo=20De=20Un=C3=A1nue?= <adolfo+git <at> unanue.mx>
Date: Thu, 2 Sep 2021 00:53:32 -0500
Subject: [PATCH] fixed missing files in org-roam
---
gnu/packages/emacs-xyz.scm | 36 +++++++++++++++++++++++-------------
1 file changed, 23 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c106e81fa5..e712892e34 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -102,6 +102,7 @@
;;; Copyright © 2021 Dhruvin Gandhi <contact <at> dhruvin.dev>
;;; Copyright © 2021 Matthew James Kraai <kraai <at> ftbfs.org>
;;; Copyright © 2021 Noisytoot <noisytoot <at> disroot.org>
+;;; Copyright © 2021 Nanounanue <adolfo <at> 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
[Message part 2 (text/plain, inline)]
-- - A
guix-patches <at> gnu.org:bug#50333; Package guix-patches.
(Fri, 03 Sep 2021 04:06:01 GMT) Full text and rfc822 format available.Message #8 received at 50333 <at> debbugs.gnu.org (full text, mbox):
From: Adolfo De Unánue <adolfo <at> unanue.mx> To: 50333 <at> debbugs.gnu.org Subject: [PATCH] Fixed missing files in org-roam 2.1.0 Date: Thu, 02 Sep 2021 22:30:07 -0500
[Message part 1 (text/plain, inline)]
Added missed revision
[0001-Fixed-missing-files-in-org-roam-v2.1.0.patch (text/x-diff, inline)]
From d680238cdf0893f09de7b20b0aa264e163bb12b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adolfo=20De=20Un=C3=A1nue?= <adolfo+git <at> unanue.mx>
Date: Thu, 2 Sep 2021 22:23:58 -0500
Subject: [PATCH] Fixed missing files in org-roam v2.1.0
---
gnu/packages/emacs-xyz.scm | 92 +++++++++++++++++++++-----------------
1 file changed, 51 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 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 <at> ftbfs.org>
;;; Copyright © 2021 Noisytoot <noisytoot <at> disroot.org>
;;; Copyright © 2021 Simon South <simon <at> simonsouth.net>
+;;; Copyright © 2021 Nanounanue <adolfo <at> 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
[Message part 3 (text/plain, inline)]
-- - A
guix-patches <at> gnu.org:bug#50333; Package guix-patches.
(Fri, 03 Sep 2021 04:06:01 GMT) Full text and rfc822 format available.Message #11 received at 50333 <at> debbugs.gnu.org (full text, mbox):
From: Adolfo De Unánue <adolfo <at> unanue.mx> To: 50333 <at> debbugs.gnu.org Subject: [PATCH] Fixed missing files in org-roam 2.1.0 Date: Thu, 02 Sep 2021 22:57:19 -0500
[Message part 1 (text/plain, inline)]
Wrong patch! (I am so sorry for this, my first time with this workflow)
[0001-Fixed-missing-files-in-org-roam-v2.1.0.patch (text/x-diff, inline)]
From a99fa75c0f5d3025827d99c3ef6a2c71c85e0be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adolfo=20De=20Un=C3=A1nue?= <adolfo+git <at> unanue.mx>
Date: Thu, 2 Sep 2021 22:23:58 -0500
Subject: [PATCH] Fixed missing files in org-roam v2.1.0
---
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 <at> ftbfs.org>
;;; Copyright © 2021 Noisytoot <noisytoot <at> disroot.org>
;;; Copyright © 2021 Simon South <simon <at> simonsouth.net>
+;;; Copyright © 2021 Nanounanue <adolfo <at> 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
[Message part 3 (text/plain, inline)]
-- - A
guix-patches <at> gnu.org:bug#50333; Package guix-patches.
(Tue, 14 Sep 2021 14:50:01 GMT) Full text and rfc822 format available.Message #14 received at 50333 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: Adolfo De Unánue <adolfo <at> unanue.mx> Cc: 50333 <at> debbugs.gnu.org Subject: Re: [bug#50333] [PATCH] Fixed missing files in org-roam 2.1.0 Date: Tue, 14 Sep 2021 14:26:45 +0200
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 <at> unanue.mx> wrote: >>From a99fa75c0f5d3025827d99c3ef6a2c71c85e0be5 Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?Adolfo=20De=20Un=C3=A1nue?= <adolfo+git <at> 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. > --- > 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 <at> ftbfs.org> > ;;; Copyright © 2021 Noisytoot <noisytoot <at> disroot.org> > ;;; Copyright © 2021 Simon South <simon <at> simonsouth.net> > +;;; Copyright © 2021 Nanounanue <adolfo <at> 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. :-) > + (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. 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? All the best, simon
guix-patches <at> gnu.org:bug#50333; Package guix-patches.
(Tue, 14 Sep 2021 22:16:02 GMT) Full text and rfc822 format available.Message #17 received at 50333 <at> debbugs.gnu.org (full text, mbox):
From: Adolfo De Unánue <adolfo <at> unanue.mx> To: zimoun <zimon.toutoune <at> gmail.com> Cc: 50333 <at> debbugs.gnu.org Subject: Re: [bug#50333] [PATCH] Fixed missing files in org-roam 2.1.0 Date: Tue, 14 Sep 2021 17:10:49 -0500
Thank you for your comments and advices. zimoun <zimon.toutoune <at> gmail.com> writes: > 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 <at> unanue.mx> wrote: > >>>From a99fa75c0f5d3025827d99c3ef6a2c71c85e0be5 Mon Sep 17 >>>00:00:00 2001 >> From: =?UTF-8?q?Adolfo=20De=20Un=C3=A1nue?= >> <adolfo+git <at> 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 commit message, create the patch and send them again? >> --- >> 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 <at> ftbfs.org> >> ;;; Copyright © 2021 Noisytoot <noisytoot <at> disroot.org> >> ;;; Copyright © 2021 Simon South <simon <at> simonsouth.net> >> +;;; Copyright © 2021 Nanounanue <adolfo <at> 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 > >> + (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 > 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 new folder, my guess is that it shouldn't be a different packages since it is still part of org-roam. > All the best, > simon Again thank you, it was super helpful! -- - A
guix-patches <at> gnu.org:bug#50333; Package guix-patches.
(Wed, 15 Sep 2021 05:22:02 GMT) Full text and rfc822 format available.Message #20 received at 50333 <at> debbugs.gnu.org (full text, mbox):
From: zimoun <zimon.toutoune <at> gmail.com> To: Adolfo De Unánue <adolfo <at> unanue.mx> Cc: 50333 <at> debbugs.gnu.org Subject: Re: [bug#50333] [PATCH] Fixed missing files in org-roam 2.1.0 Date: Wed, 15 Sep 2021 07:03:43 +0200
Hi,
On Tue, 14 Sep 2021 at 17:10, Adolfo De Unánue <adolfo <at> unanue.mx> wrote:
> zimoun <zimon.toutoune <at> 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, please
increment the re-roll count which eases to know that patch is the last.
For instance, the ones you sent looks like:
--8<---------------cut here---------------start------------->8---
[ Adolfo De Unánue ] [bug#50333] [PATCH] Fixed missing files in org-roam 2.1.0
[ Adolfo De Unánue ]
[ Adolfo De Unánue ]
--8<---------------cut here---------------end--------------->8---
and the reviewer has to open all 3 to know what happens. Compare with
for instance:
--8<---------------cut here---------------start------------->8---
[ 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 …
--8<---------------cut here---------------end--------------->8---
Well, I suggest you to use “git format-patch -v4”. :-)
>>> + (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 is
the development version, usually it is on per user basis, i.e., you can
use a package transformation. Inclusion of releases is preferred.
>>> + (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 indeed
different packages. For instance, notmuch and emacs-notmuch (for the
most recent :-)). Another example, IIRC, some time ago, Org-contrib was
a folder under Org but distributed by 2 packages. Well, it is sometime
the 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
guix-patches <at> gnu.org:bug#50333; Package guix-patches.
(Sat, 25 Sep 2021 06:23:02 GMT) Full text and rfc822 format available.Message #23 received at 50333 <at> debbugs.gnu.org (full text, mbox):
From: Adolfo De Unánue <adolfo <at> unanue.mx> To: 50333 <at> debbugs.gnu.org Subject: [PATCH v4] gnu: emacs-org-roam: Adding extensions. Date: Sat, 25 Sep 2021 01:16:05 -0500
[Message part 1 (text/plain, inline)]
Following suggestions from zimoun <zimon.toutoune <at> 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.
[v4-0001-gnu-emacs-org-roam-Adding-extensions.patch (text/x-diff, inline)]
From dee5956e0dbe43327c6fdeee06bdb623e618f448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adolfo=20De=20Un=C3=A1nue?= <adolfo+git <at> 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 <at> ftbfs.org>
;;; Copyright © 2021 Noisytoot <noisytoot <at> disroot.org>
;;; Copyright © 2021 Simon South <simon <at> simonsouth.net>
+;;; Copyright © 2021 Adolfo De Unánue <adolfo <at> 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
[Message part 3 (text/plain, inline)]
-- - A
Nicolas Goaziou <mail <at> nicolasgoaziou.fr>:Adolfo De Unánue <adolfo <at> unanue.mx>:Message #28 received at 50333-done <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr> To: Adolfo De Unánue <adolfo <at> unanue.mx> Cc: 50333-done <at> debbugs.gnu.org Subject: Re: [bug#50333] [PATCH v4] gnu: emacs-org-roam: Adding extensions. Date: Mon, 17 Jan 2022 00:30:47 +0100
Hello, Adolfo De Unánue <adolfo <at> 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, -- Nicolas Goaziou
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Mon, 14 Feb 2022 12:24:05 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.