[bug#43330] [PATCH 0/6] Use pandoc instead of ghc-pandoc

[bug#43330] [PATCH 0/6] Use pandoc instead of ghc-pandoc

[zimoun]

From: simon <simon@pfiuh02.univ-paris-diderot.fr>

Dear,

These patches close #33844 <http://issues.guix.gnu.org/issue/33844>.
However, the bug number is not mentioned in the commit messages, mimicking
previous commit messages doing the same.

Note that rapicorn does not build, independently of {ghc-,}pandoc.  See:

https://data.guix.gnu.org/repository/1/branch/master/package/rapicorn/output-history

All the best,
simon


zimoun (6):
  gnu: ruby-pandoc-ruby: Use pandoc instead of ghc-pandoc.
  gnu: emacs-ox-pandoc: Use pandoc instead of ghc-pandoc.
  gnu: emacs-org-web-tools: Use pandoc instead of ghc-pandoc.
  gnu: manuskript: Use pandoc instead of ghc-pandoc.
  gnu: ganeti: Use pandoc instead of ghc-pandoc.
  gnu: rapicorn: Use pandoc instead of ghc-pandoc.

 gnu/packages/emacs-xyz.scm      | 4 ++--
 gnu/packages/graphics.scm       | 2 +-
 gnu/packages/ruby.scm           | 4 ++--
 gnu/packages/text-editors.scm   | 2 +-
 gnu/packages/virtualization.scm | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)


base-commit: 0574446be82ef54b925441e4283bf754a86918a9
-- 
2.20.1

[bug#43330] [PATCH 1/6] gnu: ruby-pandoc-ruby: Use pandoc instead of ghc-pandoc.

[zimoun]

* gnu/packages/ruby.scm (ruby-pandoc-ruby)[native-inputs]: Replace ghc-pandoc
with pandoc.
---
 gnu/packages/ruby.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index b181d1dc1f..c562ade153 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -1115,7 +1115,7 @@ line of code.")
              #t))
          (add-after 'unpack 'patch-pandoc-path
            (lambda* (#:key inputs #:allow-other-keys)
-             (let ((pandoc (string-append (assoc-ref inputs "ghc-pandoc")
+             (let ((pandoc (string-append (assoc-ref inputs "pandoc")
                                           "/bin/pandoc")))
                (substitute* "lib/pandoc-ruby.rb"
                  (("@@pandoc_path = 'pandoc'")
@@ -1135,7 +1135,7 @@ line of code.")
     (native-inputs
      `(("ruby-mocha" ,ruby-mocha)))
     (inputs
-     `(("ghc-pandoc" ,ghc-pandoc)))
+     `(("pandoc" ,pandoc)))
     (synopsis "Ruby wrapper for Pandoc")
     (description "PandocRuby is a wrapper for Pandoc, a Haskell library with
 command line tools for converting one markup format to another.  Pandoc can
-- 
2.20.1

[bug#43330] [PATCH 2/6] gnu: emacs-ox-pandoc: Use pandoc instead of ghc-pandoc.

[zimoun]

* gnu/packages/emacs-xyz.scm (emacs-ox-pandoc)[inputs]: Replace ghc-pandoc
with pandoc.
---
 gnu/packages/emacs-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 1dd010af6d..d4e83b29ad 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -21960,7 +21960,7 @@ format.")
                 "0iibxplgdp34bpq1yll2gmqjd8d8lnqn4mqjvx6cdf0y438yr4jz"))))
     (build-system emacs-build-system)
     (inputs
-     `(("pandoc" ,ghc-pandoc)))
+     `(("pandoc" ,pandoc)))
     (propagated-inputs
      `(("emacs-dash" ,emacs-dash)
        ("emacs-ht" ,emacs-ht)))
-- 
2.20.1

[bug#43330] [PATCH 3/6] gnu: emacs-org-web-tools: Use pandoc instead of ghc-pandoc.

[zimoun]

* gnu/packages/emacs-xyz.scm (emacs-org-webtools)[inputs]: Replace ghc-pandoc
with pandoc.
---
 gnu/packages/emacs-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index d4e83b29ad..0d41b352af 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -18413,7 +18413,7 @@ can be queued at any time.")
        ("emacs-esxml" ,emacs-esxml)
        ("emacs-s" ,emacs-s)))
     (inputs
-     `(("pandoc" ,ghc-pandoc)))
+     `(("pandoc" ,pandoc)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-- 
2.20.1

[bug#43330] [PATCH 4/6] gnu: manuskript: Use pandoc instead of ghc-pandoc.

[zimoun]

* gnu/packages/text-editors.scm (manuskript)[inputs]: Replace ghc-pandoc with
pandoc.
---
 gnu/packages/text-editors.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index cbf7693ddb..18f1c00da5 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -670,7 +670,7 @@ environment with Markdown markup.")
                    #:categories "Office;WordProcessor;"))
                #t))))))
     (inputs
-     `(("ghc-pandoc" ,ghc-pandoc)
+     `(("pandoc" ,pandoc)
        ("python-lxml" ,python-lxml)
        ("python-markdown" ,python-markdown)
        ("python-pyqt" ,python-pyqt)
-- 
2.20.1

[bug#43330] [PATCH 5/6] gnu: ganeti: Use pandoc instead of ghc-pandoc.

[zimoun]

* gnu/packages/text-editors.scm (ganeti)[native-inputs]: Replace ghc-pandoc
with pandoc.
---
 gnu/packages/virtualization.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 9880acf085..8e634ba6c6 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -679,7 +679,7 @@ server and embedded PowerPC, and S390 guests.")
        ;; For the documentation.
        ("python-docutils" ,python-docutils)
        ("sphinx" ,python-sphinx)
-       ("pandoc" ,ghc-pandoc)
+       ("pandoc" ,pandoc)
        ("dot" ,graphviz)
 
        ;; Test dependencies.
-- 
2.20.1

[bug#43330] [PATCH 6/6] gnu: rapicorn: Use pandoc instead of ghc-pandoc.

[zimoun]

* gnu/packages/graphics.scm (rapicorn)[native-inputs]: Replace ghc-pandoc with
pandoc.
---
 gnu/packages/graphics.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index d6c8e415bb..cf52984183 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1208,7 +1208,7 @@ realistic reflections, shading, perspective and other effects.")
        ("python" ,python-2)
        ("cython" ,python2-cython)))
     (native-inputs
-     `(("pandoc" ,ghc-pandoc)
+     `(("pandoc" ,pandoc)
        ("bison" ,bison)
        ("flex" ,flex)
        ("doxygen" ,doxygen)
-- 
2.20.1

[bug#43330] [PATCH 0/6] Use pandoc instead of ghc-pandoc

[Ludovic Courtès]

Hi,

zimoun <zimon.toutoune@gmail.com> skribis:

> These patches close #33844 <http://issues.guix.gnu.org/issue/33844>.
> However, the bug number is not mentioned in the commit messages, mimicking
> previous commit messages doing the same.
>
> Note that rapicorn does not build, independently of {ghc-,}pandoc.  See:
>
> https://data.guix.gnu.org/repository/1/branch/master/package/rapicorn/output-history

Uh.

[...]

>   gnu: ruby-pandoc-ruby: Use pandoc instead of ghc-pandoc.
>   gnu: emacs-ox-pandoc: Use pandoc instead of ghc-pandoc.
>   gnu: emacs-org-web-tools: Use pandoc instead of ghc-pandoc.
>   gnu: manuskript: Use pandoc instead of ghc-pandoc.
>   gnu: ganeti: Use pandoc instead of ghc-pandoc.
>   gnu: rapicorn: Use pandoc instead of ghc-pandoc.

It all LGTM; Ricardo, could you confirm this is as intended?

Thanks,
Ludo’.

[bug#43330] [PATCH 0/6] Use pandoc instead of ghc-pandoc

[Ricardo Wurmus]

Ludovic Courtès <ludo@gnu.org> writes:

> Hi,
>
> zimoun <zimon.toutoune@gmail.com> skribis:
>
>> These patches close #33844 <http://issues.guix.gnu.org/issue/33844>.
>> However, the bug number is not mentioned in the commit messages, mimicking
>> previous commit messages doing the same.
>>
>> Note that rapicorn does not build, independently of {ghc-,}pandoc.  See:
>>
>> https://data.guix.gnu.org/repository/1/branch/master/package/rapicorn/output-history
>
> Uh.

Rapicorn was only ever used for Beast, which we will likely not be able
to include going forward as they plan to depend on npm things.

>>   gnu: ruby-pandoc-ruby: Use pandoc instead of ghc-pandoc.
>>   gnu: emacs-ox-pandoc: Use pandoc instead of ghc-pandoc.
>>   gnu: emacs-org-web-tools: Use pandoc instead of ghc-pandoc.
>>   gnu: manuskript: Use pandoc instead of ghc-pandoc.
>>   gnu: ganeti: Use pandoc instead of ghc-pandoc.
>>   gnu: rapicorn: Use pandoc instead of ghc-pandoc.
>
> It all LGTM; Ricardo, could you confirm this is as intended?

Yes, this looks all fine to me.

-- 
Ricardo

[bug#43330] [PATCH 0/6] Use pandoc instead of ghc-pandoc

[zimoun]

Thank you for the quick review.

On Sun, 13 Sep 2020 at 23:38, Ricardo Wurmus <rekado@elephly.net> wrote:
> Ludovic Courtès <ludo@gnu.org> writes:
> > zimoun <zimon.toutoune@gmail.com> skribis:

> >> Note that rapicorn does not build, independently of {ghc-,}pandoc.  See:
> >>
> >> https://data.guix.gnu.org/repository/1/branch/master/package/rapicorn/output-history
> >
> > Uh.
>
> Rapicorn was only ever used for Beast, which we will likely not be able
> to include going forward as they plan to depend on npm things.

The home-page URL <https://rapicorn.testbit.org/> is "Not found", as
the source <https://testbit.eu/pub/dists/rapicorn/rapicorn-16.0.0.tar.xz>.
And Github <https://github.com/tim-janik/rapicorn> says that the last
commit is 2017 (I do not know if it is the main upstream repo).

The package beast does not build either, but that's another story.

Well, I suggest removing both.

And this asks how to detect automatically and report broken packages.
Another story (Data Service or Cuirass). :-)


Cheers,
simon

bug#43330: [PATCH 0/6] Use pandoc instead of ghc-pandoc

[Ludovic Courtès]

Hi,

Ricardo Wurmus <rekado@elephly.net> skribis:

> Yes, this looks all fine to me.

Applied’em all, thanks!

Ludo’.