[bug#61007] [PATCH] gnu: emacs-origami-el: Fix cl package deprecation.

[bug#61007] [PATCH] gnu: emacs-origami-el: Fix cl package deprecation.

[Nicolas Graves via Guix-patches via]

* gnu/packages/emacs-xyz.scm (emacs-origami-el):
[source] Add patch to fix cl package deprecation.
[propagated-inputs] Formatting.
[home-page] Formatting.
---
 gnu/packages/emacs-xyz.scm | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 41a0ccf09e..ed5c3bd71d 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -28753,24 +28753,30 @@ (define-public emacs-rjsx-mode
 (define-public emacs-origami-el
   (let ((commit "1f38085c8f9af7842765ed63f7d6dfe4dab59366")
         (version "1.0")
-        (revision "1"))
+        (revision "1")
+        (url "https://github.com/gregsexton/origami.el")
+        (patch "1d9c4f120c027a5009b0424270e3aae59f1cb128"))
     (package
       (name "emacs-origami-el")
       (version (git-version version revision commit))
       (source
        (origin
          (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/gregsexton/origami.el")
-               (commit commit)))
+         (uri (git-reference (url url) (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32
-           "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x"))))
+          (base32 "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x"))
+         (patches
+          (list
+           (origin
+             (method url-fetch)
+             (uri (string-append url "/commit/" patch ".patch"))
+             (sha256
+              (base32
+               "0yia4dhqjzdidxd77s2ggg6mmj05jbsnwc35myzzhzh1zbq8mrfy")))))))
       (build-system emacs-build-system)
-      (propagated-inputs
-       (list emacs-dash emacs-s))
-      (home-page "https://github.com/gregsexton/origami.el")
+      (propagated-inputs (list emacs-dash emacs-s))
+      (home-page url)
       (synopsis "Flexible text-folding")
       (description "This package provides a minor mode for collapsing and
 expanding regions of text without modifying the actual contents.")
-- 
2.39.1

[bug#61007] [PATCH] gnu: emacs-origami-el: Fix cl package deprecation.

[Nicolas Goaziou]

Hello,

Nicolas Graves via Guix-patches via <guix-patches@gnu.org> writes:

> * gnu/packages/emacs-xyz.scm (emacs-origami-el):
> [source] Add patch to fix cl package deprecation.
> [propagated-inputs] Formatting.
> [home-page] Formatting.
> ---
>  gnu/packages/emacs-xyz.scm | 24 +++++++++++++++---------
>  1 file changed, 15 insertions(+), 9 deletions(-)
>
> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
> index 41a0ccf09e..ed5c3bd71d 100644
> --- a/gnu/packages/emacs-xyz.scm
> +++ b/gnu/packages/emacs-xyz.scm
> @@ -28753,24 +28753,30 @@ (define-public emacs-rjsx-mode
>  (define-public emacs-origami-el
>    (let ((commit "1f38085c8f9af7842765ed63f7d6dfe4dab59366")
>          (version "1.0")
> -        (revision "1"))
> +        (revision "1")
> +        (url "https://github.com/gregsexton/origami.el")

Please don't factor out URL, even if you can.

Otherwise, LGTM.

Regards,
-- 
Nicolas Goaziou

[bug#61007] [PATCH v2] gnu: emacs-origami-el: Add patch to fix cl package deprecation.

[Nicolas Graves via Guix-patches via]

* gnu/packages/emacs-xyz.scm (emacs-origami-el):
[source] Add patch to fix cl package deprecation.
---
 gnu/packages/emacs-xyz.scm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index a5143b13c5..5ebf8f0e1d 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -28750,7 +28750,8 @@ (define-public emacs-rjsx-mode
 (define-public emacs-origami-el
   (let ((commit "1f38085c8f9af7842765ed63f7d6dfe4dab59366")
         (version "1.0")
-        (revision "1"))
+        (revision "1")
+        (patch "1d9c4f120c027a5009b0424270e3aae59f1cb128"))
     (package
       (name "emacs-origami-el")
       (version (git-version version revision commit))
@@ -28763,7 +28764,17 @@ (define-public emacs-origami-el
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x"))))
+           "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x"))
+         (patches
+          (list
+           (origin
+             (method url-fetch)
+             (uri (string-append
+                   "https://github.com/gregsexton/origami.el"
+                   "/commit/" patch ".patch"))
+             (sha256
+              (base32
+               "0yia4dhqjzdidxd77s2ggg6mmj05jbsnwc35myzzhzh1zbq8mrfy")))))))
       (build-system emacs-build-system)
       (propagated-inputs
        (list emacs-dash emacs-s))
-- 
2.39.1

[bug#61007] [PATCH v2] gnu: emacs-origami-el: Add patch to fix cl package deprecation.

[Nicolas Goaziou]

Hello,

Nicolas Graves via Guix-patches via <guix-patches@gnu.org> writes:

> * gnu/packages/emacs-xyz.scm (emacs-origami-el):
> [source] Add patch to fix cl package deprecation.

Applied.

The linter seems unhappy with the patch, but I think the linter is wrong
in this case.

Regards,
-- 
Nicolas Goaziou