>From 6aa6764e9b2c13e91afcd73f3725db9db446c699 Mon Sep 17 00:00:00 2001 From: arkhan 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