diff options
| author | arkhan <arkhan@riseup.net> | 2022-07-11 09:54:46 -0500 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-07-12 01:17:45 +0200 |
| commit | dee9a32888ed1d323a3712480c30f097368a552a (patch) | |
| tree | 2032570eda8873be2cc5cad245a453acb281a713 | |
| parent | 5ecbf5b1637762281992befec7fa53f966e5d0b1 (diff) | |
| download | guix-dee9a32888ed1d323a3712480c30f097368a552a.tar.gz guix-dee9a32888ed1d323a3712480c30f097368a552a.zip | |
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
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | gnu/packages/shells.scm | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 9fe0ed8e27..2caefd3dd0 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,32 +547,29 @@ 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") - (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" - "xonsh/xonfig.py") - (("from xonsh\\.ply\\.(.*) import" _ module) - (format #f "from ~a import" module)) - (("from xonsh\\.ply import") "import")) - #t)))) + #~(begin + (substitute* "setup.py" + (("\"xonsh\\.ply\\.ply\",") "")) + ;; Use our properly packaged PLY instead. + (substitute* (list "setup.py" + "tests/test_lexer.py" + "xonsh/lexer.py" + "xonsh/parsers/base.py" + "xonsh/parsers/completion_context.py" + "xonsh/xonfig.py") + (("from xonsh\\.ply\\.(.*) import" _ module) + (format #f "from ~a import" module)) + (("from xonsh\\.ply import") "import")) + #t)))) (build-system python-build-system) (arguments (list ;; TODO Try running run the test suite. @@ -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 ;needed at build time + 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 |