In the case where a custom org-roam package is used, we need to ensure that
having feature-citar will not create a package collision.
---
 src/rde/features/emacs-xyz.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/rde/features/emacs-xyz.scm b/src/rde/features/emacs-xyz.scm
index c2a138ab..905fe389 100644
--- a/src/rde/features/emacs-xyz.scm
+++ b/src/rde/features/emacs-xyz.scm
@@ -4623,7 +4623,7 @@ marginalia annotations."
 
   (feature
    (name f-name)
-   (values `((,f-name . #t)
+   (values `((,f-name . ,emacs-org-roam)
              (org-roam-todo? . ,org-roam-todo?)))
    (home-services-getter get-home-services)))
 
@@ -4725,7 +4725,12 @@ citar-org-roam-subdir if org-roam is enabled."
       '(convenience org-mode org-cite citar references roam knowledgebase)
       #:elisp-packages
       (append
-       (if (get-value 'emacs-org-roam config) (list emacs-citar-org-roam) '())
+       (if (get-value 'emacs-org-roam config)
+           (list
+            (package/inherit emacs-citar-org-roam
+              (propagated-inputs (list (get-value 'emacs-org-roam config)
+                                       emacs-citar))))
+           '())
        (or (and=> emacs-all-the-icons list) '())
        (list emacs-citar)))))
 
-- 
2.41.0



-- 
Best regards,
Nicolas Graves

In the case where a custom org-roam package is used, we need to ensure that
having feature-citar will not create a package collision.
---
 src/rde/features/emacs-xyz.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/rde/features/emacs-xyz.scm b/src/rde/features/emacs-xyz.scm
index 1cd8a533..6cfae804 100644
--- a/src/rde/features/emacs-xyz.scm
+++ b/src/rde/features/emacs-xyz.scm
@@ -4660,7 +4660,9 @@ marginalia annotations."
                             '())
                         (or (and=> (get-value 'emacs-org-recur config)
                                    list)
-                            '())))))
+                            '()))
+      #:elisp-packages-rewrites
+      `(("emacs-org-roam" . ,(const emacs-org-roam-package))))))
 
   (feature
    (name f-name)
-- 
2.41.0

The V2 version serves as an example for elisp-package replacements. This
should be applied after
https://lists.sr.ht/~abcdw/rde-devel/patches/46298 and can also be
considered as an example case. 

-- 
Best regards,
Nicolas Graves

In the case where a custom org-roam package is used, we need to ensure that
having feature-citar will not create a package collision.
---
 src/rde/features/emacs-xyz.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/rde/features/emacs-xyz.scm b/src/rde/features/emacs-xyz.scm
index 53c53307..82353e10 100644
--- a/src/rde/features/emacs-xyz.scm
+++ b/src/rde/features/emacs-xyz.scm
@@ -4590,7 +4590,9 @@ marginalia annotations."
                             '())
                         (or (and=> (get-value 'emacs-org-recur config)
                                    list)
-                            '())))))
+                            '()))
+      #:elisp-packages-rewrites
+      `(("emacs-org-roam" . ,(const emacs-org-roam-package))))))
 
   (feature
    (name f-name)
-- 
2.41.0

On 2023-09-15 19:08, Nicolas Graves wrote:

> In the case where a custom org-roam package is used, we need to ensure that
> having feature-citar will not create a package collision.
> ---
>  src/rde/features/emacs-xyz.scm | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/src/rde/features/emacs-xyz.scm b/src/rde/features/emacs-xyz.scm
> index c2a138ab..905fe389 100644
> --- a/src/rde/features/emacs-xyz.scm
> +++ b/src/rde/features/emacs-xyz.scm
> @@ -4623,7 +4623,7 @@ marginalia annotations."
>  
>    (feature
>     (name f-name)
> -   (values `((,f-name . #t)
> +   (values `((,f-name . ,emacs-org-roam)
>               (org-roam-todo? . ,org-roam-todo?)))
>     (home-services-getter get-home-services)))
>  
> @@ -4725,7 +4725,12 @@ citar-org-roam-subdir if org-roam is enabled."
>        '(convenience org-mode org-cite citar references roam knowledgebase)
>        #:elisp-packages
>        (append
> -       (if (get-value 'emacs-org-roam config) (list emacs-citar-org-roam) '())
> +       (if (get-value 'emacs-org-roam config)
> +           (list
> +            (package/inherit emacs-citar-org-roam
> +              (propagated-inputs (list (get-value 'emacs-org-roam config)
> +                                       emacs-citar))))
> +           '())
>         (or (and=> emacs-all-the-icons list) '())
>         (list emacs-citar)))))
>  
> -- 
> 2.41.0

Sorry for not responding on this one for some time.  I'm a bit confused
by the patch naming and not sure what to do with them, can you resend
the uptodate patch series or close the patch series, please?

Marking as NEEDS_REVISION.

-- 
Best regards,
Andrew Tropin

On 2024-07-07 15:09, Andrew Tropin wrote:

> Sorry for not responding on this one for some time.  I'm a bit confused
> by the patch naming and not sure what to do with them, can you resend
> the uptodate patch series or close the patch series, please?
>
> Marking as NEEDS_REVISION.

No worries Andrew.

Actually I don't need this one anymore since the general package
propagation patches handles this case. Marking as SUPERSEDED.

-- 
Best regards,
Nicolas Graves