[bug#41188] [PATCH] Do not propagate "emacs-org" in Emacs packages

[bug#41188] [PATCH] Do not propagate "emacs-org" in Emacs packages

[Nicolas Goaziou]

[-- Attachment #1: Type: text/plain, Size: 142 bytes --]

Hello,

The following patch removes dependency on upstream Org packages for
Emacs packages.

Feedback welcome.

Regards,

-- 
Nicolas Goaziou

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Do not propagate "emacs-org" --]
[-- Type: text/x-diff, Size: 9542 bytes --]

From d26522949e3964c17481e8c3398747ec95c4a5f2 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 11 May 2020 17:19:44 +0200
Subject: [PATCH] gnu: Do not propagate "emacs-org" in Emacs packages.

* gnu/packages/emacs-xyz.scm (emacs-unpackaged-el):
(emacs-es-mode):
(emacs-org-superstar):
(emacs-org-sidebar):
(emacs-org-tanglesync):
(emacs-elfeed-org):
(emacs-helm-org-rifle):
(emacs-org-edit-latex):
(emacs-org-recent-headings):
(emacs-org-super-agenda):
(emacs-org-make-toc):
(emacs-org-ql):
(emacs-org-auto-expand):
(emacs-org-re-reveal):
(emacs-org-caldav):
(emacs-org-download):
(emacs-org-noter):
(emacs-org-emms):
(emacs-org-jira)[propagated-inputs]: Remove "emacs-org".

Unless there is a specific reason to use latest stable release, packages can
rely on Org package bundled with Emacs.
---
 gnu/packages/emacs-xyz.scm | 44 ++++++++------------------------------
 1 file changed, 9 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c472958886..5de42b1c46 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -740,7 +740,6 @@ from within Emacs.")
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-dash" ,emacs-dash)
-         ("emacs-org" ,emacs-org)
          ("emacs-s" ,emacs-s)
          ("emacs-hydra" ,emacs-hydra)
          ("emacs-use-package" ,emacs-use-package)))
@@ -3034,10 +3033,7 @@ port of @code{cl-spark} to Emacs Lisp.")
         (base32 "1qhfnd5anp5qrmravv7ks5ix763xnki2f5jwcyj70qyxwr0l60cg"))))
     (build-system emacs-build-system)
     (propagated-inputs
-     ;; The version of org in Emacs 24.5 is not sufficient, and causes tables
-     ;; to be rendered incorrectly
      `(("emacs-dash" ,emacs-dash)
-       ("emacs-org" ,emacs-org)
        ("emacs-spark" ,emacs-spark)))
     (home-page "https://github.com/dakrone/es-mode")
     (synopsis "Major mode for editing Elasticsearch queries")
@@ -5145,8 +5141,6 @@ number.")
        (sha256
         (base32 "14w06v76xi4f6hpq6xzicrjjv0b802g5zc9as4mpimfy5gx2xpm0"))))
     (build-system emacs-build-system)
-    (propagated-inputs
-     `(("emacs-org" ,emacs-org)))
     (home-page "https://github.com/integral-dw/org-superstar-mode")
     (synopsis "Prettify headings and plain lists in Org mode")
     (description "This package prettifies headings and plain lists in
@@ -5243,7 +5237,6 @@ started with 20 minutes.  All values are customizable.")
     (propagated-inputs
      `(("emacs-dash" ,emacs-dash)
        ("emacs-org-super-agenda" ,emacs-org-super-agenda)
-       ("emacs-org" ,emacs-org)
        ("emacs-org-ql" ,emacs-org-ql)
        ("emacs-s" ,emacs-s)))
     (home-page "https://github.com/alphapapa/org-sidebar")
@@ -5301,8 +5294,6 @@ organizer.")
          (sha256
           (base32 "0x94gy1bgfd1f3p9w2bfrqj11bwy9ql0cpi1gw6srpj7kykx0lml"))))
       (build-system emacs-build-system)
-      (propagated-inputs
-       `(("emacs-org" ,emacs-org)))
       (home-page "https://github.com/mtekman/org-tanglesync.el")
       (synopsis "Sync Org source blocks with tangled external files")
       (description "This package automatically pulls changes from source code
@@ -7052,7 +7043,6 @@ and RSS, with a user interface inspired by notmuch.")
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-elfeed" ,emacs-elfeed)
-         ("emacs-org" ,emacs-org)
          ("emacs-dash" ,emacs-dash)
          ("emacs-s" ,emacs-s)))
       (native-inputs
@@ -9481,7 +9471,6 @@ above over the network.")
      `(("emacs-dash" ,emacs-dash)
        ("emacs-f" ,emacs-f)
        ("emacs-helm" ,emacs-helm)
-       ("emacs-org" ,emacs-org)
        ("emacs-s" ,emacs-s)))
     (home-page "https://github.com/alphapapa/helm-org-rifle")
     (synopsis "Rifle through Org files")
@@ -11181,10 +11170,7 @@ when browsing files with Dired.")
         (base32 "0zcllyhx9n9vcr5w87h0hfz25v52lvh5fi717cb7mf3jh89zh842"))))
     (build-system emacs-build-system)
     (propagated-inputs
-     `(("emacs-auctex" ,emacs-auctex)
-       ;; The version of org in Emacs 25.2 is not sufficient, because the
-       ;; `org-latex-make-preamble' function is required.
-       ("emacs-org" ,emacs-org)))
+     `(("emacs-auctex" ,emacs-auctex)))
     (home-page "https://github.com/et2010/org-edit-latex")
     (synopsis "Edit a latex fragment just like editing a src block")
     (description "@code{emacs-org-edit-latex} is an extension for org-mode.
@@ -13158,8 +13144,7 @@ a heuristic based on frequency and recency.")
                 "0gsrzmg3mssh9s28yjm9m866fnhm1pcligssz1q6brga6dm6f2yy"))))
     (build-system emacs-build-system)
     (propagated-inputs
-     `(("emacs-org" ,emacs-org)
-       ("emacs-dash" ,emacs-dash)
+     `(("emacs-dash" ,emacs-dash)
        ("emacs-frecency" ,emacs-frecency)))
     (home-page "https://github.com/alphapapa/org-recent-headings")
     (synopsis "Navigate to recently used Org headings and lists")
