[bug#56454] [PATCH] gnu: xonsh: Update to 0.13.0

[bug#56454] [PATCH] gnu: xonsh: Update to 0.13.0

[Edison Ibáñez]

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



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-update-xonsh-to-1.3.0.patch --]
[-- Type: text/x-patch, Size: 2593 bytes --]

From 6aa6764e9b2c13e91afcd73f3725db9db446c699 Mon Sep 17 00:00:00 2001
From: arkhan <arkhan@riseup.net>
Date: Fri, 8 Jul 2022 09:52:54 -0500
Subject: [PATCH] gnu: update xonsh to 1.3.0

---
 gnu/packages/shells.scm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 9fe0ed8e27..7675fe84e9 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -57,6 +57,7 @@ (define-module (gnu packages shells)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages rust)
@@ -64,6 +65,7 @@ (define-module (gnu packages shells)
   #:use-module (gnu packages scheme)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
+  #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages texinfo)
   #:use-module (guix build-system cargo)
@@ -545,7 +547,7 @@ (define-public zsh
 (define-public xonsh
   (package
     (name "xonsh")
-    (version "0.12.4")
+    (version "0.13.0")
     (source
       (origin
         (method url-fetch)
@@ -554,15 +556,12 @@ (define-public xonsh
           (base32 "0xlac84nsgs0052n2pw8np1smlgghrbd7p6yrcp7d5qh8zdr9lx3"))
         (modules '((guix build utils)))
         (snippet
-         `(begin
-            ;; Delete bundled PLY.
-            (delete-file-recursively "xonsh/ply")
+         #~(begin
             (substitute* "setup.py"
               (("\"xonsh\\.ply\\.ply\",") ""))
             ;; Use our properly packaged PLY instead.
             (substitute* (list "setup.py"
                                "tests/test_lexer.py"
-                               "xonsh/__amalgam__.py"
                                "xonsh/lexer.py"
                                "xonsh/parsers/base.py"
                                "xonsh/parsers/completion_context.py"
@@ -587,7 +586,13 @@ (define-public xonsh
                      (invoke "python" "setup.py" "install" "--root=/"
                              (string-append "--prefix=" out))))))))
     (inputs
-     (list python-ply))
+     (list python-distro
+           python-ply
+           python-pygments
+           python-pyperclip
+           python-setproctitle
+           python-setuptools
+           python-wheel))
     (home-page "https://xon.sh/")
     (synopsis "Python-ish shell")
     (description
-- 
2.36.1

[bug#56454] [PATCH] gnu: xonsh: Update to 0.13.0

[Ludovic Courtès]

Hi,

Edison Ibáñez <arkhan@riseup.net> skribis:

>>From 6aa6764e9b2c13e91afcd73f3725db9db446c699 Mon Sep 17 00:00:00 2001
> From: arkhan <arkhan@riseup.net>
> Date: Fri, 8 Jul 2022 09:52:54 -0500
> Subject: [PATCH] gnu: update xonsh to 1.3.0
>
> ---
>  gnu/packages/shells.scm | 17 +++++++++++------

[...]

> +    (version "0.13.0")
>      (source
>        (origin
>          (method url-fetch)
> @@ -554,15 +556,12 @@ (define-public xonsh
>            (base32 "0xlac84nsgs0052n2pw8np1smlgghrbd7p6yrcp7d5qh8zdr9lx3"))

Look like you forgot to update the hash, which leads to:

--8<---------------cut here---------------start------------->8---
downloading from https://files.pythonhosted.org/packages/source/x/xonsh/xonsh-0.13.0.tar.gz ...
 xonsh-0.13.0.tar.gz  751KiB                           17.1MiB/s 00:00 [##################] 100.0%
sha256 hash mismatch for /gnu/store/jy4fj2bbgrmhi164z3qk6423mhdzma00-xonsh-0.13.0.tar.gz:
  expected hash: 0xlac84nsgs0052n2pw8np1smlgghrbd7p6yrcp7d5qh8zdr9lx3
  actual hash:   12ayz1kw2ag3r407j0lng2kfp75im8xqap1nvpmpa0lmsx8wk7ll
hash mismatch for store item '/gnu/store/jy4fj2bbgrmhi164z3qk6423mhdzma00-xonsh-0.13.0.tar.gz'
--8<---------------cut here---------------end--------------->8---

>      (inputs
> -     (list python-ply))
> +     (list python-distro
> +           python-ply
> +           python-pygments
> +           python-pyperclip
> +           python-setproctitle
> +           python-setuptools
> +           python-wheel))

‘guix lint’ reports this:

--8<---------------cut here---------------start------------->8---
$ ./pre-inst-env  guix lint xonsh
gnu/packages/shells.scm:589:5: xonsh@0.13.0: 'python-setuptools' should probably not be an input at all
--8<---------------cut here---------------end--------------->8---

Is setuptools used at run time?  If not, which is likely, it probably
shouldn’t be there.

Could you send an updated patch?

Bonus points if you can provide a ChangeLog-style commit log.  :-)

  https://guix.gnu.org/manual/devel/en/html_node/Submitting-Patches.html

Thanks,
Ludo’.

[bug#56454] [PATCH] gnu: xonsh: Update to 0.13.0

[Edison Ibáñez]

El 2022-07-10 16:54, Ludovic Courtès escribió:
> Hi,
> 
> Edison Ibáñez <arkhan@riseup.net> skribis:
> 
>>>From 6aa6764e9b2c13e91afcd73f3725db9db446c699 Mon Sep 17 00:00:00 2001
>> From: arkhan <arkhan@riseup.net>
>> Date: Fri, 8 Jul 2022 09:52:54 -0500
>> Subject: [PATCH] gnu: update xonsh to 1.3.0
>>
>> ---
>>  gnu/packages/shells.scm | 17 +++++++++++------
> 
> [...]
> 
>> +    (version "0.13.0")
>>      (source
>>        (origin
>>          (method url-fetch)
>> @@ -554,15 +556,12 @@ (define-public xonsh
>>            (base32 "0xlac84nsgs0052n2pw8np1smlgghrbd7p6yrcp7d5qh8zdr9lx3"))
> 

Sorry, I missed it, I already sent the updated patch

> Look like you forgot to update the hash, which leads to:
> 
> --8<---------------cut here---------------start------------->8---
> downloading from
> https://files.pythonhosted.org/packages/source/x/xonsh/xonsh-0.13.0.tar.gz
> ...
>  xonsh-0.13.0.tar.gz  751KiB                           17.1MiB/s 00:00
> [##################] 100.0%
> sha256 hash mismatch for
> /gnu/store/jy4fj2bbgrmhi164z3qk6423mhdzma00-xonsh-0.13.0.tar.gz:
>   expected hash: 0xlac84nsgs0052n2pw8np1smlgghrbd7p6yrcp7d5qh8zdr9lx3
>   actual hash:   12ayz1kw2ag3r407j0lng2kfp75im8xqap1nvpmpa0lmsx8wk7ll
> hash mismatch for store item
> '/gnu/store/jy4fj2bbgrmhi164z3qk6423mhdzma00-xonsh-0.13.0.tar.gz'
> --8<---------------cut here---------------end--------------->8---
> 
>>      (inputs
>> -     (list python-ply))
>> +     (list python-distro
>> +           python-ply
>> +           python-pygments
>> +           python-pyperclip
>> +           python-setproctitle
>> +           python-setuptools
>> +           python-wheel))
> 
> ‘guix lint’ reports this:
> 
> --8<---------------cut here---------------start------------->8---
> $ ./pre-inst-env  guix lint xonsh
> gnu/packages/shells.scm:589:5: xonsh@0.13.0: 'python-setuptools'
> should probably not be an input at all
> --8<---------------cut here---------------end--------------->8---
> 
> Is setuptools used at run time?  If not, which is likely, it probably
> shouldn’t be there.
> 

python-setuptools and python-wheel are not required for run time but for
package build, so in patch update I moved them to native-inputs

> Could you send an updated patch?
> 
> Bonus points if you can provide a ChangeLog-style commit log.  :-)
> 
>   https://guix.gnu.org/manual/devel/en/html_node/Submitting-Patches.html
> 
> Thanks,
> Ludo’.

Thanks for taking the time to review this.
Edison.

[bug#56454] [PATCH] gnu: xonsh: Update to 0.13.0

[Edison Ibáñez]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-xonsh-Update-to-0.13.0.patch --]
[-- Type: text/x-diff; name=0001-gnu-xonsh-Update-to-0.13.0.patch, Size: 3020 bytes --]

From 57dfcac63ae2b940570065a13d2c075f527d288b Mon Sep 17 00:00:00 2001
From: arkhan <arkhan@riseup.net>
Date: Mon, 11 Jul 2022 09:54:46 -0500
Subject: [PATCH] gnu: xonsh: Update to 0.13.0

* gnu/packages/shells.scm (xonsh): Update to 0.13.0.
* [source]: Rewrite snippet as a gexp.
* [native-inputs]: Add python-setuptools, python-wheel
* [inputs]: Add python-distro, python-pygments, python-pyperclip, python-setproctitle
---
 gnu/packages/shells.scm | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 9fe0ed8e27..0b5ddd7333 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -57,6 +57,7 @@ (define-module (gnu packages shells)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages rust)
@@ -64,6 +65,7 @@ (define-module (gnu packages shells)
   #:use-module (gnu packages scheme)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
+  #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages texinfo)
   #:use-module (guix build-system cargo)
@@ -545,24 +547,21 @@ (define-public zsh
 (define-public xonsh
   (package
     (name "xonsh")
-    (version "0.12.4")
+    (version "0.13.0")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "xonsh" version))
         (sha256
-          (base32 "0xlac84nsgs0052n2pw8np1smlgghrbd7p6yrcp7d5qh8zdr9lx3"))
+          (base32 "12ayz1kw2ag3r407j0lng2kfp75im8xqap1nvpmpa0lmsx8wk7ll"))
         (modules '((guix build utils)))
         (snippet
-         `(begin
-            ;; Delete bundled PLY.
-            (delete-file-recursively "xonsh/ply")
+         #~(begin
             (substitute* "setup.py"
               (("\"xonsh\\.ply\\.ply\",") ""))
             ;; Use our properly packaged PLY instead.
             (substitute* (list "setup.py"
                                "tests/test_lexer.py"
-                               "xonsh/__amalgam__.py"
                                "xonsh/lexer.py"
                                "xonsh/parsers/base.py"
                                "xonsh/parsers/completion_context.py"
@@ -586,8 +585,15 @@ (define-public xonsh
                              "--invalidation-mode=unchecked-hash" out)
                      (invoke "python" "setup.py" "install" "--root=/"
                              (string-append "--prefix=" out))))))))
+    (native-inputs
+     (list python-setuptools
+           python-wheel))
     (inputs
-     (list python-ply))
+     (list python-distro
+           python-ply
+           python-pygments
+           python-pyperclip
+           python-setproctitle))
     (home-page "https://xon.sh/")
     (synopsis "Python-ish shell")
     (description
-- 
2.36.1

bug#56454: [PATCH] gnu: xonsh: Update to 0.13.0

[Ludovic Courtès]

Hi,

Edison Ibáñez <arkhan@riseup.net> skribis:

> From 57dfcac63ae2b940570065a13d2c075f527d288b Mon Sep 17 00:00:00 2001
> From: arkhan <arkhan@riseup.net>
> Date: Mon, 11 Jul 2022 09:54:46 -0500
> Subject: [PATCH] gnu: xonsh: Update to 0.13.0
>
> * gnu/packages/shells.scm (xonsh): Update to 0.13.0.
> * [source]: Rewrite snippet as a gexp.
> * [native-inputs]: Add python-setuptools, python-wheel
> * [inputs]: Add python-distro, python-pygments, python-pyperclip, python-setproctitle

I tweaked the commit log and applied it, thanks!

Ludo’.