diff mbox series

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

Message ID 9a11ae0a79f20c167abdf7428908beab@riseup.net
State Accepted
Headers show
Series [bug#56454] gnu: xonsh: Update to 0.13.0 | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git-branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Edison Ibáñez July 11, 2022, 3:07 p.m. UTC

Comments

Ludovic Courtès July 11, 2022, 8:01 p.m. UTC | #1 
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’.
diff mbox series

Patch

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