@@ -13185,8 +13170,7 @@ as well as functions for navigating between these headings.")
                   "08b7babdaqblb6jff57an4kbcxk6fkhf668620fipfjgbsnqv3ff"))))
       (build-system emacs-build-system)
       (propagated-inputs
-       `(("emacs-org" ,emacs-org)
-         ("emacs-dash" ,emacs-dash)
+       `(("emacs-dash" ,emacs-dash)
          ("emacs-ts" ,emacs-ts)
          ("emacs-ht" ,emacs-ht)
          ("emacs-s" ,emacs-s)))
@@ -13211,8 +13195,7 @@ into sections while preserving the structure imposed by any timestamps.")
                 "180ji6nnj6qj0rs1rdp1zlcrfsqf7ikb44ym8icbp5d6al2s4hnr"))))
     (build-system emacs-build-system)
     (propagated-inputs
-     `(("emacs-org" ,emacs-org)
-       ("emacs-dash" ,emacs-dash)
+     `(("emacs-dash" ,emacs-dash)
        ("emacs-s" ,emacs-s)))
     (home-page "https://github.com/alphapapa/org-make-toc")
     (synopsis "Maintain a table of contents for an Org file")
@@ -13324,7 +13307,6 @@ according to a parsing expression grammar.")
        ("emacs-peg" ,emacs-peg)
        ("emacs-org-super-agenda" ,emacs-org-super-agenda)
        ("emacs-ts" ,emacs-ts)
-       ("emacs-org" ,emacs-org)
        ("emacs-helm" ,emacs-helm)
        ("emacs-helm-org" ,emacs-helm-org)
        ("emacs-dash" ,emacs-dash)))
@@ -13364,8 +13346,7 @@ files, allowing for actions to be performed based on search criteria.")
                   "1my0c6xmkh37lwi6l472lz9d86lf20h6xcllzlxm1lxa24rhva6v"))))
       (build-system emacs-build-system)
       (propagated-inputs
-       `(("emacs-org" ,emacs-org)
-         ("emacs-dash" ,emacs-dash)))
+       `(("emacs-dash" ,emacs-dash)))
       (home-page "https://github.com/alphapapa/org-auto-expand")
       (synopsis "Automatically expand certain Org headings")
       (description "This package allows a customizable set of headings in Org
@@ -14579,8 +14560,7 @@ powerful Org contents.")
                 "1zbz6hbddxbb264ibmhc04cmnpk17kb50jpn5l8878q4hxw5wwy2"))))
     (build-system emacs-build-system)
     (propagated-inputs
-     `(("emacs-htmlize" ,emacs-htmlize)
-       ("emacs-org" ,emacs-org)))
+     `(("emacs-htmlize" ,emacs-htmlize)))
     (home-page "https://gitlab.com/oer/org-re-reveal")
     (synopsis "Build HTML presentations with reveal.js from Org source files")
     (description "This project started as fork of org-reveal.  It provides an
@@ -15968,8 +15948,6 @@ be changed by customizing the appropriate variables.")
       (arguments
        ;; Tests require to have two specific calendars on a test server.
        `(#:exclude '("^org-caldav-testsuite\\.el")))
-      (propagated-inputs
-       `(("emacs-org" ,emacs-org)))
       (home-page "https://github.com/dengste/org-caldav")
       (synopsis "Sync Org files with external calendars via the CalDAV protocol")
       (description "Synchronize between events in Org files and a CalDAV
@@ -19992,8 +19970,7 @@ and searching through @code{Ctags} files.")
                 (file-name (git-file-name name version))))
       (build-system emacs-build-system)
       (propagated-inputs
-       `(("emacs-org" ,emacs-org)
-         ("emacs-async" ,emacs-async)))
+       `(("emacs-async" ,emacs-async)))
       (home-page "https://github.com/abo-abo/org-download")
       (synopsis "Facilitate moving images")
       (description "This package provides utilities for managing image files
@@ -20628,7 +20605,6 @@ text-property translator.")
         (base32
          "1vwfpdi7hfkxx4vi0cwg7rvqby3i0mymzdkyzrqzv30dazmcjpag"))))
     (build-system emacs-build-system)
