summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarkhan <arkhan@riseup.net>2022-07-11 09:54:46 -0500
committerGuix Patches Tester <>2022-07-11 16:39:33 +0100
commit88eade65d849c2b4f03d6f65f44c43161f715a99 (patch)
treebb38a9af07a180a4dcf947ea95e937b101927b95
parent9bb14bd2378fa76c7619c0702cd63a28611c12f2 (diff)
downloadguix-patches-88eade65d849c2b4f03d6f65f44c43161f715a99.tar
guix-patches-88eade65d849c2b4f03d6f65f44c43161f715a99.tar.gz
gnu: xonsh: Update to 0.13.0issue-56454
* 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
-rw-r--r--gnu/packages/shells.scm20
1 files 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 @@
#: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 @@
#: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 @@ ksh, and tcsh.")
(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 @@ ksh, and tcsh.")
"--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