-    (propagated-inputs `(("emacs-org" ,emacs-org)))
     (home-page "https://github.com/weirdNox/org-noter")
     (synopsis "Synchronized, Org-mode, document annotator")
     (description
@@ -21009,8 +20985,7 @@ helm and ivy.")
            "1sqsm5sv311xfdk4f4rsnvprdf2v2vm7l1b3vqi7pc0g8adlnw1d"))))
       (build-system emacs-build-system)
       (propagated-inputs
-       `(("emms" ,emacs-emms)
-         ("emacs-org" ,emacs-org)))
+       `(("emms" ,emacs-emms)))
       (home-page "https://gitlab.com/jagrg/org-emms")
       (synopsis "Play multimedia files from org-mode")
       (description
@@ -21037,8 +21012,7 @@ contains a track position, playback will start at the specified position.")
    (propagated-inputs
     `(("emacs-request" ,emacs-request)
       ("emacs-s" ,emacs-s)
-      ("emacs-dash" ,emacs-dash)
-      ("emacs-org" ,emacs-org)))
+      ("emacs-dash" ,emacs-dash)))
    (home-page "https://github.com/ahungry/org-jira")
    (synopsis "Syncing between Jira and Org-mode")
    (description
-- 
2.26.2

[bug#41188] [PATCH] Do not propagate "emacs-org" in Emacs packages

[Jelle Licht]

Hi Nicolas,


Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

> Hello,
>
> The following patch removes dependency on upstream Org packages for
> Emacs packages.
>
> Feedback welcome.

You asked for it ;-).

On a more serious note, I have had _many_ issues with byte-compilation
of org-related anything over the years. Wouldn't this mean that the list
of packages that is touched by this patch will be byte-compiled using
the outdated org-mode that comes with Emacs?

Put another way, will all of these packages still work if I _do_ have
emacs-org installed in my profile?

 Thanks!

 - Jelle

[bug#41188] [PATCH] Do not propagate "emacs-org" in Emacs packages

[Nicolas Goaziou]

Hello,

Jelle Licht <jlicht@fsfe.org> writes:

> You asked for it ;-).

Heh.

> On a more serious note, I have had _many_ issues with byte-compilation
> of org-related anything over the years.

I have not encountered such problems. I don't use much Org-related
anything, either. Would you have any example in mind?

> Wouldn't this mean that the list of packages that is touched by this
> patch will be byte-compiled using the outdated org-mode that comes
> with Emacs?

It means exactly that.

> Put another way, will all of these packages still work if I _do_ have
> emacs-org installed in my profile?

Good question. This is why I'm sending this patch for review in the
first place.

I don't expect byte-compilation to do anything fancy here. As long as
the functions do not change their name, byte-compilation should be fine.
Take it with a grain of salt, tho. Maybe we should just test it and fix
encountered issues piece wise.

OTOH, we currently force users to always update Org, possibly
introducing, each time, breakage in their workflow, to get features that
would work perfectly with bundled Org.

Regards,

-- 
Nicolas Goaziou

[bug#41188] [PATCH] Do not propagate "emacs-org" in Emacs packages

[Ricardo Wurmus]

Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

>> On a more serious note, I have had _many_ issues with byte-compilation
>> of org-related anything over the years.
>
> I have not encountered such problems. I don't use much Org-related
> anything, either. Would you have any example in mind?
>
>> Wouldn't this mean that the list of packages that is touched by this
>> patch will be byte-compiled using the outdated org-mode that comes
>> with Emacs?
>
> It means exactly that.
>
>> Put another way, will all of these packages still work if I _do_ have
>> emacs-org installed in my profile?
>
> Good question. This is why I'm sending this patch for review in the
> first place.

I think it’s a good idea to ignore the version of org-mode that comes
with Emacs and assume that the latest version is installed, because they
are unfortunately far apart that I’m sure will cause problems.

I’m assuming that Org users generally will have a more recent org-mode
installed.

> OTOH, we currently force users to always update Org, possibly
> introducing, each time, breakage in their workflow, to get features that
> would work perfectly with bundled Org.

This is a general problem with Guix, though.  Org-mode is no exception.

-- 
Ricardo

bug#41188: [PATCH] Do not propagate "emacs-org" in Emacs packages

[Nicolas Goaziou]

Hello,

Ricardo Wurmus <rekado@elephly.net> writes:

> I think it’s a good idea to ignore the version of org-mode that comes
> with Emacs and assume that the latest version is installed, because they
> are unfortunately far apart that I’m sure will cause problems.
>
> I’m assuming that Org users generally will have a more recent org-mode
> installed.

Fair enough. I'm dropping the patch, then.

Thanks to both of you for the feedback.

Regards,

-- 
Nicolas Goaziou